Merge pull request #519 from leecoder/0.11-devel

deanberris · deanberris · commit a315e2b540bf · 2015-04-20T17:24:39.000+10:00
Fix #499 - Parsing empty query parameters
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,7 @@ before_install:
         sudo apt-get update;
       fi
     - if [ "${CXX}" == "clang++" ] && [ ${BUILD_SHARED_LIBS} = "ON" ]; then
-        curl -s http://cznic.dl.sourceforge.net/project/boost/boost/${BOOST_VER}/boost_${BOOST_VER//./_}.tar.bz2|tar xfj - -C ..;
+        svn export http://svn.boost.org/svn/boost/tags/release/Boost_${BOOST_VER//./_} ../boost_${BOOST_VER//./_};
         export BOOST_ROOT=$TRAVIS_BUILD_DIR/../boost_${BOOST_VER//./_};
       fi
 
diff --git a/boost/network/uri/accessors.hpp b/boost/network/uri/accessors.hpp
@@ -27,7 +27,7 @@ struct key_value_sequence : spirit::qi::grammar<uri::const_iterator, Map()> {
     pair = key >> -('=' >> value);
     key =
         spirit::qi::char_("a-zA-Z_") >> *spirit::qi::char_("-+.~a-zA-Z_0-9/%");
-    value = +spirit::qi::char_("-+.~a-zA-Z_0-9/%");
+    value = *spirit::qi::char_("-+.~a-zA-Z_0-9/%");
   }
 
   spirit::qi::rule<uri::const_iterator, Map()> query;
diff --git a/libs/network/test/uri/uri_test.cpp b/libs/network/test/uri/uri_test.cpp
@@ -566,3 +566,16 @@ BOOST_AUTO_TEST_CASE(issue_447_test) {
   uri::uri instance("http://[www.foo.com/");
   BOOST_REQUIRE(!uri::valid(instance));
 }
+
+BOOST_AUTO_TEST_CASE(issue_499_test) {
+  uri::uri instance(
+      "http://www.example.com/path?param1&param2=&param3=value");
+  BOOST_REQUIRE(uri::valid(instance));
+
+  std::map<std::string, std::string> queries;
+  uri::query_map(instance, queries);
+  BOOST_REQUIRE_EQUAL(queries.size(), std::size_t(3));
+  BOOST_CHECK_EQUAL(queries["param1"], "");
+  BOOST_CHECK_EQUAL(queries["param2"], "");
+  BOOST_CHECK_EQUAL(queries["param3"], "value");
+}

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ struct key_value_sequence : spirit::qi::grammar<uri::const_iterator, Map()> {`
`27`	`27`	`pair = key >> -('=' >> value);`
`28`	`28`	`key =`
`29`	`29`	`spirit::qi::char_("a-zA-Z_") >> *spirit::qi::char_("-+.~a-zA-Z_0-9/%");`
`30`		`- value = +spirit::qi::char_("-+.~a-zA-Z_0-9/%");`
	`30`	`+ value = *spirit::qi::char_("-+.~a-zA-Z_0-9/%");`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`spirit::qi::rule<uri::const_iterator, Map()> query;`