Revert "Merge pull request #1 from CovenantEyes/ce-custom"

3noch · 3noch · commit 26c681bb6c76 · 2013-01-23T11:51:43.000-05:00
This reverts commit ac45ccd, reversing changes made to d51d6e4.
diff --git a/boost/network/protocol/http/impl/request.hpp b/boost/network/protocol/http/impl/request.hpp
@@ -157,7 +157,6 @@ namespace http {
         typedef vector_type headers_container_type;
         typedef boost::uint16_t port_type;
         mutable string_type source;
-        mutable port_type source_port;
         mutable string_type method;
         mutable string_type destination;
         mutable boost::uint8_t http_version_major;
@@ -169,7 +168,6 @@ namespace http {
             using std::swap;
             swap(method, r.method);
             swap(source, r.source);
-            swap(source_port, r.source_port);
             swap(destination, r.destination);
             swap(http_version_major, r.http_version_major);
             swap(http_version_minor, r.http_version_minor);
diff --git a/boost/network/protocol/http/server/sync_connection.hpp b/boost/network/protocol/http/server/sync_connection.hpp
@@ -79,7 +79,6 @@ namespace boost { namespace network { namespace http {
         void handle_read_headers(boost::system::error_code const &ec, size_t bytes_transferred) {
             if (!ec) {
                 request_.source = socket_.remote_endpoint().address().to_string();
-                request_.source_port = socket_.remote_endpoint().port();
                 boost::tribool done;
                 buffer_type::iterator new_start;
                 tie(done,new_start) = parser_.parse_headers(request_, buffer_.data(), buffer_.data() + bytes_transferred);
diff --git a/libs/network/example/http/hello_world_server.cpp b/libs/network/example/http/hello_world_server.cpp
@@ -29,9 +29,8 @@ struct hello_world {
     void operator() (server::request const &request,
                      server::response &response) {
         server::string_type ip = source(request);
-        unsigned int port = request.source_port;
         std::ostringstream data;
-        data << "Hello, " << ip << ':' << port << '!';
+        data << "Hello, " << ip << "!";
         response = server::response::stock_reply(
             server::response::ok, data.str());
     }
