Skip to content

Integration with Travis CI #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 4, 2014
Merged

Integration with Travis CI #411

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2174385
Adding .travis.yml
leecoder Jul 3, 2014
f36b485
Fixes for ci build errors
leecoder Jul 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fixes for ci build errors
  • Loading branch information
@leecoder
leecoder authored and 이충우 committed Jul 4, 2014
commit f36b48597d8e81bc91462afdc5619f0579b4c635
7 changes: 4 additions & 3 deletions boost/network/protocol/stream_handler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -182,4 +183,4 @@ namespace boost { namespace network {
}
}

#endif
#endif
4 changes: 2 additions & 2 deletions libs/network/test/http/client_get_timeout_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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));
Expand Down