Skip to content

Commit 28ba508

Browse files
glynosglynos
committed
Merge pull request cpp-netlib#420 from deanberris/0.11-devel
RC0 for 0.11.1
2 parents 4303c44 + 650b126 commit 28ba508

36 files changed

+255
-204
lines changed

‎boost/network/version.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#define BOOST_NETLIB_VERSION_MAJOR 0
1313
#define BOOST_NETLIB_VERSION_MINOR 11
14-
#define BOOST_NETLIB_VERSION_INCREMENT 0
14+
#define BOOST_NETLIB_VERSION_INCREMENT 1
1515

1616
#ifndef BOOST_NETLIB_VERSION
1717
# define BOOST_NETLIB_VERSION \

‎libs/network/doc/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
# General information about the project.
4747
project = u'cpp-netlib'
48-
copyright = u'2008-2013, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc.'
48+
copyright = u'2008-2014, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc.'
4949

5050
# The version info for the project you're documenting, acts as replacement for
5151
# |version| and |release|, also used in various other places throughout the
@@ -54,7 +54,7 @@
5454
# The short X.Y version.
5555
version = '0.11'
5656
# The full version, including alpha/beta/rc tags.
57-
release = '0.11.0'
57+
release = '0.11.1'
5858

5959
# The language for content autogenerated by Sphinx. Refer to documentation
6060
# for a list of supported languages.
@@ -99,7 +99,7 @@
9999

100100
# The name for this set of Sphinx documents. If None, it defaults to
101101
# "<project> v<release> documentation".
102-
html_title = 'cpp-netlib v0.11.0'
102+
html_title = 'cpp-netlib v0.11.1'
103103

104104
# A shorter title for the navigation bar. Default is the same as html_title.
105105
# html_short_title = 'cpp-netlib'

‎libs/network/doc/html/_sources/reference/http_client.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,11 @@ initialization.
212212
| | | client-side SSL session |
213213
| | | establishment. |
214214
+--------------------------+----------------------------+--------------------------+
215+
| timeout | ``int`` | Number of seconds to |
216+
| | | wait for client requests |
217+
| | | before considering a |
218+
| | | timeout has occurred. |
219+
+--------------------------+----------------------------+--------------------------+
215220

216221

217222
To use the above supported named parameters, you'll have code that looks like
@@ -225,7 +230,8 @@ the following:
225230
.cache_resolved(true)
226231
.io_service(boost::make_shared<boost::asio::io_service>())
227232
.openssl_certificate("/tmp/my-cert")
228-
.openssl_verify_path("/tmp/ca-certs");
233+
.openssl_verify_path("/tmp/ca-certs")
234+
.timeout(10);
229235
client client_(options);
230236
// use client_ as normal from here on out.
231237

‎libs/network/doc/html/_sources/whats_new.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@
77
:mod:`cpp-netlib` 0.11
88
----------------------
99

10+
v0.11.1
11+
~~~~~~~
12+
* Add support for request timeouts.
13+
* Build configuration fixes.
14+
* Support for Travis CI in-project config.
15+
* Make the response parser more flexible to support older/ad-hoc servers that don't have standard format responses.
16+
* Fix some instability in the client destructor.
17+
* MSVC 2010 specific fixes.
18+
1019
v0.11.0
1120
~~~~~~~
1221
* Fix thread leak in DNS resolution failure (`#245`_)

‎libs/network/doc/html/contents.html

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>Contents &mdash; cpp-netlib v0.11.0</title>
9+
<title>Contents &mdash; cpp-netlib v0.11.1</title>
1010

1111
<link rel="stylesheet" href="_static/pyramid.css" type="text/css" />
1212
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: './',
17-
VERSION: '0.11.0',
17+
VERSION: '0.11.1',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -23,7 +23,7 @@
2323
<script type="text/javascript" src="_static/jquery.js"></script>
2424
<script type="text/javascript" src="_static/underscore.js"></script>
2525
<script type="text/javascript" src="_static/doctools.js"></script>
26-
<link rel="top" title="cpp-netlib v0.11.0" href="index.html" />
26+
<link rel="top" title="cpp-netlib v0.11.1" href="index.html" />
2727
<link rel="next" title="Getting cpp-netlib" href="index.html" />
2828
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
2929
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
@@ -40,7 +40,7 @@ <h3>Navigation</h3>
4040
<li class="right" style="margin-right: 10px">
4141
<a href="index.html" title="Getting cpp-netlib"
4242
accesskey="N">next</a></li>
43-
<li><a href="#">cpp-netlib v0.11.0</a> &raquo;</li>
43+
<li><a href="#">cpp-netlib v0.11.1</a> &raquo;</li>
4444
</ul>
4545
</div>
4646

