Merge pull request cpp-netlib#448 from glynos/0.11-devel-uri-ipv6

Added better IPv6 parsing to the URI, and cleaned up some warnings.

Author: deanberris

boost/network/message/directives/header.hpp

@@ -55,7 +55,6 @@ struct header_directive {
 
   template <class Message>
   void operator()(Message const& msg) const {
-    typedef typename Message::headers_container_type::value_type value_type;
     directive_impl<Message>::eval(msg, _header_name, _header_value);
   }
 

boost/network/message/message_concept.hpp

@@ -34,9 +34,6 @@ struct Message : DefaultConstructible<M>, CopyConstructible<M>, Assignable<M> {
     typedef typename traits::source<M>::type source_type;
     typedef typename traits::destination<M>::type destination_type;
 
-    typedef typename traits::header_key<M>::type header_key_type;
-    typedef typename traits::header_value<M>::type header_value_type;
-
     headers_container_type headers_ = headers(message);
     string_type body_ = body(message);
     string_type source_ = source(message);

boost/network/message/modifiers/remove_header.hpp

@@ -46,7 +46,6 @@ struct iequals_pred {
 template <class Message, class KeyType, class Tag>
 inline typename enable_if<is_pod<Tag>, void>::type remove_header(
     Message& message, KeyType const& key, Tag) {
-  typedef typename Message::headers_container_type headers;
   message.headers.erase(
       boost::remove_if(message.headers, iequals_pred<KeyType>(key)),
       message.headers.end());

boost/network/protocol/http/server/async_connection.hpp

@@ -222,7 +222,6 @@ struct async_connection
              << consts::space() << status << consts::space()
              << status_message(status) << consts::crlf();
       if (!boost::empty(headers)) {
-        typedef typename Range::const_iterator iterator;
         typedef typename string<Tag>::type string_type;
         boost::transform(headers, std::ostream_iterator<string_type>(stream),
                          linearize_header<Tag>());

boost/network/uri/encode.hpp

@@ -126,8 +126,6 @@ template <class InputIterator, class OutputIterator>
 OutputIterator encode(const InputIterator &in_begin,
                       const InputIterator &in_end,
                       const OutputIterator &out_begin) {
-  typedef typename boost::iterator_value<InputIterator>::type value_type;
-
   InputIterator it = in_begin;
   OutputIterator out = out_begin;
   while (it != in_end) {

boost/network/uri/uri.ipp

@@ -84,19 +84,42 @@ struct uri_grammar
     ipvfuture %=
         qi::lit('v') >> +qi::xdigit >> '.' >> +(unreserved | sub_delims | ':');
 
-    ipv6address %=
-        qi::raw[qi::repeat(6)[h16 >> ':'] >> ls32 |
-                "::" >> qi::repeat(5)[h16 >> ':'] >> ls32 |
-                qi::raw[h16] >> "::" >> qi::repeat(4)[h16 >> ':'] >> ls32 |
-                qi::raw[+(*(h16 >> ':')) >> h16] >> "::" >>
-                    qi::repeat(3)[h16 >> ':'] >> ls32 |
-                qi::raw[qi::repeat(2)[*(h16 >> ':')] >> h16] >> "::" >>
-                    qi::repeat(2)[h16 >> ':'] >> ls32 |
-                qi::raw[qi::repeat(3)[*(h16 >> ':')] >> h16] >> "::" >> h16 >>
-                    ':' >> ls32 |
-                qi::raw[qi::repeat(4)[*(h16 >> ':')] >> h16] >> "::" >> ls32 |
-                qi::raw[qi::repeat(5)[*(h16 >> ':')] >> h16] >> "::" >> h16 |
-                qi::raw[qi::repeat(6)[*(h16 >> ':')] >> h16] >> "::"];
+    ipv6address %= qi::raw
+        [qi::repeat(6)[h16 >> ':'] >> ls32 |
+         "::" >> qi::repeat(5)[h16 >> ':'] >> ls32 |
+         -qi::raw[h16] >> "::" >> qi::repeat(4)[h16 >> ':'] >> ls32 |
+         -qi::raw[h16] >> "::" >> qi::repeat(3)[h16 >> ':'] >> ls32 |
+         -qi::raw[h16] >> "::" >> qi::repeat(2)[h16 >> ':'] >> ls32 |
+         -qi::raw[h16] >> "::" >> h16 >> ':' >> ls32 |
+         -qi::raw[h16] >> "::" >> ls32 | -qi::raw[h16] >> "::" >> h16 |
+         -qi::raw[h16] >> "::" |
+         -qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >>
+             qi::repeat(3)[h16 >> ':'] >> ls32 |
+         -qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >>
+             qi::repeat(2)[h16 >> ':'] >> ls32 |
+         -qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >> h16 >>
+             ':' >> ls32 |
+         -qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >> ls32 |
+         -qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" >> h16 |
+         -qi::raw[qi::repeat(1)[(h16 >> ':')] >> h16] >> "::" |
+         -qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::" >>
+             qi::repeat(2)[h16 >> ':'] >> ls32 |
+         -qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::" >> h16 >>
+             ':' >> ls32 |
+         -qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::" >> ls32 |
+         -qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::" >> h16 |
+         -qi::raw[qi::repeat(2)[(h16 >> ':')] >> h16] >> "::" |
+         -qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >> "::" >> h16 >>
+             ':' >> ls32 |
+         -qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >> "::" >> ls32 |
+         -qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >> "::" >> h16 |
+         -qi::raw[qi::repeat(3)[(h16 >> ':')] >> h16] >> "::" |
+         -qi::raw[qi::repeat(4)[(h16 >> ':')] >> h16] >> "::" >> ls32 |
+         -qi::raw[qi::repeat(4)[(h16 >> ':')] >> h16] >> "::" >> h16 |
+         -qi::raw[qi::repeat(4)[(h16 >> ':')] >> h16] >> "::" |
+         -qi::raw[qi::repeat(5)[(h16 >> ':')] >> h16] >> "::" >> h16 |
+         -qi::raw[qi::repeat(5)[(h16 >> ':')] >> h16] >> "::" |
+         -qi::raw[qi::repeat(6)[(h16 >> ':')] >> h16] >> "::"];
 
     // ls32 = ( h16 ":" h16 ) / IPv4address
     ls32 %= (h16 >> ':' >> h16) | ipv4address;

libs/network/test/uri/uri_test.cpp

@@ -561,3 +561,8 @@ BOOST_AUTO_TEST_CASE(issue_364_test) {
   uri::schemes::http(instance) << uri::host("my.awesome.server.com");
   BOOST_CHECK_EQUAL("my.awesome.server.com", uri::authority(instance));
 }
+
+BOOST_AUTO_TEST_CASE(issue_447_test) {
+  uri::uri instance("http://[www.foo.com/");
+  BOOST_REQUIRE(!uri::valid(instance));
+}