Commite484aa2

committed

Merge pull request#411 from leecoder/0.11-devel

Integration with Travis CI

2 parents01bf00c +f36b485 commite484aa2Copy full SHA for e484aa2

File tree

+23

-5

lines changed

+23

-5

lines changed

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,17 @@`
	`1`	`+language:cpp`
	`2`	`+compiler:`
	`3`	`+ -gcc`
	`4`	`+ -clang`
	`5`	`+env:BOOST_ROOT=$TRAVIS_BUILD_DIR/../boost_1_55_0`
	`6`	`+`
	`7`	`+before_install:`
	`8`	`+ -curl -s http://cznic.dl.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2\|tar xfj - -C ..`
	`9`	`+install:`
	`10`	`+ -cd $BOOST_ROOT`
	`11`	`+ -./bootstrap.sh --with-toolset=$CC`
	`12`	`+ -./b2 -j4 --stagedir=.`
	`13`	`+ -cd -`
	`14`	`+`
	`15`	`+script:`
	`16`	`+ -cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX`
	`17`	`+ -make all test`

Lines changed: 4 additions & 3 deletions

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`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout_1_0, client, client_types) {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout_with_options, client, client_types) {`
`25`		`-typename client::requestrequest("http://commondatastorage.googleapis.com/cpp-netlib-downloads/0.11.0/cpp-netlib-0.11.0.zip");`
	`25`	`+typename client::requestrequest("http://cznic.dl.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2");`
`26`	`26`	`typename client::response response;`
`27`	`27`	`typename client::options options;`
`28`	`28`	`clientclient_(options.timeout(1));`
`@@ -33,7 +33,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout_with_options, client, client`
`33`	`33`	`#ifdef BOOST_NETWORK_ENABLE_HTTPS`
`34`	`34`
`35`	`35`	`BOOST_AUTO_TEST_CASE_TEMPLATE(https_get_test_timeout_with_options, client, client_types) {`
`36`		`-typename client::requestrequest("https://codeload.github.com/cpp-netlib/cpp-netlib/zip/0.11-devel");`
	`36`	`+typename client::requestrequest("https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.8.2.tar.bz2");`
`37`	`37`	`typename client::response response;`
`38`	`38`	`typename client::options options;`
`39`	`39`	`clientclient_(options.timeout(1));`

Comments

(0)