[squashable] Comments from @deanberris

Teddy Reed · Teddy Reed · commit 4f7fb0687f0a · 2015-05-22T10:00:43.000-07:00
diff --git a/boost/network/protocol/http/client/connection/ssl_delegate.ipp b/boost/network/protocol/http/client/connection/ssl_delegate.ipp
@@ -32,7 +32,7 @@ void boost::network::http::impl::ssl_delegate::connect(
     asio::ip::tcp::endpoint &endpoint, std::string host,
     function<void(system::error_code const &)> handler) {
   context_.reset(
-      new asio::ssl::context(service_, asio::ssl::context::tlsv1_client));
+      new asio::ssl::context(service_, asio::ssl::context::sslv23_client));
   if (ciphers_) {
     ::SSL_CTX_set_cipher_list(context_->native_handle(), ciphers_->c_str());
   }
@@ -47,7 +47,7 @@ void boost::network::http::impl::ssl_delegate::connect(
   } else {
     if (always_verify_peer_) {
       context_->set_verify_mode(asio::ssl::context::verify_peer);
-	   	// use openssl default verify paths.  uses openssl environment variables
+      // use openssl default verify paths.  uses openssl environment variables
       // SSL_CERT_DIR, SSL_CERT_FILE
       context_->set_default_verify_paths();
 	 } else
diff --git a/boost/network/protocol/http/client/options.hpp b/boost/network/protocol/http/client/options.hpp
@@ -102,7 +102,7 @@ struct client_options {
   }
 
   client_options& openssl_options(long o) {
-    openssl_options_ ^= o;
+    openssl_options_ = o;
     return *this;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ struct client_options {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`client_options& openssl_options(long o) {`
`105`		`- openssl_options_ ^= o;`
	`105`	`+ openssl_options_ = o;`
`106`	`106`	`return *this;`
`107`	`107`	`}`
`108`	`108`