From: lists.drrngrvy_at_[hidden]
Date: 2007-08-20 18:18:33
Author: drrngrvy
Date: 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
New Revision: 38808
URL: http://svn.boost.org/trac/boost/changeset/38808
Log:
Committing fixes to accidentally mangled local repository. What did work should work again, except tests, which aren't picking up the correct include paths.
Text files modified:
sandbox/SOC/2007/cgi/boost/cgi/acgi.hpp | 14 ++++++--
sandbox/SOC/2007/cgi/boost/cgi/acgi/request.hpp | 3 +
sandbox/SOC/2007/cgi/boost/cgi/acgi/request_impl.hpp | 6 +-
sandbox/SOC/2007/cgi/boost/cgi/acgi/request_service.hpp | 24 +++++++--------
sandbox/SOC/2007/cgi/boost/cgi/acgi/service.hpp | 2
sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service.hpp | 5 +-
sandbox/SOC/2007/cgi/boost/cgi/basic_request.hpp | 62 +++++++++++++++++++++++++++++----------
sandbox/SOC/2007/cgi/boost/cgi/basic_sync_io_object.hpp | 1
sandbox/SOC/2007/cgi/boost/cgi/cgi.hpp | 12 +++---
sandbox/SOC/2007/cgi/boost/cgi/cgi/request.hpp | 3 +
sandbox/SOC/2007/cgi/boost/cgi/cgi/request_service.hpp | 4 +-
sandbox/SOC/2007/cgi/boost/cgi/connections/async_stdio.hpp | 14 +++++---
sandbox/SOC/2007/cgi/boost/cgi/detail/cgi_request_impl_base.hpp | 16 ++++++++-
sandbox/SOC/2007/cgi/boost/cgi/detail/cgi_service_impl_base.hpp | 33 ++++++++++++++-------
sandbox/SOC/2007/cgi/libs/cgi/example/Jamfile.v2 | 2
sandbox/SOC/2007/cgi/libs/cgi/example/acgi/main.cpp | 12 +++++-
sandbox/SOC/2007/cgi/libs/cgi/example/cgi/Jamfile.v2 | 10 +++++
sandbox/SOC/2007/cgi/libs/cgi/example/cgi/main.cpp | 4 +-
sandbox/SOC/2007/cgi/libs/cgi/test/compile/acgi_request.cpp | 2
sandbox/SOC/2007/cgi/libs/cgi/test/compile/cgi_request.cpp | 2
20 files changed, 151 insertions(+), 80 deletions(-)
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-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -10,14 +10,20 @@
#define CGI_ACGI_HPP_INCLUDED__
// #include all acgi-related headers only
-#include "cgi/acgi_request.hpp"
-#include "cgi/cgi_service.hpp"
-#include "service_impl/acgi_service_impl.hpp"
-#include "request_impl/acgi_request_impl.hpp"
+#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 headers common to all protocols
#include "detail/common_headers.hpp"
+namespace cgi {
+#ifndef CGI_NO_IMPLICIT_TYPEDEFS
+ typedef acgi_request request;
+#endif
+} // namespace cgi
+
#endif // CGI_ACGI_HPP_INCLUDED__
Modified: sandbox/SOC/2007/cgi/boost/cgi/acgi/request.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/acgi/request.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/acgi/request.hpp 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -9,6 +9,7 @@
#ifndef CGI_ACGI_REQUEST_HPP_INCLUDED__
#define CGI_ACGI_REQUEST_HPP_INCLUDED__
+#include "service.hpp"
#include "request_impl.hpp"
#include "request_service.hpp"
#include "boost/cgi/tags.hpp"
@@ -19,7 +20,7 @@
class acgi_request_service;
- typedef basic_request<acgi_request_service> acgi_request;
+ typedef basic_request<acgi_request_service, acgi_service> acgi_request;
} // namespace cgi
Modified: sandbox/SOC/2007/cgi/boost/cgi/acgi/request_impl.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/acgi/request_impl.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/acgi/request_impl.hpp 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -21,13 +21,13 @@
class acgi_service_impl;
class acgi_request_impl
- : public cgi_request_impl_base<acgi_request_impl, async_stdio_connection>
+ : public cgi_request_impl_base<async_stdio_connection>
{
public:
- typedef cgi_service protocol_service_type;
+ typedef acgi_service protocol_service_type;
acgi_request_impl()
- : cgi_request_impl_base<acgi_request_impl, connection_type>()
+ : cgi_request_impl_base<async_stdio_connection>()
{
}
Modified: sandbox/SOC/2007/cgi/boost/cgi/acgi/request_service.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/acgi/request_service.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/acgi/request_service.hpp 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -9,16 +9,14 @@
#ifndef CGI_ACGI_SERVICE_IMPL_HPP_INCLUDED__
#define CGI_ACGI_SERVICE_IMPL_HPP_INCLUDED__
-#include <boost/asio/io_service.hpp>
-#include "../tags.hpp"
-#include "../io_service.hpp"
-#include "../map.hpp"
-#include "../request_impl/acgi_request_impl.hpp"
-#include "../detail/cgi_service_impl_base.hpp"
-#include "../detail/service_base.hpp"
-#include "../io_service.hpp"
-#include "../detail/extract_params.hpp"
-#include "../connections/async_stdio.hpp"
+#include "request_impl.hpp"
+#include "boost/cgi/tags.hpp"
+#include "boost/cgi/io_service.hpp"
+#include "boost/cgi/map.hpp"
+#include "boost/cgi/detail/cgi_service_impl_base.hpp"
+#include "boost/cgi/detail/service_base.hpp"
+#include "boost/cgi/detail/extract_params.hpp"
+#include "boost/cgi/connections/async_stdio.hpp"
namespace cgi {
@@ -33,13 +31,13 @@
typedef acgi_request_impl impl_type;
typedef cgi::map map_type;
typedef tags::acgi protocol_type;
- typedef cgi_service protocol_service_type;
+ typedef acgi_service protocol_service_type;
/// The unique service identifier
// static boost::asio::io_service::id id;
acgi_request_service(cgi::io_service& ios)
- : detail::service_base<acgi_service_impl>(ios)
+ : detail::service_base<acgi_request_service>(ios)
{
}
@@ -48,7 +46,7 @@
}
void construct(implementation_type& impl)
{
- impl.connection_ = async_stdio_connection::create(io_service());
+ impl.connection() = async_stdio_connection::create(io_service());
}
void destroy(implementation_type& impl)
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-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -22,7 +22,7 @@
/**
* Works with both cgi_request and acgi_request.
*/
- typedef basic_protocol_service<tags::acgi> cgi_service;
+ typedef basic_protocol_service<tags::acgi> acgi_service;
/// A service 'owned' by a single user-supplied io_service
//typedef basic_protocol_service<tags::acgi> cgi_sub_service;
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-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -39,15 +39,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<request_type::pointer> set_type;
+ typedef std::set<typename request_type::pointer> 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<request_type::pointer> queue_type;
+ typedef std::queue<typename request_type::pointer> queue_type;
basic_protocol_service(int pool_size_hint = 1)
: ios_provider_(pool_size_hint)
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-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -62,28 +62,32 @@
* whole library much simpler to do it this way.
*/
template<typename RequestService
- , role_type Role
, typename ProtocolService
+ , role_type Role
, typename Allocator>
class basic_request
: public request_base
- , public boost::mpl::if_c<is_async<Protocol>::value
- , basic_io_object<Service>
- , basic_sync_io_object<Service>
+ , public boost::mpl::if_c<is_async<typename RequestService::protocol_type>::value
+ , basic_io_object<RequestService>
+ , basic_sync_io_object<RequestService>
>::type
{
public:
- typedef basic_request<RequestService, Role
- , ProtocolService, Allocator > type;
+ typedef basic_request<RequestService, ProtocolService
+ , Role, Allocator > type;
typedef RequestService service_type;
- typedef service_type::protocol_type protocol_type;
+ typedef typename service_type::protocol_type protocol_type;
+ typedef typename boost::mpl::if_c<is_async<typename RequestService::protocol_type>::value
+ , basic_io_object<RequestService>
+ , basic_sync_io_object<RequestService>
+ >::type base_type;
typedef ProtocolService protocol_service_type;
typedef boost::shared_ptr<type> pointer;
// Throws
basic_request(bool load_now = true, bool parse_post = true)
- : basic_sync_io_object<Service>()
+ : basic_sync_io_object<service_type>()
{
if (load_now) load(parse_post);//this->service.load(this->impl, true, ec);
}
@@ -91,14 +95,14 @@
basic_request(boost::system::error_code& ec
, const bool load_now = true
, const bool parse_post = true)
- : basic_sync_io_object<Service>()
+ : basic_sync_io_object<service_type>()
{
if (load_now) load(ec, parse_post);//this->service.load(this->impl, true, ec);
}
basic_request(protocol_service_type& s, const bool load_now = false
, const bool parse_post = false)
- : basic_io_object<Service>(s.io_service())
+ : basic_io_object<service_type>(s.io_service())
{
if (load_now) load(parse_post);//this->service.load(this->impl, false, ec);
}
@@ -106,7 +110,7 @@
basic_request(protocol_service_type& s
, boost::system::error_code& ec
, const bool load_now = false, const bool parse_post = false)
- : basic_io_object<Service>(s.io_service())
+ : basic_io_object<service_type>(s.io_service())
{
if(load_now) load(ec, parse_post);//this->service.load(this->impl, false, ec);
}
@@ -131,16 +135,16 @@
}
/// Set a cookie
- void set_cookie(const std::string& name, const std::string& val)
+ void set_cookie(const std::string& name, const std::string& val
+ , const std::string& expires = "")
{
- this->service.set_cookie(this->impl, name, val);
+ this->service.set_cookie(this->impl, name, val, expires);
}
/// Delete a cookie
void del_cookie(const std::string& name)
{
- this->service.set_cookie(this->impl, name, val
- , "Mon, 01-Jan-1945 00:00:01 GMT");
+ this->service.del_cookie(this->impl, name);
}
/// Delete all cookies
@@ -197,14 +201,14 @@
//BOOST_ASSERT( request_status_ != status_type::ended );
//this->service.set_status(this->impl, http_status);
- return this->service.end(this->impl, http_status, program_status);
+ return this->service.close(this->impl, http_status, program_status);
}
/// Reject the request with a standard '500 Internal Server Error' error
int reject()
{
this->service.set_status(this->impl, aborted);
- return this->service.end(this->impl, http::internal_server_error);
+ return this->service.close(this->impl, http::internal_server_error);
}
/// Set the output for the request
@@ -275,6 +279,12 @@
return this->service.write_some(this->impl, buf, ec);
}
+ /// Get a `cgi::map&` corresponding to all of the GET variables
+ cgi::map& meta_get()
+ {
+ return this->service.meta_get(this->impl);
+ }
+
/// Find the get meta-variable matching name
/**
* @throws `boost::system::system_error` if an error occurred. This may
@@ -300,6 +310,12 @@
return this->service.meta_get(this->impl, name, ec);
}
+ /// Get a `cgi::map&` corresponding to all of the POST variables
+ cgi::map& meta_post()
+ {
+ return this->service.meta_post(this->impl);
+ }
+
/// Find the post meta-variable matching name
/**
* @param greedy This determines whether more data can be read to find
@@ -329,6 +345,12 @@
return this->service.meta_post(this->impl, name, ec, greedy);
}
+ /// Get a `cgi::map&` corresponding to all of the form variables
+ cgi::map& meta_form()
+ {
+ return this->service.meta_form(this->impl);
+ }
+
/// Find the form variable matching name
/**
* Depending on the request's request_method, either the GET or the POST
@@ -357,6 +379,12 @@
return this->service.meta_form(this->impl, name, ec, greedy);
}
+ /// Get a `cgi::map&` corresponding to all of the HTTP_COOKIE variables
+ cgi::map& meta_cookie()
+ {
+ return this->service.meta_cookie(this->impl);
+ }
+
/// Find the cookie meta-variable matching name
/**
* @throws `boost::system::system_error` if an error occurred. This may
Modified: sandbox/SOC/2007/cgi/boost/cgi/basic_sync_io_object.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/basic_sync_io_object.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/basic_sync_io_object.hpp 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -25,6 +25,7 @@
protected:
explicit basic_sync_io_object()
{
+ std::cout<< "Hello";
service.construct(impl);
}
Modified: sandbox/SOC/2007/cgi/boost/cgi/cgi.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/cgi.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/cgi.hpp 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -10,12 +10,12 @@
#define CGI_CGI_HPP_INCLUDED__
// Include all cgi-related headers only.
-#include "cgi/cgi_request.hpp"
-#include "cgi/cgi_service.hpp"
-#include "service_impl/cgi_service_impl.hpp"
-#include "request_impl/cgi_request_impl.hpp"
-#include "gateway_impl/cgi_gateway_impl.hpp"
-#include "gateway_service/cgi_gateway_service.hpp"
+#include "cgi/request.hpp"
+#include "cgi/service.hpp"
+//#include "cgi/service_impl.hpp"
+//#include "cgi/request_impl.hpp"
+//#include "cgi/gateway_impl.hpp"
+//#include "cgi/gateway_service.hpp"
// Include headers common to all protocols
#include "detail/common_headers.hpp"
Modified: sandbox/SOC/2007/cgi/boost/cgi/cgi/request.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/cgi/request.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/cgi/request.hpp 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -9,10 +9,11 @@
#ifndef CGI_CGI_REQUEST_HPP_INCLUDED__
#define CGI_CGI_REQUEST_HPP_INCLUDED__
+#include "service.hpp"
#include "request_service.hpp"
#include "boost/cgi/tags.hpp"
#include "boost/cgi/basic_request_fwd.hpp"
-#include "boost/cgi/cgi/cgi_request_impl.hpp"
+#include "boost/cgi/cgi/request_impl.hpp"
#include "boost/cgi/basic_request.hpp"
namespace cgi {
Modified: sandbox/SOC/2007/cgi/boost/cgi/cgi/request_service.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/cgi/request_service.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/cgi/request_service.hpp 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -13,7 +13,7 @@
#include <map>
#include <boost/system/error_code.hpp>
-#include "cgi_request_impl.hpp"
+#include "request_impl.hpp"
#include "../detail/cgi_service_impl_base.hpp"
#include "../detail/extract_params.hpp"
#include "../connections/stdio.hpp"
@@ -45,7 +45,7 @@
void construct(implementation_type& impl)
{
- impl.connection() = stdio_connection::create();
+ impl.connection() = implementation_type::connection_type::create();
}
void destroy(implementation_type& impl)
Modified: sandbox/SOC/2007/cgi/boost/cgi/connections/async_stdio.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/connections/async_stdio.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/connections/async_stdio.hpp 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -56,8 +56,9 @@
void operator()()
{
- std::size_t bytes_read = cptr_->read_some(buf_, ec_);
- handler_(boost::system::error_code(), bytes_read);
+ boost::system::error_code ec;
+ std::size_t bytes_read = cptr_->read_some(buf_, ec);
+ handler_(ec, bytes_read);
}
private:
@@ -67,7 +68,7 @@
};
template<typename MutableBufferSequence, typename Handler>
- void async_read_some(MutableBufferSequence buf, Handler handler)
+ void async_read_some(const MutableBufferSequence& buf, Handler handler)
{
io_service_.post(read_handler<pointer, MutableBufferSequence, Handler>
(shared_from_this(), buf, handler));
@@ -88,8 +89,9 @@
void operator()()
{
- std::size_t bytes_written = cptr_->write_some(buf_, ec_);
- handler_(boost::system::error_code(), bytes_written);
+ boost::system::error_code ec;
+ std::size_t bytes_written = cptr_->write_some(buf_, ec);
+ handler_(ec, bytes_written);
}
private:
@@ -99,7 +101,7 @@
};
template<typename ConstBufferSequence, typename Handler>
- void async_write_some(ConstBufferSequence& buf, Handler handler)
+ void async_write_some(const ConstBufferSequence& buf, Handler handler)
{
io_service_.post(write_handler<pointer, ConstBufferSequence, Handler>
(shared_from_this(), buf, handler));
Modified: sandbox/SOC/2007/cgi/boost/cgi/detail/cgi_request_impl_base.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/detail/cgi_request_impl_base.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/detail/cgi_request_impl_base.hpp 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -36,7 +36,7 @@
* copied around. Since basic_request is noncopyable, basic copying will be
* restricted but if someone really wants to copy the data, then they can.
*/
- template<typename RequestImpl, typename Connection>
+ template<typename Connection>
class cgi_request_impl_base
{
public:
@@ -53,10 +53,20 @@
{
}
- protected:
+ map_type& get_vars() { return get_vars_; }
+ map_type& post_vars() { return post_vars_; }
+ map_type& cookie_vars() { return cookie_vars_; }
+
+ bool stdin_parsed() { return stdin_parsed_; }
+ http::status_code& http_status() { return http_status_; }
+
conn_ptr connection() { return connection_; }
+ std::string& null_str() { return null_str_; }
+
+ protected:
+ //conn_ptr connection() { return connection_; }
- friend class cgi_service_impl_base<RequestImpl>;
+ //friend class cgi_service_impl_base<RequestImpl>;
map_type get_vars_;
map_type post_vars_;
Modified: sandbox/SOC/2007/cgi/boost/cgi/detail/cgi_service_impl_base.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/detail/cgi_service_impl_base.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/detail/cgi_service_impl_base.hpp 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -31,7 +31,7 @@
{
public:
typedef RequestImplType implementation_type;
- typedef ::cgi::map map_type;
+ typedef cgi::map map_type;
cgi_service_impl_base()
{
@@ -42,6 +42,17 @@
{
}
+ bool is_open(implementation_type& impl)
+ {
+ return true;
+ }
+
+ int close(implementation_type& impl, http::status_code&, int status)
+ {
+ //impl.set_status(aborted);
+ return status;
+ }
+
/// Synchronously read/parse the request meta-data
/**
* @param parse_stdin if true then STDIN data is also read/parsed
@@ -111,12 +122,12 @@
std::string meta_get(implementation_type& impl, const std::string& name
, boost::system::error_code& ec)
{
- return var(impl.get_vars_, name, ec);
+ return var(impl.get_vars(), name, ec);
}
map_type& meta_get(implementation_type& impl)
{
- return impl.get_vars_;
+ return impl.get_vars();
}
/// Find the post meta-variable matching name
@@ -135,7 +146,7 @@
, boost::system::error_code& ec
, bool greedy = true)
{
- const std::string& val = var(impl.post_vars_, name, ec);
+ const std::string& val = var(impl.post_vars(), name, ec);
if (val.empty() && greedy && !ec)
{
@@ -146,7 +157,7 @@
map_type& meta_post(implementation_type& impl)
{
- return impl.post_vars_;
+ return impl.post_vars();
}
@@ -154,12 +165,12 @@
std::string cookie(implementation_type& impl, const std::string& name
, boost::system::error_code& ec)
{
- return var(impl.cookie_vars_, name, ec);
+ return var(impl.cookie_vars(), name, ec);
}
map_type& meta_cookie(implementation_type& impl)
{
- return impl.cookie_vars_;
+ return impl.cookie_vars();
}
@@ -168,7 +179,7 @@
, boost::system::error_code& ec)
{
const char* c = ::getenv(name.c_str());
- return c ? c : impl.null_str_;
+ return c ? c : impl.null_str();
}
@@ -184,7 +195,7 @@
parse_get_vars(RequestImpl& impl, boost::system::error_code& ec)
{
detail::extract_params(meta_env(impl, "QUERY_STRING", ec)
- , impl.get_vars_
+ , impl.get_vars()
, boost::char_separator<char>
("", "=&", boost::keep_empty_tokens)
, ec);
@@ -205,7 +216,7 @@
return ec;
detail::extract_params(meta_env(impl, "HTTP_COOKIE", ec)
- , impl.cookie_vars_
+ , impl.cookie_vars()
, boost::char_separator<char>
("", "=&", boost::keep_empty_tokens)
, ec);
@@ -223,7 +234,7 @@
//# error "Not implemented"
- if (impl.stdin_parsed_)
+ if (impl.stdin_parsed())
{
}
Modified: sandbox/SOC/2007/cgi/libs/cgi/example/Jamfile.v2
==============================================================================
--- sandbox/SOC/2007/cgi/libs/cgi/example/Jamfile.v2 (original)
+++ sandbox/SOC/2007/cgi/libs/cgi/example/Jamfile.v2 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -13,7 +13,7 @@
install examples
: # the sources
- easy_cgi
+ ecgi
acgi
#reply
: <location>/var/www/cgi-bin
Modified: sandbox/SOC/2007/cgi/libs/cgi/example/acgi/main.cpp
==============================================================================
--- sandbox/SOC/2007/cgi/libs/cgi/example/acgi/main.cpp (original)
+++ sandbox/SOC/2007/cgi/libs/cgi/example/acgi/main.cpp 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -26,16 +26,20 @@
int main()
{
- cgi::cgi_service service;
+ cgi::acgi_service service;
cgi::acgi_request req(service);
req.load();
- std::string buf("Content-type:text/html\r\n\r\nHello there, Universe.");
+ std::cout<< "checking in";
+
+ std::string buf("Content-type: text/html\r\n\r\nHello there, Universe.");
cgi::write(req, cgi::buffer(buf.c_str(), buf.size()));
+ std::cout<< "checking reply";
+
cgi::reply rep;
- rep<< "<br />Yuppers.";
+ rep<< "Content-type: <br />Yuppers.";
rep<< "<form method='POST'>"
"<input name='name' type='text' value='"
@@ -45,6 +49,8 @@
"</form>"
;
+ rep.send(req);
+
/*
Modified: sandbox/SOC/2007/cgi/libs/cgi/example/cgi/Jamfile.v2
==============================================================================
--- sandbox/SOC/2007/cgi/libs/cgi/example/cgi/Jamfile.v2 (original)
+++ sandbox/SOC/2007/cgi/libs/cgi/example/cgi/Jamfile.v2 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -6,11 +6,14 @@
import os ;
+project boost/cgi/example/cgi
+ : build-dir ../../../../bin.v2
+ ;
local BOOST_ROOT = [ os.environ BOOST_ROOT ] ;
-exe easy_cgi
+exe ecgi
:
main.cpp
:
@@ -20,3 +23,8 @@
<define>BOOST_ALL_NO_LIB=1
<toolset>gcc:<linkflags>-lpthread
;
+
+install _
+ : ecgi
+ : <location>/var/www/cgi-bin
+ ;
\ No newline at end of file
Modified: sandbox/SOC/2007/cgi/libs/cgi/example/cgi/main.cpp
==============================================================================
--- sandbox/SOC/2007/cgi/libs/cgi/example/cgi/main.cpp (original)
+++ sandbox/SOC/2007/cgi/libs/cgi/example/cgi/main.cpp 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -10,10 +10,10 @@
std::string buf("Content-type: text/html\r\n\r\nHello there, universe!");
boost::system::error_code ec;
- req.write_some(cgi::buffer(buf.c_str(), buf.size()), ec);
+ cgi::write(req, cgi::buffer(buf.c_str(), buf.size()));
buf = req.meta_get("blah");
- req.write_some(cgi::buffer(buf.c_str(), buf.size()), ec);
+ cgi::write(req, cgi::buffer(buf.c_str(), buf.size()));
} catch( boost::system::error_code& ec ) {
std::cerr<< "error: " << ec.message() << std::endl;
Modified: sandbox/SOC/2007/cgi/libs/cgi/test/compile/acgi_request.cpp
==============================================================================
--- sandbox/SOC/2007/cgi/libs/cgi/test/compile/acgi_request.cpp (original)
+++ sandbox/SOC/2007/cgi/libs/cgi/test/compile/acgi_request.cpp 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -4,7 +4,7 @@
int main()
{
- cgi::cgi_service service;
+ cgi::acgi_service service;
cgi::acgi_request req(service);
return 0;
Modified: sandbox/SOC/2007/cgi/libs/cgi/test/compile/cgi_request.cpp
==============================================================================
--- sandbox/SOC/2007/cgi/libs/cgi/test/compile/cgi_request.cpp (original)
+++ sandbox/SOC/2007/cgi/libs/cgi/test/compile/cgi_request.cpp 2007-08-20 18:18:31 EDT (Mon, 20 Aug 2007)
@@ -1,4 +1,4 @@
-#include "boost/cgi/cgi/cgi_request.hpp"
+#include <boost/cgi/cgi/cgi_request.hpp>
int main()
{