Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4a30673

Browse files
committed
Merged from upstream.
2 parents400e3e3 +a32c9bd commit4a30673

File tree

298 files changed

+17848
-19779
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+17848
-19779
lines changed

‎README.rst‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,9 @@ you will need. These are:
105105
* A build tool (CMake [#]_ recommended, Boost.Build also an option)
106106
* OpenSSL headers (optional)
107107

108-
..note::This assumes that you have the cpp-netlib distribution package
109-
unpacked somwhere in your home directory. This specifically assumes that you
110-
have cpp-netlib at the toplevel of your home directory.
111-
.. [#]http://www.cmake.org/
108+
..note::This assumes that you have cpp-netlib at the top-level of
109+
your home directory.
110+
[#] http://www.cmake.org/
112111

113112
Hacking on cpp-netlib
114113
---------------------

‎boost/network/protocol/http/client/connection/ssl_delegate.ipp‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void boost::network::http::impl::ssl_delegate::connect(
3333
socket_.reset(new asio::ssl::stream<asio::ip::tcp::socket>(service_, *context_));
3434
socket_->lowest_layer().async_connect(
3535
endpoint,
36-
bind(&boost::network::http::impl::ssl_delegate::handle_connected,
36+
::boost::bind(&boost::network::http::impl::ssl_delegate::handle_connected,
3737
boost::network::http::impl::ssl_delegate::shared_from_this(),
3838
asio::placeholders::error,
3939
handler));

‎boost/network/protocol/http/client/connection/sync_base.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ namespace boost { namespace network { namespace http { namespace impl {
132132
bool stopping =false;
133133
do {
134134
std::size_t chunk_size_line =read_until(socket_, response_buffer,"\r\n", error);
135-
std::size_tbody_already_read = response_buffer.size() - chunk_size_line;
135+
std::size_ttooMuchRead = response_buffer.size() - chunk_size_line;
136136
if ((chunk_size_line ==0) && (error != boost::asio::error::eof))throwboost::system::system_error(error);
137137
std::size_t chunk_size =0;
138138
string_type data;
@@ -149,8 +149,8 @@ namespace boost { namespace network { namespace http { namespace impl {
149149
}else {
150150
bool stopping_inner =false;
151151
do {
152-
BOOST_ASSERT( body_already_read <= chunk_size +2 );
153-
std::size_t chunk_bytes_read =read(socket_, response_buffer,boost::asio::transfer_at_least(chunk_size +2 -body_already_read), error);
152+
assert( tooMuchRead <= chunk_size +2 );
153+
std::size_t chunk_bytes_read =read(socket_, response_buffer,boost::asio::transfer_at_least(chunk_size +2 -tooMuchRead), error);
154154
if (chunk_bytes_read ==0) {
155155
if (error != boost::asio::error::eof)throwboost::system::system_error(error);
156156
stopping_inner =true;

‎boost/network/uri/detail/uri_parts.hpp‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2009, 2010, 2011 Dean Michael Berris, Jeroen Habraken, Glyn Matthews.
1+
// Copyright 2009, 2010, 2011, 2012 Dean Michael Berris, Jeroen Habraken, Glyn Matthews.
22
// Distributed under the Boost Software License, Version 1.0.
33
// (See accompanying file LICENSE_1_0.txt or copy at
44
// http://www.boost.org/LICENSE_1_0.txt)
@@ -7,6 +7,7 @@
77
#defineBOOST_NETWORK_URL_DETAIL_URL_PARTS_HPP_
88

99

10+
#include<boost/range/iterator_range.hpp>
1011
#include<boost/optional.hpp>
1112

1213

@@ -15,32 +16,32 @@ namespace network {
1516
namespaceuri {
1617
namespacedetail {
1718
template<
18-
classString
19+
classFwdIter
1920
>
2021
structhierarchical_part {
21-
boost::optional<String> user_info;
22-
boost::optional<String> host;
23-
boost::optional<String> port;
24-
boost::optional<String> path;
22+
optional<iterator_range<FwdIter>> user_info;
23+
optional<iterator_range<FwdIter>> host;
24+
optional<iterator_range<FwdIter>> port;
25+
optional<iterator_range<FwdIter>> path;
2526
};
2627

2728
template<
28-
classString
29+
classFwdIter
2930
>
3031
structuri_parts {
31-
String scheme;
32-
hierarchical_part<String> hier_part;
33-
boost::optional<String> query;
34-
boost::optional<String> fragment;
32+
iterator_range<FwdIter> scheme;
33+
hierarchical_part<FwdIter> hier_part;
34+
optional<iterator_range<FwdIter>> query;
35+
optional<iterator_range<FwdIter>> fragment;
3536

3637
voidclear() {
37-
scheme.clear();
38-
hier_part.user_info =boost::optional<String>();
39-
hier_part.host =boost::optional<String>();
40-
hier_part.port =boost::optional<String>();
41-
hier_part.path =boost::optional<String>();
42-
query =boost::optional<String>();
43-
fragment =boost::optional<String>();
38+
scheme = iterator_range<FwdIter>();
39+
hier_part.user_info = optional<iterator_range<FwdIter>>();
40+
hier_part.host = optional<iterator_range<FwdIter>>();
41+
hier_part.port = optional<iterator_range<FwdIter>>();
42+
hier_part.path = optional<iterator_range<FwdIter>>();
43+
query = optional<iterator_range<FwdIter>>();
44+
fragment = optional<iterator_range<FwdIter>>();
4445
}
4546
};
4647
}// namespace detail

‎boost/network/uri/directives.hpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
// Copyright (c) Glyn Matthews 2011, 2012.
2+
// Distributed under the Boost Software License, Version 1.0.
3+
// (See accompanying file LICENSE_1_0.txt or copy at
4+
// http://www.boost.org/LICENSE_1_0.txt)
5+
6+
17
#ifndef __BOOST_NETWORK_URI_DIRECTIVES_INC__
28
#define__BOOST_NETWORK_URI_DIRECTIVES_INC__
39

‎boost/network/uri/directives/authority.hpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
// Copyright (c) Glyn Matthews 2011, 2012.
2+
// Distributed under the Boost Software License, Version 1.0.
3+
// (See accompanying file LICENSE_1_0.txt or copy at
4+
// http://www.boost.org/LICENSE_1_0.txt)
5+
6+
17
#ifndef __BOOST_NETWORK_URI_DIRECTIVES_AUTHORITY_INC__
28
#define__BOOST_NETWORK_URI_DIRECTIVES_AUTHORITY_INC__
39

‎boost/network/uri/directives/fragment.hpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
// Copyright (c) Glyn Matthews 2011, 2012.
2+
// Distributed under the Boost Software License, Version 1.0.
3+
// (See accompanying file LICENSE_1_0.txt or copy at
4+
// http://www.boost.org/LICENSE_1_0.txt)
5+
6+
17
#ifndef __BOOST_NETWORK_URI_DIRECTIVES_FRAGMENT_INC__
28
#define__BOOST_NETWORK_URI_DIRECTIVES_FRAGMENT_INC__
39

‎boost/network/uri/directives/host.hpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
// Copyright (c) Glyn Matthews 2011, 2012.
2+
// Distributed under the Boost Software License, Version 1.0.
3+
// (See accompanying file LICENSE_1_0.txt or copy at
4+
// http://www.boost.org/LICENSE_1_0.txt)
5+
6+
17
#ifndef __BOOST_NETWORK_URI_DIRECTIVES_HOST_INC__
28
#define__BOOST_NETWORK_URI_DIRECTIVES_HOST_INC__
39

‎boost/network/uri/directives/path.hpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
// Copyright (c) Glyn Matthews 2011, 2012.
2+
// Distributed under the Boost Software License, Version 1.0.
3+
// (See accompanying file LICENSE_1_0.txt or copy at
4+
// http://www.boost.org/LICENSE_1_0.txt)
5+
6+
17
#ifndef __BOOST_NETWORK_URI_DIRECTIVES_PATH_INC__
28
#define__BOOST_NETWORK_URI_DIRECTIVES_PATH_INC__
39

‎boost/network/uri/directives/port.hpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
// Copyright (c) Glyn Matthews 2011, 2012.
2+
// Distributed under the Boost Software License, Version 1.0.
3+
// (See accompanying file LICENSE_1_0.txt or copy at
4+
// http://www.boost.org/LICENSE_1_0.txt)
5+
6+
17
#ifndef __BOOST_NETWORK_URI_DIRECTIVES_PORT_INC__
28
#define__BOOST_NETWORK_URI_DIRECTIVES_PORT_INC__
39

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp