Merge pull request cpp-netlib#1 from cpp-netlib/0.11-devel

wujunzhuo · wujunzhuo · commit 6f229d8f2ffb · 2015-02-16T09:11:46.000+08:00
0.11 devel
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ include(GNUInstallDirs)
 if(WIN32 AND NOT CYGWIN)
     set(DEF_INSTALL_CMAKE_DIR CMake)
 else()
-    set(DEF_INSTALL_CMAKE_DIR lib/cmake/cppnetlib)
+    set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/cppnetlib)
 endif()
 set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
 
@@ -48,7 +48,7 @@ set(CMAKE_VERBOSE_MAKEFILE true)
 
 set(CPPNETLIB_VERSION_MAJOR 0) # MUST bump this whenever we make ABI-incompatible changes
 set(CPPNETLIB_VERSION_MINOR 11)
-set(CPPNETLIB_VERSION_PATCH 0)
+set(CPPNETLIB_VERSION_PATCH 1)
 set(CPPNETLIB_VERSION_STRING ${CPPNETLIB_VERSION_MAJOR}.${CPPNETLIB_VERSION_MINOR}.${CPPNETLIB_VERSION_PATCH})
 
 if (CMAKE_BUILD_TYPE MATCHES Debug)
diff --git a/boost/network/protocol/http/client/connection/ssl_delegate.ipp b/boost/network/protocol/http/client/connection/ssl_delegate.ipp
@@ -34,8 +34,10 @@ void boost::network::http::impl::ssl_delegate::connect(
       context_->load_verify_file(*certificate_filename_);
     if (verify_path_) context_->add_verify_path(*verify_path_);
   } else {
-    if (always_verify_peer_)
+    if (always_verify_peer_) {
       context_->set_verify_mode(asio::ssl::context::verify_peer);
+	  context_->set_default_verify_paths();	// use openssl default verify paths.  uses openssl environment variables SSL_CERT_DIR, SSL_CERT_FILE
+	}
     else
       context_->set_verify_mode(asio::ssl::context::verify_none);
   }
diff --git a/boost/network/protocol/http/client/options.hpp b/boost/network/protocol/http/client/options.hpp
@@ -95,6 +95,11 @@ struct client_options {
     return *this;
   }
 
+  client_options& always_verify_peer(bool v) {
+    always_verify_peer_ = v;
+    return *this;
+  }
+
   client_options& timeout(int v) {
     timeout_ = v;
     return *this;
diff --git a/boost/network/protocol/http/policies/async_resolver.hpp b/boost/network/protocol/http/policies/async_resolver.hpp
@@ -53,7 +53,7 @@ struct async_resolver : boost::enable_shared_from_this<async_resolver<Tag> > {
       }
     }
 
-    typename resolver_type::query q(resolver_type::protocol_type::v4(), host,
+    typename resolver_type::query q(host,
                                     lexical_cast<string_type>(port));
     resolver_.async_resolve(q, resolver_strand_->wrap(boost::bind(
                                    &async_resolver<Tag>::handle_resolve,
diff --git a/libs/mime/test/mime-roundtrip.cpp b/libs/mime/test/mime-roundtrip.cpp
@@ -76,7 +76,6 @@ void test_roundtrip(const char *fileName) {
   BOOST_CHECK_EQUAL(readfile(fileName), from_mime(mp));
 }
 
-void test_expected_parse_fail(const char *) {}
 }
 
 using namespace boost::unit_test;
diff --git a/libs/network/example/http/fileserver.cpp b/libs/network/example/http/fileserver.cpp
@@ -12,6 +12,7 @@
 #include <sys/fcntl.h>
 #include <unistd.h>
 #include <iostream>
+#include <cassert>
 
 namespace http = boost::network::http;
 namespace utils = boost::network::utils;
@@ -142,7 +143,8 @@ struct connection_handler : boost::enable_shared_from_this<connection_handler> {
   void handle_chunk(std::pair<void *, std::size_t> mmaped_region, off_t offset,
                     server::connection_ptr connection,
                     boost::system::error_code const &ec) {
-    if (!ec && offset < mmaped_region.second)
+    assert(offset>=0);
+    if (!ec && static_cast<std::size_t>(offset) < mmaped_region.second)
       send_file(mmaped_region, offset, connection);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ struct async_resolver : boost::enable_shared_from_this<async_resolver<Tag> > {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- typename resolver_type::query q(resolver_type::protocol_type::v4(), host,`
	`56`	`+ typename resolver_type::query q(host,`
`57`	`57`	`lexical_cast<string_type>(port));`
`58`	`58`	`resolver_.async_resolve(q, resolver_strand_->wrap(boost::bind(`
`59`	`59`	`&async_resolver<Tag>::handle_resolve,`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ void test_roundtrip(const char *fileName) {`
`76`	`76`	`BOOST_CHECK_EQUAL(readfile(fileName), from_mime(mp));`
`77`	`77`	`}`
`78`	`78`
`79`		`-void test_expected_parse_fail(const char *) {}`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`using namespace boost::unit_test;`