added request::is_websocket() and response::set_header(name, value)

highpower · Mar 5, 2011 · 313c36a · 313c36a
1 parent 336df41
commit 313c36a
Show file tree

Hide file tree

Showing 13 changed files with 104 additions and 19 deletions.
diff --git a/include/details/connection_base.hpp b/include/details/connection_base.hpp
@@ -29,6 +29,7 @@
 
 #include "details/guard.hpp"
 #include "details/websocket_info.hpp"
+#include "details/response_impl.hpp"
 
 namespace xiva { namespace details {
 
@@ -60,9 +61,11 @@ class connection_base {
 	boost::shared_ptr<guard> const& get_guard() const;
 
 protected:
-	void init(request_impl const &req, bool secure);
+	void init(request_impl &req, bool secure);
 	void init_formatters(connection_data const &cdata, request_impl const &req, response_impl const &resp);
 
+	void handle_response(response_impl const &resp);
+
 	bool print_message(message const &msg, std::streambuf &buf);
 
 	static bool print_policy_data(std::string const &data, std::streambuf &buf);
@@ -77,10 +80,13 @@ class connection_base {
 	connection_base(connection_base const &);
 	connection_base& operator = (connection_base const &);
 
+	void print_common_headers(std::string const &content_type, std::streambuf &buf) const;
+
 	std::auto_ptr<formatters_data> fmt_data_;
 	websocket_info ws_info_;
 	std::string name_;
 	boost::shared_ptr<guard> guard_;
+	response_impl::headers_ptr_type headers_;
 };
 
 inline std::string const&

diff --git a/include/details/connection_impl.hpp b/include/details/connection_impl.hpp
@@ -185,6 +185,7 @@ template <typename ConnectionTraits> void
 connection_impl<ConnectionTraits>::handled(request_impl const &req, response_impl const &resp) {
 	timer_.cancel();
 	try {
+		connection_base_type::handle_response(resp);
 		std::string const *content = resp.content_ptr();
 		if (NULL != content) {
 			write_static_content(resp, *content);

diff --git a/include/details/request_impl.hpp b/include/details/request_impl.hpp
@@ -53,7 +53,10 @@ class request_impl {
 
 	bool has_cookie(std::string const &name) const;
 	std::string const& cookie(std::string const &name) const;
-
+
+	bool is_websocket() const;
+	void set_websocket();
+
 	void swap(request_impl &other) throw ();
 
 private:
@@ -85,17 +88,19 @@ class request_impl {
 	param_map_type params_;
 	header_map_type headers_;
 	cookie_map_type cookies_;
+	bool is_websocket_;
 };
 
+
 inline
 request_impl::request_impl() :
-	params_(), headers_(), cookies_()
+	params_(), headers_(), cookies_(), is_websocket_(false)
 {
 }
 
 template <typename Iter> inline
 request_impl::request_impl(Iter begin, Iter end) :
-	params_(), headers_(), cookies_()
+	params_(), headers_(), cookies_(), is_websocket_(false)
 {
 	init(begin, end);
 }
@@ -110,6 +115,16 @@ request_impl::body() const {
         return body_;
 }
 
+inline bool
+request_impl::is_websocket() const {
+	return is_websocket_;
+}
+
+inline void
+request_impl::set_websocket() {
+	is_websocket_ = true;
+}
+
 template <typename Iter> inline void
 request_impl::init(Iter begin, Iter end) {
 

diff --git a/include/details/response_impl.hpp b/include/details/response_impl.hpp
@@ -21,8 +21,11 @@
 #include <string>
 #include <map>
 
+#include <boost/shared_ptr.hpp>
+
 #include "xiva/shared.hpp"
 #include "xiva/channel_info.hpp"
+#include "details/functors.hpp"
 
 namespace xiva { namespace details {
 
@@ -32,6 +35,11 @@ class response_impl {
 	response_impl();
 	virtual ~response_impl();
 
+	typedef std::map<channel_info, std::string> channels_data_type;
+
+	typedef std::map<std::string, std::string, ci_less<std::string> > headers_data_type;
+	typedef boost::shared_ptr<headers_data_type> headers_ptr_type;
+
 	void swap(response_impl &impl) throw ();
 
 	std::string const& content_type() const;
@@ -40,9 +48,12 @@ class response_impl {
 	std::string const& default_formatter_id() const;
 	void formatter_id(std::string const &fmt_id);
 
-	std::map<channel_info, std::string> const& channels_data() const;
+	channels_data_type const& channels_data() const;
 	void formatter_by_channel(channel_info const &ch_info, std::string const &fmt_id);
 
+	headers_ptr_type const& headers() const;
+	void set_header(std::string const &name, std::string const &value);
+
 	bool single_message() const;
 	void single_message(bool value);
 
@@ -57,7 +68,8 @@ class response_impl {
 private:
 	std::string type_;
 	std::string formatter_id_;
-	std::map<channel_info, std::string> channels_data_;
+	channels_data_type channels_data_;
+	headers_ptr_type headers_;
 	std::string content_;
 	std::string const *content_ptr_;
 	bool single_message_;
@@ -84,11 +96,16 @@ response_impl::formatter_id(std::string const &fmt_id) {
 	formatter_id_.assign(fmt_id);
 }
 
-inline std::map<channel_info, std::string> const&
+inline response_impl::channels_data_type const&
 response_impl::channels_data() const {
 	return channels_data_;
 }
 
+inline response_impl::headers_ptr_type const&
+response_impl::headers() const {
+	return headers_;
+}
+
 inline bool
 response_impl::single_message() const {
 	return single_message_;

diff --git a/include/details/websocket_info.hpp b/include/details/websocket_info.hpp
@@ -33,7 +33,7 @@ class websocket_info {
 	bool empty() const;
 	bool valid() const;
 
-	void parse(request_impl const &req, bool secure);
+	bool parse(request_impl const &req, bool secure);
 
 	static void write_message(std::ostream &stream, std::string const &msg);
 

diff --git a/include/xiva/request.hpp b/include/xiva/request.hpp
@@ -44,6 +44,8 @@ class XIVA_API request {
 	bool has_cookie(std::string const &name) const;
 	std::string const& cookie(std::string const &name) const;
 
+	bool is_websocket() const;
+
 private:
 	details::request_impl const &impl_;
 };

diff --git a/include/xiva/response.hpp b/include/xiva/response.hpp
@@ -38,6 +38,8 @@ class XIVA_API response {
 
 	void formatter_by_channel(channel_info const &ch_info, std::string const &fmt_id);
 
+	void set_header(std::string const &name, std::string const &value);
+
 	void single_message(bool value);
 
 	void content(std::string const &body);

diff --git a/library/connection_base.cpp b/library/connection_base.cpp
@@ -13,6 +13,7 @@
 #include "details/formatters_factory.hpp"
 #include "details/http_constants.hpp"
 #include "details/http.hpp"
+#include "details/request_impl.hpp"
 
 namespace xiva { namespace details {
 
@@ -30,15 +31,22 @@ connection_base::id() const {
 }
 
 void
-connection_base::init(request_impl const &req, bool secure) {
-	ws_info_.parse(req, secure);
+connection_base::init(request_impl &req, bool secure) {
+	if (ws_info_.parse(req, secure)) {
+		req.set_websocket();
+	}
 }
 
 void
 connection_base::init_formatters(connection_data const &cdata, request_impl const &req, response_impl const &resp) {
 	fmt_data_ = cdata.fmt_factory().create_formatters_data(req, resp);
 }
 
+void
+connection_base::handle_response(response_impl const &resp) {
+	headers_ = resp.headers();
+}
+
 bool
 connection_base::allow_message(message const &msg, message_filter const *filter) const {
 	if (NULL == fmt_data_.get()) {
@@ -120,9 +128,7 @@ connection_base::print_headers(std::string const &content_type, std::streambuf &
 		stream << http_header::connection_close();
 		stream << http_header("Transfer-Encoding", "chunked");
 	}
-	stream << http_date(boost::posix_time::second_clock::universal_time());
-	stream << http_header::server();
-	stream << http_header("Content-Type", content_type.c_str());
+	print_common_headers(content_type, buf);
 	stream << http_constants<char>::endl;
 	if (is_websocket) {
 		ws_info_.write_body(stream);
@@ -142,15 +148,30 @@ connection_base::print_static_content(
 
 	stream << http_status(200);
 	stream << http_header::connection_close();
-	stream << http_date(boost::posix_time::second_clock::universal_time());
-	stream << http_header::server();
-	stream << http_header("Content-Type", content_type.c_str());
+	print_common_headers(content_type, buf);
 	stream << "Content-Length: " << content.size() << http_constants<char>::endl;
 	stream << http_constants<char>::endl;
 	stream << content;
 	return true;
 }
 
+void
+connection_base::print_common_headers(std::string const &content_type, std::streambuf &buf) const {
+
+	std::ostream stream(&buf);
+
+	stream << http_date(boost::posix_time::second_clock::universal_time());
+	stream << http_header::server();
+	stream << http_header("Content-Type", content_type.c_str());
+
+	if (headers_ && !headers_->empty()) {
+		response_impl::headers_data_type::const_iterator it = headers_->begin(), end = headers_->end();
+		for (; it != end; ++it) {
+			stream << http_header(it->first.c_str(), it->second.c_str());
+		}
+	}
+}
+
 bool
 connection_base::print_message_content(std::string const &content, std::streambuf &buf) const {
 

diff --git a/library/request.cpp b/library/request.cpp
@@ -52,4 +52,9 @@ request::cookie(std::string const &name) const {
 	return impl_.cookie(name);
 }
 
+bool
+request::is_websocket() const {
+	return impl_.is_websocket();
+}
+
 } // namespace
diff --git a/library/request_impl.cpp b/library/request_impl.cpp
@@ -39,6 +39,7 @@ get(Map const &map, std::string const &name) {
 	return (map.end() != i) ? i->second : http_constants<char>::empty_string;
 }
 
+
 request_impl::~request_impl() {
 }
 
@@ -48,6 +49,7 @@ request_impl::swap(request_impl &other) throw () {
 	std::swap(params_, other.params_);
 	std::swap(headers_, other.headers_);
 	std::swap(cookies_, other.cookies_);
+	std::swap(is_websocket_, other.is_websocket_);
 }
 
 bool

diff --git a/library/response.cpp b/library/response.cpp
@@ -32,6 +32,11 @@ response::formatter_by_channel(channel_info const &ch_info, std::string const &f
 	impl_.formatter_by_channel(ch_info, fmt_id);
 }
 
+void
+response::set_header(std::string const &name, std::string const &value) {
+	impl_.set_header(name, value);
+}
+
 void
 response::single_message(bool value) {
 	impl_.single_message(value);

diff --git a/library/response_impl.cpp b/library/response_impl.cpp
@@ -3,7 +3,7 @@
 
 namespace xiva { namespace details {
 
-response_impl::response_impl() : content_ptr_(NULL), single_message_(false)
+response_impl::response_impl() : headers_(new headers_data_type()), content_ptr_(NULL), single_message_(false)
 {
 }
 
@@ -18,6 +18,14 @@ response_impl::swap(response_impl &other) throw () {
 	std::swap(content_ptr_, other.content_ptr_);
 	std::swap(single_message_, other.single_message_);
 	std::swap(channels_data_, other.channels_data_);
+	std::swap(headers_, other.headers_);
+}
+
+void
+response_impl::set_header(std::string const &name, std::string const &value) {
+	if (!name.empty()) {
+		headers_->insert(std::make_pair(name, value));
+	}
 }
 
 void

diff --git a/library/websocket_info.cpp b/library/websocket_info.cpp
@@ -128,11 +128,11 @@ get_websocket_key_value(char const *s, std::string const &key) {
 	return v32;
 }
 
-void
+bool
 websocket_info::parse(request_impl const &req, bool secure) {
 
 	if (req.header(WS_STR_CONNECTION) != WS_STR_UPGRADE || req.header(WS_STR_UPGRADE) != WS_STR_WEBSOCKET) {
-		return;
+		return false;
 	}
 	empty_ = false;
 
@@ -175,6 +175,7 @@ websocket_info::parse(request_impl const &req, bool secure) {
 
 	origin_ = req.header(WS_STR_ORIGIN);
 	protocol_ = req.header(WS_STR_WEBSOCKET_PROTOCOL);
+	return true;
 }
 
 void