Boost-Commit :

Date view	Thread view	Subject view	Author view

From: lists.drrngrvy_at_[hidden]
Date: 2007-08-24 21:58:40

Next message: lists.drrngrvy_at_[hidden]: "[Boost-commit] svn:boost r38916 - in sandbox/SOC/2007/cgi/libs/cgi/test: . compile compile_fail"
Previous message: grafikrobot_at_[hidden]: "[Boost-commit] svn:boost r38914 - trunk/tools/regression"

Author: drrngrvy
Date: 2007-08-24 21:58:38 EDT (Fri, 24 Aug 2007)
New Revision: 38915
URL: http://svn.boost.org/trac/boost/changeset/38915

Log:
Removing some unnecessary includes which broke compiling on windows (but not linux...).
Text files modified:
   sandbox/SOC/2007/cgi/boost/cgi.hpp | 10 ++++++++--
   sandbox/SOC/2007/cgi/boost/cgi/acgi.hpp | 12 ++++++------
   sandbox/SOC/2007/cgi/boost/cgi/acgi/service.hpp | 15 ++++++++++-----
   sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service.hpp | 16 +++++++---------
   sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service_fwd.hpp | 4 ++--
   sandbox/SOC/2007/cgi/boost/cgi/basic_request.hpp | 1 +
   sandbox/SOC/2007/cgi/boost/cgi/cookie.hpp | 5 +++++
   sandbox/SOC/2007/cgi/boost/cgi/detail/save_environment.hpp | 1 +
   sandbox/SOC/2007/cgi/boost/cgi/response.hpp | 6 +++---
   9 files changed, 43 insertions(+), 27 deletions(-)

Modified: sandbox/SOC/2007/cgi/boost/cgi.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi.hpp 2007-08-24 21:58:38 EDT (Fri, 24 Aug 2007)
@@ -12,7 +12,13 @@
// #include all headers except for cgi/cgi.hpp, cgi/fcgi.hpp, cgi/scgi.hpp

#include "cgi/basic_request.hpp"
-#include "cgi/request.hpp"
-#include "cgi/reply.hpp"
+#include "cgi/response.hpp"
+#include "cgi/map.hpp"
+#include "cgi/basic_protocol_service.hpp"
+#include "cgi/cookie.hpp"
+#include "cgi/header.hpp"
+#include "cgi/io_service.hpp"
+#include "cgi/basic_connection.hpp"
+#include "cgi/io_service_provider.hpp"

#endif // CGI_HPP_INCLUDED__

Modified: sandbox/SOC/2007/cgi/boost/cgi/acgi.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/acgi.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/acgi.hpp 2007-08-24 21:58:38 EDT (Fri, 24 Aug 2007)
@@ -10,12 +10,12 @@
#define CGI_ACGI_HPP_INCLUDED__

// #include all acgi-related headers only
-#include "boost/cgi/acgi/request.hpp"
#include "boost/cgi/acgi/service.hpp"
-#include "boost/cgi/acgi/request_service.hpp"
-#include "boost/cgi/acgi/request_impl.hpp"
-#include "gateway_impl/acgi_gateway_impl.hpp"
-#include "gateway_service/acgi_gateway_service.hpp"
+#include "boost/cgi/acgi/request.hpp"
+//#include "boost/cgi/acgi/request_service.hpp"
+//#include "boost/cgi/acgi/request_impl.hpp"
+//#include "gateway_impl/acgi_gateway_impl.hpp"
+//#include "gateway_service/acgi_gateway_service.hpp"

// Include headers common to all protocols
#include "boost/cgi/detail/common_headers.hpp"
@@ -27,7 +27,7 @@
  namespace acgi {

    typedef acgi_request request;
- typedef acgi_service service;
+ //typedef acgi_service service;
    //typedef acgi_acceptor acceptor;
    using namespace cgi;

Modified: sandbox/SOC/2007/cgi/boost/cgi/acgi/service.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/acgi/service.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/acgi/service.hpp 2007-08-24 21:58:38 EDT (Fri, 24 Aug 2007)
@@ -10,11 +10,9 @@
#define CGI_CGI_SERVICE_HPP_INCLUDED__

#include "boost/cgi/tags.hpp"
-#include "boost/cgi/connections/stdio.hpp"
-#include "boost/cgi/connections/async_stdio.hpp"
-#include "boost/cgi/gateway_impl/acgi_gateway_impl.hpp"
-#include "boost/cgi/gateway_service/acgi_gateway_service.hpp"
-#include "boost/cgi/basic_protocol_service.hpp"
+//#include "boost/cgi/gateway_impl/acgi_gateway_impl.hpp"
+//#include "boost/cgi/gateway_service/acgi_gateway_service.hpp"
+#include "boost/cgi/basic_protocol_service_fwd.hpp"

namespace cgi {

@@ -24,6 +22,10 @@
    */
   typedef basic_protocol_service<tags::acgi> acgi_service;

+ namespace acgi {
+ typedef basic_protocol_service<tags::acgi> service;
+ }
+
   /// A service 'owned' by a single user-supplied io_service
   //typedef basic_protocol_service<tags::acgi> cgi_sub_service;

@@ -41,6 +43,9 @@
   };
   */

+
} // namespace cgi

