Merge pull request cpp-netlib#254 from deanberris/0.9-devel

This is a PR that brings 0.9-devel into 0.10.0 release readiness.

Author: deanberris

boost/network/protocol/http/client/connection/async_normal.hpp

@@ -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);
         }
       }
     }

boost/network/version.hpp

@@ -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 \

libs/network/doc/_templates/genindex.html

@@ -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'
@@ -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.
@@ -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 ---------------------------------------------------
@@ -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,
@@ -124,4 +123,4 @@
 html_use_smartypants = True
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'cpp-netlibdoc'
+# htmlhelp_basename = 'cpp-netlibdoc'

libs/network/doc/_templates/layout.html

@@ -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: 

libs/network/doc/_templates/modindex.html

@@ -3,10 +3,10 @@
 
 .. :Authors: Glyn Matthews <[email protected]>
 .. 	  Dean Michael Berris <[email protected]>
-.. :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
@@ -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
 
@@ -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();
     }
 

libs/network/doc/_templates/search.html

@@ -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
 ~~~~~~

libs/network/doc/conf.py

@@ -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.
  *
  */

libs/network/doc/html/.buildinfo

@@ -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.
  *
  */
@@ -32,7 +32,7 @@ if (!window.console || !console.firebug) {
  */
 jQuery.urldecode = function(x) {
   return decodeURIComponent(x).replace(/\+/g, ' ');
-}
+};
 
 /**
  * small helper function to urlencode strings
@@ -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.