NotificationsYou must be signed in to change notification settings
Fork425
Star2k

Commitbbf431c

committed

Backport fix for#163 into 0.11.0

1 parent8c28ccc commitbbf431cCopy full SHA for bbf431c

File tree

3 files changed

+367

-329

lines changed

boost/network/uri
- accessors.hpp
- decode.hpp
libs/network/test/uri
- uri_test.cpp

3 files changed

+367

-329

lines changed

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ struct key_value_sequence`
`34`	`34`	`{`
`35`	`35`	`query = pair >> *((spirit::qi::lit(';') \|'&') >> pair);`
`36`	`36`	`pair = key >> -('=' >> value);`
`37`		`- key =spirit::qi::char_("a-zA-Z_") >> *spirit::qi::char_("a-zA-Z_0-9/%");`
`38`		`- value = +spirit::qi::char_("a-zA-Z_0-9/%");`
	`37`	`+ key =spirit::qi::char_("a-zA-Z_") >> *spirit::qi::char_("-+.~a-zA-Z_0-9/%");`
	`38`	`+ value = +spirit::qi::char_("-+.~a-zA-Z_0-9/%");`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`spirit::qi::rule<uri::const_iterator, Map()> query;`

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

Lines changed: 45 additions & 61 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,28 +3,21 @@`
`3`	`3`	`// (See accompanying file LICENSE_1_0.txt or copy at`
`4`	`4`	`// http://www.boost.org/LICENSE_1_0.txt)`
`5`	`5`
`6`		`-`
`7`	`6`	`#ifndef __BOOST_NETWORK_URI_DECODE_INC__`
`8`		`-#define__BOOST_NETWORK_URI_DECODE_INC__`
`9`		`-`
`10`		`-`
`11`		`-#include<boost/iterator/iterator_traits.hpp>`
`12`		`-#include<boost/range/begin.hpp>`
`13`		`-#include<boost/range/end.hpp>`
`14`		`-#include<cassert>`
	`7`	`+#define__BOOST_NETWORK_URI_DECODE_INC__`
`15`	`8`
	`9`	`+#include<boost/iterator/iterator_traits.hpp>`
	`10`	`+#include<boost/range/begin.hpp>`
	`11`	`+#include<boost/range/end.hpp>`
	`12`	`+#include<cassert>`
`16`	`13`
`17`	`14`	`namespaceboost {`
`18`	`15`	`namespacenetwork {`
`19`	`16`	`namespaceuri {`
`20`	`17`	`namespacedetail {`
`21`		`-template<`
`22`		`-typename CharT`
`23`		`- >`
`24`		`-CharTletter_to_hex(CharT in)`
`25`		`-{`
`26`		`-switch (in)`
`27`		`- {`
	`18`	`+template<typename CharT>`
	`19`	`+CharTletter_to_hex(CharT in) {`
	`20`	`+switch (in) {`
`28`	`21`	`case'0':`
`29`	`22`	`case'1':`
`30`	`23`	`case'2':`
`@@ -35,74 +28,65 @@ CharT letter_to_hex(CharT in)`
`35`	`28`	`case'7':`
`36`	`29`	`case'8':`
`37`	`30`	`case'9':`
`38`		`-return in -'0';`
	`31`	`+return in -'0';`
`39`	`32`	`case'a':`
`40`	`33`	`case'b':`
`41`	`34`	`case'c':`
`42`	`35`	`case'd':`
`43`	`36`	`case'e':`
`44`	`37`	`case'f':`
`45`		`-return in +10 -'a';`
	`38`	`+return in +10 -'a';`
`46`	`39`	`case'A':`
`47`	`40`	`case'B':`
`48`	`41`	`case'C':`
`49`	`42`	`case'D':`
`50`	`43`	`case'E':`
`51`	`44`	`case'F':`
`52`		`-return in +10 -'A';`
`53`		`-}`
`54`		`-returnCharT();`
	`45`	`+return in +10 -'A';`
	`46`	`+ }`
	`47`	`+returnCharT();`
`55`	`48`	`}`
`56`		`-}// namespace detail`
	`49`	`+}// namespace detail`
`57`	`50`
`58`		`-template<`
`59`		`-classInputIterator,`
`60`		`-classOutputIterator`
`61`		`- >`
	`51`	`+template<classInputIterator,classOutputIterator>`
`62`	`52`	`OutputIteratordecode(const InputIterator &in_begin,`
`63`	`53`	`const InputIterator &in_end,`
`64`	`54`	`const OutputIterator &out_begin) {`
`65`		`-typedeftypename boost::iterator_value<InputIterator>::type value_type;`
	`55`	`+typedeftypename boost::iterator_value<InputIterator>::type value_type;`
`66`	`56`
`67`		`- InputIterator it = in_begin;`
`68`		`- OutputIterator out = out_begin;`
`69`		`-while (it != in_end) {`
`70`		`-if (*it =='%')`
`71`		`- {`
`72`		`- ++it;`
`73`		`- value_type v0 =detail::letter_to_hex(*it);`
`74`		`- ++it;`
`75`		`- value_type v1 =detail::letter_to_hex(*it);`
`76`		`- ++it;`
`77`		`- out++ =0x10 v0 + v1;`
`78`		`- }`
`79`		`-else`
`80`		`- {`
`81`		`- out++ = it++;`
`82`		`- }`
	`57`	`+ InputIterator it = in_begin;`
	`58`	`+ OutputIterator out = out_begin;`
	`59`	`+while (it != in_end) {`
	`60`	`+if (*it =='%') {`
	`61`	`+ ++it;`
	`62`	`+ value_type v0 =detail::letter_to_hex(*it);`
	`63`	`+ ++it;`
	`64`	`+ value_type v1 =detail::letter_to_hex(*it);`
	`65`	`+ ++it;`
	`66`	`+ out++ =0x10 v0 + v1;`
	`67`	`+ }elseif (*it =='+') {`
	`68`	`+ *out++ ='';`
	`69`	`+ ++it;`
	`70`	`+ }else {`
	`71`	`+ out++ = it++;`
`83`	`72`	`}`
`84`		`-return out;`
	`73`	`+ }`
	`74`	`+return out;`
`85`	`75`	`}`
`86`	`76`
`87`		`-template<`
`88`		`-classSinglePassRange,`
`89`		`-classOutputIterator`
`90`		`- >`
`91`		`-inline`
`92`		`-OutputIteratordecode(const SinglePassRange &range,`
`93`		`-const OutputIterator &out) {`
`94`		`-returndecode(boost::begin(range),boost::end(range), out);`
	`77`	`+template<classSinglePassRange,classOutputIterator>`
	`78`	`+inline OutputIteratordecode(const SinglePassRange &range,`
	`79`	`+const OutputIterator &out) {`
	`80`	`+returndecode(boost::begin(range),boost::end(range), out);`
`95`	`81`	`}`
`96`	`82`
`97`		`-inline`
`98`		`-std::stringdecoded(const std::string &input) {`
`99`		`- std::string decoded;`
`100`		`-decode(input,std::back_inserter(decoded));`
`101`		`-return decoded;`
	`83`	`+inline std::stringdecoded(const std::string &input) {`
	`84`	`+ std::string decoded;`
	`85`	`+decode(input,std::back_inserter(decoded));`
	`86`	`+return decoded;`
`102`	`87`	`}`
`103`		`-}// namespace uri`
`104`		`-}// namespace network`
`105`		`-}// namespace boost`
`106`		`-`
	`88`	`+}// namespace uri`
	`89`	`+}// namespace network`
	`90`	`+}// namespace boost`
`107`	`91`
`108`		`-#endif// __BOOST_NETWORK_URI_DECODE_INC__`
	`92`	`+#endif// __BOOST_NETWORK_URI_DECODE_INC__`

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!

Commitbbf431c

File tree

3 files changed

3 files changed

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

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

0 commit comments