Author: joes Date: Sun Jan 23 13:34:37 2005 New Revision: 126243 URL: http://svn.apache.org/viewcvs?view=rev&rev=126243 Log: Rename apreq_env_t to apreq_env_module_t. joes adds a few notes describing the current status and goals for this (multi-env-unstable) branch.
Submitted by: Max Kellermann Reviewed by: joes Modified: httpd/apreq/branches/multi-env-unstable/CHANGES httpd/apreq/branches/multi-env-unstable/STATUS httpd/apreq/branches/multi-env-unstable/env/mod_apreq.c httpd/apreq/branches/multi-env-unstable/src/apreq_env.c httpd/apreq/branches/multi-env-unstable/src/apreq_env.h Modified: httpd/apreq/branches/multi-env-unstable/CHANGES Url: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/CHANGES?view=diff&rev=126243&p1=httpd/apreq/branches/multi-env-unstable/CHANGES&r1=126242&p2=httpd/apreq/branches/multi-env-unstable/CHANGES&r2=126243 ============================================================================== --- httpd/apreq/branches/multi-env-unstable/CHANGES (original) +++ httpd/apreq/branches/multi-env-unstable/CHANGES Sun Jan 23 13:34:37 2005 @@ -5,6 +5,10 @@ @section v2_05 Changes with libapreq2-2.05 +- C API [Max Kellemann] + Rename apreq_env_t to apreq_env_module_t, to prepare for + a new thread-safe apreq_env API. + - C API [Max Kellermann] mod_apreq must check the return value of apreq_brigade_concat to avoid a RAM-consuming infinite loop. A bad APREQ_TempDir Modified: httpd/apreq/branches/multi-env-unstable/STATUS Url: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/STATUS?view=diff&rev=126243&p1=httpd/apreq/branches/multi-env-unstable/STATUS&r1=126242&p2=httpd/apreq/branches/multi-env-unstable/STATUS&r2=126243 ============================================================================== --- httpd/apreq/branches/multi-env-unstable/STATUS (original) +++ httpd/apreq/branches/multi-env-unstable/STATUS Sun Jan 23 13:34:37 2005 @@ -10,10 +10,16 @@ CURRENT RELEASE NOTES: + - This is the multi-env-unstable branch. It is a work-in-progress + which attempts to refactor our C interfaces to provide a more + robust module API. This refactoring effort will propagate + into the perl glue as well, once the C API changes settle into + place. RELEASE SHOWSTOPPERS: + - The api docs and perl glue are currently broken. CURRENT VOTES: Modified: httpd/apreq/branches/multi-env-unstable/env/mod_apreq.c Url: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/env/mod_apreq.c?view=diff&rev=126243&p1=httpd/apreq/branches/multi-env-unstable/env/mod_apreq.c&r1=126242&p2=httpd/apreq/branches/multi-env-unstable/env/mod_apreq.c&r2=126243 ============================================================================== --- httpd/apreq/branches/multi-env-unstable/env/mod_apreq.c (original) +++ httpd/apreq/branches/multi-env-unstable/env/mod_apreq.c Sun Jan 23 13:34:37 2005 @@ -718,7 +718,7 @@ static void register_hooks (apr_pool_t *p) { - const apreq_env_t *old_env; + const apreq_env_module_t *old_env; old_env = apreq_env_module(&apache2_module); ap_register_input_filter(filter_name, apreq_filter, apreq_filter_init, AP_FTYPE_PROTOCOL-1); Modified: httpd/apreq/branches/multi-env-unstable/src/apreq_env.c Url: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/src/apreq_env.c?view=diff&rev=126243&p1=httpd/apreq/branches/multi-env-unstable/src/apreq_env.c&r1=126242&p2=httpd/apreq/branches/multi-env-unstable/src/apreq_env.c&r2=126243 ============================================================================== --- httpd/apreq/branches/multi-env-unstable/src/apreq_env.c (original) +++ httpd/apreq/branches/multi-env-unstable/src/apreq_env.c Sun Jan 23 13:34:37 2005 @@ -22,17 +22,17 @@ #include "apr_file_io.h" -extern const apreq_env_t cgi_module; -static const apreq_env_t *apreq_env = &cgi_module; +extern const apreq_env_module_t cgi_module; +static const apreq_env_module_t *apreq_env = &cgi_module; extern void apreq_parser_initialize(void); -APREQ_DECLARE(const apreq_env_t *) apreq_env_module(const apreq_env_t *mod) +APREQ_DECLARE(const apreq_env_module_t *) apreq_env_module(const apreq_env_module_t *mod) { apreq_parser_initialize(); if (mod != NULL) { - const apreq_env_t *old_mod = apreq_env; + const apreq_env_module_t *old_mod = apreq_env; apreq_env = mod; return old_mod; } Modified: httpd/apreq/branches/multi-env-unstable/src/apreq_env.h Url: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/src/apreq_env.h?view=diff&rev=126243&p1=httpd/apreq/branches/multi-env-unstable/src/apreq_env.h&r1=126242&p2=httpd/apreq/branches/multi-env-unstable/src/apreq_env.h&r2=126243 ============================================================================== --- httpd/apreq/branches/multi-env-unstable/src/apreq_env.h (original) +++ httpd/apreq/branches/multi-env-unstable/src/apreq_env.h Sun Jan 23 13:34:37 2005 @@ -241,7 +241,7 @@ * @brief Vtable describing the necessary environment functions. */ -typedef struct apreq_env_t { +typedef struct apreq_env_module_t { const char *name; apr_uint32_t magic_number; void (*log)(const char *,int,int,apr_status_t,void *,const char *,va_list); @@ -256,18 +256,18 @@ const char *(*temp_dir)(void *, const char *); apr_off_t (*max_body)(void *,apr_off_t); apr_ssize_t (*max_brigade)(void *, apr_ssize_t); -} apreq_env_t; +} apreq_env_module_t; /** * Convenience macro for defining an environment module by mapping * a function prefix to an associated environment structure. * @param pre Prefix to define new environment. All attributes of - * the apreq_env_t struct are defined with this as their prefix. The + * the apreq_env_module_t struct are defined with this as their prefix. The * generated struct is named by appending "_module" to the prefix. * @param name Name of this environment. * @param mmn Magic number (i.e. version number) of this environment. */ -#define APREQ_ENV_MODULE(pre, name, mmn) const apreq_env_t pre##_module = { \ +#define APREQ_ENV_MODULE(pre, name, mmn) const apreq_env_module_t pre##_module = { \ name, mmn, pre##_log, pre##_pool, pre##_bucket_alloc, pre##_jar, \ pre##_request, pre##_query_string, pre##_header_in, pre##_header_out, \ pre##_read, pre##_temp_dir, pre##_max_body, pre##_max_brigade } @@ -280,7 +280,7 @@ * @return The previous active environment. Note: a call using * mod == NULL fetches the current environment module without modifying it. */ -APREQ_DECLARE(const apreq_env_t *) apreq_env_module(const apreq_env_t *mod); +APREQ_DECLARE(const apreq_env_module_t *) apreq_env_module(const apreq_env_module_t *mod); /** * The current environment's name.