+#include "boost/cgi/basic_protocol_service.hpp"
+
#endif // CGI_CGI_SERVICE_HPP_INCLUDED__

Modified: sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service.hpp 2007-08-24 21:58:38 EDT (Fri, 24 Aug 2007)
@@ -15,12 +15,10 @@
#include <boost/asio/io_service.hpp>
#include <boost/asio/strand.hpp>

-#include "io_service_provider.hpp"
-//#include "basic_gateway.hpp"
-//#include "basic_connection_fwd.hpp"
-//#include "basic_acceptor_fwd.hpp"
-#include "basic_request_fwd.hpp"
-#include "detail/protocol_traits.hpp"
+#include "boost/cgi/tags.hpp"
+#include "boost/cgi/io_service_provider.hpp"
+#include "boost/cgi/basic_request_fwd.hpp"
+#include "boost/cgi/detail/protocol_traits.hpp"

namespace cgi {

@@ -39,14 +37,14 @@
     typedef typename detail::protocol_traits<Protocol>::type traits;
     typedef typename traits::request_type request_type;
     typedef typename boost::shared_ptr<request_type> request_ptr;
- typedef std::set<typename request_type::pointer> set_type;
+ typedef std::set<request_ptr> set_type;
       //typename boost::mpl::if_<
       // boost::is_same<protocol_type, tags::acgi>::value
       // , request_type::pointer
       // , std::set<request_type::pointer>
       // >::type

- typedef std::queue<typename request_type::pointer> queue_type;
+ typedef std::queue<request_ptr> queue_type;

     basic_protocol_service(int pool_size_hint = 1)
       : ios_provider_(pool_size_hint)
@@ -141,7 +139,7 @@

     //friend class basic_gateway<protocol_type>;//gateway_type;
     //friend class basic_acceptor<protocol_type>;//class acceptor_type;
- friend class traits::request_type;//typename request_type;
+ friend typename traits::request_type;//typename request_type;
   };

} // namespace cgi

Modified: sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service_fwd.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service_fwd.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service_fwd.hpp 2007-08-24 21:58:38 EDT (Fri, 24 Aug 2007)
@@ -9,8 +9,8 @@
#ifndef CGI_BASIC_PROTOCOL_SERVICE_FWD_HPP_INCLUDED__
#define CGI_BASIC_PROTOCOL_SERVICE_FWD_HPP_INCLUDED__

-#include "tags.hpp"
-#include "io_service_provider_fwd.hpp"
+#include "boost/cgi/tags.hpp"
+#include "boost/cgi/io_service_provider_fwd.hpp"

namespace cgi {

Modified: sandbox/SOC/2007/cgi/boost/cgi/basic_request.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/basic_request.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/basic_request.hpp 2007-08-24 21:58:38 EDT (Fri, 24 Aug 2007)
@@ -34,6 +34,7 @@
#include "basic_request_fwd.hpp"
#include "basic_sync_io_object.hpp"
#include "basic_io_object.hpp"
+#include "map.hpp"

namespace cgi {

Modified: sandbox/SOC/2007/cgi/boost/cgi/cookie.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/cookie.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/cookie.hpp 2007-08-24 21:58:38 EDT (Fri, 24 Aug 2007)
@@ -18,6 +18,11 @@
    * Either set the parameters in the constructor, or set them directly.
    * Note: If you want to set the parameters individually, remember that each
    * parameter must NOT have a trailing semi-colon!
+ *
+ * TODO
+ * - Add 'domain' attribute
+ * - Add 'HttpOnly' attribute
+ * - Data should be URL-encoded
    */
   struct cookie
   {

Modified: sandbox/SOC/2007/cgi/boost/cgi/detail/save_environment.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/detail/save_environment.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/detail/save_environment.hpp 2007-08-24 21:58:38 EDT (Fri, 24 Aug 2007)
@@ -11,6 +11,7 @@

#include <string>
#include <cstdlib>
+#include "boost/cgi/map.hpp"

namespace cgi {
namespace detail {

Modified: sandbox/SOC/2007/cgi/boost/cgi/response.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/response.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/response.hpp 2007-08-24 21:58:38 EDT (Fri, 24 Aug 2007)
@@ -83,11 +83,11 @@
     // Note: the 'set-cookie' isn't part of the cookie object since
     // the cookie can also be set after the headers have been sent.
     // See http://tinyurl.com/33znkj
- resp<< "Set-cookie: " << c.content << ";";
+ resp<< "Set-cookie: " << c.content << "; ";
     if (!c.expires.empty())
- resp<< c.expires << ";";
+ resp<< c.expires << "; ";
     if (!c.path.empty())
- resp<< c.path << ";";
+ resp<< c.path << "; ";
     return resp<< "\r\n";
   }

Next message: lists.drrngrvy_at_[hidden]: "[Boost-commit] svn:boost r38916 - in sandbox/SOC/2007/cgi/libs/cgi/test: . compile compile_fail"
Previous message: grafikrobot_at_[hidden]: "[Boost-commit] svn:boost r38914 - trunk/tools/regression"

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk