Author: joes
Date: Sun Feb 13 18:33:08 2005
New Revision: 153694
URL: http://svn.apache.org/viewcvs?view=rev&rev=153694
Log:
s/apreq_env_/apreq_/g, and begin APR:: module layout.
Added:
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/APR/
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/APR/Request/
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/APR/Request/Cookie/
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/APR/Request/Error/
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/APR/Request/Handle/
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/APR/Request/Param/
httpd/apreq/branches/multi-env-unstable/glue/perl/xsbuilder/APR/Request/Table/
Modified:
httpd/apreq/branches/multi-env-unstable/include/apreq.h
httpd/apreq/branches/multi-env-unstable/library/module.c
httpd/apreq/branches/multi-env-unstable/library/module_cgi.c
httpd/apreq/branches/multi-env-unstable/library/module_custom.c
httpd/apreq/branches/multi-env-unstable/library/t/cookie.c
httpd/apreq/branches/multi-env-unstable/module/apache2/apreq_module_apache2.h
httpd/apreq/branches/multi-env-unstable/module/apache2/apreq_private_apache2.h
httpd/apreq/branches/multi-env-unstable/module/apache2/handle.c
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_access_test/mod_apreq_access_test.c
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_big_request_test/mod_apreq_big_request_test.c
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_cookie_test/mod_apreq_cookie_test.c
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_output_filter_test/mod_apreq_output_filter_test.c
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_redirect_test/mod_apreq_redirect_test.c
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_request_test/mod_apreq_request_test.c
httpd/apreq/branches/multi-env-unstable/module/test_cgi.c
Modified: httpd/apreq/branches/multi-env-unstable/include/apreq.h
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/include/apreq.h?view=diff&r1=153693&r2=153694
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/include/apreq.h (original)
+++ httpd/apreq/branches/multi-env-unstable/include/apreq.h Sun Feb 13 18:33:08
2005
@@ -30,9 +30,9 @@
* may have variable size, because the module may append its own data
* structures after it.
*/
-typedef struct apreq_env_handle_t {
- const struct apreq_env_module_t *module;
-} apreq_env_handle_t;
+typedef struct apreq_handle_t {
+ const struct apreq_module_t *module;
+} apreq_handle_t;
/**
* This must be fully defined for libapreq2 to operate properly
@@ -42,143 +42,143 @@
*/
-typedef struct apreq_env_module_t {
+typedef struct apreq_module_t {
const char *name;
apr_uint32_t magic_number;
- apr_status_t (*jar)(apreq_env_handle_t *, const apr_table_t **);
- apr_status_t (*args)(apreq_env_handle_t *, const apr_table_t **);
- apr_status_t (*body)(apreq_env_handle_t *, const apr_table_t **);
+ apr_status_t (*jar)(apreq_handle_t *, const apr_table_t **);
+ apr_status_t (*args)(apreq_handle_t *, const apr_table_t **);
+ apr_status_t (*body)(apreq_handle_t *, const apr_table_t **);
- apreq_cookie_t *(*jar_get)(apreq_env_handle_t *, const char *);
- apreq_param_t *(*args_get)(apreq_env_handle_t *, const char *);
- apreq_param_t *(*body_get)(apreq_env_handle_t *, const char *);
+ apreq_cookie_t *(*jar_get)(apreq_handle_t *, const char *);
+ apreq_param_t *(*args_get)(apreq_handle_t *, const char *);
+ apreq_param_t *(*body_get)(apreq_handle_t *, const char *);
- apr_status_t (*parser_get)(apreq_env_handle_t *, const apreq_parser_t **);
- apr_status_t (*parser_set)(apreq_env_handle_t *, apreq_parser_t *);
- apr_status_t (*hook_add)(apreq_env_handle_t *, apreq_hook_t *);
+ apr_status_t (*parser_get)(apreq_handle_t *, const apreq_parser_t **);
+ apr_status_t (*parser_set)(apreq_handle_t *, apreq_parser_t *);
+ apr_status_t (*hook_add)(apreq_handle_t *, apreq_hook_t *);
- apr_status_t (*brigade_limit_get)(apreq_env_handle_t *, apr_size_t *);
- apr_status_t (*brigade_limit_set)(apreq_env_handle_t *, apr_size_t);
+ apr_status_t (*brigade_limit_get)(apreq_handle_t *, apr_size_t *);
+ apr_status_t (*brigade_limit_set)(apreq_handle_t *, apr_size_t);
- apr_status_t (*read_limit_get)(apreq_env_handle_t *, apr_uint64_t *);
- apr_status_t (*read_limit_set)(apreq_env_handle_t *, apr_uint64_t);
+ apr_status_t (*read_limit_get)(apreq_handle_t *, apr_uint64_t *);
+ apr_status_t (*read_limit_set)(apreq_handle_t *, apr_uint64_t);
- apr_status_t (*temp_dir_get)(apreq_env_handle_t *, const char **);
- apr_status_t (*temp_dir_set)(apreq_env_handle_t *, const char *);
+ apr_status_t (*temp_dir_get)(apreq_handle_t *, const char **);
+ apr_status_t (*temp_dir_set)(apreq_handle_t *, const char *);
- const char *(*header_in)(apreq_env_handle_t *,const char *);
- apr_status_t (*header_out)(apreq_env_handle_t *, const char *,char *);
+ const char *(*header_in)(apreq_handle_t *,const char *);
+ apr_status_t (*header_out)(apreq_handle_t *, const char *,char *);
-} apreq_env_module_t;
+} apreq_module_t;
static APR_INLINE
-apr_status_t apreq_jar(apreq_env_handle_t *env, const apr_table_t **t)
+apr_status_t apreq_jar(apreq_handle_t *env, const apr_table_t **t)
{
return env->module->jar(env,t);
}
static APR_INLINE
-apr_status_t apreq_args(apreq_env_handle_t *env, const apr_table_t **t)
+apr_status_t apreq_args(apreq_handle_t *env, const apr_table_t **t)
{
return env->module->args(env,t);
}
static APR_INLINE
-apr_status_t apreq_body(apreq_env_handle_t *env, const apr_table_t **t)
+apr_status_t apreq_body(apreq_handle_t *env, const apr_table_t **t)
{
return env->module->body(env,t);
}
static APR_INLINE
-apreq_cookie_t *apreq_jar_get(apreq_env_handle_t *env, const char *name)
+apreq_cookie_t *apreq_jar_get(apreq_handle_t *env, const char *name)
{
return env->module->jar_get(env, name);
}
static APR_INLINE
-apreq_param_t *apreq_args_get(apreq_env_handle_t *env, const char *name)
+apreq_param_t *apreq_args_get(apreq_handle_t *env, const char *name)
{
return env->module->args_get(env, name);
}
static APR_INLINE
-apreq_param_t *apreq_body_get(apreq_env_handle_t *env, const char *name)
+apreq_param_t *apreq_body_get(apreq_handle_t *env, const char *name)
{
return env->module->body_get(env, name);
}
static APR_INLINE
-apr_status_t apreq_parser_get(apreq_env_handle_t *env,
+apr_status_t apreq_parser_get(apreq_handle_t *env,
const apreq_parser_t **parser)
{
return env->module->parser_get(env, parser);
}
static APR_INLINE
-apr_status_t apreq_parser_set(apreq_env_handle_t *env,
+apr_status_t apreq_parser_set(apreq_handle_t *env,
apreq_parser_t *parser)
{
return env->module->parser_set(env, parser);
}
static APR_INLINE
-apr_status_t apreq_hook_add(apreq_env_handle_t *env, apreq_hook_t *hook)
+apr_status_t apreq_hook_add(apreq_handle_t *env, apreq_hook_t *hook)
{
return env->module->hook_add(env, hook);
}
static APR_INLINE
-const char *apreq_header_in(apreq_env_handle_t *env, const char *name)
+const char *apreq_header_in(apreq_handle_t *env, const char *name)
{
return env->module->header_in(env, name);
}
static APR_INLINE
-apr_status_t apreq_header_out(apreq_env_handle_t *env,
+apr_status_t apreq_header_out(apreq_handle_t *env,
const char *name, char *val)
{
return env->module->header_out(env, name, val);
}
static APR_INLINE
-apr_status_t apreq_brigade_limit_set(apreq_env_handle_t *env,
+apr_status_t apreq_brigade_limit_set(apreq_handle_t *env,
apr_size_t bytes)
{
return env->module->brigade_limit_set(env, bytes);
}
static APR_INLINE
-apr_status_t apreq_brigade_limit_get(apreq_env_handle_t *env,
+apr_status_t apreq_brigade_limit_get(apreq_handle_t *env,
apr_size_t *bytes)
{
return env->module->brigade_limit_get(env, bytes);
}
static APR_INLINE
-apr_status_t apreq_read_limit_set(apreq_env_handle_t *env,
+apr_status_t apreq_read_limit_set(apreq_handle_t *env,
apr_uint64_t bytes)
{
return env->module->read_limit_set(env, bytes);
}
static APR_INLINE
-apr_status_t apreq_read_limit_get(apreq_env_handle_t *env,
+apr_status_t apreq_read_limit_get(apreq_handle_t *env,
apr_uint64_t *bytes)
{
return env->module->read_limit_get(env, bytes);
}
static APR_INLINE
-apr_status_t apreq_temp_dir_set(apreq_env_handle_t *env, const char *path)
+apr_status_t apreq_temp_dir_set(apreq_handle_t *env, const char *path)
{
return env->module->temp_dir_set(env, path);
}
static APR_INLINE
-apr_status_t apreq_temp_dir_get(apreq_env_handle_t *env, const char **path)
+apr_status_t apreq_temp_dir_get(apreq_handle_t *env, const char **path)
{
return env->module->temp_dir_get(env, path);
}
@@ -222,7 +222,7 @@
* @param name Name of this environment.
* @param mmn Magic number (i.e. version number) of this environment.
*/
-#define APREQ_MODULE(pre, mmn) const apreq_env_module_t \
+#define APREQ_MODULE(pre, mmn) const apreq_module_t \
pre##_module = { #pre, mmn, \
pre##_jar, pre##_args, pre##_body, \
pre##_jar_get, pre##_args_get, pre##_body_get, \
@@ -236,7 +236,7 @@
* Create an apreq handle which is suitable for a CGI program. It
* reads input from stdin and writes output to stdout.
*/
-APREQ_DECLARE(apreq_env_handle_t*) apreq_handle_cgi(apr_pool_t *pool);
+APREQ_DECLARE(apreq_handle_t*) apreq_handle_cgi(apr_pool_t *pool);
/**
* Create a custom apreq handle which knows only some static
@@ -249,7 +249,7 @@
* @param content_type content type of the request body
* @param in a bucket brigade containing the request body
*/
-APREQ_DECLARE(apreq_env_handle_t*) apreq_handle_custom(apr_pool_t *pool,
+APREQ_DECLARE(apreq_handle_t*) apreq_handle_custom(apr_pool_t *pool,
const char
*query_string,
const char *cookie,
const char *cookie2,
@@ -264,7 +264,7 @@
* @param env Environment.
*/
APREQ_DECLARE(apr_status_t) apreq_cookie_bake(const apreq_cookie_t *c,
- apreq_env_handle_t *env);
+ apreq_handle_t *env);
/**
* Add the cookie to the outgoing "Set-Cookie2" headers.
@@ -273,7 +273,7 @@
* @param env Environment.
*/
APREQ_DECLARE(apr_status_t) apreq_cookie_bake2(const apreq_cookie_t *c,
- apreq_env_handle_t *env);
+ apreq_handle_t *env);
/**
* Looks for the presence of a "Cookie2" header to determine whether
@@ -283,10 +283,10 @@
* APREQ_COOKIE_VERSION_NETSCAPE otherwise.
*/
APREQ_DECLARE(apreq_cookie_version_t)
- apreq_ua_cookie_version(apreq_env_handle_t *env);
+ apreq_ua_cookie_version(apreq_handle_t *env);
-APREQ_DECLARE(apreq_param_t *)apreq_param(apreq_env_handle_t *env,
+APREQ_DECLARE(apreq_param_t *)apreq_param(apreq_handle_t *env,
const char *name);
#define apreq_cookie(env, name) apreq_jar_get(env, name)
@@ -299,11 +299,11 @@
* @remark Also parses the request if necessary.
*/
APREQ_DECLARE(apr_table_t *) apreq_params(apr_pool_t *p,
- apreq_env_handle_t *env);
+ apreq_handle_t *env);
APREQ_DECLARE(apr_table_t *)apreq_cookies(apr_pool_t *p,
- apreq_env_handle_t *env);
+ apreq_handle_t *env);
/**
* Force a complete parse.
@@ -314,7 +314,7 @@
*/
static APR_INLINE
-apr_status_t apreq_parse_request(apreq_env_handle_t *req)
+apr_status_t apreq_parse_request(apreq_handle_t *req)
{
const apr_table_t *dummy;
apr_status_t jar_status, args_status, body_status;
Modified: httpd/apreq/branches/multi-env-unstable/library/module.c
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/module.c?view=diff&r1=153693&r2=153694
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/library/module.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/module.c Sun Feb 13
18:33:08 2005
@@ -32,7 +32,7 @@
}
APREQ_DECLARE(apreq_cookie_version_t)
- apreq_ua_cookie_version(apreq_env_handle_t *env)
+ apreq_ua_cookie_version(apreq_handle_t *env)
{
if (apreq_header_in(env, "Cookie2") == NULL) {
@@ -51,7 +51,7 @@
APREQ_DECLARE(apr_status_t) apreq_cookie_bake(const apreq_cookie_t *c,
- apreq_env_handle_t *env)
+ apreq_handle_t *env)
{
char s[APREQ_COOKIE_MAX_LENGTH];
int len = apreq_cookie_serialize(c, s, APREQ_COOKIE_MAX_LENGTH);
@@ -63,7 +63,7 @@
}
APREQ_DECLARE(apr_status_t) apreq_cookie_bake2(const apreq_cookie_t *c,
- apreq_env_handle_t *env)
+ apreq_handle_t *env)
{
char s[APREQ_COOKIE_MAX_LENGTH];
int len = apreq_cookie_serialize(c, s, APREQ_COOKIE_MAX_LENGTH);
@@ -78,7 +78,7 @@
}
-APREQ_DECLARE(apreq_param_t *)apreq_param(apreq_env_handle_t *env,
+APREQ_DECLARE(apreq_param_t *)apreq_param(apreq_handle_t *env,
const char *name)
{
apreq_param_t *param = apreq_args_get(env, name);
@@ -90,7 +90,7 @@
APREQ_DECLARE(apr_table_t *)apreq_params(apr_pool_t *pool,
- apreq_env_handle_t *env)
+ apreq_handle_t *env)
{
const apr_table_t *args, *body;
Modified: httpd/apreq/branches/multi-env-unstable/library/module_cgi.c
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/module_cgi.c?view=diff&r1=153693&r2=153694
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/library/module_cgi.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/module_cgi.c Sun Feb 13
18:33:08 2005
@@ -40,7 +40,7 @@
struct cgi_handle {
- struct apreq_env_handle_t env;
+ struct apreq_handle_t env;
apr_pool_t *pool;
apr_bucket_alloc_t *bucket_alloc;
@@ -90,7 +90,7 @@
{NULL, -1},
};
-static const char *cgi_header_in(apreq_env_handle_t *env,
+static const char *cgi_header_in(apreq_handle_t *env,
const char *name)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -119,7 +119,7 @@
static void cgi_log_error(const char *file, int line, int level,
- apr_status_t status, apreq_env_handle_t *env,
+ apr_status_t status, apreq_handle_t *env,
const char *fmt, ...)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -169,7 +169,7 @@
}
-static apr_status_t cgi_header_out(apreq_env_handle_t *env, const char *name,
+static apr_status_t cgi_header_out(apreq_handle_t *env, const char *name,
char *value)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -186,7 +186,7 @@
APR_INLINE
-static const char *cgi_query_string(apreq_env_handle_t *env)
+static const char *cgi_query_string(apreq_handle_t *env)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
char *value = NULL, qs[] = "QUERY_STRING";
@@ -195,7 +195,7 @@
}
-static void init_body(apreq_env_handle_t *env)
+static void init_body(apreq_handle_t *env)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
const char *cl_header = cgi_header_in(env, "Content-Length");
@@ -274,7 +274,7 @@
}
-static apr_status_t cgi_read(apreq_env_handle_t *env,
+static apr_status_t cgi_read(apreq_handle_t *env,
apr_off_t bytes)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -349,7 +349,7 @@
-static apr_status_t cgi_jar(apreq_env_handle_t *env,
+static apr_status_t cgi_jar(apreq_handle_t *env,
const apr_table_t **t)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -369,7 +369,7 @@
return handle->jar_status;
}
-static apr_status_t cgi_args(apreq_env_handle_t *env,
+static apr_status_t cgi_args(apreq_handle_t *env,
const apr_table_t **t)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -392,7 +392,7 @@
-static apreq_cookie_t *cgi_jar_get(apreq_env_handle_t *env,
+static apreq_cookie_t *cgi_jar_get(apreq_handle_t *env,
const char *name)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -414,7 +414,7 @@
return apreq_value_to_cookie(val);
}
-static apreq_param_t *cgi_args_get(apreq_env_handle_t *env,
+static apreq_param_t *cgi_args_get(apreq_handle_t *env,
const char *name)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -438,7 +438,7 @@
-static apr_status_t cgi_body(apreq_env_handle_t *env,
+static apr_status_t cgi_body(apreq_handle_t *env,
const apr_table_t **t)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -459,7 +459,7 @@
return handle->body_status;
}
-static apreq_param_t *cgi_body_get(apreq_env_handle_t *env,
+static apreq_param_t *cgi_body_get(apreq_handle_t *env,
const char *name)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -497,7 +497,7 @@
return NULL;
}
-static apr_status_t cgi_parser_get(apreq_env_handle_t *env,
+static apr_status_t cgi_parser_get(apreq_handle_t *env,
const apreq_parser_t **parser)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -506,7 +506,7 @@
return APR_SUCCESS;
}
-static apr_status_t cgi_parser_set(apreq_env_handle_t *env,
+static apr_status_t cgi_parser_set(apreq_handle_t *env,
apreq_parser_t *parser)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -534,7 +534,7 @@
}
-static apr_status_t cgi_hook_add(apreq_env_handle_t *env,
+static apr_status_t cgi_hook_add(apreq_handle_t *env,
apreq_hook_t *hook)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -555,7 +555,7 @@
}
-static apr_status_t cgi_brigade_limit_set(apreq_env_handle_t *env,
+static apr_status_t cgi_brigade_limit_set(apreq_handle_t *env,
apr_size_t bytes)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -571,7 +571,7 @@
return APREQ_ERROR_CONFLICT;
}
-static apr_status_t cgi_brigade_limit_get(apreq_env_handle_t *env,
+static apr_status_t cgi_brigade_limit_get(apreq_handle_t *env,
apr_size_t *bytes)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -582,7 +582,7 @@
return APR_SUCCESS;
}
-static apr_status_t cgi_read_limit_set(apreq_env_handle_t *env,
+static apr_status_t cgi_read_limit_set(apreq_handle_t *env,
apr_uint64_t bytes)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -596,7 +596,7 @@
}
-static apr_status_t cgi_read_limit_get(apreq_env_handle_t *env,
+static apr_status_t cgi_read_limit_get(apreq_handle_t *env,
apr_uint64_t *bytes)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -605,7 +605,7 @@
}
-static apr_status_t cgi_temp_dir_set(apreq_env_handle_t *env,
+static apr_status_t cgi_temp_dir_set(apreq_handle_t *env,
const char *path)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -624,7 +624,7 @@
}
-static apr_status_t cgi_temp_dir_get(apreq_env_handle_t *env,
+static apr_status_t cgi_temp_dir_get(apreq_handle_t *env,
const char **path)
{
struct cgi_handle *handle = (struct cgi_handle *)env;
@@ -646,7 +646,7 @@
static APREQ_MODULE(cgi, 20050130);
-APREQ_DECLARE(apreq_env_handle_t *)apreq_handle_cgi(apr_pool_t *pool)
+APREQ_DECLARE(apreq_handle_t *)apreq_handle_cgi(apr_pool_t *pool)
{
apr_bucket_alloc_t *ba;
struct cgi_handle *handle;
Modified: httpd/apreq/branches/multi-env-unstable/library/module_custom.c
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/module_custom.c?view=diff&r1=153693&r2=153694
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/library/module_custom.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/module_custom.c Sun Feb 13
18:33:08 2005
@@ -20,7 +20,7 @@
#define READ_BYTES (64 * 1024)
struct custom_handle {
- struct apreq_env_handle_t env;
+ struct apreq_handle_t env;
const char *cookie_header, *cookie2_header;
apr_table_t *jar, *args, *body;
@@ -36,7 +36,7 @@
};
-static apr_status_t custom_parse_brigade(apreq_env_handle_t *env, apr_uint64_t
bytes)
+static apr_status_t custom_parse_brigade(apreq_handle_t *env, apr_uint64_t
bytes)
{
struct custom_handle *handle = (struct custom_handle*)env;
apr_status_t s;
@@ -94,21 +94,21 @@
-static apr_status_t custom_jar(apreq_env_handle_t *env, const apr_table_t **t)
+static apr_status_t custom_jar(apreq_handle_t *env, const apr_table_t **t)
{
struct custom_handle *handle = (struct custom_handle*)env;
*t = handle->jar;
return handle->jar_status;
}
-static apr_status_t custom_args(apreq_env_handle_t *env, const apr_table_t **t)
+static apr_status_t custom_args(apreq_handle_t *env, const apr_table_t **t)
{
struct custom_handle *handle = (struct custom_handle*)env;
*t = handle->args;
return handle->args_status;
}
-static apr_status_t custom_body(apreq_env_handle_t *env, const apr_table_t **t)
+static apr_status_t custom_body(apreq_handle_t *env, const apr_table_t **t)
{
struct custom_handle *handle = (struct custom_handle*)env;
while (handle->body_status == APR_INCOMPLETE)
@@ -119,7 +119,7 @@
-static apreq_cookie_t *custom_jar_get(apreq_env_handle_t *env, const char
*name)
+static apreq_cookie_t *custom_jar_get(apreq_handle_t *env, const char *name)
{
struct custom_handle *handle = (struct custom_handle*)env;
const char *val;
@@ -135,7 +135,7 @@
return apreq_value_to_cookie(val);
}
-static apreq_param_t *custom_args_get(apreq_env_handle_t *env, const char
*name)
+static apreq_param_t *custom_args_get(apreq_handle_t *env, const char *name)
{
struct custom_handle *handle = (struct custom_handle*)env;
const char *val;
@@ -151,7 +151,7 @@
return apreq_value_to_param(val);
}
-static apreq_param_t *custom_body_get(apreq_env_handle_t *env, const char
*name)
+static apreq_param_t *custom_body_get(apreq_handle_t *env, const char *name)
{
struct custom_handle *handle = (struct custom_handle*)env;
const char *val;
@@ -176,7 +176,7 @@
-static apr_status_t custom_parser_get(apreq_env_handle_t *env,
+static apr_status_t custom_parser_get(apreq_handle_t *env,
const apreq_parser_t **parser)
{
struct custom_handle *handle = (struct custom_handle*)env;
@@ -185,7 +185,7 @@
return APR_SUCCESS;
}
-static apr_status_t custom_parser_set(apreq_env_handle_t *env,
+static apr_status_t custom_parser_set(apreq_handle_t *env,
apreq_parser_t *parser)
{
(void)env;
@@ -193,7 +193,7 @@
return APR_ENOTIMPL;
}
-static apr_status_t custom_hook_add(apreq_env_handle_t *env,
+static apr_status_t custom_hook_add(apreq_handle_t *env,
apreq_hook_t *hook)
{
struct custom_handle *handle = (struct custom_handle*)env;
@@ -201,7 +201,7 @@
return APR_SUCCESS;
}
-static apr_status_t custom_brigade_limit_get(apreq_env_handle_t *env,
+static apr_status_t custom_brigade_limit_get(apreq_handle_t *env,
apr_size_t *bytes)
{
struct custom_handle *handle = (struct custom_handle*)env;
@@ -209,7 +209,7 @@
return APR_SUCCESS;
}
-static apr_status_t custom_brigade_limit_set(apreq_env_handle_t *env,
+static apr_status_t custom_brigade_limit_set(apreq_handle_t *env,
apr_size_t bytes)
{
(void)env;
@@ -217,7 +217,7 @@
return APR_ENOTIMPL;
}
-static apr_status_t custom_read_limit_get(apreq_env_handle_t *env,
+static apr_status_t custom_read_limit_get(apreq_handle_t *env,
apr_uint64_t *bytes)
{
struct custom_handle *handle = (struct custom_handle*)env;
@@ -225,7 +225,7 @@
return APR_SUCCESS;
}
-static apr_status_t custom_read_limit_set(apreq_env_handle_t *env,
+static apr_status_t custom_read_limit_set(apreq_handle_t *env,
apr_uint64_t bytes)
{
(void)env;
@@ -233,7 +233,7 @@
return APR_ENOTIMPL;
}
-static apr_status_t custom_temp_dir_get(apreq_env_handle_t *env,
+static apr_status_t custom_temp_dir_get(apreq_handle_t *env,
const char **path)
{
struct custom_handle *handle = (struct custom_handle*)env;
@@ -242,7 +242,7 @@
return APR_SUCCESS;
}
-static apr_status_t custom_temp_dir_set(apreq_env_handle_t *env,
+static apr_status_t custom_temp_dir_set(apreq_handle_t *env,
const char *path)
{
(void)env;
@@ -253,7 +253,7 @@
-static const char *custom_header_in(apreq_env_handle_t *env,
+static const char *custom_header_in(apreq_handle_t *env,
const char *name)
{
struct custom_handle *handle = (struct custom_handle*)env;
@@ -268,7 +268,7 @@
return NULL;
}
-static apr_status_t custom_header_out(apreq_env_handle_t *env, const char
*name,
+static apr_status_t custom_header_out(apreq_handle_t *env, const char *name,
char *value)
{
(void)env;
@@ -281,7 +281,7 @@
static APREQ_MODULE(custom, 20050130);
-APREQ_DECLARE(apreq_env_handle_t*) apreq_handle_custom(apr_pool_t *pool,
+APREQ_DECLARE(apreq_handle_t*) apreq_handle_custom(apr_pool_t *pool,
const char
*query_string,
const char *cookie,
const char *cookie2,
Modified: httpd/apreq/branches/multi-env-unstable/library/t/cookie.c
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/t/cookie.c?view=diff&r1=153693&r2=153694
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/library/t/cookie.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/t/cookie.c Sun Feb 13
18:33:08 2005
@@ -111,7 +111,7 @@
static void ua_version(dAT)
{
- apreq_env_handle_t *ns, *rfc;
+ apreq_handle_t *ns, *rfc;
ns = apreq_handle_custom(p, NULL, NULL, NULL, NULL, 0, NULL);
AT_int_eq(apreq_ua_cookie_version(ns), APREQ_COOKIE_VERSION_NETSCAPE);
Modified:
httpd/apreq/branches/multi-env-unstable/module/apache2/apreq_module_apache2.h
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/apache2/apreq_module_apache2.h?view=diff&r1=153693&r2=153694
==============================================================================
---
httpd/apreq/branches/multi-env-unstable/module/apache2/apreq_module_apache2.h
(original)
+++
httpd/apreq/branches/multi-env-unstable/module/apache2/apreq_module_apache2.h
Sun Feb 13 18:33:08 2005
@@ -28,7 +28,7 @@
* Create an apreq handle which communicates with an Apache 2
* request_rec.
*/
-APREQ_DECLARE(apreq_env_handle_t*) apreq_handle_apache2(request_rec *r);
+APREQ_DECLARE(apreq_handle_t*) apreq_handle_apache2(request_rec *r);
#ifdef __cplusplus
}
Modified:
httpd/apreq/branches/multi-env-unstable/module/apache2/apreq_private_apache2.h
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/apache2/apreq_private_apache2.h?view=diff&r1=153693&r2=153694
==============================================================================
---
httpd/apreq/branches/multi-env-unstable/module/apache2/apreq_private_apache2.h
(original)
+++
httpd/apreq/branches/multi-env-unstable/module/apache2/apreq_private_apache2.h
Sun Feb 13 18:33:08 2005
@@ -9,7 +9,7 @@
/* The "warehouse", stored in r->request_config */
struct apache2_handle {
- apreq_env_handle_t env;
+ apreq_handle_t env;
request_rec *r;
apr_table_t *jar, *args;
apr_status_t jar_status, args_status;
@@ -55,7 +55,7 @@
}
APR_INLINE
-static ap_filter_t *get_apreq_filter(apreq_env_handle_t *env)
+static ap_filter_t *get_apreq_filter(apreq_handle_t *env)
{
struct apache2_handle *handle = (struct apache2_handle *)env;
Modified: httpd/apreq/branches/multi-env-unstable/module/apache2/handle.c
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/apache2/handle.c?view=diff&r1=153693&r2=153694
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/apache2/handle.c (original)
+++ httpd/apreq/branches/multi-env-unstable/module/apache2/handle.c Sun Feb 13
18:33:08 2005
@@ -29,7 +29,7 @@
#include "apreq_private_apache2.h"
-static apr_status_t apache2_jar(apreq_env_handle_t *env, const apr_table_t **t)
+static apr_status_t apache2_jar(apreq_handle_t *env, const apr_table_t **t)
{
struct apache2_handle *handle = (struct apache2_handle*)env;
request_rec *r = handle->r;
@@ -49,7 +49,7 @@
return handle->jar_status;
}
-static apr_status_t apache2_args(apreq_env_handle_t *env, const apr_table_t
**t)
+static apr_status_t apache2_args(apreq_handle_t *env, const apr_table_t **t)
{
struct apache2_handle *handle = (struct apache2_handle*)env;
request_rec *r = handle->r;
@@ -71,7 +71,7 @@
-static apreq_cookie_t *apache2_jar_get(apreq_env_handle_t *env, const char
*name)
+static apreq_cookie_t *apache2_jar_get(apreq_handle_t *env, const char *name)
{
struct apache2_handle *handle = (struct apache2_handle *)env;
const apr_table_t *t;
@@ -92,7 +92,7 @@
return apreq_value_to_cookie(val);
}
-static apreq_param_t *apache2_args_get(apreq_env_handle_t *env, const char
*name)
+static apreq_param_t *apache2_args_get(apreq_handle_t *env, const char *name)
{
struct apache2_handle *handle = (struct apache2_handle *)env;
const apr_table_t *t;
@@ -114,13 +114,13 @@
}
-static const char *apache2_header_in(apreq_env_handle_t *env, const char *name)
+static const char *apache2_header_in(apreq_handle_t *env, const char *name)
{
struct apache2_handle *handle = (struct apache2_handle *)env;
return apr_table_get(handle->r->headers_in, name);
}
-static apr_status_t apache2_header_out(apreq_env_handle_t *env,
+static apr_status_t apache2_header_out(apreq_handle_t *env,
const char *name, char *value)
{
struct apache2_handle *handle = (struct apache2_handle *)env;
@@ -128,7 +128,7 @@
return APR_SUCCESS;
}
-static apr_status_t apache2_body(apreq_env_handle_t *env, const apr_table_t
**t)
+static apr_status_t apache2_body(apreq_handle_t *env, const apr_table_t **t)
{
ap_filter_t *f = get_apreq_filter(env);
struct filter_ctx *ctx;
@@ -154,7 +154,7 @@
return ctx->status;
}
-static apreq_param_t *apache2_body_get(apreq_env_handle_t *env, const char
*name)
+static apreq_param_t *apache2_body_get(apreq_handle_t *env, const char *name)
{
ap_filter_t *f = get_apreq_filter(env);
struct filter_ctx *ctx;
@@ -198,7 +198,7 @@
}
static
-apr_status_t apache2_parser_get(apreq_env_handle_t *env,
+apr_status_t apache2_parser_get(apreq_handle_t *env,
const apreq_parser_t **parser)
{
ap_filter_t *f = get_apreq_filter(env);
@@ -213,7 +213,7 @@
}
static
-apr_status_t apache2_parser_set(apreq_env_handle_t *env,
+apr_status_t apache2_parser_set(apreq_handle_t *env,
apreq_parser_t *parser)
{
ap_filter_t *f = get_apreq_filter(env);
@@ -235,7 +235,7 @@
static
-apr_status_t apache2_hook_add(apreq_env_handle_t *env,
+apr_status_t apache2_hook_add(apreq_handle_t *env,
apreq_hook_t *hook)
{
ap_filter_t *f = get_apreq_filter(env);
@@ -263,7 +263,7 @@
}
static
-apr_status_t apache2_brigade_limit_set(apreq_env_handle_t *env,
+apr_status_t apache2_brigade_limit_set(apreq_handle_t *env,
apr_size_t bytes)
{
ap_filter_t *f = get_apreq_filter(env);
@@ -283,7 +283,7 @@
}
static
-apr_status_t apache2_brigade_limit_get(apreq_env_handle_t *env,
+apr_status_t apache2_brigade_limit_get(apreq_handle_t *env,
apr_size_t *bytes)
{
ap_filter_t *f = get_apreq_filter(env);
@@ -298,7 +298,7 @@
}
static
-apr_status_t apache2_read_limit_set(apreq_env_handle_t *env,
+apr_status_t apache2_read_limit_set(apreq_handle_t *env,
apr_uint64_t bytes)
{
ap_filter_t *f = get_apreq_filter(env);
@@ -318,7 +318,7 @@
}
static
-apr_status_t apache2_read_limit_get(apreq_env_handle_t *env,
+apr_status_t apache2_read_limit_get(apreq_handle_t *env,
apr_uint64_t *bytes)
{
ap_filter_t *f = get_apreq_filter(env);
@@ -333,7 +333,7 @@
}
static
-apr_status_t apache2_temp_dir_set(apreq_env_handle_t *env,
+apr_status_t apache2_temp_dir_set(apreq_handle_t *env,
const char *path)
{
ap_filter_t *f = get_apreq_filter(env);
@@ -354,7 +354,7 @@
}
static
-apr_status_t apache2_temp_dir_get(apreq_env_handle_t *env,
+apr_status_t apache2_temp_dir_get(apreq_handle_t *env,
const char **path)
{
ap_filter_t *f = get_apreq_filter(env);
@@ -370,7 +370,7 @@
static APREQ_MODULE(apache2, 20050131);
-APREQ_DECLARE(apreq_env_handle_t *) apreq_handle_apache2(request_rec *r)
+APREQ_DECLARE(apreq_handle_t *) apreq_handle_apache2(request_rec *r)
{
struct apache2_handle *handle =
ap_get_module_config(r->request_config, &apreq_module);
Modified:
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_access_test/mod_apreq_access_test.c
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_access_test/mod_apreq_access_test.c?view=diff&r1=153693&r2=153694
==============================================================================
---
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_access_test/mod_apreq_access_test.c
(original)
+++
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_access_test/mod_apreq_access_test.c
Sun Feb 13 18:33:08 2005
@@ -64,7 +64,7 @@
static int apreq_access_checker(request_rec *r)
{
- apreq_env_handle_t *handle;
+ apreq_handle_t *handle;
apreq_param_t *param;
struct access_test_cfg *cfg = (struct access_test_cfg *)
ap_get_module_config(r->per_dir_config, &apreq_access_test_module);
Modified:
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_big_request_test/mod_apreq_big_request_test.c
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_big_request_test/mod_apreq_big_request_test.c?view=diff&r1=153693&r2=153694
==============================================================================
---
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_big_request_test/mod_apreq_big_request_test.c
(original)
+++
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_big_request_test/mod_apreq_big_request_test.c
Sun Feb 13 18:33:08 2005
@@ -39,7 +39,7 @@
static int apreq_big_request_test_handler(request_rec *r)
{
- apreq_env_handle_t *env;
+ apreq_handle_t *env;
apr_table_t *params;
int count = 0;
Modified:
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_cookie_test/mod_apreq_cookie_test.c
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_cookie_test/mod_apreq_cookie_test.c?view=diff&r1=153693&r2=153694
==============================================================================
---
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_cookie_test/mod_apreq_cookie_test.c
(original)
+++
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_cookie_test/mod_apreq_cookie_test.c
Sun Feb 13 18:33:08 2005
@@ -43,7 +43,7 @@
static int apreq_cookie_test_handler(request_rec *r)
{
- apreq_env_handle_t *req;
+ apreq_handle_t *req;
apr_status_t s;
const char *test, *key;
apreq_cookie_t *cookie;
Modified:
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_output_filter_test/mod_apreq_output_filter_test.c
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_output_filter_test/mod_apreq_output_filter_test.c?view=diff&r1=153693&r2=153694
==============================================================================
---
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_output_filter_test/mod_apreq_output_filter_test.c
(original)
+++
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_output_filter_test/mod_apreq_output_filter_test.c
Sun Feb 13 18:33:08 2005
@@ -34,7 +34,7 @@
static apr_status_t apreq_output_filter_test_init(ap_filter_t *f)
{
- apreq_env_handle_t *handle;
+ apreq_handle_t *handle;
handle = apreq_handle_apache2(f->r);
return APR_SUCCESS;
}
@@ -56,7 +56,7 @@
static apr_status_t apreq_output_filter_test(ap_filter_t *f,
apr_bucket_brigade *bb)
{
request_rec *r = f->r;
- apreq_env_handle_t *handle;
+ apreq_handle_t *handle;
apr_bucket_brigade *eos;
struct ctx_t ctx = {r, bb};
const apr_table_t *t;
Modified:
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_redirect_test/mod_apreq_redirect_test.c
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_redirect_test/mod_apreq_redirect_test.c?view=diff&r1=153693&r2=153694
==============================================================================
---
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_redirect_test/mod_apreq_redirect_test.c
(original)
+++
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_redirect_test/mod_apreq_redirect_test.c
Sun Feb 13 18:33:08 2005
@@ -33,7 +33,7 @@
static int apreq_redirect_test_handler(request_rec *r)
{
- apreq_env_handle_t *req;
+ apreq_handle_t *req;
const apreq_param_t *loc;
if (strcmp(r->handler, "apreq_redirect_test") != 0)
Modified:
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_request_test/mod_apreq_request_test.c
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_request_test/mod_apreq_request_test.c?view=diff&r1=153693&r2=153694
==============================================================================
---
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_request_test/mod_apreq_request_test.c
(original)
+++
httpd/apreq/branches/multi-env-unstable/module/t/c-modules/apreq_request_test/mod_apreq_request_test.c
Sun Feb 13 18:33:08 2005
@@ -42,7 +42,7 @@
static int apreq_request_test_handler(request_rec *r)
{
- apreq_env_handle_t *req;
+ apreq_handle_t *req;
const apr_table_t *t;
apr_status_t s;
Modified: httpd/apreq/branches/multi-env-unstable/module/test_cgi.c
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/test_cgi.c?view=diff&r1=153693&r2=153694
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/test_cgi.c (original)
+++ httpd/apreq/branches/multi-env-unstable/module/test_cgi.c Sun Feb 13
18:33:08 2005
@@ -32,7 +32,7 @@
int main(int argc, char const * const * argv)
{
apr_pool_t *pool;
- apreq_env_handle_t *req;
+ apreq_handle_t *req;
const apreq_param_t *foo, *bar, *test, *key;
apr_file_t *out;