@@ -59,6 +59,7 @@ <h3>Navigation</h3>
5959
<li class="toctree-l1"><a class="reference internal" href="index.html#want-to-learn-more">Want to learn more?</a></li>
6060
<li class="toctree-l1"><a class="reference internal" href="whats_new.html">What&#8217;s New</a><ul>
6161
<li class="toctree-l2"><a class="reference internal" href="whats_new.html#cpp-netlib-0-11"><tt class="docutils literal"><span class="pre">cpp-netlib</span></tt> 0.11</a><ul>
62+
<li class="toctree-l3"><a class="reference internal" href="whats_new.html#v0-11-1">v0.11.1</a></li>
6263
<li class="toctree-l3"><a class="reference internal" href="whats_new.html#v0-11-0">v0.11.0</a></li>
6364
</ul>
6465
</li>
@@ -275,12 +276,12 @@ <h3>Navigation</h3>
275276
<li class="right" style="margin-right: 10px">
276277
<a href="index.html" title="Getting cpp-netlib"
277278
>next</a></li>
278-
<li><a href="#">cpp-netlib v0.11.0</a> &raquo;</li>
279+
<li><a href="#">cpp-netlib v0.11.1</a> &raquo;</li>
279280
</ul>
280281
</div>
281282
<div class="footer">
282-
&copy; Copyright 2008-2013, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
283-
Last updated on May 21, 2014.
283+
&copy; Copyright 2008-2014, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
284+
Last updated on Aug 12, 2014.
284285
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.2.
285286
</div>
286287
</body>

‎libs/network/doc/html/examples.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>Examples &mdash; cpp-netlib v0.11.0</title>
9+
<title>Examples &mdash; cpp-netlib v0.11.1</title>
1010

1111
<link rel="stylesheet" href="_static/pyramid.css" type="text/css" />
1212
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: './',
17-
VERSION: '0.11.0',
17+
VERSION: '0.11.1',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -23,7 +23,7 @@
2323
<script type="text/javascript" src="_static/jquery.js"></script>
2424
<script type="text/javascript" src="_static/underscore.js"></script>
2525
<script type="text/javascript" src="_static/doctools.js"></script>
26-
<link rel="top" title="cpp-netlib v0.11.0" href="index.html" />
26+
<link rel="top" title="cpp-netlib v0.11.1" href="index.html" />
2727
<link rel="next" title="HTTP client" href="examples/http/http_client.html" />
2828
<link rel="prev" title="Getting Started" href="getting_started.html" />
2929
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
@@ -44,7 +44,7 @@ <h3>Navigation</h3>
4444
<li class="right" >
4545
<a href="getting_started.html" title="Getting Started"
4646
accesskey="P">previous</a> |</li>
47-
<li><a href="contents.html">cpp-netlib v0.11.0</a> &raquo;</li>
47+
<li><a href="contents.html">cpp-netlib v0.11.1</a> &raquo;</li>
4848
</ul>
4949
</div>
5050

@@ -124,12 +124,12 @@ <h3>Navigation</h3>
124124
<li class="right" >
125125
<a href="getting_started.html" title="Getting Started"
126126
>previous</a> |</li>
127-
<li><a href="contents.html">cpp-netlib v0.11.0</a> &raquo;</li>
127+
<li><a href="contents.html">cpp-netlib v0.11.1</a> &raquo;</li>
128128
</ul>
129129
</div>
130130
<div class="footer">
131-
&copy; Copyright 2008-2013, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
132-
Last updated on May 21, 2014.
131+
&copy; Copyright 2008-2014, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
132+
Last updated on Aug 12, 2014.
133133
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.2.
134134
</div>
135135
</body>

‎libs/network/doc/html/examples/http/atom_reader.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>Atom feed reader &mdash; cpp-netlib v0.11.0</title>
9+
<title>Atom feed reader &mdash; cpp-netlib v0.11.1</title>
1010

