Skip to content

Fixes failing timeout test. #254

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.

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 8 commits into from
Jun 27, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ namespace boost { namespace network { namespace http { namespace impl {
} else {
set_errors(ec ? ec : boost::asio::error::host_not_found);
boost::iterator_range<const char*> range;
callback(range,ec);
if (callback) callback(range,ec);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions boost/network/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <boost/config.hpp>

#define BOOST_NETLIB_VERSION_MAJOR 0
#define BOOST_NETLIB_VERSION_MINOR 9
#define BOOST_NETLIB_VERSION_INCREMENT 5
#define BOOST_NETLIB_VERSION_MINOR 10
#define BOOST_NETLIB_VERSION_INCREMENT 0

#ifndef BOOST_NETLIB_VERSION
# define BOOST_NETLIB_VERSION \
Expand Down
4 changes: 0 additions & 4 deletions libs/network/doc/_templates/genindex.html

This file was deleted.

109 changes: 0 additions & 109 deletions libs/network/doc/_templates/layout.html

This file was deleted.

3 changes: 0 additions & 3 deletions libs/network/doc/_templates/modindex.html

This file was deleted.

3 changes: 0 additions & 3 deletions libs/network/doc/_templates/search.html

This file was deleted.

25 changes: 12 additions & 13 deletions libs/network/doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
todo_include_todos = True

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
# templates_path = ['_templates']

# The suffix of source filenames.
source_suffix = '.rst'
Expand All @@ -52,9 +52,9 @@
# built documents.
#
# The short X.Y version.
version = '0.9'
version = '0.10'
# The full version, including alpha/beta/rc tags.
release = '0.9.5'
release = '0.10.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand All @@ -73,22 +73,22 @@
exclude_trees = ['build', 'doxyxml', 'ext']

# If true, '()' will be appended to :func: etc. cross-reference text.
#add_function_parentheses = True
# add_function_parentheses = True

# If true, the current module name will be prepended to all description
# unit titles (such as .. function::).
add_module_names = True

# If true, sectionauthor and moduleauthor directives will be shown in the
# output. They are ignored by default.
#show_authors = False
# show_authors = False

# The name of the Pygments (syntax highlighting) style to use.
# pygments_style = 'sphinx'
pygments_style = 'bw'
pygments_style = 'sphinx'

# A list of ignored prefixes for module index sorting.
#modindex_common_prefix = []
# modindex_common_prefix = []


# -- Options for HTML output ---------------------------------------------------
Expand All @@ -99,20 +99,19 @@

# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
html_title = 'cpp-netlib v0.9.5'
html_title = 'cpp-netlib v0.10.0'

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

# Use an HTML index.
html_use_index = False

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_style = 'cpp-netlib.css'
html_static_path = ['_static']

# html_style = 'cpp-netlib.css'
# html_static_path = ['_static']
# html_translator_class = "adjusts.CppNetlibHTMLTranslator"

# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
Expand All @@ -124,4 +123,4 @@
html_use_smartypants = True

# Output file base name for HTML help builder.
htmlhelp_basename = 'cpp-netlibdoc'
# htmlhelp_basename = 'cpp-netlibdoc'
4 changes: 2 additions & 2 deletions libs/network/doc/html/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 08239cf2918f3b576f229180a785211f
tags: fbb0d17656682115ca4d033fb2f83ba1
config:
tags:
Binary file modified libs/network/doc/html/.doctrees/contents.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/environment.pickle
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/examples.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/examples/http/atom_reader.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/examples/http/http_client.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/examples/http/simple_wget.doctree
Binary file not shown.
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/getting_started.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/history.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/in_depth.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/in_depth/http.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/in_depth/http_client_tags.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/in_depth/message.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/in_depth/uri.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/index.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/reference.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/reference/http_client.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/reference/http_request.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/reference/http_response.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/reference/http_server.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/references.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/techniques.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/techniques/directives.doctree
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/techniques/polymorphism.doctree
Binary file not shown.
Binary file not shown.
Binary file modified libs/network/doc/html/.doctrees/whats_new.doctree
Binary file not shown.
20 changes: 10 additions & 10 deletions libs/network/doc/html/_sources/index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

.. :Authors: Glyn Matthews <glyn.matthews@gmail.com>
.. Dean Michael Berris <dberris@google.com>
.. :Date: Feb 2, 2013
.. :Version: 0.9.5
.. :Date: Jun 26, 2013
.. :Version: 0.10.0
.. :Description: Complete user documentation, with examples, for the :mod:`cpp-netlib`.
.. :Copyright: Copyright Glyn Matthews, Dean Michael Berris 2008-2012.
.. :Copyright: Copyright Glyn Matthews, Dean Michael Berris 2008-2013.
.. Copyrigh 2013 Google, Inc.
.. Distributed under the Boost Software License, Version
.. 1.0. (See accompanying file LICENSE_1_0.txt or copy at
Expand All @@ -20,12 +20,9 @@ http://cpp-netlib.org/.

**Download**

You can download the latest releases of the library at:

http://github.com/cpp-netlib/cpp-netlib/downloads

You can find more information about the progress of the development by
checking our GitHub_ project page at:
This version of :mod:`cpp-netlib` is tagged as cpp-netlib-0.10.0 in the GitHub_
repository. You can find more information about the progress of the development
by checking our GitHub_ project page at:

http://github.com/cpp-netlib/cpp-netlib

Expand Down Expand Up @@ -93,7 +90,10 @@ And the corresponding server code is listed below:

int main(int arg, char * argv[]) {
handler handler_;
http_server server_("0.0.0.0", "8000", handler_);
http_server::options options(handler_);
http_server server_(
options.address("0.0.0.0")
.port("8000"));
server_.run();
}

Expand Down
12 changes: 6 additions & 6 deletions libs/network/doc/html/_sources/whats_new.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

v0.9.5
~~~~~~
* Removing dependency on Boost.Parameter from HTTP client and server.
* Fix for Clang error on Twitter example.
* Adding source port to the request (HTTP server).
* Updates to CMake config for MSVC 2010/2012.
* Support chunked content encoding in client response parsing.
* Fix bug with client not invoking callback when a request fails.
* Removed dependency on Boost.Parameter from HTTP client and server.
* Fixed for Clang error on Twitter example.
* Added source port to the request (HTTP server).
* Updated CMake config for MSVC 2010/2012.
* Now support chunked content encoding in client response parsing.
* Fixed bug with client not invoking callback when a request fails.

v0.9.4
~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion libs/network/doc/html/_static/basic.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* Sphinx stylesheet -- basic theme.
*
* :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
* :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Expand Down
Binary file added libs/network/doc/html/_static/dialog-todo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 2 additions & 14 deletions libs/network/doc/html/_static/doctools.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* Sphinx JavaScript utilities for all documentation.
*
* :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
* :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Expand Down Expand Up @@ -32,7 +32,7 @@ if (!window.console || !console.firebug) {
*/
jQuery.urldecode = function(x) {
return decodeURIComponent(x).replace(/\+/g, ' ');
}
};

/**
* small helper function to urlencode strings
Expand Down Expand Up @@ -61,18 +61,6 @@ jQuery.getQueryParameters = function(s) {
return result;
};

/**
* small function to check if an array contains
* a given item.
*/
jQuery.contains = function(arr, item) {
for (var i = 0; i < arr.length; i++) {
if (arr[i] == item)
return true;
}
return false;
};

/**
* highlight a given string on a jquery object by wrapping it in
* span elements with the given class name.
Expand Down
Loading