Commit39a6a4e

committed

Merge branch '0.5-devel' of git@github.com:mikhailberis/cpp-netlib into 0.5-devel

2 parents0ba2a8d +4d336e7 commit39a6a4eCopy full SHA for 39a6a4e

File tree

+28

-58

lines changed

+28

-58

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`
`9`	`9`	`#include<boost/network/uri/detail/uri_parts.hpp>`
`10`	`10`	`#include<boost/network/traits/string.hpp>`
	`11`	`+#include<boost/optional.hpp>`
	`12`	`+#include<boost/cstdint.hpp>`
`11`	`13`
`12`	`14`	`namespaceboost {namespacenetwork {namespaceuri {`
`13`	`15`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -93,6 +93,25 @@ The `hello_world` request handler is given as a template argument to
`93`	`93`	and port, and the `hello_world` handler object is passed as the third
`94`	`94`	`argument.`
`95`	`95`
	`96`	+[heading Using `http::server`]
	`97`	`+`
	`98`	`+While this example shows how easy it is to create and use a single`
	`99`	`+server instance, typically we want to do a lot more. An embedder`
	`100`	+might store several `http::server` instances and call their `run`
	`101`	`+functions in a thread pool.`
	`102`	`+`
	`103`	+`http::basic_server` can be further extended according to the supplied
	`104`	`+tag, so that it may implement specific functionality including, but`
	`105`	`+not limited to:`
	`106`	`+`
	`107`	`+* HTTP 1.0 only or HTTP 1.1 only`
	`108`	`+* WebDAV support`
	`109`	`+* Static files`
	`110`	`+* Request pipelining`
	`111`	`+`
	`112`	`+As the project continues to develop, more of this functionality will`
	`113`	`+be implemented.`
	`114`	`+`
`96`	`115`	`[endsect] [/ http_server_example]`
`97`	`116`
`98`	`117`	`[section:http_client_example HTTP Client]`
`@@ -223,6 +242,9 @@ follow HTTP redirect(s) (300..307) by looking at the "Location" header`
`223`	`242`	`provided by the response(s); headers present in the original request`
`224`	`243`	`are preserved in the subsequent request(s).`
`225`	`244`
	`245`	+As with the `http::server`, the client can be extended to support
	`246`	`+different characteristics.`
	`247`	`+`
`226`	`248`	`[endsect] [/ http_client_example]`
`227`	`249`
`228`	`250`	`[endsect] [/ http]`

Lines changed: 0 additions & 54 deletions

This file was deleted.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*/`
`14`	`14`	`#include<boost/network/protocol/http/server.hpp>`
`15`	`15`	`#include<iostream>`
`16`		`-f`
	`16`	`+`
`17`	`17`
`18`	`18`	`namespacehttp= boost::network::http;`
`19`	`19`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) Glyn Matthews 2009.`
	`1`	`+// Copyright (c) Glyn Matthews 2009, 2010.`
`2`	`2`	`// Distributed under the Boost Software License, Version 1.0.`
`3`	`3`	`// (See accompanying file LICENSE_1_0.txt or copy at`
`4`	`4`	`// http://www.boost.org/LICENSE_1_0.txt)`
`@@ -10,11 +10,11 @@`
`10`	`10`	`features, such as content-type detection, but it does the`
`11`	`11`	`fundamental things the same.`
`12`	`12`
`13`		`- It demonstrates the use the http::uri and the http::client.`
	`13`	+ It demonstrates the use the`http::uri` and the`http::client`.
`14`	`14`	`*/`
`15`	`15`
`16`	`16`
`17`		`-#include<boost/network.hpp>`
	`17`	`+#include<boost/network/protocol/http/client.hpp>`
`18`	`18`	`#include<boost/network/uri/http/uri.hpp>`
`19`	`19`	`#include<string>`
`20`	`20`	`#include<fstream>`

Comments

(0)