|
From: Mod C. C. L. <mod...@so...> - 2004-06-28 02:54:51
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : include
Dir : mod_cplusplus/include
Modified Files:
cpp_request.h
Log Message:
fix up the code a little and add a test and an example for content type
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/cpp_request.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- cpp_request.h 19 Jun 2002 14:11:07 -0000 1.8
+++ cpp_request.h 28 Jun 2004 02:54:44 -0000 1.9
@@ -60,7 +60,6 @@
apr_off_t bytes_sent() { return mRequest->bytes_sent; }
apr_time_t mtime() { return mRequest->mtime; }
int chunked() { return mRequest->chunked; }
- /* const char *boundary() {return mRequest->boundary; } */
const char *range() {return mRequest->range; }
apr_off_t clength() {return mRequest->clength; }
apr_off_t remaining() {return mRequest->remaining; }
|
|
From: Mod C. C. L. <mod...@so...> - 2004-07-31 13:58:14
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : include
Dir : mod_cplusplus/include
Modified Files:
cpp_request.h
Log Message:
add some constness correctness :) patch submitted by wil...@th...
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/cpp_request.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- cpp_request.h 28 Jun 2004 02:54:44 -0000 1.9
+++ cpp_request.h 31 Jul 2004 13:58:07 -0000 1.10
@@ -18,8 +18,10 @@
#include <http_core.h>
#include <http_protocol.h>
#include <apr_strings.h>
+#include <string> // for std::string
#include "cpp_server.h"
+using std::string;
class MODCPP_API ApacheRequestRec
{
private:
@@ -41,39 +43,39 @@
ApacheRequestRec *next() { return mNext; }
ApacheRequestRec *prev() { return mPrev; }
ApacheRequestRec *main() { return mMain; }
- char *the_request() { return mRequest->the_request; }
- int assbackwards() { return mRequest->assbackwards; }
- int proxyreq() { return mRequest->proxyreq; }
- int header_only() { return mRequest->header_only; }
- char *protocol() {return mRequest->protocol; }
- int proto_num() { return mRequest->proto_num; }
- const char *hostname() { return mRequest->hostname; }
- apr_time_t request_time() { return mRequest->request_time; }
- const char *status_line() { return mRequest->status_line; }
- int status() {return mRequest->status; }
- const char *method() { return mRequest->method; }
- int method_number() { return mRequest->method_number; }
- apr_int64_t allowed() { return mRequest->allowed; }
- apr_array_header_t *allowed_xmethods() {return mRequest->allowed_xmethods; }
- ap_method_list_t *allowed_methods() {return mRequest->allowed_methods; }
- apr_off_t sent_bodyct() {return mRequest->sent_bodyct; }
- apr_off_t bytes_sent() { return mRequest->bytes_sent; }
- apr_time_t mtime() { return mRequest->mtime; }
- int chunked() { return mRequest->chunked; }
- const char *range() {return mRequest->range; }
- apr_off_t clength() {return mRequest->clength; }
- apr_off_t remaining() {return mRequest->remaining; }
- apr_off_t read_length() { return mRequest->read_length; }
- int read_body() { return mRequest->read_body; }
- int read_chunked() { return mRequest->read_chunked; }
-
- apr_table_t *headers_in() { return mRequest->headers_in; }
- apr_table_t *headers_out() { return mRequest->headers_out; }
- apr_table_t *err_headers_out() { return mRequest->err_headers_out; }
- apr_table_t *subprocess_env() { return mRequest->subprocess_env; }
- apr_table_t *notes() { return mRequest->notes; }
+ char *the_request() const { return mRequest->the_request; }
+ int assbackwards() const { return mRequest->assbackwards; }
+ int proxyreq() const { return mRequest->proxyreq; }
+ int header_only() const { return mRequest->header_only; }
+ char *protocol() const {return mRequest->protocol; }
+ int proto_num() const { return mRequest->proto_num; }
+ const char *hostname() const { return mRequest->hostname; }
+ apr_time_t request_time() const { return mRequest->request_time; }
+ const char *status_line() const { return mRequest->status_line; }
+ int status() const {return mRequest->status; }
+ const char *method() const { return mRequest->method; }
+ int method_number() const { return mRequest->method_number; }
+ apr_int64_t allowed() const { return mRequest->allowed; }
+ apr_array_header_t *allowed_xmethods() const {return mRequest->allowed_xmethods; }
+ ap_method_list_t *allowed_methods() const {return mRequest->allowed_methods; }
+ apr_off_t sent_bodyct() const {return mRequest->sent_bodyct; }
+ apr_off_t bytes_sent() const { return mRequest->bytes_sent; }
+ apr_time_t mtime() const { return mRequest->mtime; }
+ int chunked() const { return mRequest->chunked; }
+ const char *range() const {return mRequest->range; }
+ apr_off_t clength() const {return mRequest->clength; }
+ apr_off_t remaining() const {return mRequest->remaining; }
+ apr_off_t read_length() const { return mRequest->read_length; }
+ int read_body() const { return mRequest->read_body; }
+ int read_chunked() const { return mRequest->read_chunked; }
+
+ apr_table_t *headers_in() const { return mRequest->headers_in; }
+ apr_table_t *headers_out() const { return mRequest->headers_out; }
+ apr_table_t *err_headers_out() const { return mRequest->err_headers_out; }
+ apr_table_t *subprocess_env() const { return mRequest->subprocess_env; }
+ apr_table_t *notes() const { return mRequest->notes; }
- const char *content_type(char *type = NULL)
+ const char *content_type(char *type = NULL) const
{ return type ? (mRequest->content_type =
apr_pstrdup(mRequest->pool, type)) :
mRequest->content_type; }
@@ -90,27 +92,27 @@
apr_array_header_t *content_languages()
{ return mRequest->content_languages; }
- char *vlist_validator() { return mRequest->vlist_validator; }
- char *user() { return mRequest->user; }
- char *ap_auth_type() { return mRequest->ap_auth_type; }
- char *unparsed_uri() { return mRequest->unparsed_uri; }
- char *uri() { return mRequest->uri; }
- char *filename() { return mRequest->filename; }
- char *path_info() { return mRequest->path_info; }
- char *args() { return mRequest->args; }
+ char *vlist_validator() const { return mRequest->vlist_validator; }
+ char *user() const { return mRequest->user; }
+ char *ap_auth_type() const { return mRequest->ap_auth_type; }
+ char *unparsed_uri() const { return mRequest->unparsed_uri; }
+ char *uri() const { return mRequest->uri; }
+ char *filename() const { return mRequest->filename; }
+ char *path_info() const { return mRequest->path_info; }
+ char *args() const { return mRequest->args; }
- int no_cache() { return mRequest->no_cache; }
- int no_local_copy() { return mRequest->no_local_copy; }
+ int no_cache() const { return mRequest->no_cache; }
+ int no_local_copy() const { return mRequest->no_local_copy; }
- apr_finfo_t finfo() { return mRequest->finfo; }
- apr_uri_t parsed_uri() { return mRequest->parsed_uri; }
+ apr_finfo_t finfo() const { return mRequest->finfo; }
+ apr_uri_t parsed_uri() const { return mRequest->parsed_uri; }
void *get_dir_config(module *m);
void *get_server_config(module *m);
int get_basic_auth_pw(const char **sent_pw);
int rputc(int c);
- int rputs(const char *str);
+ int rputs(const char *str) const;
int rwrite(const void *buf, int nbyte);
int rprintf(const char *fmt, ...);
int rflush();
@@ -141,8 +143,10 @@
void allow_methods(int reset, ...);
- void dump();
- void dump_table(apr_table_t *pTable);
+ void dump() const;
+ string dump_string() const;
+ string table_string(const apr_table_t *pTable) const;
+ void dump_table(const apr_table_t *pTable) const;
request_rec *get_request_rec() { return mRequest; }
};
|
|
From: Mod C. C. L. <mod...@so...> - 2004-08-27 13:09:07
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : include
Dir : mod_cplusplus/include
Modified Files:
cpp_request.h
Log Message:
rework 3 things: 1) use snprintf instead of sprintf 2) use result from snprintf to build the string (optimization) 3) make utility methods private instance methods to protect them
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/cpp_request.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- cpp_request.h 31 Jul 2004 13:58:07 -0000 1.10
+++ cpp_request.h 27 Aug 2004 13:08:59 -0000 1.11
@@ -30,7 +30,9 @@
ApacheRequestRec *mNext;
ApacheRequestRec *mMain;
ApacheServerRec *mServer;
-
+ /** utility functions for formatting **/
+ string istring(int value, const char* format = "%d") const;
+ string mstring(const char *cp) const;
public:
ApacheRequestRec(request_rec *r, ApacheRequestRec *pPrev = NULL,
ApacheRequestRec *pNext = NULL);
|
|
From: Mod C. C. L. <mod...@so...> - 2004-08-27 13:19:43
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : include
Dir : mod_cplusplus/include
Modified Files:
cpp_request.h
Log Message:
add more constification - we were returning non-const results from const methods. Submitted by Jonathan Wakely <co...@co...>
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/cpp_request.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- cpp_request.h 27 Aug 2004 13:08:59 -0000 1.11
+++ cpp_request.h 27 Aug 2004 13:19:36 -0000 1.12
@@ -45,11 +45,11 @@
ApacheRequestRec *next() { return mNext; }
ApacheRequestRec *prev() { return mPrev; }
ApacheRequestRec *main() { return mMain; }
- char *the_request() const { return mRequest->the_request; }
+ const char *the_request() const { return mRequest->the_request; }
int assbackwards() const { return mRequest->assbackwards; }
int proxyreq() const { return mRequest->proxyreq; }
int header_only() const { return mRequest->header_only; }
- char *protocol() const {return mRequest->protocol; }
+ const char *protocol() const {return mRequest->protocol; }
int proto_num() const { return mRequest->proto_num; }
const char *hostname() const { return mRequest->hostname; }
apr_time_t request_time() const { return mRequest->request_time; }
@@ -58,8 +58,8 @@
const char *method() const { return mRequest->method; }
int method_number() const { return mRequest->method_number; }
apr_int64_t allowed() const { return mRequest->allowed; }
- apr_array_header_t *allowed_xmethods() const {return mRequest->allowed_xmethods; }
- ap_method_list_t *allowed_methods() const {return mRequest->allowed_methods; }
+ const apr_array_header_t *allowed_xmethods() const {return mRequest->allowed_xmethods; }
+ const ap_method_list_t *allowed_methods() const {return mRequest->allowed_methods; }
apr_off_t sent_bodyct() const {return mRequest->sent_bodyct; }
apr_off_t bytes_sent() const { return mRequest->bytes_sent; }
apr_time_t mtime() const { return mRequest->mtime; }
@@ -91,17 +91,17 @@
return ap_get_client_block(mRequest, buf, bufsiz);
}
- apr_array_header_t *content_languages()
+ const apr_array_header_t *content_languages() const
{ return mRequest->content_languages; }
- char *vlist_validator() const { return mRequest->vlist_validator; }
- char *user() const { return mRequest->user; }
- char *ap_auth_type() const { return mRequest->ap_auth_type; }
- char *unparsed_uri() const { return mRequest->unparsed_uri; }
- char *uri() const { return mRequest->uri; }
- char *filename() const { return mRequest->filename; }
- char *path_info() const { return mRequest->path_info; }
- char *args() const { return mRequest->args; }
+ const char *vlist_validator() const { return mRequest->vlist_validator; }
+ const char *user() const { return mRequest->user; }
+ const char *ap_auth_type() const { return mRequest->ap_auth_type; }
+ const char *unparsed_uri() const { return mRequest->unparsed_uri; }
+ const char *uri() const { return mRequest->uri; }
+ const char *filename() const { return mRequest->filename; }
+ const char *path_info() const { return mRequest->path_info; }
+ const char *args() const { return mRequest->args; }
int no_cache() const { return mRequest->no_cache; }
int no_local_copy() const { return mRequest->no_local_copy; }
|
|
From: Mod C. C. L. <mod...@so...> - 2005-04-23 12:03:21
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : include
Dir : mod_cplusplus/include
Modified Files:
cpp_request.h
Log Message:
more documentation fixes
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/cpp_request.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- cpp_request.h 3 Apr 2005 19:38:24 -0000 1.13
+++ cpp_request.h 23 Apr 2005 12:03:14 -0000 1.14
@@ -189,44 +189,153 @@
/** \return Array of strings representing content languages **/
const apr_array_header_t *content_languages() const
{ return mRequest->content_languages; }
-
+
+ /** \return variant list validator (if negotiated) **/
const char *vlist_validator() const { return mRequest->vlist_validator; }
+
+ /** \return If an authentication check was made, this gets set to the user name. */
const char *user() const { return mRequest->user; }
+
+ /** \return If an authentication check was made, this gets set to the auth type. */
const char *ap_auth_type() const { return mRequest->ap_auth_type; }
+
+ /** \return The URI without any parsing performed */
const char *unparsed_uri() const { return mRequest->unparsed_uri; }
+
+ /** \return Just the path portion of the URI */
const char *uri() const { return mRequest->uri; }
+
+ /** \return The filename on disk corresponding to this response */
const char *filename() const { return mRequest->filename; }
+
+ /** \return The PATH_INFO extracted from this request */
const char *path_info() const { return mRequest->path_info; }
+
+ /** \return The QUERY_ARGS extracted from this request */
const char *args() const { return mRequest->args; }
+ /** \return true if this response can not be cached */
int no_cache() const { return mRequest->no_cache; }
+
+ /** \return true if there is no local copy of this response */
int no_local_copy() const { return mRequest->no_local_copy; }
+ /** \return finfo.protection (st_mode) set to zero if no such file */
apr_finfo_t finfo() const { return mRequest->finfo; }
+
+ /** \return a struct containing the components of URI */
apr_uri_t parsed_uri() const { return mRequest->parsed_uri; }
+ /**
+ * \brief pass in a module and this method will returrn you its per-dir config
+ * \param m a pointer to the static module definition
+ * \return a void pointer to the config structure that was set for module m
+ **/
void *get_dir_config(module *m);
+
+ /**
+ * \brief pass in a module and this method will returrn you its per-server config
+ * \param m a pointer to the static module definition
+ * \return a void pointer to the config structure that was set for module m
+ **/
void *get_server_config(module *m);
+ /**
+ * \brief gives you access to the encoded password sent by the client
+ * \param sent_pw a reference to a string pointer into the request where the password is
+ * \return 0 (OK) if it set the 'pw' argument (and assured
+ * a correct value in r->user); otherwise it returns
+ * an error code, either HTTP_INTERNAL_SERVER_ERROR if things are
+ * really confused, HTTP_UNAUTHORIZED if no authentication at all
+ * seemed to be in use, or DECLINED if there was authentication but
+ * it wasn't Basic (in which case, the caller should presumably
+ * decline as well).
+ **/
int get_basic_auth_pw(const char **sent_pw);
+
+ /**
+ * \brief this method writes a character for this request
+ * \param c the character to write
+ * \return the number of bytes sent
+ **/
int rputc(int c);
+
+ /**
+ * \brief this method writes a string for this request
+ * \param c the character to write
+ * \return the number of bytes sent
+ **/
int rputs(const char *str) const;
+
+ /**
+ * \brief writes a buffer for this request
+ * \param buf the content to write
+ * \param nbyte the number of bytes to send from buf
+ * \return the number of bytes sent
+ **/
int rwrite(const void *buf, int nbyte);
+
+ /**
+ * \brief a printf style way to write data to the request
+ * \param fmt The format string
+ * \param ... Thee arguments used to fill the format string
+ * \return the number of bytes sent
+ **/
int rprintf(const char *fmt, ...);
+
+ /**
+ * \brief Flushn all the data for this request to the client
+ * \return number of bytes sent
+ **/
int rflush();
+ /**
+ * \brief the allow options tell you what options are set for this request:
+ * indexes, includes, sym links, execcgi
+ * \return a bitmap of the options set
+ **/
int allow_options() { return ap_allow_options(mRequest); }
+
+ /** \return bitmask of the allowoverrides for this request **/
int allow_overrides(){ return ap_allow_overrides(mRequest); }
+
+ /** \return default type from the configuration, or text/plain if not set **/
const char *default_type() { return ap_default_type(mRequest); }
+
+ /**
+ * \brief WARNING: This is in to be backward compatible, but is not always
+ * acurate (e.g. if mod_userdir is enabled). This should not be used
+ * \return the document root from the configuration (not necessarily the active one for this request)
+ **/
const char *document_root() { return ap_document_root(mRequest); }
+
+ /** \return Lookup the login name of the remote user. Undefined if it cannot be determined **/
const char *get_remote_logname() { return ap_get_remote_logname(mRequest); }
+
+ /** \return the server name from the reuqest **/
const char *get_server_name() { return ap_get_server_name(mRequest); }
+
+ /**
+ * \brief Install a custom response handler for a given status)
+ * \param status the status to hook into
+ * \param str the custom response - it can be a static string, the full path to a file, or a URL
+ **/
void custom_response(int status, const char *str)
{ ap_custom_response(mRequest, status, (char *)str); }
+ /**
+ * \brief run an internal redirect to another URI in this server
+ * \param new_uri the new uri to fire
+ **/
void internal_redirect(const char *new_uri)
{ ap_internal_redirect(new_uri, mRequest); }
+ /**
+ * \brief This function is designed for things like actions or CGI scripts, when
+ * using AddHandler, and you want to preserve the content type across
+ * an internal redirect.
+ * \param new_uri the URI to replace the current request with
+ **/
void internal_redirect_handler(const char *new_uri)
{ ap_internal_redirect(new_uri, mRequest); }
|