1111
<link rel="stylesheet" href="../../_static/pyramid.css" type="text/css" />
1212
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: '../../',
17-
VERSION: '0.11.0',
17+
VERSION: '0.11.1',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -23,7 +23,7 @@
2323
<script type="text/javascript" src="../../_static/jquery.js"></script>
2424
<script type="text/javascript" src="../../_static/underscore.js"></script>
2525
<script type="text/javascript" src="../../_static/doctools.js"></script>
26-
<link rel="top" title="cpp-netlib v0.11.0" href="../../index.html" />
26+
<link rel="top" title="cpp-netlib v0.11.1" href="../../index.html" />
2727
<link rel="up" title="Examples" href="../../examples.html" />
2828
<link rel="next" title="Twitter search" href="twitter_search.html" />
2929
<link rel="prev" title="“Hello world” HTTP client" href="hello_world_client.html" />
@@ -45,7 +45,7 @@ <h3>Navigation</h3>
4545
<li class="right" >
4646
<a href="hello_world_client.html" title="“Hello world” HTTP client"
4747
accesskey="P">previous</a> |</li>
48-
<li><a href="../../contents.html">cpp-netlib v0.11.0</a> &raquo;</li>
48+
<li><a href="../../contents.html">cpp-netlib v0.11.1</a> &raquo;</li>
4949
<li><a href="../../examples.html" accesskey="U">Examples</a> &raquo;</li>
5050
</ul>
5151
</div>
@@ -169,13 +169,13 @@ <h3>Navigation</h3>
169169
<li class="right" >
170170
<a href="hello_world_client.html" title="“Hello world” HTTP client"
171171
>previous</a> |</li>
172-
<li><a href="../../contents.html">cpp-netlib v0.11.0</a> &raquo;</li>
172+
<li><a href="../../contents.html">cpp-netlib v0.11.1</a> &raquo;</li>
173173
<li><a href="../../examples.html" >Examples</a> &raquo;</li>
174174
</ul>
175175
</div>
176176
<div class="footer">
177-
&copy; Copyright 2008-2013, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
178-
Last updated on May 21, 2014.
177+
&copy; Copyright 2008-2014, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
178+
Last updated on Aug 12, 2014.
179179
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.2.
180180
</div>
181181
</body>

‎libs/network/doc/html/examples/http/hello_world_client.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>“Hello world” HTTP client &mdash; cpp-netlib v0.11.0</title>
9+
<title>“Hello world” HTTP client &mdash; cpp-netlib v0.11.1</title>
1010

1111
<link rel="stylesheet" href="../../_static/pyramid.css" type="text/css" />
1212
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: '../../',
17-
VERSION: '0.11.0',
17+
VERSION: '0.11.1',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -23,7 +23,7 @@
2323
<script type="text/javascript" src="../../_static/jquery.js"></script>
2424
<script type="text/javascript" src="../../_static/underscore.js"></script>
2525
<script type="text/javascript" src="../../_static/doctools.js"></script>
26-
<link rel="top" title="cpp-netlib v0.11.0" href="../../index.html" />
26+
<link rel="top" title="cpp-netlib v0.11.1" href="../../index.html" />
2727
<link rel="up" title="Examples" href="../../examples.html" />
2828
<link rel="next" title="Atom feed reader" href="atom_reader.html" />
2929
<link rel="prev" title="“Hello world” HTTP server" href="hello_world_server.html" />
@@ -45,7 +45,7 @@ <h3>Navigation</h3>
4545
<li class="right" >
4646
<a href="hello_world_server.html" title="“Hello world” HTTP server"
4747
accesskey="P">previous</a> |</li>
48-
<li><a href="../../contents.html">cpp-netlib v0.11.0</a> &raquo;</li>
48+
<li><a href="../../contents.html">cpp-netlib v0.11.1</a> &raquo;</li>
4949
<li><a href="../../examples.html" accesskey="U">Examples</a> &raquo;</li>
5050
</ul>
5151
</div>
@@ -186,13 +186,13 @@ <h3>Navigation</h3>
186186
<li class="right" >
187187
<a href="hello_world_server.html" title="“Hello world” HTTP server"
188188
>previous</a> |</li>
189-
<li><a href="../../contents.html">cpp-netlib v0.11.0</a> &raquo;</li>
189+
<li><a href="../../contents.html">cpp-netlib v0.11.1</a> &raquo;</li>
190190
<li><a href="../../examples.html" >Examples</a> &raquo;</li>
191191
</ul>
192192
</div>
193193
<div class="footer">
194-
&copy; Copyright 2008-2013, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
195-
Last updated on May 21, 2014.
194+
&copy; Copyright 2008-2014, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
195+
Last updated on Aug 12, 2014.
196196
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.2.
197197
</div>
198198
</body>

‎libs/network/doc/html/examples/http/hello_world_server.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>“Hello world” HTTP server &mdash; cpp-netlib v0.11.0</title>
9+
<title>“Hello world” HTTP server &mdash; cpp-netlib v0.11.1</title>
1010

