Merge remote-tracking branch 'deanberris/0.9-devel' into 0.9-devel

Author: glynos

CMakeLists.txt

@@ -21,6 +21,10 @@ if (OPENSSL_FOUND)
     include_directories(${OPENSSL_INCLUDE_DIR})
 endif()
 
+if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+endif()
+
 if (Boost_FOUND)
     if (MSVC)
       add_definitions(-D_SCL_SECURE_NO_WARNINGS)

boost/network/protocol/http/algorithms/linearize.hpp

@@ -6,6 +6,8 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#include <algorithm>
+#include <bitset>
 #include <boost/network/traits/string.hpp>
 #include <boost/network/protocol/http/message/header/name.hpp>
 #include <boost/network/protocol/http/message/header/value.hpp>
@@ -15,6 +17,7 @@
 #include <boost/concept/requires.hpp>
 #include <boost/optional.hpp>
 #include <boost/range/algorithm/copy.hpp>
+#include <boost/algorithm/string/compare.hpp>
 
 namespace boost { namespace network { namespace http {
 
@@ -92,48 +95,86 @@ namespace boost { namespace network { namespace http {
         *oi = consts::dot_char();
         boost::copy(version_minor_str, oi);
         boost::copy(crlf, oi);
-        boost::copy(host, oi);
-        *oi = consts::colon_char();
-        *oi = consts::space_char();
-        boost::copy(request.host(), oi);
-        boost::optional<boost::uint16_t> port_ = port(request);
-        if (port_) {
-            string_type port_str = boost::lexical_cast<string_type>(*port_);
-            *oi = consts::colon_char();
-            boost::copy(port_str, oi);
-        }
-        boost::copy(crlf, oi);
-        boost::copy(accept, oi);
-        *oi = consts::colon_char();
-        *oi = consts::space_char();
-        boost::copy(accept_mime, oi);
-        boost::copy(crlf, oi);
-        if (version_major == 1u && version_minor == 1u) {
-            boost::copy(accept_encoding, oi);
-            *oi = consts::colon_char();
-            *oi = consts::space_char();
-            boost::copy(default_accept_encoding, oi);
-            boost::copy(crlf, oi);
-        }
+
+        // We need to determine whether we've seen any of the following headers
+        // before setting the defaults. We use a bitset to keep track of the
+        // defaulted headers.
+        enum { ACCEPT, ACCEPT_ENCODING, HOST, MAX };
+        std::bitset<MAX> found_headers;
+        static char const* defaulted_headers[][2] = {
+          {consts::accept(),
+           consts::accept() + std::strlen(consts::accept())},
+          {consts::accept_encoding(),
+           consts::accept_encoding() + std::strlen(consts::accept_encoding())},
+          {consts::host(), consts::host() + std::strlen(consts::host())}
+        };
+
         typedef typename headers_range<Request>::type headers_range;
         typedef typename range_value<headers_range>::type headers_value;
-        BOOST_FOREACH(const headers_value &header, headers(request))
-        {
-            string_type header_name = name(header),
-                        header_value = value(header);
-            boost::copy(header_name, oi);
-            *oi = consts::colon_char();
-            *oi = consts::space_char();
-            boost::copy(header_value, oi);
-            boost::copy(crlf, oi);
+        BOOST_FOREACH(const headers_value & header, headers(request)) {
+          string_type header_name = name(header), header_value = value(header);
+          // Here we check that we have not seen an override to the defaulted
+          // headers.
+          for (int header_index = 0; header_index < MAX; ++header_index)
+            if (std::distance(header_name.begin(), header_name.end()) ==
+                    std::distance(defaulted_headers[header_index][0],
+                                  defaulted_headers[header_index][1]) &&
+                std::equal(header_name.begin(),
+                           header_name.end(),
+                           defaulted_headers[header_index][0],
+                           algorithm::is_iequal()))
+              found_headers.set(header_index, true);
+
+          // We ignore empty headers.
+          if (header_value.empty()) continue;
+          boost::copy(header_name, oi);
+          *oi = consts::colon_char();
+          *oi = consts::space_char();
+          boost::copy(header_value, oi);
+          boost::copy(crlf, oi);
+
+        }
+
+        if (!found_headers[HOST]) {
+          boost::copy(host, oi);
+          *oi = consts::colon_char();
+          *oi = consts::space_char();
+          boost::copy(request.host(), oi);
+          boost::optional<boost::uint16_t> port_ = port(request);
+          if (port_) {
+              string_type port_str = boost::lexical_cast<string_type>(*port_);
+              *oi = consts::colon_char();
+              boost::copy(port_str, oi);
+          }
+          boost::copy(crlf, oi);
+        }
+
+        if (!found_headers[ACCEPT]) {
+          boost::copy(accept, oi);
+          *oi = consts::colon_char();
+          *oi = consts::space_char();
+          boost::copy(accept_mime, oi);
+          boost::copy(crlf, oi);
+        }
+
+        if (version_major == 1u &&
+            version_minor == 1u &&
+            !found_headers[ACCEPT_ENCODING]) {
+          boost::copy(accept_encoding, oi);
+          *oi = consts::colon_char();
+          *oi = consts::space_char();
+          boost::copy(default_accept_encoding, oi);
+          boost::copy(crlf, oi);
         }
+
         if (!connection_keepalive<Tag>::value) {
-            boost::copy(connection, oi);
-            *oi = consts::colon_char();
-            *oi = consts::space_char();
+          boost::copy(connection, oi);
+          *oi = consts::colon_char();
+          *oi = consts::space_char();
             boost::copy(close, oi);
             boost::copy(crlf, oi);
         }
+
         boost::copy(crlf, oi);
         typename body_range<Request>::type body_data = body(request).range();
         return boost::copy(body_data, oi);

boost/network/protocol/http/server/async_server.hpp

@@ -90,20 +90,21 @@ namespace boost { namespace network { namespace http {
               scoped_mutex_lock stopping_lock(stopping_mutex_);
               if (stopping) return;  // we dont want to add another handler instance, and we dont want to know about errors for a socket we dont need anymore
             }
-            if (!ec) {
-                socket_options_base::socket_options(new_connection->socket());
-                new_connection->start();
-                new_connection.reset(
-                    new connection(service_, handler, *thread_pool));
-                acceptor.async_accept(
-                    new_connection->socket(),
-                    boost::bind(
-                        &async_server_base<Tag,Handler>::handle_accept,
-                        this,
-                        boost::asio::placeholders::error));
-            } else {
-                BOOST_NETWORK_MESSAGE("Error accepting connection, reason: " << ec);
+
+            if (ec) {
+              BOOST_NETWORK_MESSAGE("Error accepting connection, reason: "
+                                    << ec);
             }
+
+            socket_options_base::socket_options(new_connection->socket());
+            new_connection->start();
+            new_connection.reset(
+                new connection(service_, handler, *thread_pool));
+            acceptor.async_accept(
+                new_connection->socket(),
+                boost::bind(&async_server_base<Tag, Handler>::handle_accept,
+                            this,
+                            boost::asio::placeholders::error));
         }
 
         void start_listening() {

boost/network/protocol/http/server/sync_server.hpp

@@ -68,15 +68,18 @@ namespace boost { namespace network { namespace http {
         boost::mutex listening_mutex_;
         bool listening_;
 
-        void handle_accept(boost::system::error_code const & ec) {
-            if (!ec) {
-                socket_options_base::socket_options(new_connection->socket());
-                new_connection->start();
-                new_connection.reset(new sync_connection<Tag,Handler>(service_, handler_));
-                acceptor_.async_accept(new_connection->socket(),
-                    boost::bind(&sync_server_base<Tag,Handler>::handle_accept,
-                                this, boost::asio::placeholders::error));
-            }
+        void handle_accept(boost::system::error_code const& ec) {
+          if (ec) {
+          }
+          socket_options_base::socket_options(new_connection->socket());
+          new_connection->start();
+          new_connection.reset(
+              new sync_connection<Tag, Handler>(service_, handler_));
+          acceptor_.async_accept(
+              new_connection->socket(),
+              boost::bind(&sync_server_base<Tag, Handler>::handle_accept,
+                          this,
+                          boost::asio::placeholders::error));
         }
 
         void start_listening() {
@@ -87,24 +90,24 @@ namespace boost { namespace network { namespace http {
             tcp::resolver::iterator endpoint_iterator = resolver.resolve(query, error);
             if (error) {
                 BOOST_NETWORK_MESSAGE("Error resolving address: " << address_ << ':' << port_);
-                return;
+                boost::throw_exception(std::runtime_error("Error resolving address."));
             }
             tcp::endpoint endpoint = *endpoint_iterator;
             acceptor_.open(endpoint.protocol(), error);
             if (error) {
                 BOOST_NETWORK_MESSAGE("Error opening socket: " << address_ << ':' << port_ << " -- reason: '" << error << '\'');
-                return;
+                boost::throw_exception(std::runtime_error("Error opening socket."));
             }
             socket_options_base::acceptor_options(acceptor_);
             acceptor_.bind(endpoint, error);
             if (error) {
                 BOOST_NETWORK_MESSAGE("Error binding to socket: " << address_ << ':' << port_ << " -- reason: '" << error << '\'');
-                return;
+                boost::throw_exception(std::runtime_error("Error binding to socket."));
             }
             acceptor_.listen(tcp::socket::max_connections, error);
             if (error) {
                 BOOST_NETWORK_MESSAGE("Error listening on socket: " << address_ << ':' << port_ << " -- reason: '" << error << '\'');
-                return;
+                boost::throw_exception(std::runtime_error("Error listening on socket."));
             }
             new_connection.reset(new sync_connection<Tag,Handler>(service_, handler_));
             acceptor_.async_accept(new_connection->socket(),

boost/network/support/is_udp.hpp

@@ -24,4 +24,5 @@ namespace boost { namespace network {
 
 } // namespace boost
 
-#endif // BOOST_NETWORK_SUPPORT_IS_UDP_HPP_20100622
+#endif // BOOST_NETWORK_SUPPORT_IS_UDP_HPP_20100622
+

boost/network/version.hpp

@@ -11,7 +11,7 @@
 
 #define BOOST_NETLIB_VERSION_MAJOR 0
 #define BOOST_NETLIB_VERSION_MINOR 10
-#define BOOST_NETLIB_VERSION_INCREMENT 0
+#define BOOST_NETLIB_VERSION_INCREMENT 1
 
 #ifndef BOOST_NETLIB_VERSION
 # define BOOST_NETLIB_VERSION \

libs/network/doc/html/.doctrees/environment.pickle

@@ -33,14 +33,14 @@ overload of the ``basic_client``:
 
 
 The default typedef for the HTTP client that is provided uses the
-``http_default_8bit_udp_resolve`` tag, and implements HTTP 1.0. The exact
+``http_async_8bit_udp_resolve`` tag, and implements HTTP 1.1. The exact
 typedef is in the ``boost::network::http`` namespace as the following:
 
 .. code-block:: c++
 
     namespace boost { namespace network { namespace http {
 
-        typedef basic_client<tags::http_default_8bit_udp_resolve, 1, 0>
+        typedef basic_client<tags::http_async_8bit_udp_resolve, 1, 1>
             client;
 
     }}}

libs/network/doc/html/.doctrees/in_depth/http.doctree

@@ -3,8 +3,8 @@
 
 .. :Authors: Glyn Matthews <[email protected]>
 .. 	  Dean Michael Berris <[email protected]>
-.. :Date: Jun 26, 2013
-.. :Version: 0.10.0
+.. :Date: Jul 4, 2013
+.. :Version: 0.10.1
 .. :Description: Complete user documentation, with examples, for the :mod:`cpp-netlib`.
 .. :Copyright: Copyright Glyn Matthews, Dean Michael Berris 2008-2013.
 ..             Copyrigh 2013 Google, Inc.

libs/network/doc/html/.doctrees/in_depth/uri.doctree

@@ -105,6 +105,26 @@ happens on a different thread.
    dedicated to that request. The client does not re-cycle connections and uses
    a one-request-one-connection model.
 
+When an asynchronous client object is destroyed, it waits for all pending
+asynchronous operations to finish. Errors encountered during operations on
+retrieving data from the response objects cause exceptions to be thrown --
+therefore it is best that if a client object is constructed, it should outlive
+the response object or be outside the try-catch block handling the errors from
+operations on responses. In code, usage should look like the following:
+
+.. code-block:: c++
+
+    http::client client;
+    try {
+      http::client::response response = client.get("http://www.example.com/");
+      std::cout << body(response);
+    } catch (std::exception& e) {
+      // deal with exceptions here
+    }
+
+A common mistake is to declare the client inside the try block which invokes
+undefined behavior when errors arise from the handling of response objects.
+
 Member Functions
 ----------------
 

libs/network/doc/html/.doctrees/index.doctree

@@ -7,6 +7,11 @@ HTTP Response objects. This section details the `Response Concept`_ requirements
 the implemented and required Directives_, Modifiers_, and Wrappers_ that work
 with the HTTP Response objects.
 
+.. note:: The HTTP server response object is a POD type, which doesn't support
+   any of the following details. There are only a few fields available in the
+   HTTP server response type, which can be seen in
+   ``boost/network/protocol/http/impl/response.ipp``.
+
 Response Concept
 ----------------
 

libs/network/doc/html/.doctrees/reference/http_client.doctree

@@ -7,6 +7,26 @@
 :mod:`cpp-netlib` 0.10
 ----------------------
 
+v0.10.1
+~~~~~~~
+* Documentation updates (`#182`_, `#265`_, `#194`_, `#233`_, `#255`_)
+* Fix issue with async server inadvertently stopping from listening when
+  accepting a connection fails. (`#172`_)
+* Allow overriding and ultimately removing defaulted headers from HTTP
+  requests. (`#263`_)
+* Add `-Wall` to the base rule for GCC builds. (`#264`_)
+* Make the server implementation throw on startup errors. (`#166`_)
+
+.. _`#182`: https://github.com/cpp-netlib/cpp-netlib/issues/182
+.. _`#265`: https://github.com/cpp-netlib/cpp-netlib/issues/265
+.. _`#194`: https://github.com/cpp-netlib/cpp-netlib/issues/194
+.. _`#172`: https://github.com/cpp-netlib/cpp-netlib/issues/172
+.. _`#263`: https://github.com/cpp-netlib/cpp-netlib/issues/263
+.. _`#233`: https://github.com/cpp-netlib/cpp-netlib/issues/233
+.. _`#264`: https://github.com/cpp-netlib/cpp-netlib/issues/264
+.. _`#255`: https://github.com/cpp-netlib/cpp-netlib/issues/255
+.. _`#166`: https://github.com/cpp-netlib/cpp-netlib/issues/166
+
 v0.10.0
 ~~~~~~~
 * Added support for more HTTP status codes (206, 408, 412, 416, 507).

libs/network/doc/html/.doctrees/reference/http_response.doctree

@@ -59,6 +59,7 @@ <h3>Navigation</h3>
 <li class="toctree-l1"><a class="reference internal" href="index.html#want-to-learn-more">Want to learn more?</a></li>
 <li class="toctree-l1"><a class="reference internal" href="whats_new.html">What&#8217;s New</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="whats_new.html#cpp-netlib-0-10"><tt class="docutils literal"><span class="pre">cpp-netlib</span></tt> 0.10</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="whats_new.html#v0-10-1">v0.10.1</a></li>
 <li class="toctree-l3"><a class="reference internal" href="whats_new.html#v0-10-0">v0.10.0</a></li>
 </ul>
 </li>
@@ -270,7 +271,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2008-2013, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
-      Last updated on Jun 28, 2013.
+      Last updated on Jul 04, 2013.
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2b1.
     </div>
   </body>

libs/network/doc/html/.doctrees/whats_new.doctree

@@ -131,7 +131,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2008-2013, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
-      Last updated on Jun 28, 2013.
+      Last updated on Jul 04, 2013.
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2b1.
     </div>
   </body>

libs/network/doc/html/_sources/in_depth/http.txt

@@ -175,7 +175,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2008-2013, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
-      Last updated on Jun 28, 2013.
+      Last updated on Jul 04, 2013.
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2b1.
     </div>
   </body>

libs/network/doc/html/_sources/index.txt

@@ -192,7 +192,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
         &copy; Copyright 2008-2013, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
-      Last updated on Jun 28, 2013.
+      Last updated on Jul 04, 2013.
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2b1.
     </div>
   </body>