NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commitc59dbd7

committed

Merge branch 'deanberris-0.9-devel' into 0.9-devel

2 parentsc511896 +5f4660c commitc59dbd7Copy full SHA for c59dbd7

File tree

29 files changed

+1146

-1210

lines changed

CMakeLists.txt
boost/network
- protocol/http
  - impl
    - request.hpp
  - message/wrappers
    - port.hpp
  - policies
    - sync_resolver.hpp
- uri.hpp
- uri
  - basic_uri.hpp
  - basic_uri_fwd.hpp
  - detail
    - impl
      - parse_uri.ipp
    - parse_uri.hpp
    - uri_parts.hpp
  - http
    - detail
      - parse_specific.hpp
      - uri_parts.hpp
    - uri.hpp
  - mailto
    - uri.hpp
  - uri.hpp
  - uri_accessors.hpp
  - uri_concept.hpp
libs/network
- example
  - simple_wget.cpp
  - uri.cpp
- src
  - CMakeLists.txt
  - uri
    - parse.cpp
- test

29 files changed

+1146

-1210

lines changed

`‎CMakeLists.txt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ if (Boost_FOUND)`
`18`	`18`	`include_directories(${Boost_INCLUDE_DIRS})`
`19`	`19`	`endif()`
`20`	`20`	`enable_testing()`
`21`		`-add_subdirectory(libs/network/build)`
	`21`	`+add_subdirectory(libs/network/src)`
`22`	`22`	`add_subdirectory(libs/network/test)`
`23`	`23`	`add_subdirectory(libs/mime/test)`
`24`	`24`	`add_subdirectory(libs/network/example)`

`‎boost/network/protocol/http/impl/request.hpp‎`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`#include<boost/fusion/sequence/intrinsic/at_key.hpp>`
`16`	`16`	`#include<boost/fusion/sequence/intrinsic/value_at_key.hpp>`
`17`	`17`
`18`		`-#include<boost/network/uri.hpp>`
	`18`	`+#include<boost/network/uri/http/uri.hpp>`
`19`	`19`	`#include<boost/network/traits/vector.hpp>`
`20`	`20`
`21`	`21`	`#include<boost/network/protocol/http/message/async_message.hpp>`
`@@ -24,8 +24,8 @@`
`24`	`24`
`25`	`25`	`#include<boost/cstdint.hpp>`
`26`	`26`
`27`		`-namespaceboost {namespacenetwork {`
`28`		`-`
	`27`	`+namespaceboost {namespacenetwork {`
	`28`	`+`
`29`	`29`	`/** Specialize the traits for the http_server tag.*/`
`30`	`30`	`template<>`
`31`	`31`	`structheaders_container<http::tags::http_server> :`
`@@ -50,7 +50,7 @@ namespace http {`
`50`	`50`	`structbasic_request :publicbasic_message<Tag>`
`51`	`51`	`{`
`52`	`52`
`53`		`-mutable boost::network::uri::http::uri uri_;`
	`53`	`+mutable boost::network::uri::http::basic_uri<Tag> uri_;`
`54`	`54`	`typedef basic_message<Tag> base_type;`
`55`	`55`
`56`	`56`	`public:`
`@@ -92,7 +92,7 @@ namespace http {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`port_typeport()const {`
`95`		`-returnuri::port(uri_);`
	`95`	`+returnuri::port_us(uri_);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`string_typeconstpath()const {`
`@@ -115,7 +115,7 @@ namespace http {`
`115`	`115`	`uri_ = new_uri;`
`116`	`116`	`}`
`117`	`117`
`118`		`- boost::network::uri::http::uriconsturi()const {`
	`118`	`+ boost::network::uri::http::basic_uri<Tag>const &uri()const {`
`119`	`119`	`return uri_;`
`120`	`120`	`}`
`121`	`121`
`@@ -162,7 +162,7 @@ namespace http {`
`162`	`162`	`};`
`163`	`163`
`164`	`164`	`template<>`
`165`		`-structbasic_request<tags::http_async_server>`
	`165`	`+structbasic_request<tags::http_async_server>`
`166`	`166`	`: not_quite_pod_request_base<tags::http_async_server>`
`167`	`167`	`{};`
`168`	`168`

`‎boost/network/protocol/http/message/wrappers/port.hpp‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ namespace boost { namespace network { namespace http {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`operator boost::optional<boost::uint16_t> () {`
`33`		`-returnport(message_.uri());`
	`33`	`+returnport_us(message_.uri());`
`34`	`34`	`}`
`35`	`35`	`};`
`36`	`36`

`‎boost/network/protocol/http/policies/sync_resolver.hpp‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`#include<utility>`
`10`	`10`	`#include<boost/network/protocol/http/traits/resolver.hpp>`
`11`	`11`	`#include<boost/fusion/adapted/std_pair.hpp>`
	`12`	`+#include<boost/fusion/include/tuple.hpp>`
`12`	`13`	`#include<boost/network/traits/string.hpp>`
`13`	`14`	`#include<boost/algorithm/string/case_conv.hpp>`
`14`	`15`	`#include<boost/unordered_map.hpp>`

`‎boost/network/uri.hpp‎`

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,19 +6,20 @@`
`6`	`6`	`// (See accompanying file LICENSE_1_0.txt or copy at`
`7`	`7`	`// http://www.boost.org/LICENSE_1_0.txt)`
`8`	`8`
`9`		`-#include<boost/network/protocol/http/tags.hpp>`
`10`	`9`	`#include<boost/network/traits/string.hpp>`
`11`		`-#include<boost/network/uri/basic_uri.hpp>`
	`10`	`+#include<boost/network/uri/uri.hpp>`
	`11`	`+#include<boost/network/protocol/http/tags.hpp>`
`12`	`12`	`#include<boost/network/uri/http/uri.hpp>`
`13`	`13`
	`14`	`+`
`14`	`15`	`namespaceboost {namespacenetwork {namespaceuri {`
`15`	`16`
`16`		`-typedef basic_uri<boost::network::tags::default_string> uri;`
`17`		`-typedef basic_uri<boost::network::tags::default_wstring> wuri;`
	`17`	`+typedef basic_uri<boost::network::tags::default_string> uri;`
	`18`	`+typedef basic_uri<boost::network::tags::default_wstring> wuri;`
`18`	`19`
`19`		`-namespacehttp {`
`20`		`-typedef basic_uri<boost::network::http::tags::http_default_8bit_tcp_resolve> uri;`
`21`		`-}`
	`20`	`+namespacehttp {`
	`21`	`+typedef basic_uri<boost::network::http::tags::http_default_8bit_udp_resolve> uri;`
	`22`	`+}`
`22`	`23`
`23`	`24`	`}// namespace uri`
`24`	`25`	`}// namespace network`

`‎boost/network/uri/basic_uri.hpp‎`

Lines changed: 0 additions & 242 deletions

This file was deleted.

`‎boost/network/uri/basic_uri_fwd.hpp‎`

Lines changed: 0 additions & 19 deletions

This file was deleted.

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc59dbd7

File tree

29 files changed

29 files changed

`‎CMakeLists.txt‎`

`‎boost/network/protocol/http/impl/request.hpp‎`

`‎boost/network/protocol/http/message/wrappers/port.hpp‎`

`‎boost/network/protocol/http/policies/sync_resolver.hpp‎`

`‎boost/network/uri.hpp‎`

`‎boost/network/uri/basic_uri.hpp‎`

`‎boost/network/uri/basic_uri_fwd.hpp‎`

0 commit comments