1111
<link rel="stylesheet" href="../../_static/pyramid.css" type="text/css" />
1212
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: '../../',
17-
VERSION: '0.11.0',
17+
VERSION: '0.11.1',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -23,7 +23,7 @@
2323
<script type="text/javascript" src="../../_static/jquery.js"></script>
2424
<script type="text/javascript" src="../../_static/underscore.js"></script>
2525
<script type="text/javascript" src="../../_static/doctools.js"></script>
26-
<link rel="top" title="cpp-netlib v0.11.0" href="../../index.html" />
26+
<link rel="top" title="cpp-netlib v0.11.1" href="../../index.html" />
2727
<link rel="up" title="Examples" href="../../examples.html" />
2828
<link rel="next" title="“Hello world” HTTP client" href="hello_world_client.html" />
2929
<link rel="prev" title="Simple wget" href="simple_wget.html" />
@@ -45,7 +45,7 @@ <h3>Navigation</h3>
4545
<li class="right" >
4646
<a href="simple_wget.html" title="Simple wget"
4747
accesskey="P">previous</a> |</li>
48-
<li><a href="../../contents.html">cpp-netlib v0.11.0</a> &raquo;</li>
48+
<li><a href="../../contents.html">cpp-netlib v0.11.1</a> &raquo;</li>
4949
<li><a href="../../examples.html" accesskey="U">Examples</a> &raquo;</li>
5050
</ul>
5151
</div>
@@ -227,13 +227,13 @@ <h3>Navigation</h3>
227227
<li class="right" >
228228
<a href="simple_wget.html" title="Simple wget"
229229
>previous</a> |</li>
230-
<li><a href="../../contents.html">cpp-netlib v0.11.0</a> &raquo;</li>
230+
<li><a href="../../contents.html">cpp-netlib v0.11.1</a> &raquo;</li>
231231
<li><a href="../../examples.html" >Examples</a> &raquo;</li>
232232
</ul>
233233
</div>
234234
<div class="footer">
235-
&copy; Copyright 2008-2013, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
236-
Last updated on May 21, 2014.
235+
&copy; Copyright 2008-2014, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
236+
Last updated on Aug 12, 2014.
237237
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.2.
238238
</div>
239239
</body>

‎libs/network/doc/html/examples/http/http_client.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>HTTP client &mdash; cpp-netlib v0.11.0</title>
9+
<title>HTTP client &mdash; cpp-netlib v0.11.1</title>
1010

1111
<link rel="stylesheet" href="../../_static/pyramid.css" type="text/css" />
1212
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: '../../',
17-
VERSION: '0.11.0',
17+
VERSION: '0.11.1',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -23,7 +23,7 @@
2323
<script type="text/javascript" src="../../_static/jquery.js"></script>
2424
<script type="text/javascript" src="../../_static/underscore.js"></script>
2525
<script type="text/javascript" src="../../_static/doctools.js"></script>
26-
<link rel="top" title="cpp-netlib v0.11.0" href="../../index.html" />
26+
<link rel="top" title="cpp-netlib v0.11.1" href="../../index.html" />
2727
<link rel="up" title="Examples" href="../../examples.html" />
2828
<link rel="next" title="Simple wget" href="simple_wget.html" />
2929
<link rel="prev" title="Examples" href="../../examples.html" />
@@ -45,7 +45,7 @@ <h3>Navigation</h3>
4545
<li class="right" >
4646
<a href="../../examples.html" title="Examples"
4747
accesskey="P">previous</a> |</li>
48-
<li><a href="../../contents.html">cpp-netlib v0.11.0</a> &raquo;</li>
48+
<li><a href="../../contents.html">cpp-netlib v0.11.1</a> &raquo;</li>
4949
<li><a href="../../examples.html" accesskey="U">Examples</a> &raquo;</li>
5050
</ul>
5151
</div>
@@ -200,13 +200,13 @@ <h3>Navigation</h3>
200200
<li class="right" >
201201
<a href="../../examples.html" title="Examples"
202202
>previous</a> |</li>
203-
<li><a href="../../contents.html">cpp-netlib v0.11.0</a> &raquo;</li>
203+
<li><a href="../../contents.html">cpp-netlib v0.11.1</a> &raquo;</li>
204204
<li><a href="../../examples.html" >Examples</a> &raquo;</li>
205205
</ul>
206206
</div>
207207
<div class="footer">
208-
&copy; Copyright 2008-2013, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
209-
Last updated on May 21, 2014.
208+
&copy; Copyright 2008-2014, Glyn Matthews, Dean Michael Berris; 2013 Google, Inc..
209+
Last updated on Aug 12, 2014.
210210
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.2.
211211
</div>
212212
</body>

0 commit comments

Comments
 (0)