Merge pull request cpp-netlib#43 from deanberris/0.9-devel

0.9 devel

Author: deanberris

boost/network/protocol/http/message/async_message.hpp

@@ -3,6 +3,8 @@
 
 // Copyright 2010 (c) Dean Michael Berris
 // Copyright 2010 (c) Sinefunc, Inc.
+// Copyright 2011 Dean Michael Berris ([email protected]).
+// Copyright 2011 Google, Inc.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -91,13 +93,15 @@ namespace boost { namespace network { namespace http {
             destination_ = future;
         }
 
-        headers_container_type const headers() const {
+        headers_container_type const & headers() const {
+            if (retrieved_headers_) return *retrieved_headers_;
             headers_container_type raw_headers = headers_.get();
             raw_headers.insert(added_headers.begin(), added_headers.end());
             BOOST_FOREACH(string_type const & key, removed_headers) {
                 raw_headers.erase(key);
             }
-            return raw_headers;
+            retrieved_headers_ = raw_headers;
+            return *retrieved_headers_;
         }
 
         void headers(boost::shared_future<headers_container_type> const & future) const {
@@ -144,6 +148,7 @@ namespace boost { namespace network { namespace http {
         mutable headers_container_type added_headers;
         mutable std::set<string_type> removed_headers;
         mutable boost::shared_future<string_type> body_;
+        mutable boost::optional<headers_container_type> retrieved_headers_;
 
         friend struct boost::network::http::impl::ready_wrapper<Tag>;
     };

libs/network/test/http/CMakeLists.txt

@@ -23,12 +23,14 @@ if (Boost_FOUND)
         client_get_test
         client_get_different_port_test
         client_get_timeout_test
-        client_localhost_normal_test
+        # TODO: refactor these so that local servers are no longer necessary
+        # client_localhost_normal_test
         client_get_streaming_test
         )
-    if (OPENSSL_FOUND)
-        set ( TESTS ${TESTS} client_localhost_ssl_test )
-    endif (OPENSSL_FOUND)
+    # TODO: refactor these so that local servers are no longer necessary
+    #if (OPENSSL_FOUND)
+    #    set ( TESTS ${TESTS} client_localhost_ssl_test )
+    #endif (OPENSSL_FOUND)
     foreach ( test ${TESTS} )
         if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
             set_source_files_properties(${test}.cpp
@@ -42,12 +44,13 @@ if (Boost_FOUND)
         endif()
         set_target_properties(cpp-netlib-http-${test}
             PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
-        add_test(cpp-netlib-http-${test} 
+        add_test(cpp-netlib-http-${test}
             ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test})
     endforeach (test)
 
     set ( SERVER_API_TESTS
         server_constructor_test
+        server_async_run_stop_concurrency
         )
     foreach ( test ${SERVER_API_TESTS} )
         if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
@@ -67,7 +70,6 @@ if (Boost_FOUND)
         server_hello_world
         server_async
         server_async_less_copy
-		server_async_run_stop_concurrency
         )
     set ( PORT 8000 )
     foreach ( test ${SERVER_TESTS} )