NotificationsYou must be signed in to change notification settings
Fork425
Star2k

Commit4e1d254

committed

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

2 parentsa53e7e1 +9c3f4ef commit4e1d254Copy full SHA for 4e1d254

File tree

10 files changed

+378

-275

lines changed

boost/network
- protocol/http
  - impl
    - request.hpp
  - policies
    - sync_resolver.hpp
- uri
  - basic_uri.hpp
  - detail
    - parse_uri.hpp
    - uri_parts.hpp
  - http
    - detail
      - parse_specific.hpp
    - uri.hpp
    - uri_concept.hpp
  - uri_concept.hpp
libs/network/test
- url_test.cpp

10 files changed

+378

-275

lines changed

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ namespace boost { namespace network { namespace http {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`string_typeconstprotocol()const {`
`90`		`-return uri_.protocol();`
	`90`	`+return uri_.scheme();`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`};`

`‎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/asio.hpp>`
`11`	`11`	`#include<boost/network/protocol/http/traits/resolver.hpp>`
	`12`	`+#include<boost/fusion/adapted/std_pair.hpp>`
`12`	`13`
`13`	`14`	`namespaceboost {namespacenetwork {namespacehttp {namespacepolicies {`
`14`	`15`

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

Lines changed: 66 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`	`1`	`#ifndef BOOST_NETWORK_URL_BASIC_URL_`
`2`	`2`	`#defineBOOST_NETWORK_URL_BASIC_URL_`
`3`	`3`
`4`		`-// Copyright 2009 Dean Michael Berris.`
	`4`	`+// Copyright 2009 Dean Michael Berris, Jeroen Habraken.`
`5`	`5`	`// Distributed under the Boost Software License, Version 1.0.`
`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/fusion/adapted/std_pair.hpp>`
`10`	`9`	`#include<boost/range.hpp>`
`11`	`10`
`12`	`11`	`#include<boost/network/tags.hpp>`
`@@ -45,17 +44,38 @@ namespace boost { namespace network { namespace uri {`
`45`	`44`
`46`	`45`	`voidswap(uri_base & other) {`
`47`	`46`	`using std::swap;`
	`47`	`+`
`48`	`48`	`swap(other.raw_, raw_);`
`49`	`49`	`swap(other.parts_, parts_);`
`50`	`50`	`swap(other.valid_, valid_);`
`51`	`51`	`}`
`52`	`52`
`53`		`- string_typeprotocol()const {`
	`53`	`+ string_typescheme()const {`
`54`	`54`	`return parts_.scheme;`
`55`	`55`	`}`
`56`	`56`
`57`		`- string_typerest()const {`
`58`		`-return parts_.scheme_specific_part;`
	`57`	`+ string_typeuser_info()const {`
	`58`	`+return parts_.user_info ? *parts_.user_info :string_type();`
	`59`	`+ }`
	`60`	`+`
	`61`	`+ string_typehost()const {`
	`62`	`+return parts_.host ? *parts_.host :string_type();`
	`63`	`+ }`
	`64`	`+`
	`65`	`+uint16_tport()const {`
	`66`	`+return parts_.port ? *parts_.port :0;`
	`67`	`+ }`
	`68`	`+`
	`69`	`+ string_typepath()const {`
	`70`	`+return parts_.path;`
	`71`	`+ }`
	`72`	`+`
	`73`	`+ string_typequery()const {`
	`74`	`+return parts_.query ? *parts_.query :string_type();`
	`75`	`+ }`
	`76`	`+`
	`77`	`+ string_typefragment()const {`
	`78`	`+return parts_.fragment ? *parts_.fragment :string_type();`
`59`	`79`	`}`
`60`	`80`
`61`	`81`	`boolvalid()const {`
`@@ -97,15 +117,50 @@ namespace boost { namespace network { namespace uri {`
`97`	`117`	`template<classTag>`
`98`	`118`	`inline`
`99`	`119`	`typename string<Tag>::type`
`100`		`-protocol(basic_uri<Tag>const & uri) {`
`101`		`-return uri.protocol();`
	`120`	`+scheme(basic_uri<Tag>const & uri) {`
	`121`	`+return uri.scheme();`
`102`	`122`	`}`
`103`	`123`
`104`	`124`	`template<classTag>`
`105`		`-inline`
`106`		`-typename string<Tag>::type`
`107`		`-rest(basic_uri<Tag>const & uri) {`
`108`		`-return uri.rest();`
	`125`	`+inline`
	`126`	`+typename string<Tag>::type`
	`127`	`+user_info(basic_uri<Tag>const & uri) {`
	`128`	`+return uri.user_info();`
	`129`	`+ }`
	`130`	`+`
	`131`	`+template<classTag>`
	`132`	`+inline`
	`133`	`+typename string<Tag>::type`
	`134`	`+host(basic_uri<Tag>const & uri) {`
	`135`	`+return uri.host();`
	`136`	`+ }`
	`137`	`+`
	`138`	`+template<classTag>`
	`139`	`+inline`
	`140`	`+uint16_t`
	`141`	`+port(basic_uri<Tag>const & uri) {`
	`142`	`+return uri.port();`
	`143`	`+ }`
	`144`	`+`
	`145`	`+template<classTag>`
	`146`	`+inline`
	`147`	`+typename string<Tag>::type`
	`148`	`+path(basic_uri<Tag>const & uri) {`
	`149`	`+return uri.path();`
	`150`	`+ }`
	`151`	`+`
	`152`	`+template<classTag>`
	`153`	`+inline`
	`154`	`+typename string<Tag>::type`
	`155`	`+query(basic_uri<Tag>const & uri) {`
	`156`	`+return uri.query();`
	`157`	`+ }`
	`158`	`+`
	`159`	`+template<classTag>`
	`160`	`+inline`
	`161`	`+typename string<Tag>::type`
	`162`	`+fragment(basic_uri<Tag>const & uri) {`
	`163`	`+return uri.fragment();`
`109`	`164`	`}`
`110`	`165`
`111`	`166`	`template<classTag>`

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!

Commit4e1d254

File tree

10 files changed

10 files changed

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

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

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

0 commit comments