Merge pull request #411 from leecoder/0.11-devel

deanberris · deanberris · commit e484aa28173f · 2014-07-04T23:03:05.000+10:00
Integration with Travis CI
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,17 @@
+language: cpp
+compiler:
+  - gcc
+  - clang
+env: BOOST_ROOT=$TRAVIS_BUILD_DIR/../boost_1_55_0
+
+before_install:
+  - curl -s http://cznic.dl.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2|tar xfj - -C ..
+install:
+  - cd $BOOST_ROOT
+  - ./bootstrap.sh --with-toolset=$CC
+  - ./b2 -j4 --stagedir=.
+  - cd -
+
+script:
+  - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX
+  - make all test
diff --git a/boost/network/protocol/stream_handler.hpp b/boost/network/protocol/stream_handler.hpp
@@ -44,11 +44,12 @@ namespace boost { namespace network {
 		}
 
 		stream_handler(boost::asio::io_service& io, boost::shared_ptr<boost::asio::ssl::context> ctx = boost::shared_ptr<boost::asio::ssl::context>())  {	
-			tcp_sock_ = boost::make_shared< tcp_socket >(io);
+			tcp_sock_ = boost::make_shared< tcp_socket >(boost::ref(io));
 			ssl_enabled = false;
 			if(ctx) {
 				/// SSL is enabled
-				ssl_sock_ = boost::make_shared< ssl_socket >(io, *ctx);
+				ssl_sock_ = boost::make_shared< ssl_socket >(boost::ref(io),
+                                                             boost::ref(*ctx));
 				ssl_enabled = true;
 			}
 		}
@@ -182,4 +183,4 @@ namespace boost { namespace network {
 }
 }
 
-#endif
+#endif
diff --git a/libs/network/test/http/client_get_timeout_test.cpp b/libs/network/test/http/client_get_timeout_test.cpp
@@ -22,7 +22,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout_1_0, client, client_types) {
 }
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout_with_options, client, client_types) {
-    typename client::request request("http://commondatastorage.googleapis.com/cpp-netlib-downloads/0.11.0/cpp-netlib-0.11.0.zip");
+    typename client::request request("http://cznic.dl.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2");
     typename client::response response;
     typename client::options options;
     client client_(options.timeout(1));
@@ -33,7 +33,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout_with_options, client, client
 #ifdef BOOST_NETWORK_ENABLE_HTTPS
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(https_get_test_timeout_with_options, client, client_types) {
-    typename client::request request("https://codeload.github.com/cpp-netlib/cpp-netlib/zip/0.11-devel");
+    typename client::request request("https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.8.2.tar.bz2");
     typename client::response response;
     typename client::options options;
     client client_(options.timeout(1));

Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,12 @@ namespace boost { namespace network {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`stream_handler(boost::asio::io_service& io, boost::shared_ptr<boost::asio::ssl::context> ctx = boost::shared_ptr<boost::asio::ssl::context>()) {`
`47`		`- tcp_sock_ = boost::make_shared< tcp_socket >(io);`
	`47`	`+ tcp_sock_ = boost::make_shared< tcp_socket >(boost::ref(io));`
`48`	`48`	`ssl_enabled = false;`
`49`	`49`	`if(ctx) {`
`50`	`50`	`/// SSL is enabled`
`51`		`- ssl_sock_ = boost::make_shared< ssl_socket >(io, *ctx);`
	`51`	`+ ssl_sock_ = boost::make_shared< ssl_socket >(boost::ref(io),`
	`52`	`+ boost::ref(*ctx));`
`52`	`53`	`ssl_enabled = true;`
`53`	`54`	`}`
`54`	`55`	`}`
`@@ -182,4 +183,4 @@ namespace boost { namespace network {`
`182`	`183`	`}`
`183`	`184`	`}`
`184`	`185`
`185`		`-#endif`
	`186`	`+#endif`