Updated constants and message headers.

glynos · glynos · commit 72ea85eb9754 · 2013-08-26T18:32:15.000+02:00
diff --git a/http/src/http/v2/constants.cpp b/http/src/http/v2/constants.cpp
@@ -38,7 +38,7 @@ static std::unordered_map<int, std::string> status_message_map() {
   status_messages[411] = "Length Required";
   status_messages[412] = "Precondition Failed";
   status_messages[413] = "Request Entity Too Large";
-  status_messages[414] = "Request Uri Too Large";
+  status_messages[414] = "Request Uri Too Long";
   status_messages[415] = "Unsupported Media Type";
   status_messages[416] = "Request Range Not Satisfiable";
   status_messages[417] = "Expectation Failed";
diff --git a/http/src/network/http/v2/constants.hpp b/http/src/network/http/v2/constants.hpp
@@ -220,7 +220,7 @@ namespace network {
 	}
 
 	inline
-	constexpr int request_uri_too_large() {
+	constexpr int request_uri_too_long() {
 	  return 414;
 	}
 
diff --git a/http/src/network/http/v2/headers.hpp b/http/src/network/http/v2/headers.hpp
@@ -0,0 +1,58 @@
+// Copyright (C) 2013 by Glyn Matthews
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef __NETWORK_HTTP_V2_HEADERS_INC__
+#define __NETWORK_HTTP_V2_HEADERS_INC__
+
+#include <network/http/v2/message_base.hpp>
+#include <vector>
+#include <utility>
+#include <map>
+#include <string>
+#include <ostream>
+#include <istream>
+
+namespace network {
+  namespace http {
+    namespace v2 {
+
+      struct header {
+	typedef std::string string-type;
+	typedef boost::string_ref string_view;
+	string_type name, value;
+      };
+
+      class headers {
+
+	typedef header::string_type string-type;
+	typedef boost::string_ref string_view;
+	typedef std::map<string_type, string_type> map_type;
+
+      public:
+
+	typedef map_type::value_type_type value_type;
+	typedef map_type::key_type key_type;
+	typedef map_type::mapped_type mapped_type;
+	typedef map_type::allocator_type allocator_type;
+	typedef map_type::iterator iterator;
+	typedef map_type::const_iterator const_iterator;
+	typedef map_type::reverse_iterator reverse_iterator;
+	typedef map_type::const_reverse_iterator const_reverse_iterator;
+	typedef map_type::size_type size_type;
+	typedef map_type::difference_type difference_type;
+	typedef map_type::pointer pointer;
+	typedef map_type::const_pointer const_pointer;
+	typedef map_type::reference reference;
+	typedef map_type::const_reference const_reference;
+
+	headers();
+
+      };
+
+    } // namespace v2
+  } // namespace http
+} // namespace network
+
+#endif // __NETWORK_HTTP_V2_HEADERS_INC__
diff --git a/http/src/network/http/v2/message_base.hpp b/http/src/network/http/v2/message_base.hpp
@@ -8,6 +8,8 @@
 
 #include <network/config.hpp>
 #include <network/uri.hpp>
+#include <network/http/v2/headers.hpp>
+#include <boost/utility/string_ref.hpp>
 #include <string>
 #include <functional>
 
@@ -18,8 +20,9 @@ namespace network {
 
     public:
 
-      typedef std::string string_type;
+      typedef headers::string_type string_type;
       typedef string_type::size_type size_type;
+      typedef boost::string_ref string_view;
 
       message_base() NETWORK_DEFAULTED_FUNCTION;
       message_base(const message_base &) NETWORK_DELETED_FUNCTION;
@@ -36,14 +39,15 @@ namespace network {
       virtual void append_body(std::string data) = 0;
 
       // Accessors
-      virtual string_type destination() const = 0;
-      virtual string_type source() = 0;
-      virtual string_type headers(std::function<void (string_type, string_type)> inserter) const = 0;
-      virtual string_type headers(std::function<bool (string_type, string_type)> predicate,
-				  std::function<void (string_type, string_type)> inserter) const = 0;
-      virtual string_type body() const = 0;
-      virtual void body(std::function<void (string_type::const_iterator, size_type)> chunk_reader,
-			size_type size) = 0;
+      virtual string_type get_destination() const = 0;
+      virtual string_type get_source() = 0;
+      virtual void get_headers(std::function<void (string_type, string_type)> inserter) const = 0;
+      virtual void get_headers(std::function<bool (string_type, string_type)> predicate,
+			   std::function<void (string_type, string_type)> inserter) const = 0;
+      virtual header get_header(std::string header) = 0;
+      virtual string_type get_body() const = 0;
+      //virtual void get_body(std::function<void (string_type::const_iterator, size_type)> chunk_reader,
+      //			    size_type size) const = 0;
 
     };
     } // namespace v2

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ namespace network {`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`inline`
`223`		`- constexpr int request_uri_too_large() {`
	`223`	`+ constexpr int request_uri_too_long() {`
`224`	`224`	`return 414;`
`225`	`225`	`}`
`226`	`226`