You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/04/14 17:59:21 UTC
cvs commit: apache-2.0/src/test test_find.c test_parser.c
rbb 00/04/14 08:59:20
Modified: src/ap ap_hooks.c
src/include ap_hooks.h ap_mpm.h buff.h http_config.h
http_connection.h http_core.h http_log.h
http_request.h http_vhost.h httpd.h mpm_status.h
util_md5.h util_script.h util_uri.h
src/lib/apr/dso/aix dso.c dso.h
src/lib/apr/dso/beos dso.c dso.h
src/lib/apr/dso/os2 dso.c dso.h
src/lib/apr/dso/unix dso.c dso.h
src/lib/apr/dso/win32 dso.c dso.h
src/lib/apr/file_io/os2 dir.c fileio.h filestat.c open.c
pipe.c
src/lib/apr/file_io/unix dir.c fileio.h filestat.c open.c
pipe.c
src/lib/apr/file_io/win32 dir.c fileio.h filestat.c open.c
pipe.c
src/lib/apr/include apr_dso.h apr_file_io.h apr_fnmatch.h
apr_general.h apr_getopt.h apr_iconv.h apr_lib.h
apr_lock.h apr_mmap.h apr_network_io.h apr_pools.h
apr_portable.h apr_shmem.h apr_thread_proc.h
src/lib/apr/lib apr_cpystrn.c apr_pools.c apr_tables.c
src/lib/apr/locks/beos crossproc.c locks.c locks.h
src/lib/apr/locks/os2 locks.c locks.h
src/lib/apr/locks/unix crossproc.c locks.c locks.h
src/lib/apr/locks/win32 locks.c locks.h
src/lib/apr/misc/beos misc.h otherchild.c start.c
src/lib/apr/misc/unix getopt.c misc.h otherchild.c start.c
src/lib/apr/misc/win32 getopt.c misc.h names.c start.c
src/lib/apr/mmap/beos mmap.c mmap_h.h
src/lib/apr/mmap/unix mmap.c mmap_h.h
src/lib/apr/network_io/beos networkio.h poll.c sockets.c
sockopt.c
src/lib/apr/network_io/os2 networkio.h poll.c sockets.c
sockopt.c
src/lib/apr/network_io/unix networkio.h poll.c sockets.c
sockopt.c
src/lib/apr/network_io/win32 networkio.h poll.c sockets.c
sockopt.c
src/lib/apr/shmem/os2 shmem.c
src/lib/apr/shmem/unix shmem.c
src/lib/apr/test ab_apr.c abc.c client.c htdigest.c server.c
testargs.c testcontext.c testdso.c testfile.c
testmmap.c testoc.c testpipe.c testproc.c
testshmem.c testsock.c testthread.c
src/lib/apr/threadproc/beos proc.c procsup.c thread.c
threadcancel.c threadpriv.c threadproc.h
src/lib/apr/threadproc/os2 proc.c thread.c threadcancel.c
threadpriv.c threadproc.h
src/lib/apr/threadproc/unix proc.c procsup.c thread.c
threadcancel.c threadpriv.c threadproc.h
src/lib/apr/threadproc/win32 proc.c thread.c threadcancel.c
threadpriv.c threadproc.h
src/lib/apr/time/unix atime.h time.c
src/lib/apr/time/win32 atime.h time.c
src/lib/expat-lite xmlparse.h
src/main buff.c http_config.c http_connection.c http_core.c
http_log.c http_main.c http_protocol.c
http_request.c http_vhost.c listen.c util.c
util_md5.c util_script.c util_uri.c
src/modules/example mod_example.c
src/modules/experimental mod_mmap_static.c
src/modules/mpm/dexter dexter.c scoreboard.c scoreboard.h
src/modules/mpm/mpmt_beos mpmt_beos.c scoreboard.c
scoreboard.h
src/modules/mpm/mpmt_pthread mpmt_pthread.c scoreboard.c
scoreboard.h
src/modules/mpm/prefork prefork.c
src/modules/mpm/spmt_os2 spmt_os2.c
src/modules/mpm/winnt winnt.c winnt.h
src/modules/proxy mod_proxy.c mod_proxy.h proxy_cache.c
proxy_ftp.c proxy_http.c proxy_util.c
src/modules/standard mod_access.c mod_actions.c mod_alias.c
mod_auth.c mod_auth_anon.c mod_auth_db.c
mod_auth_dbm.c mod_auth_digest.c mod_autoindex.c
mod_cern_meta.c mod_cgi.c mod_cgid.c mod_digest.c
mod_dir.c mod_echo.c mod_env.c mod_expires.c
mod_headers.c mod_imap.c mod_include.c mod_info.c
mod_log_agent.c mod_log_config.c mod_log_referer.c
mod_mime.c mod_mime_magic.c mod_negotiation.c
mod_rewrite.c mod_rewrite.h mod_setenvif.c mod_so.c
mod_speling.c mod_unique_id.c mod_userdir.c
mod_usertrack.c mod_vhost_alias.c
src/modules/test mod_test_util_uri.c
src/os/bs2000 bs2login.c
src/os/os2 os.h util_os2.c
src/os/tpf os.c
src/os/win32 iol_socket.c iol_socket.h main_win32.c
mod_dll.c os.h registry.c registry.h service.c
util_win32.c
src/test test_find.c test_parser.c
Log:
Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages
on Linux, but probably breaks somewhere.
Revision Changes Path
1.12 +3 -3 apache-2.0/src/ap/ap_hooks.c
Index: ap_hooks.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap_hooks.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ap_hooks.c 2000/03/23 14:48:44 1.11
+++ ap_hooks.c 2000/04/14 15:58:16 1.12
@@ -34,7 +34,7 @@
return a->nOrder-b->nOrder;
}
-static TSort *prepare(ap_context_t *p,TSortData *pItems,int nItems)
+static TSort *prepare(ap_pool_t *p,TSortData *pItems,int nItems)
{
TSort *pData=ap_palloc(p,nItems*sizeof *pData);
int n;
@@ -115,12 +115,12 @@
static ap_array_header_t *sort_hook(ap_array_header_t *pHooks,const char *szName)
{
- ap_context_t *p;
+ ap_pool_t *p;
TSort *pSort;
ap_array_header_t *pNew;
int n;
- ap_create_context(&p, g_pHookPool);
+ ap_create_pool(&p, g_pHookPool);
pSort=prepare(p,(TSortData *)pHooks->elts,pHooks->nelts);
pSort=tsort(pSort,pHooks->nelts);
pNew=ap_make_array(g_pHookPool,pHooks->nelts,sizeof(TSortData));
1.12 +1 -1 apache-2.0/src/include/ap_hooks.h
Index: ap_hooks.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_hooks.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ap_hooks.h 1999/08/31 05:32:17 1.11
+++ ap_hooks.h 2000/04/14 15:58:16 1.12
@@ -115,7 +115,7 @@
#define HOOK_LAST 20
#define HOOK_REALLY_LAST 30
-extern ap_context_t *g_pHookPool;
+extern ap_pool_t *g_pHookPool;
extern int g_bDebugHooks;
extern const char *g_szCurrentHookName;
1.11 +3 -3 apache-2.0/src/include/ap_mpm.h
Index: ap_mpm.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_mpm.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ap_mpm.h 2000/03/31 07:18:53 1.10
+++ ap_mpm.h 2000/04/14 15:58:16 1.11
@@ -85,7 +85,7 @@
However the MPM may choose to terminate processes when the user
requests a non-graceful restart/stop. When this occurs, the MPM kills
all threads with extreme prejudice, and destroys the pchild pool.
- User cleanups registered in the pchild ap_context_t will be invoked at
+ User cleanups registered in the pchild ap_pool_t will be invoked at
this point. (This can pose some complications, the user cleanups
are asynchronous behaviour not unlike longjmp/signal... but if the
admin is asking for a non-graceful shutdown, how much effort should
@@ -103,7 +103,7 @@
/* run until a restart/shutdown is indicated, return 1 for shutdown
0 otherwise */
-API_EXPORT(int) ap_mpm_run(ap_context_t *pconf, ap_context_t *plog, server_rec *server_conf);
+API_EXPORT(int) ap_mpm_run(ap_pool_t *pconf, ap_pool_t *plog, server_rec *server_conf);
/* predicate indicating if a graceful stop has been requested ...
used by the connection loop */
@@ -128,7 +128,7 @@
/*
* ap_signal_parent() - used to send a signal to the parent process.
*/
-void ap_signal_parent(ap_context_t *p, const char* signal, const char* server_root);
+void ap_signal_parent(ap_pool_t *p, const char* signal, const char* server_root);
#ifdef HAS_OTHER_CHILD
/*
1.19 +4 -4 apache-2.0/src/include/buff.h
Index: buff.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/buff.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- buff.h 2000/04/13 23:51:13 1.18
+++ buff.h 2000/04/14 15:58:16 1.19
@@ -153,7 +153,7 @@
void *error_data;
long int bytes_sent; /* number of bytes actually written */
- ap_context_t *pool;
+ ap_pool_t *pool;
ap_iol *iol;
};
@@ -171,12 +171,12 @@
#define BO_ERROR (3)
/* Stream creation and modification */
-API_EXPORT(BUFF *) ap_bcreate(ap_context_t *p, int flags);
+API_EXPORT(BUFF *) ap_bcreate(ap_pool_t *p, int flags);
API_EXPORT(void) ap_bpush_iol(BUFF *fb, ap_iol *iol);
/* XXX - unused right now - mvsk */
-API_EXPORT(BUFF *) ap_bopenf(ap_context_t *a, const char *name, int flg, int mode);
+API_EXPORT(BUFF *) ap_bopenf(ap_pool_t *a, const char *name, int flg, int mode);
API_EXPORT(ap_status_t) ap_bsetopt(BUFF *fb, int optname, const void *optval);
API_EXPORT(ap_status_t) ap_bgetopt(BUFF *fb, int optname, void *optval);
@@ -229,7 +229,7 @@
(fb)->outcnt == (fb)->bufsiz) ? ap_bflsbuf(c, (fb)) : \
((fb)->outbase[(fb)->outcnt++] = (c), 0))
-API_EXPORT(int) ap_bspawn_child(ap_context_t *, int (*)(void *, ap_child_info_t *), void *,
+API_EXPORT(int) ap_bspawn_child(ap_pool_t *, int (*)(void *, ap_child_info_t *), void *,
enum kill_conditions, BUFF **pipe_in, BUFF **pipe_out,
BUFF **pipe_err);
1.13 +22 -22 apache-2.0/src/include/http_config.h
Index: http_config.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_config.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- http_config.h 2000/04/14 02:39:05 1.12
+++ http_config.h 2000/04/14 15:58:17 1.13
@@ -156,8 +156,8 @@
configfile_t *config_file; /* Config file structure from pcfg_openfile() */
- ap_context_t *pool; /* Pool to allocate new storage in */
- ap_context_t *temp_pool; /* Pool for scratch memory; persists during
+ ap_pool_t *pool; /* Pool to allocate new storage in */
+ ap_pool_t *temp_pool; /* Pool for scratch memory; persists during
* configuration, but wiped before the first
* request is served...
*/
@@ -211,11 +211,11 @@
* It's mainly important for the DSO facility
* (see also mod_so).
*/
- void (*pre_config) (ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp);
- void *(*create_dir_config) (ap_context_t *p, char *dir);
- void *(*merge_dir_config) (ap_context_t *p, void *base_conf, void *new_conf);
- void *(*create_server_config) (ap_context_t *p, server_rec *s);
- void *(*merge_server_config) (ap_context_t *p, void *base_conf, void *new_conf);
+ void (*pre_config) (ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp);
+ void *(*create_dir_config) (ap_pool_t *p, char *dir);
+ void *(*merge_dir_config) (ap_pool_t *p, void *base_conf, void *new_conf);
+ void *(*create_server_config) (ap_pool_t *p, server_rec *s);
+ void *(*merge_server_config) (ap_pool_t *p, void *base_conf, void *new_conf);
const command_rec *cmds;
const handler_rec *handlers;
@@ -290,7 +290,7 @@
* it relativizes it wrt server_root.
*/
-API_EXPORT(const char *) ap_server_root_relative(ap_context_t *p, const char *fname);
+API_EXPORT(const char *) ap_server_root_relative(ap_pool_t *p, const char *fname);
/* Finally, the hook for dynamically loading modules in... */
@@ -329,38 +329,38 @@
/* For mod_so.c... */
-void ap_single_module_configure(ap_context_t *p, server_rec *s, module *m);
+void ap_single_module_configure(ap_pool_t *p, server_rec *s, module *m);
/* For http_main.c... */
void ap_setup_prelinked_modules(process_rec *process);
void ap_show_directives(void);
void ap_show_modules(void);
-server_rec *ap_read_config(process_rec *process, ap_context_t *temp_pool, const char *config_name);
-void ap_run_pre_config(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp);
-void ap_post_config_hook(ap_context_t *pconf, ap_context_t *plog, ap_context_t *ptemp, server_rec *s);
-void ap_child_init_hook(ap_context_t *pchild, server_rec *s);
+server_rec *ap_read_config(process_rec *process, ap_pool_t *temp_pool, const char *config_name);
+void ap_post_config_hook(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s);
+void ap_child_init_hook(ap_pool_t *pchild, server_rec *s);
+
void ap_register_hooks(module *m);
void ap_hook_deregister_all(void);
/* For http_request.c... */
-void *ap_create_request_config(ap_context_t *p);
-CORE_EXPORT(void *) ap_create_per_dir_config(ap_context_t *p);
-void *ap_merge_per_dir_configs(ap_context_t *p, void *base, void *new);
+void *ap_create_request_config(ap_pool_t *p);
+CORE_EXPORT(void *) ap_create_per_dir_config(ap_pool_t *p);
+void *ap_merge_per_dir_configs(ap_pool_t *p, void *base, void *new);
/* For http_connection.c... */
-void *ap_create_conn_config(ap_context_t *p);
+void *ap_create_conn_config(ap_pool_t *p);
/* For http_core.c... (<Directory> command and virtual hosts) */
int ap_parse_htaccess(void **result, request_rec *r, int override,
const char *path, const char *access_name);
-CORE_EXPORT(const char *) ap_init_virtual_host(ap_context_t *p, const char *hostname,
+CORE_EXPORT(const char *) ap_init_virtual_host(ap_pool_t *p, const char *hostname,
server_rec *main_server, server_rec **);
-void ap_process_resource_config(server_rec *s, const char *fname, ap_context_t *p, ap_context_t *ptemp);
+void ap_process_resource_config(server_rec *s, const char *fname, ap_pool_t *p, ap_pool_t *ptemp);
/* Module-method dispatchers, also for http_request.c */
@@ -380,10 +380,10 @@
/* Hooks */
DECLARE_HOOK(int,header_parser,(request_rec *))
DECLARE_HOOK(void,post_config,
- (ap_context_t *pconf,ap_context_t *plog,ap_context_t *ptemp,server_rec *s))
+ (ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp,server_rec *s))
DECLARE_HOOK(void,open_logs,
- (ap_context_t *pconf,ap_context_t *plog,ap_context_t *ptemp,server_rec *s))
-DECLARE_HOOK(void,child_init,(ap_context_t *pchild, server_rec *s))
+ (ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp,server_rec *s))
+DECLARE_HOOK(void,child_init,(ap_pool_t *pchild, server_rec *s))
#ifdef __cplusplus
}
1.13 +2 -2 apache-2.0/src/include/http_connection.h
Index: http_connection.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_connection.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- http_connection.h 2000/03/31 07:18:57 1.12
+++ http_connection.h 2000/04/14 15:58:17 1.13
@@ -63,10 +63,10 @@
#endif
#ifdef CORE_PRIVATE
-conn_rec *ap_new_connection(ap_context_t *p, server_rec *server, BUFF *inout,
+conn_rec *ap_new_connection(ap_pool_t *p, server_rec *server, BUFF *inout,
const struct sockaddr_in *remaddr,
const struct sockaddr_in *saddr, long id);
-conn_rec *ap_new_apr_connection(ap_context_t *p, server_rec *server, BUFF *inout,
+conn_rec *ap_new_apr_connection(ap_pool_t *p, server_rec *server, BUFF *inout,
const ap_socket_t *conn_socket, long id);
CORE_EXPORT(void) ap_process_connection(conn_rec *);
int ap_process_http_connection(conn_rec *);
1.9 +2 -2 apache-2.0/src/include/http_core.h
Index: http_core.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_core.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- http_core.h 2000/03/31 07:18:58 1.8
+++ http_core.h 2000/04/14 15:58:17 1.9
@@ -131,7 +131,7 @@
/* Used for constructing self-referencing URLs, and things like SERVER_PORT,
* and SERVER_NAME.
*/
-API_EXPORT(char *) ap_construct_url(ap_context_t *p, const char *uri, request_rec *r);
+API_EXPORT(char *) ap_construct_url(ap_pool_t *p, const char *uri, request_rec *r);
API_EXPORT(const char *) ap_get_server_name(request_rec *r);
API_EXPORT(unsigned) ap_get_server_port(const request_rec *r);
API_EXPORT(unsigned long) ap_get_limit_req_body(const request_rec *r);
@@ -295,7 +295,7 @@
} core_server_config;
/* for http_config.c */
-void ap_core_reorder_directories(ap_context_t *, server_rec *);
+void ap_core_reorder_directories(ap_pool_t *, server_rec *);
/* for mod_perl */
CORE_EXPORT(void) ap_add_per_dir_conf (server_rec *s, void *dir_config);
1.15 +4 -4 apache-2.0/src/include/http_log.h
Index: http_log.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_log.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- http_log.h 2000/04/05 02:01:09 1.14
+++ http_log.h 2000/04/14 15:58:17 1.15
@@ -109,7 +109,7 @@
#define APLOG_MARK __FILE__,__LINE__
-void ap_open_logs (server_rec *, ap_context_t *p);
+void ap_open_logs (server_rec *, ap_pool_t *p);
/* The two primary logging functions, ap_log_error and ap_log_rerror,
* use a printf style format string to build the log message. It is
@@ -129,7 +129,7 @@
__attribute__((format(printf,6,7)));
API_EXPORT(void) ap_error_log2stderr (server_rec *);
-void ap_log_pid (ap_context_t *p, const char *fname);
+void ap_log_pid (ap_pool_t *p, const char *fname);
/* These are for legacy code, new code should use ap_log_error,
* or ap_log_rerror.
*/
@@ -142,7 +142,7 @@
request_rec *r);
typedef struct piped_log {
- ap_context_t *p;
+ ap_pool_t *p;
ap_file_t *fds[2];
/* XXX - an #ifdef that needs to be eliminated from public view. Shouldn't
* be hard */
@@ -152,7 +152,7 @@
#endif
} piped_log;
-API_EXPORT(piped_log *) ap_open_piped_log (ap_context_t *p, const char *program);
+API_EXPORT(piped_log *) ap_open_piped_log (ap_pool_t *p, const char *program);
API_EXPORT(void) ap_close_piped_log (piped_log *);
#define ap_piped_log_read_fd(pl) ((pl)->fds[0])
#define ap_piped_log_write_fd(pl) ((pl)->fds[1])
1.8 +1 -1 apache-2.0/src/include/http_request.h
Index: http_request.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_request.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- http_request.h 2000/03/31 07:19:00 1.7
+++ http_request.h 2000/04/14 15:58:17 1.8
@@ -82,7 +82,7 @@
* (e.g., for includes), a module may call for the request to be run
* by calling run_sub_req. The space allocated to create sub_reqs can be
* reclaimed by calling destroy_sub_req --- be sure to copy anything you care
- * about which was allocated in its ap_context_t elsewhere before doing this.
+ * about which was allocated in its ap_pool_t elsewhere before doing this.
*/
API_EXPORT(request_rec *) ap_sub_req_lookup_uri(const char *new_file,
1.5 +3 -3 apache-2.0/src/include/http_vhost.h
Index: http_vhost.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_vhost.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- http_vhost.h 2000/03/31 07:19:01 1.4
+++ http_vhost.h 2000/04/14 15:58:17 1.5
@@ -60,13 +60,13 @@
#endif
/* called before any config is read */
-void ap_init_vhost_config(ap_context_t *p);
+void ap_init_vhost_config(ap_pool_t *p);
/* called after the config has been read */
-void ap_fini_vhost_config(ap_context_t *p, server_rec *main_server);
+void ap_fini_vhost_config(ap_pool_t *p, server_rec *main_server);
/* handle addresses in <VirtualHost> statement */
-const char *ap_parse_vhost_addrs(ap_context_t *p, const char *hostname, server_rec *s);
+const char *ap_parse_vhost_addrs(ap_pool_t *p, const char *hostname, server_rec *s);
/* handle NameVirtualHost directive */
const char *ap_set_name_virtual_host (cmd_parms *cmd, void *dummy, char *arg);
1.38 +41 -41 apache-2.0/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- httpd.h 2000/04/01 01:14:22 1.37
+++ httpd.h 2000/04/14 15:58:17 1.38
@@ -568,8 +568,8 @@
#include "util_uri.h"
struct process_rec {
- ap_context_t *pool; /* Global pool. Please try to cleared on _all_ exits */
- ap_context_t *pconf; /* aka configuration pool, cleared on restarts */
+ ap_pool_t *pool; /* Global pool. Please try to cleared on _all_ exits */
+ ap_pool_t *pconf; /* aka configuration pool, cleared on restarts */
int argc;
const char **argv;
const char *short_name;
@@ -577,7 +577,7 @@
struct request_rec {
- ap_context_t *pool;
+ ap_pool_t *pool;
conn_rec *connection;
server_rec *server;
@@ -737,7 +737,7 @@
struct conn_rec {
- ap_context_t *pool;
+ ap_pool_t *pool;
server_rec *base_server; /* Physical vhost this conn come in on */
void *vhost_lookup_data; /* used by http_vhost.c */
@@ -889,58 +889,58 @@
/* Time */
-API_EXPORT(char *) ap_field_noparam(ap_context_t *p, const char *intype);
-API_EXPORT(char *) ap_ht_time(ap_context_t *p, ap_time_t t, const char *fmt, int gmt);
+API_EXPORT(char *) ap_field_noparam(ap_pool_t *p, const char *intype);
+API_EXPORT(char *) ap_ht_time(ap_pool_t *p, ap_time_t t, const char *fmt, int gmt);
/* String handling. The *_nc variants allow you to use non-const char **s as
arguments (unfortunately C won't automatically convert a char ** to a const
char **) */
-API_EXPORT(char *) ap_getword(ap_context_t *p, const char **line, char stop);
-API_EXPORT(char *) ap_getword_nc(ap_context_t *p, char **line, char stop);
-API_EXPORT(char *) ap_getword_white(ap_context_t *p, const char **line);
-API_EXPORT(char *) ap_getword_white_nc(ap_context_t *p, char **line);
-API_EXPORT(char *) ap_getword_nulls(ap_context_t *p, const char **line, char stop);
-API_EXPORT(char *) ap_getword_nulls_nc(ap_context_t *p, char **line, char stop);
-API_EXPORT(char *) ap_getword_conf(ap_context_t *p, const char **line);
-API_EXPORT(char *) ap_getword_conf_nc(ap_context_t *p, char **line);
-API_EXPORT(char *) ap_resolve_env(ap_context_t *p, const char * word);
+API_EXPORT(char *) ap_getword(ap_pool_t *p, const char **line, char stop);
+API_EXPORT(char *) ap_getword_nc(ap_pool_t *p, char **line, char stop);
+API_EXPORT(char *) ap_getword_white(ap_pool_t *p, const char **line);
+API_EXPORT(char *) ap_getword_white_nc(ap_pool_t *p, char **line);
+API_EXPORT(char *) ap_getword_nulls(ap_pool_t *p, const char **line, char stop);
+API_EXPORT(char *) ap_getword_nulls_nc(ap_pool_t *p, char **line, char stop);
+API_EXPORT(char *) ap_getword_conf(ap_pool_t *p, const char **line);
+API_EXPORT(char *) ap_getword_conf_nc(ap_pool_t *p, char **line);
+API_EXPORT(char *) ap_resolve_env(ap_pool_t *p, const char * word);
API_EXPORT(const char *) ap_size_list_item(const char **field, int *len);
-API_EXPORT(char *) ap_get_list_item(ap_context_t *p, const char **field);
-API_EXPORT(int) ap_find_list_item(ap_context_t *p, const char *line, const char *tok);
+API_EXPORT(char *) ap_get_list_item(ap_pool_t *p, const char **field);
+API_EXPORT(int) ap_find_list_item(ap_pool_t *p, const char *line, const char *tok);
-API_EXPORT(char *) ap_get_token(ap_context_t *p, const char **accept_line, int accept_white);
-API_EXPORT(int) ap_find_token(ap_context_t *p, const char *line, const char *tok);
-API_EXPORT(int) ap_find_last_token(ap_context_t *p, const char *line, const char *tok);
+API_EXPORT(char *) ap_get_token(ap_pool_t *p, const char **accept_line, int accept_white);
+API_EXPORT(int) ap_find_token(ap_pool_t *p, const char *line, const char *tok);
+API_EXPORT(int) ap_find_last_token(ap_pool_t *p, const char *line, const char *tok);
API_EXPORT(int) ap_is_url(const char *u);
API_EXPORT(int) ap_unescape_url(char *url);
API_EXPORT(void) ap_no2slash(char *name);
API_EXPORT(void) ap_getparents(char *name);
-API_EXPORT(char *) ap_escape_path_segment(ap_context_t *p, const char *s);
-API_EXPORT(char *) ap_os_escape_path(ap_context_t *p, const char *path, int partial);
+API_EXPORT(char *) ap_escape_path_segment(ap_pool_t *p, const char *s);
+API_EXPORT(char *) ap_os_escape_path(ap_pool_t *p, const char *path, int partial);
#define ap_escape_uri(ppool,path) ap_os_escape_path(ppool,path,1)
-API_EXPORT(char *) ap_escape_html(ap_context_t *p, const char *s);
-API_EXPORT(char *) ap_construct_server(ap_context_t *p, const char *hostname,
+API_EXPORT(char *) ap_escape_html(ap_pool_t *p, const char *s);
+API_EXPORT(char *) ap_construct_server(ap_pool_t *p, const char *hostname,
unsigned port, const request_rec *r);
-API_EXPORT(char *) ap_escape_shell_cmd(ap_context_t *p, const char *s);
+API_EXPORT(char *) ap_escape_shell_cmd(ap_pool_t *p, const char *s);
API_EXPORT(int) ap_count_dirs(const char *path);
API_EXPORT(char *) ap_make_dirstr_prefix(char *d, const char *s, int n);
-API_EXPORT(char *) ap_make_dirstr_parent(ap_context_t *p, const char *s);
+API_EXPORT(char *) ap_make_dirstr_parent(ap_pool_t *p, const char *s);
/* deprecated. The previous two routines are preferred. */
-API_EXPORT(char *) ap_make_dirstr(ap_context_t *a, const char *s, int n);
-API_EXPORT(char *) ap_make_full_path(ap_context_t *a, const char *dir, const char *f);
+API_EXPORT(char *) ap_make_dirstr(ap_pool_t *a, const char *s, int n);
+API_EXPORT(char *) ap_make_full_path(ap_pool_t *a, const char *dir, const char *f);
API_EXPORT(int) ap_is_matchexp(const char *str);
API_EXPORT(int) ap_strcmp_match(const char *str, const char *exp);
API_EXPORT(int) ap_strcasecmp_match(const char *str, const char *exp);
API_EXPORT(char *) ap_strcasestr(const char *s1, const char *s2);
-API_EXPORT(char *) ap_pbase64decode(ap_context_t *p, const char *bufcoded);
-API_EXPORT(char *) ap_pbase64encode(ap_context_t *p, char *string);
-API_EXPORT(char *) ap_uudecode(ap_context_t *p, const char *bufcoded);
-API_EXPORT(char *) ap_uuencode(ap_context_t *p, char *string);
+API_EXPORT(char *) ap_pbase64decode(ap_pool_t *p, const char *bufcoded);
+API_EXPORT(char *) ap_pbase64encode(ap_pool_t *p, char *string);
+API_EXPORT(char *) ap_uudecode(ap_pool_t *p, const char *bufcoded);
+API_EXPORT(char *) ap_uuencode(ap_pool_t *p, char *string);
/* Regexes */
#if defined(AP_USE_HSREGEX) || defined(WIN32)
@@ -949,14 +949,14 @@
#include <regex.h>
#endif
-API_EXPORT(regex_t *) ap_pregcomp(ap_context_t *p, const char *pattern,
+API_EXPORT(regex_t *) ap_pregcomp(ap_pool_t *p, const char *pattern,
int cflags);
-API_EXPORT(void) ap_pregfree(ap_context_t *p, regex_t *reg);
+API_EXPORT(void) ap_pregfree(ap_pool_t *p, regex_t *reg);
API_EXPORT(int) ap_regexec(const regex_t *preg, const char *string,
size_t nmatch, regmatch_t pmatch[], int eflags);
API_EXPORT(size_t) ap_regerror(int errcode, const regex_t *preg,
char *errbuf, size_t errbuf_size);
-API_EXPORT(char *) ap_pregsub(ap_context_t *p, const char *input, const char *source,
+API_EXPORT(char *) ap_pregsub(ap_pool_t *p, const char *input, const char *source,
size_t nmatch, regmatch_t pmatch[]);
API_EXPORT(void) ap_content_type_tolower(char *);
@@ -964,7 +964,7 @@
API_EXPORT(int) ap_ind(const char *, char); /* Sigh... */
API_EXPORT(int) ap_rind(const char *, char);
-API_EXPORT(char *) ap_escape_quotes (ap_context_t *p, const char *instring);
+API_EXPORT(char *) ap_escape_quotes (ap_pool_t *p, const char *instring);
/* Common structure for reading of config files / passwd files etc. */
typedef struct {
@@ -977,10 +977,10 @@
} configfile_t;
/* Open a configfile_t as FILE, return open configfile_t struct pointer */
-API_EXPORT(ap_status_t) ap_pcfg_openfile(configfile_t **, ap_context_t *p, const char *name);
+API_EXPORT(ap_status_t) ap_pcfg_openfile(configfile_t **, ap_pool_t *p, const char *name);
/* Allocate a configfile_t handle with user defined functions and params */
-API_EXPORT(configfile_t *) ap_pcfg_open_custom(ap_context_t *p, const char *descr,
+API_EXPORT(configfile_t *) ap_pcfg_open_custom(ap_pool_t *p, const char *descr,
void *param,
int(*getc_func)(void*),
void *(*gets_func) (void *buf, size_t bufsiz, void *param),
@@ -1005,14 +1005,14 @@
API_EXPORT(const server_rec *) ap_get_server_conf(void);
#ifdef _OSD_POSIX
-extern const char *os_set_account(ap_context_t *p, const char *account);
+extern const char *os_set_account(ap_pool_t *p, const char *account);
extern int os_init_job_environment(server_rec *s, const char *user_name, int one_process);
#endif /* _OSD_POSIX */
-char *ap_get_local_host(ap_context_t *);
+char *ap_get_local_host(ap_pool_t *);
unsigned long ap_get_virthost_addr(char *hostname, unsigned short *port);
-API_EXPORT(char *) ap_escape_quotes(ap_context_t *p, const char *instr);
+API_EXPORT(char *) ap_escape_quotes(ap_pool_t *p, const char *instr);
/*
* Redefine assert() to something more useful for an Apache...
1.5 +3 -3 apache-2.0/src/include/mpm_status.h
Index: mpm_status.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/mpm_status.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mpm_status.h 2000/03/31 07:19:02 1.4
+++ mpm_status.h 2000/04/14 15:58:17 1.5
@@ -81,7 +81,7 @@
* Get an array of current connection IDs.
*
*/
-API_EXPORT(ap_array_header_t *) ap_get_connections(ap_context_t *p);
+API_EXPORT(ap_array_header_t *) ap_get_connections(ap_pool_t *p);
/**
* Get an array of keys from a given connection.
@@ -89,7 +89,7 @@
* conn_id = Connection ID
*
*/
-API_EXPORT(ap_array_header_t *) ap_get_connection_keys(ap_context_t *p,
+API_EXPORT(ap_array_header_t *) ap_get_connection_keys(ap_pool_t *p,
long conn_id);
/**
@@ -122,7 +122,7 @@
* p = context, generally of the request
*
*/
-API_EXPORT(ap_array_header_t *) ap_get_status_table(ap_context_t *p);
+API_EXPORT(ap_array_header_t *) ap_get_status_table(ap_pool_t *p);
#endif /* APACHE_SERVER_STATS_H */
1.9 +4 -4 apache-2.0/src/include/util_md5.h
Index: util_md5.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/util_md5.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- util_md5.h 2000/03/31 07:19:03 1.8
+++ util_md5.h 2000/04/14 15:58:17 1.9
@@ -65,10 +65,10 @@
#include "ap_md5.h"
-API_EXPORT(char *) ap_md5(ap_context_t *a, const unsigned char *string);
-API_EXPORT(char *) ap_md5_binary(ap_context_t *a, const unsigned char *buf, int len);
-API_EXPORT(char *) ap_md5contextTo64(ap_context_t *p, AP_MD5_CTX * context);
-API_EXPORT(char *) ap_md5digest(ap_context_t *p, ap_file_t *infile);
+API_EXPORT(char *) ap_md5(ap_pool_t *a, const unsigned char *string);
+API_EXPORT(char *) ap_md5_binary(ap_pool_t *a, const unsigned char *buf, int len);
+API_EXPORT(char *) ap_md5contextTo64(ap_pool_t *p, AP_MD5_CTX * context);
+API_EXPORT(char *) ap_md5digest(ap_pool_t *p, ap_file_t *infile);
#ifdef __cplusplus
}
1.8 +1 -1 apache-2.0/src/include/util_script.h
Index: util_script.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/util_script.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- util_script.h 2000/03/31 07:19:04 1.7
+++ util_script.h 2000/04/14 15:58:17 1.8
@@ -71,7 +71,7 @@
#endif
#endif
-API_EXPORT(char **) ap_create_environment(ap_context_t *p, ap_table_t *t);
+API_EXPORT(char **) ap_create_environment(ap_pool_t *p, ap_table_t *t);
API_EXPORT(int) ap_find_path_info(const char *uri, const char *path_info);
API_EXPORT(void) ap_add_cgi_vars(request_rec *r);
API_EXPORT(void) ap_add_common_vars(request_rec *r);
1.5 +5 -5 apache-2.0/src/include/util_uri.h
Index: util_uri.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/util_uri.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- util_uri.h 2000/03/31 07:19:05 1.4
+++ util_uri.h 2000/04/14 15:58:17 1.5
@@ -114,12 +114,12 @@
/* util_uri.c */
API_EXPORT(unsigned short) ap_default_port_for_scheme(const char *scheme_str);
API_EXPORT(unsigned short) ap_default_port_for_request(const request_rec *r);
-API_EXPORT(struct hostent *) ap_pduphostent(ap_context_t *p, const struct hostent *hp);
-API_EXPORT(struct hostent *) ap_pgethostbyname(ap_context_t *p, const char *hostname);
-API_EXPORT(char *) ap_unparse_uri_components(ap_context_t *p, const uri_components *uptr,
+API_EXPORT(struct hostent *) ap_pduphostent(ap_pool_t *p, const struct hostent *hp);
+API_EXPORT(struct hostent *) ap_pgethostbyname(ap_pool_t *p, const char *hostname);
+API_EXPORT(char *) ap_unparse_uri_components(ap_pool_t *p, const uri_components *uptr,
unsigned flags);
-API_EXPORT(int) ap_parse_uri_components(ap_context_t *p, const char *uri, uri_components *uptr);
-API_EXPORT(int) ap_parse_hostinfo_components(ap_context_t *p, const char *hostinfo, uri_components *uptr);
+API_EXPORT(int) ap_parse_uri_components(ap_pool_t *p, const char *uri, uri_components *uptr);
+API_EXPORT(int) ap_parse_hostinfo_components(ap_pool_t *p, const char *hostinfo, uri_components *uptr);
/* called by the core in main() */
extern void ap_util_uri_init(void);
1.4 +1 -1 apache-2.0/src/lib/apr/dso/aix/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/aix/dso.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dso.c 2000/04/03 19:44:15 1.3
+++ dso.c 2000/04/14 15:58:19 1.4
@@ -135,7 +135,7 @@
}
ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path,
- ap_context_t *ctx)
+ ap_pool_t *ctx)
{
void *os_handle = dlopen((char *)path, RTLD_NOW | RTLD_GLOBAL);
1.3 +1 -1 apache-2.0/src/lib/apr/dso/aix/dso.h
Index: dso.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/aix/dso.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dso.h 2000/04/03 18:36:51 1.2
+++ dso.h 2000/04/14 15:58:19 1.3
@@ -66,7 +66,7 @@
int dlclose(void *handle);
struct ap_dso_handle_t {
- ap_context_t *cont;
+ ap_pool_t *cont;
void *handle;
};
1.4 +1 -1 apache-2.0/src/lib/apr/dso/beos/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/beos/dso.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dso.c 2000/04/04 22:56:10 1.3
+++ dso.c 2000/04/14 15:58:19 1.4
@@ -60,7 +60,7 @@
}
ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path,
- ap_context_t *ctx)
+ ap_pool_t *ctx)
{
image_id newid;
1.5 +1 -1 apache-2.0/src/lib/apr/dso/beos/dso.h
Index: dso.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/beos/dso.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dso.h 2000/04/03 18:36:52 1.4
+++ dso.h 2000/04/14 15:58:19 1.5
@@ -64,7 +64,7 @@
struct ap_dso_handle_t {
image_id handle; /* Handle to the DSO loaded */
- ap_context_t *cont;
+ ap_pool_t *cont;
};
#endif
1.6 +1 -1 apache-2.0/src/lib/apr/dso/os2/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/os2/dso.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dso.c 2000/04/08 06:58:38 1.5
+++ dso.c 2000/04/14 15:58:20 1.6
@@ -71,7 +71,7 @@
}
-ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, ap_context_t *ctx)
+ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, ap_pool_t *ctx)
{
char failed_module[1024];
HMODULE handle;
1.7 +1 -1 apache-2.0/src/lib/apr/dso/os2/dso.h
Index: dso.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/os2/dso.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dso.h 2000/04/04 12:19:32 1.6
+++ dso.h 2000/04/14 15:58:20 1.7
@@ -64,7 +64,7 @@
#include "apr_dso.h"
struct ap_dso_handle_t {
- ap_context_t *cont; /* Context for returning error strings */
+ ap_pool_t *cont; /* Context for returning error strings */
HMODULE handle; /* Handle to the DSO loaded */
char *failed_module;
};
1.12 +1 -1 apache-2.0/src/lib/apr/dso/unix/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/unix/dso.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dso.c 2000/04/14 10:17:35 1.11
+++ dso.c 2000/04/14 15:58:20 1.12
@@ -59,7 +59,7 @@
}
ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path,
- ap_context_t *ctx)
+ ap_pool_t *ctx)
{
#if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
shl_t os_handle = shl_load(path, BIND_IMMEDIATE|BIND_VERBOSE|BIND_NOSTART, 0L);
1.6 +1 -1 apache-2.0/src/lib/apr/dso/unix/dso.h
Index: dso.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/unix/dso.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dso.h 2000/04/03 18:36:55 1.5
+++ dso.h 2000/04/14 15:58:20 1.6
@@ -83,7 +83,7 @@
#endif
struct ap_dso_handle_t {
- ap_context_t *cont;
+ ap_pool_t *cont;
void *handle;
};
1.3 +1 -1 apache-2.0/src/lib/apr/dso/win32/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/win32/dso.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dso.c 2000/04/05 15:45:32 1.2
+++ dso.c 2000/04/14 15:58:21 1.3
@@ -59,7 +59,7 @@
}
ap_status_t ap_dso_load(struct ap_dso_handle_t **res_handle, const char *path,
- ap_context_t *ctx)
+ ap_pool_t *ctx)
{
HINSTANCE os_handle = LoadLibraryEx(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
if(os_handle == NULL) {
1.2 +1 -1 apache-2.0/src/lib/apr/dso/win32/dso.h
Index: dso.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/win32/dso.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dso.h 2000/04/03 20:41:11 1.1
+++ dso.h 2000/04/14 15:58:21 1.2
@@ -61,7 +61,7 @@
#include "apr_dso.h"
struct ap_dso_handle_t {
- ap_context_t *cont;
+ ap_pool_t *cont;
void *handle;
};
1.11 +3 -3 apache-2.0/src/lib/apr/file_io/os2/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/dir.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dir.c 2000/04/08 06:58:39 1.10
+++ dir.c 2000/04/14 15:58:21 1.11
@@ -68,7 +68,7 @@
-ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_context_t *cntxt)
+ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_pool_t *cntxt)
{
ap_dir_t *thedir = (ap_dir_t *)ap_palloc(cntxt, sizeof(ap_dir_t));
@@ -143,14 +143,14 @@
-ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_context_t *cont)
+ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_pool_t *cont)
{
return APR_OS2_STATUS(DosCreateDir(path, NULL));
}
-ap_status_t ap_remove_dir(const char *path, ap_context_t *cont)
+ap_status_t ap_remove_dir(const char *path, ap_pool_t *cont)
{
return APR_OS2_STATUS(DosDeleteDir(path));
}
1.15 +2 -2 apache-2.0/src/lib/apr/file_io/os2/fileio.h
Index: fileio.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/fileio.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fileio.h 2000/04/08 06:58:39 1.14
+++ fileio.h 2000/04/14 15:58:21 1.15
@@ -66,7 +66,7 @@
#define APR_FILE_BUFSIZE 4096
struct ap_file_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
HFILE filedes;
char * fname;
int isopen;
@@ -83,7 +83,7 @@
};
struct ap_dir_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
char *dirname;
ULONG handle;
FILEFINDBUF3 entry;
1.9 +1 -1 apache-2.0/src/lib/apr/file_io/os2/filestat.c
Index: filestat.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filestat.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- filestat.c 2000/04/08 06:58:39 1.8
+++ filestat.c 2000/04/14 15:58:21 1.9
@@ -138,7 +138,7 @@
-ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_context_t *cont)
+ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_pool_t *cont)
{
ULONG rc;
FILESTATUS3 fstatus;
1.21 +4 -4 apache-2.0/src/lib/apr/file_io/os2/open.c
Index: open.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/open.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- open.c 2000/04/08 06:58:39 1.20
+++ open.c 2000/04/14 15:58:21 1.21
@@ -69,7 +69,7 @@
-ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag, ap_fileperms_t perm, ap_context_t *cntxt)
+ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag, ap_fileperms_t perm, ap_pool_t *cntxt)
{
int oflags = 0;
int mflags = OPEN_FLAGS_FAIL_ON_ERROR|OPEN_SHARE_DENYNONE;
@@ -171,7 +171,7 @@
-ap_status_t ap_remove_file(char *path, ap_context_t *cntxt)
+ap_status_t ap_remove_file(char *path, ap_pool_t *cntxt)
{
ULONG rc = DosDelete(path);
return APR_OS2_STATUS(rc);
@@ -191,7 +191,7 @@
-ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile, ap_context_t *cont)
+ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile, ap_pool_t *cont)
{
ap_os_file_t *dafile = thefile;
if ((*file) == NULL) {
@@ -218,7 +218,7 @@
-ap_status_t ap_open_stderr(ap_file_t **thefile, ap_context_t *cont)
+ap_status_t ap_open_stderr(ap_file_t **thefile, ap_pool_t *cont)
{
(*thefile) = ap_palloc(cont, sizeof(ap_file_t));
if ((*thefile) == NULL) {
1.14 +2 -2 apache-2.0/src/lib/apr/file_io/os2/pipe.c
Index: pipe.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/pipe.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pipe.c 2000/04/08 06:58:39 1.13
+++ pipe.c 2000/04/14 15:58:22 1.14
@@ -58,7 +58,7 @@
#include "apr_lib.h"
#include <string.h>
-ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_context_t *cont)
+ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_pool_t *cont)
{
ULONG filedes[2];
ULONG rc;
@@ -92,7 +92,7 @@
-ap_status_t ap_create_namedpipe(char *filename, ap_fileperms_t perm, ap_context_t *cont)
+ap_status_t ap_create_namedpipe(char *filename, ap_fileperms_t perm, ap_pool_t *cont)
{
/* Not yet implemented, interface not suitable */
return APR_ENOTIMPL;
1.29 +4 -4 apache-2.0/src/lib/apr/file_io/unix/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dir.c 2000/04/14 01:38:38 1.28
+++ dir.c 2000/04/14 15:58:22 1.29
@@ -66,7 +66,7 @@
}
}
-ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_context_t *cont)
+ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_pool_t *cont)
{
if (new == NULL)
return APR_EBADARG;
@@ -143,7 +143,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_context_t *cont)
+ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_pool_t *cont)
{
mode_t mode = ap_unix_get_fileperms(perm);
@@ -155,7 +155,7 @@
}
}
-ap_status_t ap_remove_dir(const char *path, ap_context_t *cont)
+ap_status_t ap_remove_dir(const char *path, ap_pool_t *cont)
{
if (rmdir(path) == 0) {
return APR_SUCCESS;
@@ -275,7 +275,7 @@
}
ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if ((*dir) == NULL) {
(*dir) = (ap_dir_t *)ap_palloc(cont, sizeof(ap_dir_t));
1.16 +2 -2 apache-2.0/src/lib/apr/file_io/unix/fileio.h
Index: fileio.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileio.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fileio.h 2000/04/14 00:58:38 1.15
+++ fileio.h 2000/04/14 15:58:22 1.16
@@ -101,7 +101,7 @@
/* End System headers */
struct ap_file_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
int filedes;
char * fname;
int oflags;
@@ -112,7 +112,7 @@
};
struct ap_dir_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
char *dirname;
DIR *dirstruct;
struct dirent *entry;
1.24 +1 -1 apache-2.0/src/lib/apr/file_io/unix/filestat.c
Index: filestat.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filestat.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- filestat.c 2000/04/14 10:16:12 1.23
+++ filestat.c 2000/04/14 15:58:22 1.24
@@ -104,7 +104,7 @@
}
}
-ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_context_t *cont)
+ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_pool_t *cont)
{
struct stat info;
1.46 +4 -4 apache-2.0/src/lib/apr/file_io/unix/open.c
Index: open.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/open.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- open.c 2000/04/14 01:38:39 1.45
+++ open.c 2000/04/14 15:58:22 1.46
@@ -72,7 +72,7 @@
}
}
-ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag, ap_fileperms_t perm, ap_context_t *cont)
+ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag, ap_fileperms_t perm, ap_pool_t *cont)
{
int oflags = 0;
@@ -158,7 +158,7 @@
return rv;
}
-ap_status_t ap_remove_file(char *path, ap_context_t *cont)
+ap_status_t ap_remove_file(char *path, ap_pool_t *cont)
{
if (unlink(path) == 0) {
return APR_SUCCESS;
@@ -182,7 +182,7 @@
}
ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
int *dafile = thefile;
@@ -221,7 +221,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_open_stderr(ap_file_t **thefile, ap_context_t *cont)
+ap_status_t ap_open_stderr(ap_file_t **thefile, ap_pool_t *cont)
{
if (thefile == NULL)
return APR_EBADARG;
1.25 +2 -2 apache-2.0/src/lib/apr/file_io/unix/pipe.c
Index: pipe.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/pipe.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pipe.c 2000/04/14 00:58:38 1.24
+++ pipe.c 2000/04/14 15:58:23 1.25
@@ -89,7 +89,7 @@
return APR_EINVAL;
}
-ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_context_t *cont)
+ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_pool_t *cont)
{
int filedes[2];
@@ -121,7 +121,7 @@
}
ap_status_t ap_create_namedpipe(char *filename,
- ap_fileperms_t perm, ap_context_t *cont)
+ ap_fileperms_t perm, ap_pool_t *cont)
{
mode_t mode = ap_unix_get_fileperms(perm);
1.19 +5 -5 apache-2.0/src/lib/apr/file_io/win32/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/dir.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dir.c 2000/04/04 20:33:46 1.18
+++ dir.c 2000/04/14 15:58:23 1.19
@@ -79,7 +79,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_context_t *cont)
+ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_pool_t *cont)
{
char * temp;
(*new) = ap_palloc(cont, sizeof(ap_dir_t));
@@ -126,7 +126,7 @@
ap_status_t ap_rewinddir(ap_dir_t *thedir)
{
ap_status_t stat;
- ap_context_t *cont = thedir->cntxt;
+ ap_pool_t *cont = thedir->cntxt;
char *temp = ap_pstrdup(cont, thedir->dirname);
temp[strlen(temp) - 2] = '\0'; /*remove the \* at the end */
if (thedir->dirhand == INVALID_HANDLE_VALUE) {
@@ -141,7 +141,7 @@
return stat;
}
-ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_context_t *cont)
+ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_pool_t *cont)
{
if (!CreateDirectory(path, NULL)) {
return GetLastError();
@@ -149,7 +149,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_remove_dir(const char *path, ap_context_t *cont)
+ap_status_t ap_remove_dir(const char *path, ap_pool_t *cont)
{
char *temp = canonical_filename(cont, path);
if (!RemoveDirectory(temp)) {
@@ -210,7 +210,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir, ap_context_t *cont)
+ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir, ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.16 +4 -4 apache-2.0/src/lib/apr/file_io/win32/fileio.h
Index: fileio.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileio.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fileio.h 2000/04/12 22:10:16 1.15
+++ fileio.h 2000/04/14 15:58:23 1.16
@@ -96,7 +96,7 @@
*/
struct ap_file_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
HANDLE filehand;
char *fname;
DWORD dwFileAttributes;
@@ -114,7 +114,7 @@
};
struct ap_dir_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
char *dirname;
HANDLE dirhand;
WIN32_FIND_DATA *entry;
@@ -123,9 +123,9 @@
ap_status_t file_cleanup(void *);
/*mode_t get_fileperms(ap_fileperms_t);
*/
-API_EXPORT(char *) ap_os_systemcase_filename(struct ap_context_t *pCont,
+API_EXPORT(char *) ap_os_systemcase_filename(struct ap_pool_t *pCont,
const char *szFile);
-char * canonical_filename(struct ap_context_t *pCont, const char *szFile);
+char * canonical_filename(struct ap_pool_t *pCont, const char *szFile);
#endif /* ! FILE_IO_H */
1.15 +2 -2 apache-2.0/src/lib/apr/file_io/win32/filestat.c
Index: filestat.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filestat.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- filestat.c 2000/04/13 20:04:03 1.14
+++ filestat.c 2000/04/14 15:58:23 1.15
@@ -78,7 +78,7 @@
return type;
}
-BOOLEAN is_exe(const char* fname, ap_context_t *cont) {
+BOOLEAN is_exe(const char* fname, ap_pool_t *cont) {
const char* exename;
const char* ext;
exename = strrchr(fname, '/');
@@ -126,7 +126,7 @@
return errno;
}
}
-ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_context_t *cont)
+ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_pool_t *cont)
{
/* WIN32_FILE_ATTRIBUTE_DATA is an exact subset of the first
* entries of WIN32_FIND_DATA
1.30 +4 -4 apache-2.0/src/lib/apr/file_io/win32/open.c
Index: open.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/open.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- open.c 2000/04/07 02:33:58 1.29
+++ open.c 2000/04/14 15:58:24 1.30
@@ -74,7 +74,7 @@
}
ap_status_t ap_open(ap_file_t **dafile, const char *fname,
- ap_int32_t flag, ap_fileperms_t perm, ap_context_t *cont)
+ ap_int32_t flag, ap_fileperms_t perm, ap_pool_t *cont)
{
DWORD oflags = 0;
DWORD createflags = 0;
@@ -173,7 +173,7 @@
return stat;
}
-ap_status_t ap_remove_file(char *path, ap_context_t *cont)
+ap_status_t ap_remove_file(char *path, ap_pool_t *cont)
{
char *temp = canonical_filename(cont, path);
@@ -195,7 +195,7 @@
}
ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if ((*file) == NULL) {
if (cont == NULL) {
@@ -216,7 +216,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_open_stderr(ap_file_t **thefile, ap_context_t *cont)
+ap_status_t ap_open_stderr(ap_file_t **thefile, ap_pool_t *cont)
{
(*thefile) = ap_pcalloc(cont, sizeof(ap_file_t));
if ((*thefile) == NULL) {
1.12 +1 -1 apache-2.0/src/lib/apr/file_io/win32/pipe.c
Index: pipe.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/pipe.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pipe.c 2000/04/12 22:10:16 1.11
+++ pipe.c 2000/04/14 15:58:24 1.12
@@ -87,7 +87,7 @@
return APR_EINVAL;
}
-ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_context_t *cont)
+ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_pool_t *cont)
{
SECURITY_ATTRIBUTES sa;
1.8 +1 -1 apache-2.0/src/lib/apr/include/apr_dso.h
Index: apr_dso.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_dso.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apr_dso.h 2000/04/14 01:38:39 1.7
+++ apr_dso.h 2000/04/14 15:58:24 1.8
@@ -80,7 +80,7 @@
* arg 3) Context to use.
*/
ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path,
- ap_context_t *ctx);
+ ap_pool_t *ctx);
/* ***APRDOC********************************************************
* ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
1.42 +10 -9 apache-2.0/src/lib/apr/include/apr_file_io.h
Index: apr_file_io.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- apr_file_io.h 2000/04/14 00:55:02 1.41
+++ apr_file_io.h 2000/04/14 15:58:24 1.42
@@ -147,7 +147,7 @@
* file_t, or NULL (in which case it will be allocated)
*/
ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag,
- ap_fileperms_t perm, ap_context_t *cont);
+ ap_fileperms_t perm, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_close(ap_file_t *file)
@@ -164,7 +164,7 @@
* NOTE: If the file is open, it won't be removed until all instances are
* closed.
*/
-ap_status_t ap_remove_file(char *path, ap_context_t *cont);
+ap_status_t ap_remove_file(char *path, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_eof(ap_file_t *fptr)
@@ -188,7 +188,7 @@
* arg 1) The apr file to use as stderr.
* arg 2) The context to allocate the file out of.
*/
-ap_status_t ap_open_stderr(ap_file_t **thefile, ap_context_t *cont);
+ap_status_t ap_open_stderr(ap_file_t **thefile, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
@@ -317,6 +317,7 @@
* arg 2) The file to get information about.
*/
ap_status_t ap_getfileinfo(ap_finfo_t *finfo, ap_file_t *thefile);
+ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_stat(ap_file_t **finfo, char *fname, ap_context_t *cont)
@@ -326,7 +327,7 @@
* arg 2) The name of the file to stat.
* arg 3) the context to use to allocate the new file.
*/
-ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_context_t *cont);
+ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_seek(ap_file_t *thefile, ap_seek_where_t where,
@@ -350,7 +351,7 @@
* arg 2) The full path to the directory (use / on all systems)
* arg 3) The context to use.
*/
-ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_context_t *cont);
+ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_closedir(ap_dir_t *thedir)
@@ -383,7 +384,7 @@
* arg 3) the context to use.
*/
ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm,
- ap_context_t *cont);
+ ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_remove_dir(const char *path, ap_context_t *cont)
@@ -391,7 +392,7 @@
* arg 1) the path for the directory to be removed. (use / on all systems)
* arg 2) the context to use.
*/
-ap_status_t ap_remove_dir(const char *path, ap_context_t *cont);
+ap_status_t ap_remove_dir(const char *path, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out,
@@ -401,7 +402,7 @@
* arg 2) The file descriptor to use as output from the pipe.
* arg 3) The context to operate on.
*/
-ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_context_t *cont);
+ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_create_namedpipe(char *filename, ap_fileperms_t perm,
@@ -412,7 +413,7 @@
* arg 3) The context to operate on.
*/
ap_status_t ap_create_namedpipe(char *filename, ap_fileperms_t perm,
- ap_context_t *cont);
+ ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_set_pipe_timeout(ap_file_t *thepipe, ap_int32_t timeout)
1.7 +1 -1 apache-2.0/src/lib/apr/include/apr_fnmatch.h
Index: apr_fnmatch.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_fnmatch.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr_fnmatch.h 2000/03/10 00:06:09 1.6
+++ apr_fnmatch.h 2000/04/14 15:58:25 1.7
@@ -49,7 +49,7 @@
#define FNM_PATHNAME 0x02 /* Slash must be matched by slash. */
#define FNM_PERIOD 0x04 /* Period must be matched by period. */
/* This flag is an Apache addition */
-#define FNM_CASE_BLIND 0x08 /* Compare characters case ap_context_t nsensitively. */
+#define FNM_CASE_BLIND 0x08 /* Compare characters case ap_pool_t nsensitively. */
API_EXPORT(ap_status_t) ap_fnmatch(const char *pattern, const char *strings,
int flags);
1.24 +28 -10 apache-2.0/src/lib/apr/include/apr_general.h
Index: apr_general.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_general.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- apr_general.h 2000/04/14 01:38:40 1.23
+++ apr_general.h 2000/04/14 15:58:25 1.24
@@ -77,7 +77,6 @@
#define MAXIMUM_WAIT_OBJECTS 64
-typedef struct ap_context_t ap_context_t;
typedef int ap_signum_t;
#ifdef SIGHUP
@@ -212,8 +211,26 @@
#define XtOffsetOf(s_type,field) XtOffset(s_type*,field)
#endif
-
-
+typedef struct ap_pool_t {
+ union block_hdr *first;
+ union block_hdr *last;
+ struct cleanup *cleanups;
+ struct process_chain *subprocesses;
+ struct ap_pool_t *sub_pools;
+ struct ap_pool_t *sub_next;
+ struct ap_pool_t *sub_prev;
+ struct ap_pool_t *parent;
+ char *free_first_avail;
+#ifdef ALLOC_USE_MALLOC
+ void *allocation_list;
+#endif
+#ifdef POOL_DEBUG
+ ap_pool_t *joined;
+#endif
+ int (*apr_abort)(int retcode);
+ struct datastruct *prog_data;
+}ap_pool_t;
+
/* Context functions */
/* ***APRDOC********************************************************
* ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont)
@@ -224,15 +241,16 @@
* of it's parent context's attributes, except the ap_context_t will be a
* sub-pool.
*/
-ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont);
+ap_status_t ap_create_pool(ap_pool_t **newcont, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_destroy_context(ap_context_t *cont)
* Free the context and all of it's child contexts'.
* arg 1) The context to free.
*/
-ap_status_t ap_destroy_context(struct ap_context_t *cont);
-ap_status_t ap_exit(ap_context_t *);
+ap_status_t ap_destroy_context(ap_pool_t *cont);
+
+ap_status_t ap_exit(ap_pool_t *);
/* ***APRDOC********************************************************
* ap_status_t ap_set_userdata(void *data, char *key,
@@ -254,7 +272,7 @@
*/
ap_status_t ap_set_userdata(void *data, char *key,
ap_status_t (*cleanup) (void *),
- ap_context_t *cont);
+ ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_get_userdata(void **data, char *key, ap_context_t *cont)
@@ -263,7 +281,7 @@
* arg 2) The user data associated with the context.
* arg 3) The current context.
*/
-ap_status_t ap_get_userdata(void **, char *key, ap_context_t *cont);
+ap_status_t ap_get_userdata(void **, char *key, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_initialize(void)
@@ -279,7 +297,7 @@
* function at termination once it has stopped using APR
* services.
*/
-void ap_terminate(void);
+void ap_terminate(void);
/* ***APRDOC********************************************************
* ap_status_t ap_set_abort(int (*apr_abort)(int retcode), ap_context_t *cont)
@@ -291,7 +309,7 @@
* then APR will return an error and expect the calling program to
* deal with the error accordingly.
*/
-ap_status_t ap_set_abort(int (*apr_abort)(int retcode), ap_context_t *cont);
+ap_status_t ap_set_abort(int (*apr_abort)(int retcode), ap_pool_t *cont);
#ifdef __cplusplus
}
1.7 +1 -1 apache-2.0/src/lib/apr/include/apr_getopt.h
Index: apr_getopt.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_getopt.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr_getopt.h 2000/04/14 01:38:40 1.6
+++ apr_getopt.h 2000/04/14 15:58:25 1.7
@@ -83,7 +83,7 @@
* main(argc, argv)
*/
ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr,
- ap_int32_t *rv, ap_context_t *cont);
+ ap_int32_t *rv, ap_pool_t *cont);
#endif /* ! APR_GETOPT_H */
1.4 +1 -1 apache-2.0/src/lib/apr/include/apr_iconv.h
Index: apr_iconv.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_iconv.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr_iconv.h 2000/03/31 08:35:55 1.3
+++ apr_iconv.h 2000/04/14 15:58:25 1.4
@@ -85,7 +85,7 @@
typedef struct ap_iconv_t ap_iconv_t;
void ap_codepage_open(ap_iconv_t **convset, const char *topage,
- const char *frompage, ap_context_t *context);
+ const char *frompage, ap_pool_t *context);
void ap_translate_codepage(ap_iconv_t *convset, const char *inbuf,
ap_size_t inbytes_left, const char *outbuf,
ap_size_t outbytes_left);
1.25 +27 -28 apache-2.0/src/lib/apr/include/apr_lib.h
Index: apr_lib.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- apr_lib.h 2000/04/03 18:37:07 1.24
+++ apr_lib.h 2000/04/14 15:58:25 1.25
@@ -81,12 +81,11 @@
* and tables are opaque structures to applications, but arrays are
* published.
*/
-typedef struct ap_pool_t ap_pool_t;
typedef struct ap_table_t ap_table_t;
typedef struct ap_child_info_t ap_child_info_t;
typedef void ap_mutex_t;
typedef struct ap_array_header_t {
- ap_context_t *cont;
+ ap_pool_t *cont;
int elt_size;
int nelts;
int nalloc;
@@ -118,7 +117,7 @@
enum kill_conditions {
kill_never, /* process is never sent any signals */
- kill_always, /* process is sent SIGKILL on ap_context_t cleanup */
+ kill_always, /* process is sent SIGKILL on ap_pool_t cleanup */
kill_after_timeout, /* SIGTERM, wait 3 seconds, SIGKILL */
just_wait, /* wait forever for the process to complete */
kill_only_once /* send SIGTERM and then wait */
@@ -128,7 +127,7 @@
* Define the prototypes for the various APR GP routines.
*/
API_EXPORT(char *) ap_cpystrn(char *d, const char *s, size_t l);
-API_EXPORT(int) ap_tokenize_to_argv(ap_context_t *token_context,
+API_EXPORT(int) ap_tokenize_to_argv(ap_pool_t *token_context,
char *arg_str, char ***argv_out);
API_EXPORT(const char *) ap_filename_of_pathname(const char *pathname);
/*API_EXPORT(ap_mutex_t *) ap_create_mutex(void *m);*/
@@ -208,7 +207,7 @@
* can return -1 to indicate that no further output should be attempted,
* and ap_vformatter will return immediately with -1. Otherwise
* the flush_func should flush the buffer in whatever manner is
- * appropriate, re ap_context_t nitialize curpos and endpos, and return 0.
+ * appropriate, re ap_pool_t nitialize curpos and endpos, and return 0.
*
* Note that flush_func is only invoked as a result of attempting to
* write another byte at curpos when curpos >= endpos. So for
@@ -264,15 +263,15 @@
* APR memory structure manipulators (pools, tables, and arrays).
*/
API_EXPORT(ap_pool_t *) ap_make_sub_pool(ap_pool_t *p, int (*apr_abort)(int retcode));
-API_EXPORT(void) ap_clear_pool(struct ap_context_t *p);
-API_EXPORT(void) ap_destroy_pool(struct ap_context_t *p);
+API_EXPORT(void) ap_clear_pool(struct ap_pool_t *p);
+API_EXPORT(void) ap_destroy_pool(struct ap_pool_t *p);
API_EXPORT(long) ap_bytes_in_pool(ap_pool_t *p);
API_EXPORT(long) ap_bytes_in_free_blocks(void);
API_EXPORT(ap_pool_t *) ap_find_pool(const void *ts);
API_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b);
API_EXPORT(void) ap_pool_join(ap_pool_t *p, ap_pool_t *sub);
-/* used to guarantee to the ap_context_t debugging code that the sub ap_context_t will not be
+/* used to guarantee to the ap_pool_t debugging code that the sub ap_pool_t will not be
* destroyed before the parent pool
*/
#ifndef POOL_DEBUG
@@ -283,32 +282,32 @@
#endif /* POOL_DEBUG */
-API_EXPORT(void *) ap_palloc(struct ap_context_t *c, int reqsize);
-API_EXPORT(void *) ap_pcalloc(struct ap_context_t *p, int size);
-API_EXPORT(char *) ap_pstrdup(struct ap_context_t *p, const char *s);
-API_EXPORT(char *) ap_pstrndup(struct ap_context_t *p, const char *s, int n);
-API_EXPORT_NONSTD(char *) ap_pstrcat(struct ap_context_t *p, ...);
-API_EXPORT(char *) ap_pvsprintf(struct ap_context_t *p, const char *fmt, va_list ap);
-API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_context_t *p, const char *fmt, ...);
-API_EXPORT(ap_array_header_t *) ap_make_array(struct ap_context_t *p, int nelts,
+API_EXPORT(void *) ap_palloc(struct ap_pool_t *c, int reqsize);
+API_EXPORT(void *) ap_pcalloc(struct ap_pool_t *p, int size);
+API_EXPORT(char *) ap_pstrdup(struct ap_pool_t *p, const char *s);
+API_EXPORT(char *) ap_pstrndup(struct ap_pool_t *p, const char *s, int n);
+API_EXPORT_NONSTD(char *) ap_pstrcat(struct ap_pool_t *p, ...);
+API_EXPORT(char *) ap_pvsprintf(struct ap_pool_t *p, const char *fmt, va_list ap);
+API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_pool_t *p, const char *fmt, ...);
+API_EXPORT(ap_array_header_t *) ap_make_array(struct ap_pool_t *p, int nelts,
int elt_size);
API_EXPORT(void *) ap_push_array(ap_array_header_t *arr);
API_EXPORT(void) ap_array_cat(ap_array_header_t *dst,
const ap_array_header_t *src);
-API_EXPORT(ap_array_header_t *) ap_copy_array(struct ap_context_t *p,
+API_EXPORT(ap_array_header_t *) ap_copy_array(struct ap_pool_t *p,
const ap_array_header_t *arr);
API_EXPORT(ap_array_header_t *)
- ap_copy_array_hdr(struct ap_context_t *p,
+ ap_copy_array_hdr(struct ap_pool_t *p,
const ap_array_header_t *arr);
API_EXPORT(ap_array_header_t *)
- ap_append_arrays(struct ap_context_t *p,
+ ap_append_arrays(struct ap_pool_t *p,
const ap_array_header_t *first,
const ap_array_header_t *second);
-API_EXPORT(char *) ap_array_pstrcat(struct ap_context_t *p,
+API_EXPORT(char *) ap_array_pstrcat(struct ap_pool_t *p,
const ap_array_header_t *arr,
const char sep);
-API_EXPORT(ap_table_t *) ap_make_table(struct ap_context_t *p, int nelts);
-API_EXPORT(ap_table_t *) ap_copy_table(struct ap_context_t *p, const ap_table_t *t);
+API_EXPORT(ap_table_t *) ap_make_table(struct ap_pool_t *p, int nelts);
+API_EXPORT(ap_table_t *) ap_copy_table(struct ap_pool_t *p, const ap_table_t *t);
API_EXPORT(void) ap_clear_table(ap_table_t *t);
API_EXPORT(const char *) ap_table_get(const ap_table_t *t, const char *key);
API_EXPORT(void) ap_table_set(ap_table_t *t, const char *key,
@@ -324,7 +323,7 @@
const char *val);
API_EXPORT(void) ap_table_addn(ap_table_t *t, const char *key,
const char *val);
-API_EXPORT(ap_table_t *) ap_overlay_tables(struct ap_context_t *p,
+API_EXPORT(ap_table_t *) ap_overlay_tables(struct ap_pool_t *p,
const ap_table_t *overlay,
const ap_table_t *base);
API_EXPORT(void)
@@ -334,21 +333,21 @@
#define AP_OVERLAP_TABLES_MERGE (1)
API_EXPORT(void) ap_overlap_tables(ap_table_t *a, const ap_table_t *b,
unsigned flags);
-API_EXPORT(void) ap_register_cleanup(struct ap_context_t *p, void *data,
+API_EXPORT(void) ap_register_cleanup(struct ap_pool_t *p, void *data,
ap_status_t (*plain_cleanup) (void *),
ap_status_t (*child_cleanup) (void *));
-API_EXPORT(void) ap_kill_cleanup(struct ap_context_t *p, void *data,
+API_EXPORT(void) ap_kill_cleanup(struct ap_pool_t *p, void *data,
ap_status_t (*cleanup) (void *));
-API_EXPORT(void) ap_run_cleanup(struct ap_context_t *p, void *data,
+API_EXPORT(void) ap_run_cleanup(struct ap_pool_t *p, void *data,
ap_status_t (*cleanup) (void *));
API_EXPORT(void) ap_cleanup_for_exec(void);
API_EXPORT(ap_status_t) ap_getpass(const char *prompt, char *pwbuf, size_t *bufsize);
API_EXPORT_NONSTD(ap_status_t) ap_null_cleanup(void *data);
-API_EXPORT(void) ap_note_subprocess(struct ap_context_t *a, ap_proc_t *pid,
+API_EXPORT(void) ap_note_subprocess(struct ap_pool_t *a, ap_proc_t *pid,
enum kill_conditions how);
API_EXPORT(int)
- ap_spawn_child(ap_context_t *p,
+ ap_spawn_child(ap_pool_t *p,
int (*func) (void *a, ap_child_info_t *c),
void *data, enum kill_conditions kill_how,
FILE **pipe_in, FILE **pipe_out,
1.12 +4 -4 apache-2.0/src/lib/apr/include/apr_lock.h
Index: apr_lock.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lock.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- apr_lock.h 2000/04/14 01:56:23 1.11
+++ apr_lock.h 2000/04/14 15:58:25 1.12
@@ -91,8 +91,8 @@
* only guaranteed to lock processes.
*/
ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type,
- ap_lockscope_e scope, const char *fname,
- ap_context_t *cont);
+ ap_lockscope_e scope, char *fname,
+ ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_lock(ap_lock_t *lock)
@@ -133,7 +133,7 @@
* portable.
*/
ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname,
- ap_context_t *cont);
+ ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_get_lockdata(ap_lock_t *lock, char *key, void *data)
@@ -146,7 +146,7 @@
/* ***APRDOC********************************************************
* ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, char *key,
- ap_status_t (*cleanup) (void *))
+ * ap_status_t (*cleanup) (void *))
* Return the context associated with the current lock.
* arg 1) The currently open lock.
* arg 2) The user data to associate with the lock.
1.9 +1 -1 apache-2.0/src/lib/apr/include/apr_mmap.h
Index: apr_mmap.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_mmap.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apr_mmap.h 2000/04/14 01:38:40 1.8
+++ apr_mmap.h 2000/04/14 15:58:25 1.9
@@ -79,7 +79,7 @@
* arg 5) The context to use when creating the mmap.
*/
ap_status_t ap_mmap_create(ap_mmap_t ** newmmap, ap_file_t *file, ap_off_t offset,
- ap_size_t size, ap_context_t *cntxt);
+ ap_size_t size, ap_pool_t *cntxt);
/* ***APRDOC********************************************************
* ap_status_t ap_mmap_delete(ap_mmap_t *mmap)
1.28 +4 -4 apache-2.0/src/lib/apr/include/apr_network_io.h
Index: apr_network_io.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- apr_network_io.h 2000/04/14 01:44:06 1.27
+++ apr_network_io.h 2000/04/14 15:58:26 1.28
@@ -143,7 +143,7 @@
* arg 1) The new socket that has been setup.
* arg 2) The context to use
*/
-ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont);
+ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_shutdown(ap_socket_t *thesocket, ap_shutdown_how_e how)
@@ -195,7 +195,7 @@
* arg 3) The context for the new socket.
*/
ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock,
- ap_context_t *connection_context);
+ ap_pool_t *connection_context);
/* ***APRDOC********************************************************
* ap_status_t ap_connect(ap_socket_t *sock, char *hostname)
@@ -224,7 +224,7 @@
* buffer provided.
* arg 3) The context to use.
*/
-ap_status_t ap_gethostname(char *buf, int len, ap_context_t *cont);
+ap_status_t ap_gethostname(char *buf, int len, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_get_socketdata(void **data, char *key, ap_socket_t *sock)
@@ -440,7 +440,7 @@
* arg 3) The context to operate on.
*/
ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num,
- ap_context_t *cont);
+ ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_poll(ap_pollfd_t *aprset, ap_int32_t *nsds,
1.13 +5 -23 apache-2.0/src/lib/apr/include/apr_pools.h
Index: apr_pools.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_pools.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apr_pools.h 2000/04/03 18:37:07 1.12
+++ apr_pools.h 2000/04/14 15:58:26 1.13
@@ -69,14 +69,14 @@
* Instead, we maintain pools, and allocate items (both memory and I/O
* handlers) from the pools --- currently there are two, one for per
* transaction info, and one for config info. When a transaction is over,
- * we can delete everything in the per-transaction ap_context_t without fear, and
+ * we can delete everything in the per-transaction ap_pool_t without fear, and
* without thinking too hard about it either.
*
* rst
*/
/* Arenas for configuration info and transaction info
- * --- actual layout of the ap_context_t structure is private to
+ * --- actual layout of the ap_pool_t structure is private to
* alloc.c.
*/
@@ -92,24 +92,6 @@
struct process_chain *next;
};
-struct ap_pool_t {
- union block_hdr *first;
- union block_hdr *last;
- struct cleanup *cleanups;
- struct process_chain *subprocesses;
- ap_pool_t *sub_pools;
- ap_pool_t *sub_next;
- ap_pool_t *sub_prev;
- ap_pool_t *parent;
- char *free_first_avail;
-#ifdef ALLOC_USE_MALLOC
- void *allocation_list;
-#endif
-#ifdef POOL_DEBUG
- ap_pool_t *joined;
-#endif
-};
-
struct ap_table_t {
/* This has to be first to promote backwards compatibility with
* older modules which cast a ap_table_t * to an ap_array_header_t *...
@@ -153,14 +135,14 @@
/* routines to allocate memory from an pool... */
-API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_context_t *, const char *fmt, ...)
+API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_pool_t *, const char *fmt, ...)
__attribute__((format(printf,2,3)));
/* array and alist management... keeping lists of things.
* Common enough to want common support code ...
*/
-/* ap_array_pstrcat generates a new string from the ap_context_t containing
+/* ap_array_pstrcat generates a new string from the ap_pool_t containing
* the concatenated sequence of substrings referenced as elements within
* the array. The string will be empty if all substrings are empty or null,
* or if there are no elements in the array.
@@ -240,7 +222,7 @@
#define ap_table_elts(t) ((ap_array_header_t *)(t))
#define ap_is_empty_table(t) (((t) == NULL)||(((ap_array_header_t *)(t))->nelts == 0))
-/* magic numbers --- min free bytes to consider a free ap_context_t block useable,
+/* magic numbers --- min free bytes to consider a free ap_pool_t block useable,
* and the min amount to allocate if we have to go to malloc() */
#ifndef BLOCK_MINFREE
1.31 +10 -9 apache-2.0/src/lib/apr/include/apr_portable.h
Index: apr_portable.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- apr_portable.h 2000/04/14 01:38:40 1.30
+++ apr_portable.h 2000/04/14 15:58:26 1.31
@@ -265,7 +265,7 @@
* an apr file type.
*/
ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile,
- ap_context_t *cont);
+ ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir,
@@ -276,7 +276,7 @@
* arg 3) The context to use when creating to apr directory.
*/
ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir,
- ap_context_t *cont);
+ ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_socket_t *thesock,
@@ -287,7 +287,7 @@
* arg 3) The socket we are converting to an apr type.
*/
ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock,
- ap_context_t *cont);
+ ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_put_os_lock(ap_lock_t **lock, ap_os_lock_t *,
@@ -298,7 +298,7 @@
* arg 3) The context to use if it is needed.
*/
ap_status_t ap_put_os_lock(ap_lock_t **lock, ap_os_lock_t *thelock,
- ap_context_t *cont);
+ ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_put_os_proc(ap_proc_t *proc, ap_os_proc_t *theproc,
@@ -309,7 +309,7 @@
* arg 3) The context to use if it is needed.
*/
ap_status_t ap_put_os_proc(ap_proc_t **proc, ap_os_proc_t *theproc,
- ap_context_t *cont);
+ ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_put_os_imp_time(ap_time_t *aprtime, ap_os_imp_time_t **ostime, ap_context_t, *cont)
@@ -318,7 +318,7 @@
* arg 2) the time to convert
* arg 3) the context to use if necessary
*/
-ap_status_t ap_put_os_imp_time(ap_time_t *, ap_os_imp_time_t **, ap_context_t *);
+ap_status_t ap_put_os_imp_time(ap_time_t *, ap_os_imp_time_t **, ap_pool_t *);
/* ***APRDOC********************************************************
* ap_status_t ap_put_os_exp_time(ap_exploded_time_t *aprtime, ap_os_exp_time_t **ostime, ap_context_t, *cont)
@@ -327,7 +327,8 @@
* arg 2) the time to convert
* arg 3) the context to use if necessary
*/
-ap_status_t ap_put_os_exp_time(ap_exploded_time_t *, ap_os_exp_time_t **, ap_context_t *);
+ap_status_t ap_put_os_exp_time(ap_exploded_time_t *, ap_os_exp_time_t **, ap_pool_t *);
+
#if APR_HAS_THREADS
/* ***APRDOC********************************************************
* ap_status_t ap_put_os_thread(ap_thread_t *thd, ap_os_thread_t *thethd,
@@ -338,7 +339,7 @@
* arg 3) The context to use if it is needed.
*/
ap_status_t ap_put_os_thread(ap_thread_t **thd, ap_os_thread_t *thethd,
- ap_context_t *cont);
+ ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_put_os_threadkey(ap_threadkey_t *key, ap_os_threadkey_t *thekey,
@@ -349,7 +350,7 @@
* arg 3) The context to use if it is needed.
*/
ap_status_t ap_put_os_threadkey(ap_threadkey_t **key, ap_os_threadkey_t *thekey,
- ap_context_t *cont);
+ ap_pool_t *cont);
#endif
#ifdef __cplusplus
1.8 +1 -1 apache-2.0/src/lib/apr/include/apr_shmem.h
Index: apr_shmem.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_shmem.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apr_shmem.h 2000/04/14 01:38:40 1.7
+++ apr_shmem.h 2000/04/14 15:58:26 1.8
@@ -82,7 +82,7 @@
* require it.
* arg 4) The context to use
*/
-ap_status_t ap_shm_init(ap_shmem_t **m, ap_size_t reqsize, const char *file, ap_context_t *cont);
+ap_status_t ap_shm_init(ap_shmem_t **m, ap_size_t reqsize, const char *file, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_shm_destroy(ap_shmem_t *m)
1.24 +10 -16 apache-2.0/src/lib/apr/include/apr_thread_proc.h
Index: apr_thread_proc.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- apr_thread_proc.h 2000/04/14 01:57:56 1.23
+++ apr_thread_proc.h 2000/04/14 15:58:26 1.24
@@ -96,13 +96,14 @@
typedef void *(API_THREAD_FUNC *ap_thread_start_t)(void *);
/* Thread Function definitions */
+
/* ***APRDOC********************************************************
* ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_context_t *cont)
* Create and initialize a new threadattr variable
* arg 1) The newly created threadattr.
* arg 2) The context to use
*/
-ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_context_t *cont);
+ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_setthreadattr_detach(ap_threadattr_t *attr, ap_int32_t on)
@@ -132,7 +133,7 @@
*/
ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr,
ap_thread_start_t func, void *data,
- ap_context_t *cont);
+ ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_thread_exit(ap_thread_t *thd, ap_status_t *retval)
@@ -189,8 +190,8 @@
* arg 2) The destructor to use when freeing the private memory.
* arg 3) The context to use
*/
-ap_status_t ap_create_thread_private(ap_threadkey_t **key, void (*dest)(void *),
- ap_context_t *cont);
+ap_status_t ap_create_thread_private(ap_threadkey_t **key, void (*dest)(void *),
+ ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key)
@@ -246,7 +247,7 @@
* arg 1) The newly created procattr.
* arg 2) The context to use
*/
-ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_context_t *cont);
+ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_setprocattr_io(ap_procattr_t *attr, ap_int32_t in,
@@ -393,7 +394,7 @@
* arg 1) The resulting process handle.
* arg 2) The context to use.
*/
-ap_status_t ap_fork(ap_proc_t **proc, ap_context_t *cont);
+ap_status_t ap_fork(ap_proc_t **proc, ap_pool_t *cont);
#endif
/* ***APRDOC********************************************************
@@ -413,7 +414,7 @@
*/
ap_status_t ap_create_process(ap_proc_t **new, const char *progname,
char *const args[], char **env,
- ap_procattr_t *attr, ap_context_t *cont);
+ ap_procattr_t *attr, ap_pool_t *cont);
/* ***APRDOC********************************************************
* ap_status_t ap_wait_proc(ap_proc_t *proc, ap_wait_how waithow)
@@ -436,7 +437,7 @@
* arg 1) The new process handler
* arg 2) The context to use if it is needed.
*/
-ap_status_t ap_detach(ap_proc_t **new, ap_context_t *cont);
+ap_status_t ap_detach(ap_proc_t **new, ap_pool_t *cont);
/* ***APRDOC********************************************************
* void ap_register_other_child(ap_proc_t *pid,
@@ -457,7 +458,7 @@
*/
void ap_register_other_child(ap_proc_t *pid,
void (*maintenance) (int reason, void *),
- void *data, int write_fd, ap_context_t *p);
+ void *data, int write_fd, ap_pool_t *p);
/* ***APRDOC********************************************************
* void ap_unregister_other_child(void *data)
@@ -498,11 +499,4 @@
#endif
#endif /* ! APR_FILE_IO_H */
-
-
-
-
-
-
-
1.13 +1 -1 apache-2.0/src/lib/apr/lib/apr_cpystrn.c
Index: apr_cpystrn.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_cpystrn.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apr_cpystrn.c 2000/04/03 18:40:40 1.12
+++ apr_cpystrn.c 2000/04/14 15:58:28 1.13
@@ -115,7 +115,7 @@
* pool and filled in with copies of the tokens
* found during parsing of the arg_str.
*/
-API_EXPORT(int) ap_tokenize_to_argv(ap_context_t *token_context,
+API_EXPORT(int) ap_tokenize_to_argv(ap_pool_t *token_context,
char *arg_str, char ***argv_out)
{
char *cp, *tmpCnt;
1.44 +30 -45 apache-2.0/src/lib/apr/lib/apr_pools.c
Index: apr_pools.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- apr_pools.c 2000/04/13 12:40:49 1.43
+++ apr_pools.c 2000/04/14 15:58:28 1.44
@@ -594,7 +594,7 @@
}
#endif
-API_EXPORT(void) ap_register_cleanup(ap_context_t *p, void *data,
+API_EXPORT(void) ap_register_cleanup(ap_pool_t *p, void *data,
ap_status_t (*plain_cleanup) (void *),
ap_status_t (*child_cleanup) (void *))
{
@@ -605,12 +605,12 @@
c->data = data;
c->plain_cleanup = plain_cleanup;
c->child_cleanup = child_cleanup;
- c->next = p->pool->cleanups;
- p->pool->cleanups = c;
+ c->next = p->cleanups;
+ p->cleanups = c;
}
}
-API_EXPORT(void) ap_kill_cleanup(ap_context_t *p, void *data,
+API_EXPORT(void) ap_kill_cleanup(ap_pool_t *p, void *data,
ap_status_t (*cleanup) (void *))
{
struct cleanup *c;
@@ -618,8 +618,8 @@
if (p == NULL)
return;
- c = p->pool->cleanups;
- lastp = &p->pool->cleanups;
+ c = p->cleanups;
+ lastp = &p->cleanups;
while (c) {
if (c->data == data && c->plain_cleanup == cleanup) {
*lastp = c->next;
@@ -631,7 +631,7 @@
}
}
-API_EXPORT(void) ap_run_cleanup(ap_context_t *p, void *data,
+API_EXPORT(void) ap_run_cleanup(ap_pool_t *p, void *data,
ap_status_t (*cleanup) (void *))
{
ap_block_alarms(); /* Run cleanup only once! */
@@ -731,20 +731,18 @@
#endif
}
-void ap_destroy_real_pool(ap_pool_t *);
-
/* We only want to lock the mutex if we are being called from ap_clear_pool.
* This is because if we also call this function from ap_destroy_real_pool,
* which also locks the same mutex, and recursive locks aren't portable.
* This way, we are garaunteed that we only lock this mutex once when calling
* either one of these functions.
*/
-static void ap_clear_real_pool(ap_pool_t *a)
+API_EXPORT(void) ap_clear_pool(ap_pool_t *a)
{
ap_block_alarms();
while (a->sub_pools) {
- ap_destroy_real_pool(a->sub_pools);
+ ap_destroy_pool(a->sub_pools);
}
/*
* Don't hold the mutex during cleanups.
@@ -776,15 +774,10 @@
ap_unblock_alarms();
}
-API_EXPORT(void) ap_clear_pool(ap_context_t *a)
+API_EXPORT(void) ap_destroy_pool(ap_pool_t *a)
{
- ap_clear_real_pool(a->pool);
-}
-
-API_EXPORT(void) ap_destroy_real_pool(ap_pool_t *a)
-{
ap_block_alarms();
- ap_clear_real_pool(a);
+ ap_clear_pool(a);
#if APR_HAS_THREADS
ap_lock(alloc_mutex);
#endif
@@ -807,11 +800,6 @@
ap_unblock_alarms();
}
-API_EXPORT(void) ap_destroy_pool(ap_context_t *a)
-{
- ap_destroy_real_pool(a->pool);
-}
-
API_EXPORT(long) ap_bytes_in_pool(ap_pool_t *p)
{
return bytes_in_block_list(p->first);
@@ -935,12 +923,15 @@
* Allocating stuff...
*/
-static void * ap_pool_palloc(ap_pool_t *a, int reqsize, int (*apr_abort)(int retcode))
+void * ap_palloc(ap_pool_t *a, int reqsize)
{
#ifdef ALLOC_USE_MALLOC
int size = reqsize + CLICK_SZ;
void *ptr;
+ if (a == NULL) {
+ return malloc(reqsize);
+ }
ap_block_alarms();
if (c == NULL) {
return malloc(reqsize);
@@ -972,6 +963,10 @@
char *first_avail;
char *new_first_avail;
+ if (a == NULL) {
+ return malloc(reqsize);
+ }
+
nclicks = 1 + ((reqsize - 1) / CLICK_SZ);
size = nclicks * CLICK_SZ;
@@ -1004,7 +999,7 @@
ap_lock(alloc_mutex);
#endif
- blok = new_block(size, apr_abort);
+ blok = new_block(size, a->apr_abort);
a->last->h.next = blok;
a->last = blok;
#ifdef POOL_DEBUG
@@ -1023,23 +1018,15 @@
return (void *) first_avail;
#endif
}
-
-API_EXPORT(void *) ap_palloc(ap_context_t *c, int reqsize)
-{
- if (c == NULL) {
- return malloc(reqsize);
- }
- return ap_pool_palloc(c->pool, reqsize, c->apr_abort);
-}
-API_EXPORT(void *) ap_pcalloc(ap_context_t *a, int size)
+API_EXPORT(void *) ap_pcalloc(ap_pool_t *a, int size)
{
void *res = ap_palloc(a, size);
memset(res, '\0', size);
return res;
}
-API_EXPORT(char *) ap_pstrdup(ap_context_t *a, const char *s)
+API_EXPORT(char *) ap_pstrdup(ap_pool_t *a, const char *s)
{
char *res;
size_t len;
@@ -1053,7 +1040,7 @@
return res;
}
-API_EXPORT(char *) ap_pstrndup(ap_context_t *a, const char *s, int n)
+API_EXPORT(char *) ap_pstrndup(ap_pool_t *a, const char *s, int n)
{
char *res;
@@ -1066,7 +1053,7 @@
return res;
}
-API_EXPORT_NONSTD(char *) ap_pstrcat(ap_context_t *a, ...)
+API_EXPORT_NONSTD(char *) ap_pstrcat(ap_pool_t *a, ...)
{
char *cp, *argp, *res;
@@ -1113,7 +1100,7 @@
* until all the output is done.
*
* Note that this is completely safe because nothing else can
- * allocate in this ap_context_t while ap_psprintf is running. alarms are
+ * allocate in this ap_pool_t while ap_psprintf is running. alarms are
* blocked, and the only thing outside of alloc.c that's invoked
* is ap_vformatter -- which was purposefully written to be
* self-contained with no callouts.
@@ -1191,10 +1178,9 @@
#endif
}
-API_EXPORT(char *) ap_pvsprintf(ap_context_t *c, const char *fmt, va_list ap)
+API_EXPORT(char *) ap_pvsprintf(ap_pool_t *p, const char *fmt, va_list ap)
{
#ifdef ALLOC_USE_MALLOC
- ap_pool_t *p = c->pool;
struct psprintf_data ps;
void *ptr;
@@ -1224,7 +1210,6 @@
struct psprintf_data ps;
char *strp;
int size;
- ap_pool_t *p = c->pool;
ap_block_alarms();
ps.blok = p->last;
@@ -1256,7 +1241,7 @@
#endif
}
-API_EXPORT_NONSTD(char *) ap_psprintf(ap_context_t *p, const char *fmt, ...)
+API_EXPORT_NONSTD(char *) ap_psprintf(ap_pool_t *p, const char *fmt, ...)
{
va_list ap;
char *res;
@@ -1279,7 +1264,7 @@
* generic interface, but for now, it's a special case
*/
-API_EXPORT(void) ap_note_subprocess(ap_context_t *a, ap_proc_t *pid,
+API_EXPORT(void) ap_note_subprocess(ap_pool_t *a, ap_proc_t *pid,
enum kill_conditions how)
{
struct process_chain *new =
@@ -1287,8 +1272,8 @@
new->pid = pid;
new->kill_how = how;
- new->next = a->pool->subprocesses;
- a->pool->subprocesses = new;
+ new->next = a->subprocesses;
+ a->subprocesses = new;
}
#ifdef WIN32
1.14 +10 -10 apache-2.0/src/lib/apr/lib/apr_tables.c
Index: apr_tables.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_tables.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- apr_tables.c 2000/04/03 19:44:44 1.13
+++ apr_tables.c 2000/04/14 15:58:28 1.14
@@ -84,7 +84,7 @@
* The 'array' functions...
*/
-static void make_array_core(ap_array_header_t *res, ap_context_t *c,
+static void make_array_core(ap_array_header_t *res, ap_pool_t *c,
int nelts, int elt_size)
{
/*
@@ -103,7 +103,7 @@
res->nalloc = nelts; /* ...but this many allocated */
}
-API_EXPORT(ap_array_header_t *) ap_make_array(ap_context_t *p,
+API_EXPORT(ap_array_header_t *) ap_make_array(ap_pool_t *p,
int nelts, int elt_size)
{
ap_array_header_t *res;
@@ -155,7 +155,7 @@
dst->nelts += src->nelts;
}
-API_EXPORT(ap_array_header_t *) ap_copy_array(ap_context_t *p,
+API_EXPORT(ap_array_header_t *) ap_copy_array(ap_pool_t *p,
const ap_array_header_t *arr)
{
ap_array_header_t *res = ap_make_array(p, arr->nalloc, arr->elt_size);
@@ -182,7 +182,7 @@
}
API_EXPORT(ap_array_header_t *)
- ap_copy_array_hdr(ap_context_t *p,
+ ap_copy_array_hdr(ap_pool_t *p,
const ap_array_header_t *arr)
{
ap_array_header_t *res;
@@ -196,7 +196,7 @@
/* The above is used here to avoid consing multiple new array bodies... */
API_EXPORT(ap_array_header_t *)
- ap_append_arrays(ap_context_t *p,
+ ap_append_arrays(ap_pool_t *p,
const ap_array_header_t *first,
const ap_array_header_t *second)
{
@@ -206,13 +206,13 @@
return res;
}
-/* ap_array_pstrcat generates a new string from the ap_context_t containing
+/* ap_array_pstrcat generates a new string from the ap_pool_t containing
* the concatenated sequence of substrings referenced as elements within
* the array. The string will be empty if all substrings are empty or null,
* or if there are no elements in the array.
* If sep is non-NUL, it will be inserted between elements as a separator.
*/
-API_EXPORT(char *) ap_array_pstrcat(ap_context_t *p,
+API_EXPORT(char *) ap_array_pstrcat(ap_pool_t *p,
const ap_array_header_t *arr,
const char sep)
{
@@ -289,7 +289,7 @@
#endif /* MAKE_TABLE_PROFILE */
-API_EXPORT(ap_table_t *) ap_make_table(ap_context_t *p, int nelts)
+API_EXPORT(ap_table_t *) ap_make_table(ap_pool_t *p, int nelts)
{
ap_table_t *t = ap_palloc(p, sizeof(ap_table_t));
@@ -300,7 +300,7 @@
return t;
}
-API_EXPORT(ap_table_t *) ap_copy_table(ap_context_t *p, const ap_table_t *t)
+API_EXPORT(ap_table_t *) ap_copy_table(ap_pool_t *p, const ap_table_t *t)
{
ap_table_t *new = ap_palloc(p, sizeof(ap_table_t));
@@ -530,7 +530,7 @@
elts->val = (char *)val;
}
-API_EXPORT(ap_table_t *) ap_overlay_tables(ap_context_t *p,
+API_EXPORT(ap_table_t *) ap_overlay_tables(ap_pool_t *p,
const ap_table_t *overlay,
const ap_table_t *base)
{
1.13 +1 -2 apache-2.0/src/lib/apr/locks/beos/crossproc.c
Index: crossproc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/crossproc.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- crossproc.c 2000/04/14 01:56:23 1.12
+++ crossproc.c 2000/04/14 15:58:29 1.13
@@ -123,8 +123,7 @@
return stat;
}
-ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont,
- const char *fname)
+ap_status_t child_init_lock(ap_lock_t **lock, ap_pool_t *cont, char *fname)
{
return APR_SUCCESS;
}
1.15 +3 -4 apache-2.0/src/lib/apr/locks/beos/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/locks.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- locks.c 2000/04/14 01:56:23 1.14
+++ locks.c 2000/04/14 15:58:29 1.15
@@ -55,8 +55,8 @@
#include "locks.h"
ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type,
- ap_lockscope_e scope, const char *fname,
- ap_context_t *cont)
+ ap_lockscope_e scope, char *fname,
+ ap_pool_t *cont)
{
ap_lock_t *new;
ap_status_t stat;
@@ -134,8 +134,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname,
- ap_context_t *cont)
+ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, ap_pool_t *cont)
{
ap_status_t stat;
if ((*lock)->scope != APR_CROSS_PROCESS) {
1.7 +1 -1 apache-2.0/src/lib/apr/locks/beos/locks.h
Index: locks.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/locks.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- locks.h 2000/04/03 18:37:13 1.6
+++ locks.h 2000/04/14 15:58:29 1.7
@@ -62,7 +62,7 @@
#include "apr_lib.h"
struct ap_lock_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
ap_locktype_e type;
ap_lockscope_e scope;
int curr_locked;
1.14 +2 -3 apache-2.0/src/lib/apr/locks/os2/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/locks.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- locks.c 2000/04/14 01:56:24 1.13
+++ locks.c 2000/04/14 15:58:29 1.14
@@ -77,8 +77,7 @@
-ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e scope,
- const char *fname, ap_context_t *cont)
+ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e scope, char *fname, ap_pool_t *cont)
{
ap_lock_t *new;
ULONG rc;
@@ -110,7 +109,7 @@
-ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname, ap_context_t *cont)
+ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, ap_pool_t *cont)
{
int rc;
PIB *ppib;
1.7 +1 -1 apache-2.0/src/lib/apr/locks/os2/locks.h
Index: locks.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/locks.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- locks.h 2000/04/03 18:37:15 1.6
+++ locks.h 2000/04/14 15:58:30 1.7
@@ -61,7 +61,7 @@
#include <os2.h>
struct ap_lock_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
ap_locktype_e type;
ap_lockscope_e scope;
char *fname;
1.27 +5 -7 apache-2.0/src/lib/apr/locks/unix/crossproc.c
Index: crossproc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/crossproc.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- crossproc.c 2000/04/14 02:12:55 1.26
+++ crossproc.c 2000/04/14 15:58:30 1.27
@@ -130,8 +130,7 @@
return stat;
}
-ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_context_t *cont,
- const char *fname)
+ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_pool_t *cont, char *fname)
{
return APR_SUCCESS;
}
@@ -231,8 +230,7 @@
return stat;
}
-ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_context_t *cont,
- const char *fname)
+ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_pool_t *cont, char *fname)
{
return APR_SUCCESS;
}
@@ -312,8 +310,8 @@
return stat;
}
-ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_context_t *cont,
- const char *fname)
+ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_pool_t *cont,
+ const char *fname)
{
return APR_SUCCESS;
}
@@ -379,7 +377,7 @@
return stat;
}
-ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_context_t *cont,
+ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_pool_t *cont,
const char *fname)
{
ap_lock_t *new;
1.28 +5 -5 apache-2.0/src/lib/apr/locks/unix/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- locks.c 2000/04/14 02:12:55 1.27
+++ locks.c 2000/04/14 15:58:30 1.28
@@ -56,8 +56,8 @@
#include "apr_portable.h"
ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type,
- ap_lockscope_e scope, const char *fname,
- ap_context_t *cont)
+ ap_lockscope_e scope, char *fname,
+ ap_pool_t *cont)
{
ap_lock_t *new;
ap_status_t stat;
@@ -159,8 +159,8 @@
return APR_SUCCESS;
}
-ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname,
- ap_context_t *cont)
+ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname,
+ ap_pool_t *cont)
{
ap_status_t stat;
if ((*lock)->scope != APR_CROSS_PROCESS) {
@@ -210,7 +210,7 @@
}
ap_status_t ap_put_os_lock(ap_lock_t **lock, ap_os_lock_t *thelock,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.19 +2 -2 apache-2.0/src/lib/apr/locks/unix/locks.h
Index: locks.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- locks.h 2000/04/14 02:12:55 1.18
+++ locks.h 2000/04/14 15:58:30 1.19
@@ -109,7 +109,7 @@
#endif
struct ap_lock_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
ap_locktype_e type;
ap_lockscope_e scope;
int curr_locked;
@@ -150,7 +150,7 @@
ap_status_t ap_unix_unlock_inter(struct ap_lock_t *lock);
ap_status_t ap_unix_destroy_inter_lock(struct ap_lock_t *lock);
-ap_status_t ap_unix_child_init_lock(struct ap_lock_t **lock, ap_context_t *cont,
+ap_status_t ap_unix_child_init_lock(struct ap_lock_t **lock, ap_pool_t *cont,
const char *fname);
#endif /* LOCKS_H */
1.18 +57 -57 apache-2.0/src/lib/apr/locks/win32/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/win32/locks.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- locks.c 2000/04/14 01:56:25 1.17
+++ locks.c 2000/04/14 15:58:31 1.18
@@ -1,56 +1,56 @@
/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+* The Apache Software License, Version 1.1
+*
+* Copyright (c) 2000 The Apache Software Foundation. All rights
+* reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+*
+* 1. Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in
+* the documentation and/or other materials provided with the
+* distribution.
+*
+* 3. The end-user documentation included with the redistribution,
+* if any, must include the following acknowledgment:
+* "This product includes software developed by the
+* Apache Software Foundation (http://www.apache.org/)."
+* Alternately, this acknowledgment may appear in the software itself,
+* if and wherever such third-party acknowledgments normally appear.
+*
+* 4. The names "Apache" and "Apache Software Foundation" must
+* not be used to endorse or promote products derived from this
+* software without prior written permission. For written
+* permission, please contact apache@apache.org.
+*
+* 5. Products derived from this software may not be called "Apache",
+* nor may "Apache" appear in their name, without prior written
+* permission of the Apache Software Foundation.
+*
+* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+* SUCH DAMAGE.
+* ====================================================================
+*
+* This software consists of voluntary contributions made by many
+* individuals on behalf of the Apache Software Foundation. For more
+* information on the Apache Software Foundation, please see
+* <http://www.apache.org/>.
+*/
#include "apr_general.h"
#include "apr_lib.h"
@@ -58,8 +58,8 @@
#include "apr_portable.h"
ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type,
- ap_lockscope_e scope, const char *fname,
- ap_context_t *cont)
+ ap_lockscope_e scope, char *fname,
+ ap_pool_t *cont)
{
ap_lock_t *newlock;
SECURITY_ATTRIBUTES sec;
@@ -92,8 +92,8 @@
return APR_SUCCESS;
}
-ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname,
- ap_context_t *cont)
+ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname,
+ ap_pool_t *cont)
{
/* This routine should not be called (and OpenMutex will fail if called)
* on a INTRAPROCESS lock
@@ -190,7 +190,7 @@
}
ap_status_t ap_put_os_lock(ap_lock_t **lock, ap_os_lock_t *thelock,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.6 +1 -1 apache-2.0/src/lib/apr/locks/win32/locks.h
Index: locks.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/win32/locks.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- locks.h 2000/04/03 18:37:18 1.5
+++ locks.h 2000/04/14 15:58:31 1.6
@@ -58,7 +58,7 @@
#include "apr_lock.h"
struct ap_lock_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
ap_locktype_e type;
ap_lockscope_e scope;
HANDLE mutex;
1.12 +1 -1 apache-2.0/src/lib/apr/misc/beos/misc.h
Index: misc.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/misc.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- misc.h 2000/04/05 11:24:17 1.11
+++ misc.h 2000/04/14 15:58:31 1.12
@@ -81,7 +81,7 @@
struct datastruct *prev;
} datastruct;
-struct ap_context_t {
+struct ap_pool_t {
struct ap_pool_t *pool;
void *prog_data;
int (*apr_abort)(int retcode);
1.2 +1 -1 apache-2.0/src/lib/apr/misc/beos/otherchild.c
Index: otherchild.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/otherchild.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- otherchild.c 2000/04/04 22:56:11 1.1
+++ otherchild.c 2000/04/14 15:58:31 1.2
@@ -59,7 +59,7 @@
API_EXPORT(void) ap_register_other_child(ap_proc_t *pid,
void (*maintenance) (int reason, void *),
- void *data, int write_fd, ap_context_t *p)
+ void *data, int write_fd, ap_pool_t *p)
{
ap_other_child_rec_t *ocr;
1.16 +6 -6 apache-2.0/src/lib/apr/misc/beos/start.c
Index: start.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/start.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- start.c 2000/04/03 19:44:54 1.15
+++ start.c 2000/04/14 15:58:31 1.16
@@ -54,9 +54,9 @@
#include "misc.h"
-ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont)
+ap_status_t ap_create_pool(ap_pool_t **newcont, ap_pool_t *cont)
{
- ap_context_t *new;
+ ap_pool_t *new;
ap_pool_t *pool;
if (cont) {
@@ -70,7 +70,7 @@
return APR_ENOPOOL;
}
- new = (ap_context_t *)ap_palloc(cont, sizeof(ap_context_t));
+ new = (ap_pool_t *)ap_palloc(cont, sizeof(ap_pool_t));
new->pool = pool;
new->prog_data = NULL;
@@ -79,7 +79,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_destroy_context(ap_context_t *cont)
+ap_status_t ap_destroy_context(ap_pool_t *cont)
{
ap_destroy_pool(cont);
return APR_SUCCESS;
@@ -87,7 +87,7 @@
ap_status_t ap_set_userdata(void *data, char *key,
ap_status_t (*cleanup) (void *),
- ap_context_t *cont)
+ ap_pool_t *cont)
{
datastruct *dptr = NULL, *dptr2 = NULL;
if (cont) {
@@ -117,7 +117,7 @@
return APR_ENOCONT;
}
-ap_status_t ap_get_userdata(void **data, char *key, ap_context_t *cont)
+ap_status_t ap_get_userdata(void **data, char *key, ap_pool_t *cont)
{
datastruct *dptr = NULL;
if (cont) {
1.9 +1 -1 apache-2.0/src/lib/apr/misc/unix/getopt.c
Index: getopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/getopt.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- getopt.c 2000/04/14 10:14:50 1.8
+++ getopt.c 2000/04/14 15:58:32 1.9
@@ -41,7 +41,7 @@
#define EMSG ""
-ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, ap_context_t *cont)
+ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, ap_pool_t *cont)
{
char *p;
static char *place = EMSG; /* option letter processing */
1.13 +0 -6 apache-2.0/src/lib/apr/misc/unix/misc.h
Index: misc.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/misc.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- misc.h 2000/04/07 14:16:29 1.12
+++ misc.h 2000/04/14 15:58:32 1.13
@@ -85,12 +85,6 @@
struct datastruct *prev;
} datastruct;
-struct ap_context_t {
- struct ap_pool_t *pool;
- datastruct *prog_data;
- int (*apr_abort)(int retcode);
-};
-
struct ap_other_child_rec_t {
struct ap_other_child_rec_t *next;
int pid;
1.7 +1 -1 apache-2.0/src/lib/apr/misc/unix/otherchild.c
Index: otherchild.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/otherchild.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- otherchild.c 2000/04/14 01:38:42 1.6
+++ otherchild.c 2000/04/14 15:58:32 1.7
@@ -63,7 +63,7 @@
API_EXPORT(void) ap_register_other_child(ap_proc_t *pid,
void (*maintenance) (int reason, void *),
- void *data, int write_fd, ap_context_t *p)
+ void *data, int write_fd, ap_pool_t *p)
{
ap_other_child_rec_t *ocr;
1.28 +9 -13 apache-2.0/src/lib/apr/misc/unix/start.c
Index: start.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/start.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- start.c 2000/04/14 02:12:56 1.27
+++ start.c 2000/04/14 15:58:32 1.28
@@ -59,25 +59,21 @@
#include "../../locks/beos/locks.h"
#endif
-ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont)
+ap_status_t ap_create_pool(ap_pool_t **newcont, ap_pool_t *cont)
{
- ap_context_t *new;
- ap_pool_t *pool;
+ ap_pool_t *new;
if (cont) {
- pool = ap_make_sub_pool(cont->pool, cont->apr_abort);
+ new = ap_make_sub_pool(cont, cont->apr_abort);
}
else {
- pool = ap_make_sub_pool(NULL, NULL);
+ new = ap_make_sub_pool(NULL, NULL);
}
- if (pool == NULL) {
+ if (new == NULL) {
return APR_ENOPOOL;
}
- new = (ap_context_t *)ap_palloc(cont, sizeof(ap_context_t));
-
- new->pool = pool;
new->prog_data = NULL;
new->apr_abort = NULL;
@@ -85,7 +81,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_destroy_context(ap_context_t *cont)
+ap_status_t ap_destroy_context(ap_pool_t *cont)
{
ap_destroy_pool(cont);
return APR_SUCCESS;
@@ -93,7 +89,7 @@
ap_status_t ap_set_userdata(void *data, char *key,
ap_status_t (*cleanup) (void *),
- ap_context_t *cont)
+ ap_pool_t *cont)
{
datastruct *dptr = NULL, *dptr2 = NULL;
if (cont) {
@@ -123,7 +119,7 @@
return APR_ENOCONT;
}
-ap_status_t ap_get_userdata(void **data, char *key, ap_context_t *cont)
+ap_status_t ap_get_userdata(void **data, char *key, ap_pool_t *cont)
{
datastruct *dptr = NULL;
if (cont) {
@@ -160,7 +156,7 @@
ap_term_alloc();
}
-ap_status_t ap_set_abort(int (*apr_abort)(int retcode), ap_context_t *cont)
+ap_status_t ap_set_abort(int (*apr_abort)(int retcode), ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.7 +1 -1 apache-2.0/src/lib/apr/misc/win32/getopt.c
Index: getopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/getopt.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- getopt.c 2000/04/14 01:38:43 1.6
+++ getopt.c 2000/04/14 15:58:33 1.7
@@ -44,7 +44,7 @@
#define EMSG ""
-ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, ap_context_t *cont)
+ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, ap_pool_t *cont)
{
char *p;
static char *place = EMSG; /* option letter processing */
1.9 +1 -1 apache-2.0/src/lib/apr/misc/win32/misc.h
Index: misc.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/misc.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- misc.h 2000/04/03 18:37:26 1.8
+++ misc.h 2000/04/14 15:58:34 1.9
@@ -67,7 +67,7 @@
struct datastruct *prev;
} datastruct;
-struct ap_context_t {
+struct ap_pool_t {
struct ap_pool_t *pool;
datastruct *prog_data;
int (*apr_abort)(int retcode);
1.8 +2 -2 apache-2.0/src/lib/apr/misc/win32/names.c
Index: names.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/names.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- names.c 2000/04/03 19:44:58 1.7
+++ names.c 2000/04/14 15:58:34 1.8
@@ -82,7 +82,7 @@
* is present on the existing path. This routine also
* converts alias names to long names.
*/
-API_EXPORT(char *) ap_os_systemcase_filename(ap_context_t *pCont,
+API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pCont,
const char *szFile)
{
char buf[HUGE_STRING_LEN];
@@ -201,7 +201,7 @@
/* Perform canonicalization with the exception that the
* input case is preserved.
*/
-char * canonical_filename(ap_context_t *pCont, const char *szFile)
+char * canonical_filename(ap_pool_t *pCont, const char *szFile)
{
char *pNewStr;
char *s;
1.23 +7 -7 apache-2.0/src/lib/apr/misc/win32/start.c
Index: start.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/start.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- start.c 2000/04/13 18:49:29 1.22
+++ start.c 2000/04/14 15:58:34 1.23
@@ -69,12 +69,12 @@
}
-ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont)
+ap_status_t ap_create_pool(ap_pool_t **newcont, ap_pool_t *cont)
{
int iVersionRequested;
WSADATA wsaData;
int err;
- ap_context_t *new;
+ ap_pool_t *new;
ap_pool_t *pool;
if (cont) {
@@ -88,7 +88,7 @@
return APR_ENOPOOL;
}
- new = (ap_context_t *)ap_palloc(cont, sizeof(ap_context_t));
+ new = (ap_pool_t *)ap_palloc(cont, sizeof(ap_pool_t));
new->pool = pool;
new->prog_data = NULL;
@@ -111,13 +111,13 @@
return APR_SUCCESS;
}
-ap_status_t ap_destroy_context(ap_context_t *cont)
+ap_status_t ap_destroy_context(ap_pool_t *cont)
{
ap_destroy_pool(cont);
return APR_SUCCESS;
}
-ap_status_t ap_get_oslevel(ap_context_t *cont, ap_oslevel_e *level)
+ap_status_t ap_get_oslevel(ap_pool_t *cont, ap_oslevel_e *level)
{
static OSVERSIONINFO oslev;
static unsigned int servpack = 0;
@@ -177,7 +177,7 @@
ap_status_t ap_set_userdata(void *data, char *key,
ap_status_t (*cleanup) (void *),
- ap_context_t *cont)
+ ap_pool_t *cont)
{
datastruct *dptr = NULL, *dptr2 = NULL;
if (cont) {
@@ -207,7 +207,7 @@
return APR_ENOCONT;
}
-ap_status_t ap_get_userdata(void **data, char *key, ap_context_t *cont)
+ap_status_t ap_get_userdata(void **data, char *key, ap_pool_t *cont)
{
datastruct *dptr = NULL;
if (cont) {
1.12 +1 -1 apache-2.0/src/lib/apr/mmap/beos/mmap.c
Index: mmap.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/beos/mmap.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mmap.c 2000/04/14 02:21:28 1.11
+++ mmap.c 2000/04/14 15:58:34 1.12
@@ -70,7 +70,7 @@
}
ap_status_t ap_mmap_create(ap_mmap_t **new, ap_file_t *file, ap_off_t offset, ap_size_t size,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
void *mm;
area_id aid = -1;
1.9 +1 -1 apache-2.0/src/lib/apr/mmap/beos/mmap_h.h
Index: mmap_h.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/beos/mmap_h.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mmap_h.h 2000/04/14 02:21:28 1.8
+++ mmap_h.h 2000/04/14 15:58:34 1.9
@@ -69,7 +69,7 @@
#include <stdio.h>
struct ap_mmap_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
area_id area;
void *mm;
size_t size;
1.18 +1 -1 apache-2.0/src/lib/apr/mmap/unix/mmap.c
Index: mmap.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/mmap.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mmap.c 2000/04/14 02:21:28 1.17
+++ mmap.c 2000/04/14 15:58:35 1.18
@@ -77,7 +77,7 @@
}
ap_status_t ap_mmap_create(ap_mmap_t **new, ap_file_t *file, ap_off_t offset,
- ap_size_t size, ap_context_t *cont)
+ ap_size_t size, ap_pool_t *cont)
{
caddr_t mm;
1.10 +1 -1 apache-2.0/src/lib/apr/mmap/unix/mmap_h.h
Index: mmap_h.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/mmap_h.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mmap_h.h 2000/04/14 02:21:28 1.9
+++ mmap_h.h 2000/04/14 15:58:35 1.10
@@ -85,7 +85,7 @@
/* End System Headers */
struct ap_mmap_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
void *mm;
size_t size;
};
1.12 +2 -2 apache-2.0/src/lib/apr/network_io/beos/networkio.h
Index: networkio.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/networkio.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- networkio.h 2000/04/03 18:37:30 1.11
+++ networkio.h 2000/04/14 15:58:36 1.12
@@ -86,7 +86,7 @@
#define POLLNVAL 32
struct ap_socket_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
int socketdes;
struct sockaddr_in *local_addr;
struct sockaddr_in *remote_addr;
@@ -96,7 +96,7 @@
};
struct ap_pollfd_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
struct ap_socket_t *sock;
fd_set *read;
fd_set *write;
1.12 +1 -1 apache-2.0/src/lib/apr/network_io/beos/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/poll.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- poll.c 2000/04/03 19:45:03 1.11
+++ poll.c 2000/04/14 15:58:36 1.12
@@ -63,7 +63,7 @@
/* select for R4.5 of BeOS. So here we use code that uses the write */
/* bits. */
-ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
+ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
{
(*new) = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t) * num);
if ((*new) == NULL) {
1.22 +3 -3 apache-2.0/src/lib/apr/network_io/beos/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockets.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sockets.c 2000/04/03 19:45:04 1.21
+++ sockets.c 2000/04/14 15:58:36 1.22
@@ -66,7 +66,7 @@
}
}
-ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont)
+ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont)
{
(*new) = (ap_socket_t *)ap_palloc(cont,sizeof(ap_socket_t));
@@ -127,7 +127,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_context_t *connection_context)
+ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_pool_t *connection_context)
{
(*new) = (ap_socket_t *)ap_palloc(connection_context,
sizeof(ap_socket_t));
@@ -219,7 +219,7 @@
}
ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.15 +1 -1 apache-2.0/src/lib/apr/network_io/beos/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockopt.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sockopt.c 2000/04/03 19:45:04 1.14
+++ sockopt.c 2000/04/14 15:58:36 1.15
@@ -83,7 +83,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_gethostname(char * buf, int len, ap_context_t *cont)
+ap_status_t ap_gethostname(char * buf, int len, ap_pool_t *cont)
{
if (gethostname(buf, len) == -1){
return errno;
1.11 +2 -2 apache-2.0/src/lib/apr/network_io/os2/networkio.h
Index: networkio.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/networkio.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- networkio.h 2000/04/08 06:58:41 1.10
+++ networkio.h 2000/04/14 15:58:37 1.11
@@ -60,7 +60,7 @@
#include "os2calls.h"
struct ap_socket_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
int socketdes;
struct sockaddr_in *local_addr;
struct sockaddr_in *remote_addr;
@@ -70,7 +70,7 @@
};
struct ap_pollfd_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
int *socket_list;
int *r_socket_list;
int num_read;
1.13 +1 -1 apache-2.0/src/lib/apr/network_io/os2/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/poll.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- poll.c 2000/04/08 06:58:41 1.12
+++ poll.c 2000/04/14 15:58:37 1.13
@@ -64,7 +64,7 @@
/* OS/2 doesn't have a poll function, implement using OS/2 style select */
-ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
+ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
{
*new = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t));
1.17 +3 -3 apache-2.0/src/lib/apr/network_io/os2/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockets.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sockets.c 2000/04/08 06:58:42 1.16
+++ sockets.c 2000/04/14 15:58:37 1.17
@@ -78,7 +78,7 @@
}
}
-ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont)
+ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont)
{
(*new) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t));
@@ -147,7 +147,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_context_t *connection_context)
+ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_pool_t *connection_context)
{
(*new) = (ap_socket_t *)ap_palloc(connection_context,
sizeof(ap_socket_t));
@@ -240,7 +240,7 @@
-ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock, ap_context_t *cont)
+ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock, ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.13 +1 -1 apache-2.0/src/lib/apr/network_io/os2/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockopt.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sockopt.c 2000/04/08 06:58:42 1.12
+++ sockopt.c 2000/04/14 15:58:37 1.13
@@ -118,7 +118,7 @@
-ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_context_t *cont)
+ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_pool_t *cont)
{
if (gethostname(buf, len) == -1)
return APR_OS2_STATUS(sock_errno());
1.22 +2 -2 apache-2.0/src/lib/apr/network_io/unix/networkio.h
Index: networkio.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- networkio.h 2000/04/14 02:19:56 1.21
+++ networkio.h 2000/04/14 15:58:40 1.22
@@ -107,7 +107,7 @@
/* End System Headers */
struct ap_socket_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
int socketdes;
struct sockaddr_in *local_addr;
struct sockaddr_in *remote_addr;
@@ -119,7 +119,7 @@
};
struct ap_pollfd_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
#ifdef HAVE_POLL
int *sock;
int curpos;
1.24 +2 -2 apache-2.0/src/lib/apr/network_io/unix/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- poll.c 2000/04/14 02:19:56 1.23
+++ poll.c 2000/04/14 15:58:40 1.24
@@ -56,7 +56,7 @@
#ifdef HAVE_POLL /* We can just use poll to do our socket polling. */
-ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
+ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
{
(*new) = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t));
(*new)->sock = ap_palloc(cont, sizeof(ap_socket_t) * num);
@@ -211,7 +211,7 @@
#else /* Use select to mimic poll */
-ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
+ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
{
(*new) = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t) * num);
if ((*new) == NULL) {
1.38 +3 -3 apache-2.0/src/lib/apr/network_io/unix/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockets.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sockets.c 2000/04/14 01:38:45 1.37
+++ sockets.c 2000/04/14 15:58:40 1.38
@@ -67,7 +67,7 @@
}
}
-ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont)
+ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont)
{
(*new) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t));
@@ -132,7 +132,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_context_t *connection_context)
+ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_pool_t *connection_context)
{
(*new) = (ap_socket_t *)ap_palloc(connection_context,
sizeof(ap_socket_t));
@@ -231,7 +231,7 @@
}
ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.23 +1 -1 apache-2.0/src/lib/apr/network_io/unix/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockopt.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sockopt.c 2000/04/14 01:38:45 1.22
+++ sockopt.c 2000/04/14 15:58:40 1.23
@@ -153,7 +153,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_context_t *cont)
+ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_pool_t *cont)
{
if (gethostname(buf, len) == -1)
return errno;
1.9 +2 -2 apache-2.0/src/lib/apr/network_io/win32/networkio.h
Index: networkio.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/networkio.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- networkio.h 2000/04/03 18:37:38 1.8
+++ networkio.h 2000/04/14 15:58:41 1.9
@@ -59,7 +59,7 @@
#include "apr_general.h"
struct ap_socket_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
SOCKET sock;
struct sockaddr_in *local_addr;
struct sockaddr_in *remote_addr;
@@ -68,7 +68,7 @@
};
struct ap_pollfd_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
fd_set *read;
int numread;
fd_set *write;
1.12 +1 -1 apache-2.0/src/lib/apr/network_io/win32/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/poll.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- poll.c 2000/04/03 19:45:14 1.11
+++ poll.c 2000/04/14 15:58:41 1.12
@@ -61,7 +61,7 @@
#include <time.h>
-ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
+ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
{
(*new) = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t) * num);
if ((*new) == NULL) {
1.25 +3 -3 apache-2.0/src/lib/apr/network_io/win32/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockets.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sockets.c 2000/04/10 21:09:09 1.24
+++ sockets.c 2000/04/14 15:58:41 1.25
@@ -74,7 +74,7 @@
}
}
-ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont)
+ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont)
{
(*new) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t));
@@ -158,7 +158,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_context_t *connection_context)
+ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_pool_t *connection_context)
{
(*new) = (ap_socket_t *)ap_palloc(connection_context,
sizeof(ap_socket_t));
@@ -259,7 +259,7 @@
}
ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.13 +1 -1 apache-2.0/src/lib/apr/network_io/win32/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockopt.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sockopt.c 2000/04/10 21:09:09 1.12
+++ sockopt.c 2000/04/14 15:58:41 1.13
@@ -133,7 +133,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_gethostname(char *buf, int len, ap_context_t *cont)
+ap_status_t ap_gethostname(char *buf, int len, ap_pool_t *cont)
{
if (gethostname(buf, len) == -1)
return APR_EEXIST;
1.4 +1 -1 apache-2.0/src/lib/apr/shmem/os2/shmem.c
Index: shmem.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/os2/shmem.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- shmem.c 2000/04/08 06:58:42 1.3
+++ shmem.c 2000/04/14 15:58:42 1.4
@@ -68,7 +68,7 @@
-ap_status_t ap_shm_init(struct shmem_t **m, ap_size_t reqsize, const char *file, ap_context_t *cont)
+ap_status_t ap_shm_init(struct shmem_t **m, ap_size_t reqsize, const char *file, ap_pool_t *cont)
{
int rc;
struct shmem_t *newm = (struct shmem_t *)ap_palloc(cont, sizeof(struct shmem_t));
1.11 +1 -1 apache-2.0/src/lib/apr/shmem/unix/shmem.c
Index: shmem.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/shmem.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- shmem.c 2000/04/14 01:38:46 1.10
+++ shmem.c 2000/04/14 15:58:42 1.11
@@ -61,7 +61,7 @@
MM *mm;
};
-ap_status_t ap_shm_init(struct shmem_t **m, ap_size_t reqsize, const char *file, ap_context_t *cont)
+ap_status_t ap_shm_init(struct shmem_t **m, ap_size_t reqsize, const char *file, ap_pool_t *cont)
{
MM *newmm = mm_create(reqsize, file);
if (newmm == NULL) {
1.21 +2 -2 apache-2.0/src/lib/apr/test/ab_apr.c
Index: ab_apr.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/ab_apr.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ab_apr.c 2000/04/05 03:08:47 1.20
+++ ab_apr.c 2000/04/14 15:58:43 1.21
@@ -190,7 +190,7 @@
struct connection *con; /* connection array */
struct data *stats; /* date for each request */
-ap_context_t *cntxt;
+ap_pool_t *cntxt;
ap_pollfd_t *readbits;
@@ -888,7 +888,7 @@
ap_initialize();
atexit(ap_terminate);
- ap_create_context(&cntxt, NULL);
+ ap_create_pool(&cntxt, NULL);
ap_optind = 1;
while (ap_getopt(argc, argv, "n:c:t:T:p:v:kVhwx:y:z:", &c, cntxt) == APR_SUCCESS) {
1.7 +2 -2 apache-2.0/src/lib/apr/test/abc.c
Index: abc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/abc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- abc.c 2000/01/04 19:00:47 1.6
+++ abc.c 2000/04/14 15:58:43 1.7
@@ -9,9 +9,9 @@
ap_file_t *fd = NULL;
char ch;
int status = 0;
- ap_context_t *context;
+ ap_pool_t *context;
- ap_create_context(&context, NULL);
+ ap_create_pool(&context, NULL);
ap_open(&fd, argv[1], APR_READ, -1, context);
1.9 +2 -2 apache-2.0/src/lib/apr/test/client.c
Index: client.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/client.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- client.c 2000/04/03 02:39:27 1.8
+++ client.c 2000/04/14 15:58:43 1.9
@@ -62,7 +62,7 @@
int main(int argc, char *argv[])
{
- ap_context_t *context;
+ ap_pool_t *context;
ap_socket_t *sock;
ap_ssize_t length;
ap_status_t stat;
@@ -85,7 +85,7 @@
atexit(ap_terminate);
fprintf(stdout, "Creating context.......");
- if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+ if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
fprintf(stderr, "Something went wrong\n");
exit(-1);
}
1.16 +2 -2 apache-2.0/src/lib/apr/test/htdigest.c
Index: htdigest.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/htdigest.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- htdigest.c 2000/04/05 11:24:20 1.15
+++ htdigest.c 2000/04/14 15:58:44 1.16
@@ -97,7 +97,7 @@
#define MAX_STRING_LEN 256
char *tn;
-ap_context_t *cntxt;
+ap_pool_t *cntxt;
static void getword(char *word, char *line, char stop)
{
@@ -215,7 +215,7 @@
char command[MAX_STRING_LEN];
int found;
- ap_create_context(&cntxt, NULL);
+ ap_create_pool(&cntxt, NULL);
tn = NULL;
ap_signal(SIGINT, (void (*)(int)) interrupted);
1.11 +2 -2 apache-2.0/src/lib/apr/test/server.c
Index: server.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/server.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- server.c 2000/04/03 02:39:27 1.10
+++ server.c 2000/04/14 15:58:44 1.11
@@ -61,7 +61,7 @@
int main(int argc, char *argv[])
{
- ap_context_t *context;
+ ap_pool_t *context;
ap_socket_t *sock;
ap_socket_t *sock2;
ap_ssize_t length;
@@ -81,7 +81,7 @@
atexit(ap_terminate);
fprintf(stdout, "Creating context.......");
- if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+ if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
fprintf(stderr, "Could not create a context\n");
exit(-1);
}
1.12 +2 -2 apache-2.0/src/lib/apr/test/testargs.c
Index: testargs.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testargs.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- testargs.c 2000/04/03 02:39:27 1.11
+++ testargs.c 2000/04/14 15:58:44 1.12
@@ -65,12 +65,12 @@
int main(int argc, char * const argv[])
{
- ap_context_t *context;
+ ap_pool_t *context;
ap_int32_t data;
ap_initialize();
atexit(ap_terminate);
- ap_create_context(&context, NULL);
+ ap_create_pool(&context, NULL);
while (ap_getopt(argc, argv, "abc:d::", &data, context) == APR_SUCCESS) {
switch(data) {
1.8 +2 -2 apache-2.0/src/lib/apr/test/testcontext.c
Index: testcontext.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testcontext.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testcontext.c 2000/04/03 02:39:27 1.7
+++ testcontext.c 2000/04/14 15:58:44 1.8
@@ -69,7 +69,7 @@
int main()
{
- ap_context_t *context;
+ ap_pool_t *context;
char *testdata;
char *retdata;
@@ -79,7 +79,7 @@
}
atexit(ap_terminate);
- if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+ if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
fprintf(stderr, "Couldn't allocate context.");
exit(-1);
}
1.3 +2 -2 apache-2.0/src/lib/apr/test/testdso.c
Index: testdso.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testdso.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- testdso.c 2000/04/14 13:42:09 1.2
+++ testdso.c 2000/04/14 15:58:44 1.3
@@ -13,7 +13,7 @@
ap_dso_handle_t *h = NULL;
ap_dso_handle_sym_t func1 = NULL;
ap_dso_handle_sym_t func2 = NULL;
- ap_context_t *cont;
+ ap_pool_t *cont;
void (*function)(void);
void (*function1)(int);
int *retval;
@@ -26,7 +26,7 @@
ap_initialize();
atexit(ap_terminate);
- if (ap_create_context(&cont, NULL) != APR_SUCCESS) {
+ if (ap_create_pool(&cont, NULL) != APR_SUCCESS) {
fprintf(stderr, "Couldn't allocate context.");
exit(-1);
}
1.12 +8 -8 apache-2.0/src/lib/apr/test/testfile.c
Index: testfile.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testfile.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- testfile.c 2000/04/03 02:39:27 1.11
+++ testfile.c 2000/04/14 15:58:44 1.12
@@ -62,13 +62,13 @@
#include <unistd.h>
#endif
-int test_filedel(ap_context_t *);
-int testdirs(ap_context_t *);
+int test_filedel(ap_pool_t *);
+int testdirs(ap_pool_t *);
int main()
{
- ap_context_t *context;
- ap_context_t *cont2;
+ ap_pool_t *context;
+ ap_pool_t *cont2;
ap_file_t *thefile = NULL;
ap_status_t status = 0;
ap_int32_t flag = APR_READ | APR_WRITE | APR_CREATE;
@@ -84,11 +84,11 @@
exit(-1);
}
atexit(ap_terminate);
- if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+ if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
fprintf(stderr, "Couldn't allocate context.");
exit(-1);
}
- if (ap_create_context(&cont2, context) != APR_SUCCESS) {
+ if (ap_create_pool(&cont2, context) != APR_SUCCESS) {
fprintf(stderr, "Couldn't allocate context.");
exit(-1);
}
@@ -214,7 +214,7 @@
return 1;
}
-int test_filedel(ap_context_t *context)
+int test_filedel(ap_pool_t *context)
{
ap_file_t *thefile = NULL;
ap_int32_t flag = APR_READ | APR_WRITE | APR_CREATE;
@@ -241,7 +241,7 @@
return APR_SUCCESS;
}
-int testdirs(ap_context_t *context)
+int testdirs(ap_pool_t *context)
{
ap_dir_t *temp;
ap_file_t *file = NULL;
1.12 +2 -2 apache-2.0/src/lib/apr/test/testmmap.c
Index: testmmap.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testmmap.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- testmmap.c 2000/04/05 11:24:20 1.11
+++ testmmap.c 2000/04/14 15:58:44 1.12
@@ -69,7 +69,7 @@
int main()
{
- ap_context_t *context;
+ ap_pool_t *context;
ap_mmap_t *themmap = NULL;
ap_file_t *thefile = NULL;
ap_finfo_t finfo;
@@ -87,7 +87,7 @@
atexit(ap_terminate);
fprintf(stdout,"Creating context....................");
- if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+ if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
fprintf(stderr, "Failed.\n");
exit(-1);
}
1.5 +5 -2 apache-2.0/src/lib/apr/test/testoc.c
Index: testoc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testoc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- testoc.c 2000/04/14 13:42:09 1.4
+++ testoc.c 2000/04/14 15:58:44 1.5
@@ -85,7 +85,10 @@
int main(int argc, char *argv[])
{
- ap_context_t *context;
+ ap_pool_t *context;
+ ap_pool_t *cont2;
+ ap_status_t status = 0;
+ ap_ssize_t nbytes = 0;
ap_proc_t *newproc = NULL;
ap_procattr_t *procattr = NULL;
char *args[3];
@@ -99,7 +102,7 @@
exit(-1);
}
atexit(ap_terminate);
- if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+ if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
fprintf(stderr, "Couldn't allocate context.");
exit(-1);
}
1.6 +4 -4 apache-2.0/src/lib/apr/test/testpipe.c
Index: testpipe.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testpipe.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testpipe.c 2000/04/14 13:42:09 1.5
+++ testpipe.c 2000/04/14 15:58:44 1.6
@@ -62,12 +62,12 @@
#include <unistd.h>
#endif
-int test_filedel(ap_context_t *);
-int testdirs(ap_context_t *);
+int test_filedel(ap_pool_t *);
+int testdirs(ap_pool_t *);
int main()
{
- ap_context_t *context;
+ ap_pool_t *context;
ap_file_t *readp = NULL;
ap_file_t *writep = NULL;
ap_size_t nbytes;
@@ -78,7 +78,7 @@
exit(-1);
}
atexit(ap_terminate);
- if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+ if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
fprintf(stderr, "Couldn't allocate context.");
exit(-1);
}
1.15 +2 -2 apache-2.0/src/lib/apr/test/testproc.c
Index: testproc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testproc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- testproc.c 2000/04/05 03:09:30 1.14
+++ testproc.c 2000/04/14 15:58:44 1.15
@@ -70,7 +70,7 @@
int main(int argc, char *argv[])
{
- ap_context_t *context;
+ ap_pool_t *context;
ap_proc_t *newproc;
ap_procattr_t *attr;
ap_file_t *testfile = NULL;
@@ -84,7 +84,7 @@
exit(-1);
}
atexit(ap_terminate);
- ap_create_context(&context, NULL);
+ ap_create_pool(&context, NULL);
if (argc > 1) {
1.7 +2 -2 apache-2.0/src/lib/apr/test/testshmem.c
Index: testshmem.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testshmem.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testshmem.c 2000/04/14 13:42:09 1.6
+++ testshmem.c 2000/04/14 15:58:45 1.7
@@ -70,7 +70,7 @@
char msg[1024];
int msgavail;
} mbox;
-ap_context_t *context;
+ap_pool_t *context;
mbox *boxes;
void msgwait(int boxnum)
@@ -100,7 +100,7 @@
ap_initialize();
fprintf(stdout, "Initializing the context.......");
- if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+ if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
fprintf(stderr, "could not initialize\n");
exit(-1);
}
1.8 +2 -2 apache-2.0/src/lib/apr/test/testsock.c
Index: testsock.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testsock.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testsock.c 2000/04/03 02:39:27 1.7
+++ testsock.c 2000/04/14 15:58:45 1.8
@@ -64,7 +64,7 @@
int main(int argc, char *argv[])
{
- ap_context_t *context;
+ ap_pool_t *context;
ap_procattr_t *attr1 = NULL;
ap_procattr_t *attr2 = NULL;
@@ -83,7 +83,7 @@
atexit(ap_terminate);
fprintf(stdout, "Creating context.......");
- if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+ if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
fprintf(stderr, "Could not create context\n");
exit(-1);
}
1.10 +2 -2 apache-2.0/src/lib/apr/test/testthread.c
Index: testthread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testthread.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- testthread.c 2000/03/31 08:36:20 1.9
+++ testthread.c 2000/04/14 15:58:45 1.10
@@ -70,7 +70,7 @@
ap_lock_t *thread_lock;
-ap_context_t *context;
+ap_pool_t *context;
int x = 0;
void * API_THREAD_FUNC thread_func1(void *data)
@@ -131,7 +131,7 @@
ap_initialize();
fprintf(stdout, "Initializing the context.......");
- if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+ if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
fprintf(stderr, "could not initialize\n");
exit(-1);
}
1.22 +4 -4 apache-2.0/src/lib/apr/threadproc/beos/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/proc.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- proc.c 2000/04/05 11:24:21 1.21
+++ proc.c 2000/04/14 15:58:47 1.22
@@ -60,7 +60,7 @@
int err;
};
-ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_context_t *cont)
+ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_pool_t *cont)
{
(*new) = (ap_procattr_t *)ap_palloc(cont,
sizeof(ap_procattr_t));
@@ -166,7 +166,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_fork(ap_proc_t **proc, ap_context_t *cont)
+ap_status_t ap_fork(ap_proc_t **proc, ap_pool_t *cont)
{
int pid;
@@ -188,7 +188,7 @@
ap_status_t ap_create_process(ap_proc_t **new, const char *progname,
char *const args[], char **env,
- ap_procattr_t *attr, ap_context_t *cont)
+ ap_procattr_t *attr, ap_pool_t *cont)
{
int i=0,nargs=0;
char **newargs = NULL;
@@ -368,7 +368,7 @@
}
ap_status_t ap_put_os_proc(ap_proc_t **proc, ap_os_proc_t *theproc,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.12 +1 -1 apache-2.0/src/lib/apr/threadproc/beos/procsup.c
Index: procsup.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/procsup.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- procsup.c 2000/04/03 19:45:17 1.11
+++ procsup.c 2000/04/14 15:58:47 1.12
@@ -54,7 +54,7 @@
#include "threadproc.h"
-ap_status_t ap_detach(ap_proc_t **new, ap_context_t *cont)
+ap_status_t ap_detach(ap_proc_t **new, ap_pool_t *cont)
{
int x;
1.10 +3 -3 apache-2.0/src/lib/apr/threadproc/beos/thread.c
Index: thread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/thread.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- thread.c 2000/04/03 19:45:18 1.9
+++ thread.c 2000/04/14 15:58:47 1.10
@@ -54,7 +54,7 @@
#include "threadproc.h"
-ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_context_t *cont)
+ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_pool_t *cont)
{
ap_status_t stat;
@@ -93,7 +93,7 @@
ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr,
ap_thread_start_t func, void *data,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
int32 temp;
ap_status_t stat;
@@ -116,7 +116,7 @@
else
temp = B_NORMAL_PRIORITY;
- stat = ap_create_context(&(*new)->cntxt, cont);
+ stat = ap_create_pool(&(*new)->cntxt, cont);
if (stat != APR_SUCCESS) {
return stat;
}
1.9 +2 -2 apache-2.0/src/lib/apr/threadproc/beos/Attic/threadcancel.c
1.9 +1 -1 apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c
Index: threadpriv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- threadpriv.c 2000/04/03 19:45:19 1.8
+++ threadpriv.c 2000/04/14 15:58:47 1.9
@@ -59,7 +59,7 @@
static sem_id lock;
ap_status_t ap_create_thread_private(ap_threadkey_t **key,
- void (*dest)(void *), ap_context_t *cont)
+ void (*dest)(void *), ap_pool_t *cont)
{
(*key) = (ap_threadkey_t *)ap_palloc(cont, sizeof(ap_threadkey_t));
if ((*key) == NULL) {
1.10 +5 -5 apache-2.0/src/lib/apr/threadproc/beos/threadproc.h
Index: threadproc.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadproc.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- threadproc.h 2000/04/05 11:24:21 1.9
+++ threadproc.h 2000/04/14 15:58:47 1.10
@@ -78,19 +78,19 @@
#define BEOS_MAX_DATAKEYS 128
struct ap_thread_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
thread_id td;
};
struct ap_threadattr_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
int32 attr;
int detached;
int joinable;
};
struct ap_threadkey_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
int32 key;
};
@@ -109,7 +109,7 @@
};
struct ap_procattr_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
ap_file_t *parent_in;
ap_file_t *child_in;
ap_file_t *parent_out;
@@ -122,7 +122,7 @@
};
struct ap_proc_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
thread_id pid;
struct ap_procattr_t *attr;
};
1.19 +4 -4 apache-2.0/src/lib/apr/threadproc/os2/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/proc.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- proc.c 2000/04/08 06:58:43 1.18
+++ proc.c 2000/04/14 15:58:48 1.19
@@ -71,7 +71,7 @@
#include <stdlib.h>
#include <os2.h>
-ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_context_t *cont)
+ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_pool_t *cont)
{
(*new) = (ap_procattr_t *)ap_palloc(cont,
sizeof(ap_procattr_t));
@@ -139,7 +139,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_fork(ap_proc_t **proc, ap_context_t *cont)
+ap_status_t ap_fork(ap_proc_t **proc, ap_pool_t *cont)
{
int pid;
@@ -165,7 +165,7 @@
/* quotes in the string are doubled up.
* Used to escape quotes in args passed to OS/2's cmd.exe
*/
-static char *double_quotes(ap_context_t *cntxt, char *str)
+static char *double_quotes(ap_pool_t *cntxt, char *str)
{
int num_quotes = 0;
int len = 0;
@@ -192,7 +192,7 @@
ap_status_t ap_create_process(ap_proc_t **new, const char *progname,
char *const args[], char **env,
- ap_procattr_t *attr, ap_context_t *cont)
+ ap_procattr_t *attr, ap_pool_t *cont)
{
int i, arg, numargs, cmdlen;
ap_status_t status;
1.11 +3 -3 apache-2.0/src/lib/apr/threadproc/os2/thread.c
Index: thread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/thread.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- thread.c 2000/04/08 06:58:43 1.10
+++ thread.c 2000/04/14 15:58:48 1.11
@@ -61,7 +61,7 @@
#define INCL_DOS
#include <os2.h>
-ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_context_t *cont)
+ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_pool_t *cont)
{
(*new) = (ap_threadattr_t *)ap_palloc(cont, sizeof(ap_threadattr_t));
@@ -101,7 +101,7 @@
ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr,
ap_thread_start_t func, void *data,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
ap_status_t stat;
ap_thread_t *thread;
@@ -117,7 +117,7 @@
thread->attr = attr;
thread->func = func;
thread->data = data;
- stat = ap_create_context(&thread->cntxt, cont);
+ stat = ap_create_pool(&thread->cntxt, cont);
if (stat != APR_SUCCESS) {
return stat;
1.9 +2 -2 apache-2.0/src/lib/apr/threadproc/os2/Attic/threadcancel.c
1.9 +1 -1 apache-2.0/src/lib/apr/threadproc/os2/threadpriv.c
Index: threadpriv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadpriv.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- threadpriv.c 2000/04/08 06:58:43 1.8
+++ threadpriv.c 2000/04/14 15:58:49 1.9
@@ -60,7 +60,7 @@
#include "fileio.h"
ap_status_t ap_create_thread_private(ap_threadkey_t **key,
- void (*dest)(void *), ap_context_t *cont)
+ void (*dest)(void *), ap_pool_t *cont)
{
(*key) = (ap_threadkey_t *)ap_palloc(cont, sizeof(ap_threadkey_t));
1.6 +5 -5 apache-2.0/src/lib/apr/threadproc/os2/threadproc.h
Index: threadproc.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadproc.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- threadproc.h 2000/04/03 18:37:46 1.5
+++ threadproc.h 2000/04/14 15:58:49 1.6
@@ -64,12 +64,12 @@
#define APR_THREAD_STACKSIZE 65536
struct ap_threadattr_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
unsigned long attr;
};
struct ap_thread_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
struct ap_threadattr_t *attr;
unsigned long tid;
ap_thread_start_t func;
@@ -78,12 +78,12 @@
};
struct ap_threadkey_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
unsigned long *key;
};
struct ap_procattr_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
ap_file_t *parent_in;
ap_file_t *child_in;
ap_file_t *parent_out;
@@ -96,7 +96,7 @@
};
struct ap_proc_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
pid_t pid;
struct ap_procattr_t *attr;
int running;
1.22 +4 -4 apache-2.0/src/lib/apr/threadproc/unix/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/proc.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- proc.c 2000/04/14 01:38:47 1.21
+++ proc.c 2000/04/14 15:58:50 1.22
@@ -55,7 +55,7 @@
#include "threadproc.h"
#include "apr_portable.h"
-ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_context_t *cont)
+ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_pool_t *cont)
{
(*new) = (ap_procattr_t *)ap_palloc(cont,
sizeof(ap_procattr_t));
@@ -200,7 +200,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_fork(ap_proc_t **proc, ap_context_t *cont)
+ap_status_t ap_fork(ap_proc_t **proc, ap_pool_t *cont)
{
int pid;
@@ -221,7 +221,7 @@
ap_status_t ap_create_process(ap_proc_t **new, const char *progname,
char *const args[], char **env,
- ap_procattr_t *attr, ap_context_t *cont)
+ ap_procattr_t *attr, ap_pool_t *cont)
{
int i;
typedef const char *my_stupid_string;
@@ -363,7 +363,7 @@
}
ap_status_t ap_put_os_proc(ap_proc_t **proc, ap_os_proc_t *theproc,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.16 +1 -1 apache-2.0/src/lib/apr/threadproc/unix/procsup.c
Index: procsup.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/procsup.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- procsup.c 2000/04/14 01:38:47 1.15
+++ procsup.c 2000/04/14 15:58:50 1.16
@@ -54,7 +54,7 @@
#include "threadproc.h"
-ap_status_t ap_detach(ap_proc_t **new, ap_context_t *cont)
+ap_status_t ap_detach(ap_proc_t **new, ap_pool_t *cont)
{
int x;
1.17 +2 -105 apache-2.0/src/lib/apr/threadproc/unix/thread.c
Index: thread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/thread.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- thread.c 2000/04/14 01:38:47 1.16
+++ thread.c 2000/04/14 15:58:50 1.17
@@ -58,7 +58,7 @@
#if APR_HAS_THREADS
#ifdef HAVE_PTHREAD_H
-ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_context_t *cont)
+ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_pool_t *cont)
{
ap_status_t stat;
@@ -101,111 +101,8 @@
return APR_NOTDETACH;
}
-ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr,
- ap_thread_start_t func, void *data,
- ap_context_t *cont)
-{
- ap_status_t stat;
- pthread_attr_t *temp;
-
- (*new) = (ap_thread_t *)ap_palloc(cont, sizeof(ap_thread_t));
-
- if ((*new) == NULL) {
- return APR_ENOMEM;
- }
-
- (*new)->td = (pthread_t *)ap_palloc(cont, sizeof(pthread_t));
-
- if ((*new)->td == NULL) {
- return APR_ENOMEM;
- }
-
- (*new)->cntxt = cont;
-
- if (attr)
- temp = attr->attr;
- else
- temp = NULL;
-
- stat = ap_create_context(&(*new)->cntxt, cont);
- if (stat != APR_SUCCESS) {
- return stat;
- }
-
- if ((stat = pthread_create((*new)->td, temp, func, data)) == 0) {
- return APR_SUCCESS;
- }
- else {
- return stat;
- }
-}
-
-ap_status_t ap_thread_exit(ap_thread_t *thd, ap_status_t *retval)
-{
- ap_destroy_pool(thd->cntxt);
- pthread_exit(retval);
- return APR_SUCCESS;
-}
-
-ap_status_t ap_thread_join(ap_status_t *retval, ap_thread_t *thd)
-{
- ap_status_t stat;
-
- if ((stat = pthread_join(*thd->td,(void *)&retval)) == 0) {
- return APR_SUCCESS;
- }
- else {
- return stat;
- }
-}
-
-ap_status_t ap_thread_detach(ap_thread_t *thd)
-{
- ap_status_t stat;
-
- if ((stat = pthread_detach(*thd->td)) == 0) {
- return APR_SUCCESS;
- }
- else {
- return stat;
- }
-}
-
-ap_status_t ap_get_threaddata(void **data, char *key, ap_thread_t *thread)
-{
- if (thread != NULL) {
- return ap_get_userdata(data, key, thread->cntxt);
- }
- else {
- data = NULL;
- return APR_ENOTHREAD;
- }
-}
-
-ap_status_t ap_set_threaddata(void *data, char *key,
- ap_status_t (*cleanup) (void *),
- ap_thread_t *thread)
-{
- if (thread != NULL) {
- return ap_set_userdata(data, key, cleanup, thread->cntxt);
- }
- else {
- data = NULL;
- return APR_ENOTHREAD;
- }
-}
-
-ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, ap_thread_t *thd)
-{
- if (thd == NULL) {
- return APR_ENOTHREAD;
- }
- thethd = thd->td;
- return APR_SUCCESS;
-}
-
ap_status_t ap_put_os_thread(ap_thread_t **thd, ap_os_thread_t *thethd,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.12 +4 -4 apache-2.0/src/lib/apr/threadproc/unix/Attic/threadcancel.c
1.16 +2 -2 apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c
Index: threadpriv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- threadpriv.c 2000/04/14 01:38:47 1.15
+++ threadpriv.c 2000/04/14 15:58:50 1.16
@@ -59,7 +59,7 @@
#ifdef HAVE_PTHREAD_H
ap_status_t ap_create_thread_private(ap_threadkey_t **key,
- void (*dest)(void *), ap_context_t *cont)
+ void (*dest)(void *), ap_pool_t *cont)
{
ap_status_t stat;
(*key) = (ap_threadkey_t *)ap_palloc(cont, sizeof(ap_threadkey_t));
@@ -136,7 +136,7 @@
}
ap_status_t ap_put_os_threadkey(ap_threadkey_t **key,
- ap_os_threadkey_t *thekey, ap_context_t *cont)
+ ap_os_threadkey_t *thekey, ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.9 +6 -6 apache-2.0/src/lib/apr/threadproc/unix/threadproc.h
Index: threadproc.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadproc.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- threadproc.h 2000/04/03 18:37:49 1.8
+++ threadproc.h 2000/04/14 15:58:51 1.9
@@ -83,23 +83,23 @@
#if APR_HAS_THREADS
struct ap_thread_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
pthread_t *td;
};
struct ap_threadattr_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
pthread_attr_t *attr;
};
struct ap_threadkey_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
pthread_key_t key;
};
#endif
struct ap_procattr_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
ap_file_t *parent_in;
ap_file_t *child_in;
ap_file_t *parent_out;
@@ -112,7 +112,7 @@
};
struct ap_proc_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
pid_t pid;
struct ap_procattr_t *attr;
};
@@ -120,7 +120,7 @@
/*This will move to ap_threadproc.h in time, but I need to figure it out
* on windows first. :)
*/
-ap_status_t ap_detach(struct ap_proc_t **, ap_context_t *);
+ap_status_t ap_detach(struct ap_proc_t **, ap_pool_t *);
#endif /* ! THREAD_PROC_H */
1.22 +3 -3 apache-2.0/src/lib/apr/threadproc/win32/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/proc.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- proc.c 2000/04/03 19:45:35 1.21
+++ proc.c 2000/04/14 15:58:52 1.22
@@ -65,7 +65,7 @@
#include <string.h>
#include <process.h>
-ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_context_t *cont)
+ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_pool_t *cont)
{
(*new) = (ap_procattr_t *)ap_palloc(cont,
sizeof(ap_procattr_t));
@@ -185,7 +185,7 @@
ap_status_t ap_create_process(ap_proc_t **new, const char *progname,
char *const args[], char **env,
- ap_procattr_t *attr, ap_context_t *cont)
+ ap_procattr_t *attr, ap_pool_t *cont)
{
int i, iEnvBlockLen;
char *cmdline;
@@ -440,7 +440,7 @@
}
ap_status_t ap_put_os_proc(ap_proc_t **proc, ap_os_proc_t *theproc,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.15 +4 -4 apache-2.0/src/lib/apr/threadproc/win32/thread.c
Index: thread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/thread.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- thread.c 2000/04/03 19:45:35 1.14
+++ thread.c 2000/04/14 15:58:52 1.15
@@ -61,7 +61,7 @@
#include <process.h>
-ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_context_t *cont)
+ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_pool_t *cont)
{
(*new) = (ap_threadattr_t *)ap_palloc(cont,
sizeof(ap_threadattr_t));
@@ -89,7 +89,7 @@
ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr,
ap_thread_start_t func, void *data,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
ap_status_t stat;
unsigned temp;
@@ -103,7 +103,7 @@
(*new)->cntxt = cont;
- stat = ap_create_context(&(*new)->cntxt, cont);
+ stat = ap_create_pool(&(*new)->cntxt, cont);
if (stat != APR_SUCCESS) {
return stat;
}
@@ -190,7 +190,7 @@
}
ap_status_t ap_put_os_thread(ap_thread_t **thd, ap_os_thread_t *thethd,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.8 +2 -2 apache-2.0/src/lib/apr/threadproc/win32/Attic/threadcancel.c
1.13 +2 -2 apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c
Index: threadpriv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- threadpriv.c 2000/04/03 19:45:36 1.12
+++ threadpriv.c 2000/04/14 15:58:52 1.13
@@ -60,7 +60,7 @@
#include "apr_portable.h"
ap_status_t ap_create_thread_private(ap_threadkey_t **key,
- void (*dest)(void *), ap_context_t *cont)
+ void (*dest)(void *), ap_pool_t *cont)
{
(*key)->key = TlsAlloc();
return APR_SUCCESS;
@@ -123,7 +123,7 @@
}
ap_status_t ap_put_os_threadkey(ap_threadkey_t **key,
- ap_os_threadkey_t *thekey, ap_context_t *cont)
+ ap_os_threadkey_t *thekey, ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
1.8 +5 -5 apache-2.0/src/lib/apr/threadproc/win32/threadproc.h
Index: threadproc.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadproc.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- threadproc.h 2000/04/03 18:40:42 1.7
+++ threadproc.h 2000/04/14 15:58:52 1.8
@@ -63,24 +63,24 @@
#define SHELL_PATH "cmd.exe"
struct ap_thread_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
HANDLE td;
ap_int32_t cancel;
ap_int32_t cancel_how;
};
struct ap_threadattr_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
ap_int32_t detach;
};
struct ap_threadkey_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
DWORD key;
};
struct ap_procattr_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
STARTUPINFO si;
ap_file_t *parent_in;
ap_file_t *child_in;
@@ -94,7 +94,7 @@
};
struct ap_proc_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
PROCESS_INFORMATION pi;
struct ap_procattr_t *attr;
};
1.7 +1 -1 apache-2.0/src/lib/apr/time/unix/atime.h
Index: atime.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/atime.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- atime.h 2000/03/31 08:36:29 1.6
+++ atime.h 2000/04/14 15:58:53 1.7
@@ -69,7 +69,7 @@
/* End System Headers */
struct atime_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
struct timeval *currtime;
struct tm *explodedtime;
int time_ex; /* have we already exploded the time? */
1.24 +2 -2 apache-2.0/src/lib/apr/time/unix/time.c
Index: time.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/time.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- time.c 2000/04/14 01:38:48 1.23
+++ time.c 2000/04/14 15:58:53 1.24
@@ -216,14 +216,14 @@
}
ap_status_t ap_put_os_imp_time(ap_time_t *aprtime, ap_os_imp_time_t **ostime,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
*aprtime = (*ostime)->tv_sec * AP_USEC_PER_SEC + (*ostime)->tv_usec;
return APR_SUCCESS;
}
ap_status_t ap_put_os_exp_time(ap_exploded_time_t *aprtime,
- ap_os_exp_time_t **ostime, ap_context_t *cont)
+ ap_os_exp_time_t **ostime, ap_pool_t *cont)
{
aprtime->tm_sec = (*ostime)->tm_sec;
aprtime->tm_min = (*ostime)->tm_min;
1.7 +1 -1 apache-2.0/src/lib/apr/time/win32/atime.h
Index: atime.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/atime.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- atime.h 2000/04/04 20:33:47 1.6
+++ atime.h 2000/04/14 15:58:54 1.7
@@ -60,7 +60,7 @@
#include <time.h>
struct atime_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
ap_time_t currtime;
SYSTEMTIME *explodedtime;
};
1.10 +2 -2 apache-2.0/src/lib/apr/time/win32/time.c
Index: time.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/time.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- time.c 2000/03/31 08:36:31 1.9
+++ time.c 2000/04/14 15:58:54 1.10
@@ -197,14 +197,14 @@
}
ap_status_t ap_put_os_imp_time(ap_time_t *aprtime, ap_os_imp_time_t **ostime,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
FileTimeToAprTime(aprtime, *ostime);
return APR_SUCCESS;
}
ap_status_t ap_put_os_exp_time(ap_exploded_time_t *aprtime,
- ap_os_exp_time_t **ostime, ap_context_t *cont)
+ ap_os_exp_time_t **ostime, ap_pool_t *cont)
{
SystemTimeToAprExpTime(aprtime, *ostime);
return APR_SUCCESS;
1.3 +1 -1 apache-2.0/src/lib/expat-lite/xmlparse.h
Index: xmlparse.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/expat-lite/xmlparse.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmlparse.h 1999/08/31 05:32:54 1.2
+++ xmlparse.h 2000/04/14 15:58:55 1.3
@@ -246,7 +246,7 @@
3. All characters encoded must have Unicode scalar values <= 0xFFFF,
(ie characters that would be encoded by surrogates in UTF-16
are not allowed). Note that this restriction doesn't apply to
-the built ap_context_t n support for UTF-8 and UTF-16.
+the built ap_pool_t n support for UTF-8 and UTF-16.
4. No Unicode character may be encoded by more than one distinct sequence
of bytes. */
1.36 +2 -2 apache-2.0/src/main/buff.c
Index: buff.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- buff.c 2000/04/13 00:37:53 1.35
+++ buff.c 2000/04/14 15:58:55 1.36
@@ -133,7 +133,7 @@
/*
* Create a new buffered stream
*/
-API_EXPORT(BUFF *) ap_bcreate(ap_context_t *p, int flags)
+API_EXPORT(BUFF *) ap_bcreate(ap_pool_t *p, int flags)
{
BUFF *fb;
@@ -1033,7 +1033,7 @@
return res;
}
-API_EXPORT(BUFF *) ap_bopenf(ap_context_t *a, const char *name, int flg, int mode)
+API_EXPORT(BUFF *) ap_bopenf(ap_pool_t *a, const char *name, int flg, int mode)
{
ap_iol *iol;
BUFF *fb;
1.37 +28 -28 apache-2.0/src/main/http_config.c
Index: http_config.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- http_config.c 2000/04/14 02:39:06 1.36
+++ http_config.c 2000/04/14 15:58:55 1.37
@@ -94,12 +94,12 @@
IMPLEMENT_HOOK_RUN_ALL(int,header_parser,(request_rec *r),(r),OK,DECLINED)
IMPLEMENT_HOOK_VOID(post_config,
- (ap_context_t *pconf, ap_context_t *plog, ap_context_t *ptemp, server_rec *s),
+ (ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s),
(pconf,plog,ptemp,s))
IMPLEMENT_HOOK_VOID(open_logs,
- (ap_context_t *pconf, ap_context_t *plog, ap_context_t *ptemp, server_rec *s),
+ (ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s),
(pconf,plog,ptemp,s))
-IMPLEMENT_HOOK_VOID(child_init,(ap_context_t *pchild, server_rec *s),(pchild,s))
+IMPLEMENT_HOOK_VOID(child_init,(ap_pool_t *pchild, server_rec *s),(pchild,s))
/****************************************************************
*
@@ -120,8 +120,8 @@
API_VAR_EXPORT module **ap_loaded_modules=NULL;
typedef int (*handler_func) (request_rec *);
-typedef void *(*dir_maker_func) (ap_context_t *, char *);
-typedef void *(*merger_func) (ap_context_t *, void *, void *);
+typedef void *(*dir_maker_func) (ap_pool_t *, char *);
+typedef void *(*merger_func) (ap_pool_t *, void *, void *);
/* Dealing with config vectors. These are associated with per-directory,
* per-server, and per-request configuration, and have a void* pointer for
@@ -150,14 +150,14 @@
}
#endif
-static void *create_empty_config(ap_context_t *p)
+static void *create_empty_config(ap_pool_t *p)
{
void **conf_vector = (void **) ap_pcalloc(p, sizeof(void *) *
(total_modules + DYNAMIC_MODULE_LIMIT));
return (void *) conf_vector;
}
-static void *create_default_per_dir_config(ap_context_t *p)
+static void *create_default_per_dir_config(ap_pool_t *p)
{
void **conf_vector = (void **) ap_pcalloc(p, sizeof(void *) * (total_modules + DYNAMIC_MODULE_LIMIT));
module *modp;
@@ -173,7 +173,7 @@
}
void *
- ap_merge_per_dir_configs(ap_context_t *p, void *base, void *new)
+ ap_merge_per_dir_configs(ap_pool_t *p, void *base, void *new)
{
void **conf_vector = (void **) ap_palloc(p, sizeof(void *) * total_modules);
void **base_vector = (void **) base;
@@ -193,7 +193,7 @@
return (void *) conf_vector;
}
-static void *create_server_config(ap_context_t *p, server_rec *s)
+static void *create_server_config(ap_pool_t *p, server_rec *s)
{
void **conf_vector = (void **) ap_pcalloc(p, sizeof(void *) * (total_modules + DYNAMIC_MODULE_LIMIT));
module *modp;
@@ -206,7 +206,7 @@
return (void *) conf_vector;
}
-static void merge_server_configs(ap_context_t *p, void *base, void *virt)
+static void merge_server_configs(ap_pool_t *p, void *base, void *virt)
{
/* Can reuse the 'virt' vector for the spine of it, since we don't
* have to deal with the moral equivalent of .htaccess files here...
@@ -227,17 +227,17 @@
}
}
-void *ap_create_request_config(ap_context_t *p)
+void *ap_create_request_config(ap_pool_t *p)
{
return create_empty_config(p);
}
-void *ap_create_conn_config(ap_context_t *p)
+void *ap_create_conn_config(ap_pool_t *p)
{
return create_empty_config(p);
}
-CORE_EXPORT(void *) ap_create_per_dir_config(ap_context_t *p)
+CORE_EXPORT(void *) ap_create_per_dir_config(ap_pool_t *p)
{
return create_empty_config(p);
}
@@ -256,7 +256,7 @@
static fast_handler_rec *handlers;
static fast_handler_rec *wildhandlers;
-static void init_handlers(ap_context_t *p)
+static void init_handlers(ap_pool_t *p)
{
module *modp;
int nhandlers = 0;
@@ -966,7 +966,7 @@
static cmd_parms default_parms =
{NULL, 0, -1, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
-API_EXPORT(const char *) ap_server_root_relative(ap_context_t *p, const char *file)
+API_EXPORT(const char *) ap_server_root_relative(ap_pool_t *p, const char *file)
{
if(ap_os_is_path_absolute(file))
return file;
@@ -1014,8 +1014,8 @@
return 0;
}
-static void process_command_config(server_rec *s, ap_array_header_t *arr, ap_context_t *p,
- ap_context_t *ptemp)
+static void process_command_config(server_rec *s, ap_array_header_t *arr, ap_pool_t *p,
+ ap_pool_t *ptemp)
{
const char *errmsg;
cmd_parms parms;
@@ -1044,7 +1044,7 @@
ap_cfg_closefile(parms.config_file);
}
-void ap_process_resource_config(server_rec *s, const char *fname, ap_context_t *p, ap_context_t *ptemp)
+void ap_process_resource_config(server_rec *s, const char *fname, ap_pool_t *p, ap_pool_t *ptemp)
{
const char *errmsg;
cmd_parms parms;
@@ -1166,7 +1166,7 @@
}
-CORE_EXPORT(const char *) ap_init_virtual_host(ap_context_t *p, const char *hostname,
+CORE_EXPORT(const char *) ap_init_virtual_host(ap_pool_t *p, const char *hostname,
server_rec *main_server, server_rec **ps)
{
server_rec *s = (server_rec *) ap_pcalloc(p, sizeof(server_rec));
@@ -1222,7 +1222,7 @@
}
-static void fixup_virtual_hosts(ap_context_t *p, server_rec *main_server)
+static void fixup_virtual_hosts(ap_pool_t *p, server_rec *main_server)
{
server_rec *virt;
@@ -1261,13 +1261,13 @@
* Getting *everything* configured...
*/
-static void init_config_globals(ap_context_t *p)
+static void init_config_globals(ap_pool_t *p)
{
/* Global virtual host hash bucket pointers. Init to null. */
ap_init_vhost_config(p);
}
-static server_rec *init_server_config(process_rec *process, ap_context_t *p)
+static server_rec *init_server_config(process_rec *process, ap_pool_t *p)
{
server_rec *s = (server_rec *) ap_pcalloc(p, sizeof(server_rec));
@@ -1300,9 +1300,9 @@
}
-server_rec *ap_read_config(process_rec *process, ap_context_t *ptemp, const char *confname)
+server_rec *ap_read_config(process_rec *process, ap_pool_t *ptemp, const char *confname)
{
- ap_context_t *p = process->pconf;
+ ap_pool_t *p = process->pconf;
server_rec *s = init_server_config(process, p);
init_config_globals(p);
@@ -1322,7 +1322,7 @@
return s;
}
-void ap_single_module_configure(ap_context_t *p, server_rec *s, module *m)
+void ap_single_module_configure(ap_pool_t *p, server_rec *s, module *m)
{
if (m->create_server_config)
ap_set_module_config(s->module_config, m,
@@ -1332,7 +1332,7 @@
(*m->create_dir_config)(p, NULL));
}
-void ap_run_pre_config(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp)
+void ap_run_pre_config(ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp)
{
module *m;
@@ -1342,13 +1342,13 @@
init_handlers(p);
}
-void ap_post_config_hook(ap_context_t *pconf, ap_context_t *plog, ap_context_t *ptemp, server_rec *s)
+void ap_post_config_hook(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s)
{
ap_run_post_config(pconf,plog,ptemp,s);
init_handlers(pconf);
}
-void ap_child_init_hook(ap_context_t *pchild, server_rec *s)
+void ap_child_init_hook(ap_pool_t *pchild, server_rec *s)
{
/* TODO: uh this seems ugly, is there a better way? */
/*ap_child_init_alloc(); PUT THIS BACK IN XXXXX */
1.30 +2 -2 apache-2.0/src/main/http_connection.c
Index: http_connection.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- http_connection.c 2000/04/13 00:37:55 1.29
+++ http_connection.c 2000/04/14 15:58:55 1.30
@@ -253,7 +253,7 @@
structure, but for now...
*/
-conn_rec *ap_new_connection(ap_context_t *p, server_rec *server, BUFF *inout,
+conn_rec *ap_new_connection(ap_pool_t *p, server_rec *server, BUFF *inout,
const struct sockaddr_in *remaddr,
const struct sockaddr_in *saddr, long id)
{
@@ -283,7 +283,7 @@
-conn_rec *ap_new_apr_connection(ap_context_t *p, server_rec *server, BUFF *inout,
+conn_rec *ap_new_apr_connection(ap_pool_t *p, server_rec *server, BUFF *inout,
const ap_socket_t *conn_socket, long id)
{
struct sockaddr_in *sa_local, *sa_remote;
1.48 +11 -11 apache-2.0/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- http_core.c 2000/04/05 02:22:20 1.47
+++ http_core.c 2000/04/14 15:58:55 1.48
@@ -110,7 +110,7 @@
* the http_conf_globals.
*/
-static void *create_core_dir_config(ap_context_t *a, char *dir)
+static void *create_core_dir_config(ap_pool_t *a, char *dir)
{
core_dir_config *conf;
@@ -153,7 +153,7 @@
return (void *)conf;
}
-static void *merge_core_dir_configs(ap_context_t *a, void *basev, void *newv)
+static void *merge_core_dir_configs(ap_pool_t *a, void *basev, void *newv)
{
core_dir_config *base = (core_dir_config *)basev;
core_dir_config *new = (core_dir_config *)newv;
@@ -272,7 +272,7 @@
return (void*)conf;
}
-static void *create_core_server_config(ap_context_t *a, server_rec *s)
+static void *create_core_server_config(ap_pool_t *a, server_rec *s)
{
core_server_config *conf;
int is_virtual = s->is_virtual;
@@ -289,7 +289,7 @@
return (void *)conf;
}
-static void *merge_core_server_configs(ap_context_t *p, void *basev, void *virtv)
+static void *merge_core_server_configs(ap_pool_t *p, void *basev, void *virtv)
{
core_server_config *base = (core_server_config *)basev;
core_server_config *virt = (core_server_config *)virtv;
@@ -397,7 +397,7 @@
return a->orig_index - b->orig_index;
}
-void ap_core_reorder_directories(ap_context_t *p, server_rec *s)
+void ap_core_reorder_directories(ap_pool_t *p, server_rec *s)
{
core_server_config *sconf;
ap_array_header_t *sec;
@@ -405,7 +405,7 @@
int nelts;
void **elts;
int i;
- ap_context_t *tmp;
+ ap_pool_t *tmp;
sconf = ap_get_module_config(s->module_config, &core_module);
sec = sconf->sec;
@@ -413,7 +413,7 @@
elts = (void **)sec->elts;
/* we have to allocate tmp space to do a stable sort */
- ap_create_context(&tmp, p);
+ ap_create_pool(&tmp, p);
sortbin = ap_palloc(tmp, sec->nelts * sizeof(*sortbin));
for (i = 0; i < nelts; ++i) {
sortbin[i].orig_index = i;
@@ -712,7 +712,7 @@
return port;
}
-API_EXPORT(char *) ap_construct_url(ap_context_t *p, const char *uri,
+API_EXPORT(char *) ap_construct_url(ap_pool_t *p, const char *uri,
request_rec *r)
{
unsigned port = ap_get_server_port(r);
@@ -733,7 +733,7 @@
}
#ifdef WIN32
-static char* get_interpreter_from_win32_registry(ap_context_t *p, const char* ext)
+static char* get_interpreter_from_win32_registry(ap_pool_t *p, const char* ext)
{
char extension_path[] = "SOFTWARE\\Classes\\";
char executable_path[] = "\\SHELL\\OPEN\\COMMAND";
@@ -1723,7 +1723,7 @@
server_rec *main_server = cmd->server, *s;
const char *errmsg;
char *endp = strrchr(arg, '>');
- ap_context_t *p = cmd->pool;
+ ap_pool_t *p = cmd->pool;
const char *old_end_token;
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -2646,7 +2646,7 @@
{ NULL, NULL }
};
-static void core_open_logs(ap_context_t *pconf, ap_context_t *plog, ap_context_t *ptemp, server_rec *s)
+static void core_open_logs(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s)
{
ap_open_logs(s, pconf);
}
1.39 +6 -6 apache-2.0/src/main/http_log.c
Index: http_log.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- http_log.c 2000/04/05 01:23:49 1.38
+++ http_log.c 2000/04/14 15:58:55 1.39
@@ -159,7 +159,7 @@
{NULL, -1},
};
-static int log_child(ap_context_t *p, const char *progname,
+static int log_child(ap_pool_t *p, const char *progname,
ap_file_t **fpin)
{
/* Child process code for 'ErrorLog "|..."';
@@ -200,7 +200,7 @@
return(rc);
}
-static void open_error_log(server_rec *s, ap_context_t *p)
+static void open_error_log(server_rec *s, ap_pool_t *p)
{
const char *fname;
int rc;
@@ -255,7 +255,7 @@
}
}
-void ap_open_logs(server_rec *s_main, ap_context_t *p)
+void ap_open_logs(server_rec *s_main, ap_pool_t *p)
{
ap_status_t rc = APR_SUCCESS;
server_rec *virt, *q;
@@ -472,7 +472,7 @@
va_end(args);
}
-void ap_log_pid(ap_context_t *p, const char *fname)
+void ap_log_pid(ap_pool_t *p, const char *fname)
{
ap_file_t *pid_file = NULL;
ap_finfo_t finfo;
@@ -678,7 +678,7 @@
return APR_SUCCESS;
}
-API_EXPORT(piped_log *) ap_open_piped_log(ap_context_t *p, const char *program)
+API_EXPORT(piped_log *) ap_open_piped_log(ap_pool_t *p, const char *program)
{
piped_log *pl;
@@ -713,7 +713,7 @@
return APR_SUCCESS;
}
-API_EXPORT(piped_log *) ap_open_piped_log(ap_context_t *p, const char *program)
+API_EXPORT(piped_log *) ap_open_piped_log(ap_pool_t *p, const char *program)
{
piped_log *pl;
ap_file_t *dummy = NULL;
1.42 +14 -14 apache-2.0/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- http_main.c 2000/04/14 02:39:06 1.41
+++ http_main.c 2000/04/14 15:58:55 1.42
@@ -203,13 +203,13 @@
process_rec *process;
{
- ap_context_t *cntx;
+ ap_pool_t *cntx;
ap_status_t stat;
- stat = ap_create_context(&cntx, NULL);
+ stat = ap_create_pool(&cntx, NULL);
if (stat != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, NULL,
- "ap_create_context() failed to create "
+ "ap_create_pool() failed to create "
"initial context");
ap_terminate();
exit(1);
@@ -218,7 +218,7 @@
process = ap_palloc(cntx, sizeof(process_rec));
process->pool = cntx;
}
- ap_create_context(&process->pconf, process->pool);
+ ap_create_pool(&process->pconf, process->pool);
process->argc = argc;
process->argv = argv;
process->short_name = ap_filename_of_pathname(argv[0]);
@@ -276,7 +276,7 @@
destroy_and_exit_process(process, 1);
}
-ap_context_t *g_pHookPool;
+ap_pool_t *g_pHookPool;
#ifdef WIN32
API_EXPORT_NONSTD(int) apache_main(int argc, char *argv[])
@@ -290,11 +290,11 @@
const char *def_server_root = HTTPD_ROOT;
process_rec *process;
server_rec *server_conf;
- ap_context_t *pglobal;
- ap_context_t *pconf;
- ap_context_t *plog; /* Pool of log streams, reset _after_ each read of conf */
- ap_context_t *ptemp; /* Pool for temporary config stuff, reset often */
- ap_context_t *pcommands; /* Pool for -C and -c switches */
+ ap_pool_t *pglobal;
+ ap_pool_t *pconf;
+ ap_pool_t *plog; /* Pool of log streams, reset _after_ each read of conf */
+ ap_pool_t *ptemp; /* Pool for temporary config stuff, reset often */
+ ap_pool_t *pcommands; /* Pool for -C and -c switches */
module **mod;
#ifndef WIN32 /* done in main_win32.c */
@@ -311,7 +311,7 @@
ap_setup_prelinked_modules(process);
- ap_create_context(&pcommands, pglobal);
+ ap_create_pool(&pcommands, pglobal);
ap_server_pre_read_config = ap_make_array(pcommands, 1, sizeof(char *));
ap_server_post_read_config = ap_make_array(pcommands, 1, sizeof(char *));
ap_server_config_defines = ap_make_array(pcommands, 1, sizeof(char *));
@@ -356,8 +356,8 @@
}
}
- ap_create_context(&plog, pglobal);
- ap_create_context(&ptemp, pconf);
+ ap_create_pool(&plog, pglobal);
+ ap_create_pool(&ptemp, pconf);
/* Note that we preflight the config file once
before reading it _again_ in the main loop.
@@ -382,7 +382,7 @@
for (mod = ap_prelinked_modules; *mod != NULL; mod++) {
ap_register_hooks(*mod);
}
- ap_create_context(&ptemp, pconf);
+ ap_create_pool(&ptemp, pconf);
ap_server_root = def_server_root;
ap_run_pre_config(pconf, plog, ptemp);
server_conf = ap_read_config(process, ptemp, confname);
1.61 +2 -2 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- http_protocol.c 2000/04/05 01:23:49 1.60
+++ http_protocol.c 2000/04/14 15:58:56 1.61
@@ -963,11 +963,11 @@
request_rec *ap_read_request(conn_rec *conn)
{
request_rec *r;
- ap_context_t *p;
+ ap_pool_t *p;
const char *expect;
int access_status;
- ap_create_context(&p, conn->pool);
+ ap_create_pool(&p, conn->pool);
r = ap_pcalloc(p, sizeof(request_rec));
r->pool = p;
r->connection = conn;
1.22 +3 -3 apache-2.0/src/main/http_request.c
Index: http_request.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_request.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- http_request.c 2000/03/31 08:44:20 1.21
+++ http_request.c 2000/04/14 15:58:56 1.22
@@ -732,10 +732,10 @@
static request_rec *make_sub_request(const request_rec *r)
{
- ap_context_t *rrp;
+ ap_pool_t *rrp;
request_rec *rr;
- ap_create_context(&rrp, r->pool);
+ ap_create_pool(&rrp, r->pool);
rr = ap_pcalloc(rrp, sizeof(request_rec));
rr->pool = rrp;
return rr;
@@ -1259,7 +1259,7 @@
ap_run_log_transaction(r);
}
-static ap_table_t *rename_original_env(ap_context_t *p, ap_table_t *t)
+static ap_table_t *rename_original_env(ap_pool_t *p, ap_table_t *t)
{
ap_array_header_t *env_arr = ap_table_elts(t);
ap_table_entry_t *elts = (ap_table_entry_t *) env_arr->elts;
1.17 +6 -6 apache-2.0/src/main/http_vhost.c
Index: http_vhost.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_vhost.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- http_vhost.c 2000/03/31 08:44:20 1.16
+++ http_vhost.c 2000/04/14 15:58:56 1.17
@@ -150,7 +150,7 @@
/* called at the beginning of the config */
-void ap_init_vhost_config(ap_context_t *p)
+void ap_init_vhost_config(ap_pool_t *p)
{
memset(iphash_table, 0, sizeof(iphash_table));
default_list = NULL;
@@ -166,7 +166,7 @@
* *paddr is the variable used to keep track of **paddr between calls
* port is the default port to assume
*/
-static const char *get_addresses(ap_context_t *p, char *w, server_addr_rec ***paddr,
+static const char *get_addresses(ap_pool_t *p, char *w, server_addr_rec ***paddr,
unsigned port)
{
struct hostent *hep;
@@ -243,7 +243,7 @@
/* parse the <VirtualHost> addresses */
-const char *ap_parse_vhost_addrs(ap_context_t *p, const char *hostname, server_rec *s)
+const char *ap_parse_vhost_addrs(ap_pool_t *p, const char *hostname, server_rec *s)
{
server_addr_rec **addrs;
const char *err;
@@ -348,7 +348,7 @@
-static ipaddr_chain *new_ipaddr_chain(ap_context_t *p,
+static ipaddr_chain *new_ipaddr_chain(ap_pool_t *p,
server_rec *s, server_addr_rec *sar)
{
ipaddr_chain *new;
@@ -362,7 +362,7 @@
}
-static name_chain *new_name_chain(ap_context_t *p, server_rec *s, server_addr_rec *sar)
+static name_chain *new_name_chain(ap_pool_t *p, server_rec *s, server_addr_rec *sar)
{
name_chain *new;
@@ -469,7 +469,7 @@
}
/* compile the tables and such we need to do the run-time vhost lookups */
-void ap_fini_vhost_config(ap_context_t *p, server_rec *main_s)
+void ap_fini_vhost_config(ap_pool_t *p, server_rec *main_s)
{
server_addr_rec *sar;
int has_default_vhost_addr;
1.23 +2 -2 apache-2.0/src/main/listen.c
Index: listen.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/listen.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- listen.c 2000/03/31 08:44:20 1.22
+++ listen.c 2000/04/14 15:58:56 1.23
@@ -72,7 +72,7 @@
static int send_buffer_size;
/* TODO: make_sock is just begging and screaming for APR abstraction */
-static ap_status_t make_sock(ap_context_t *p, ap_listen_rec *server)
+static ap_status_t make_sock(ap_pool_t *p, ap_listen_rec *server)
{
ap_socket_t *s = server->sd;
int one = 1;
@@ -202,7 +202,7 @@
int ap_listen_open(process_rec *process, unsigned port)
{
- ap_context_t *pconf = process->pconf;
+ ap_pool_t *pconf = process->pconf;
ap_listen_rec *lr;
ap_listen_rec *next;
int num_open;
1.37 +37 -37 apache-2.0/src/main/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- util.c 2000/04/06 23:53:58 1.36
+++ util.c 2000/04/14 15:58:57 1.37
@@ -101,7 +101,7 @@
* Examine a field value (such as a media-/content-type) string and return
* it sans any parameters; e.g., strip off any ';charset=foo' and the like.
*/
-API_EXPORT(char *) ap_field_noparam(ap_context_t *p, const char *intype)
+API_EXPORT(char *) ap_field_noparam(ap_pool_t *p, const char *intype)
{
const char *semi;
@@ -119,7 +119,7 @@
}
}
-API_EXPORT(char *) ap_ht_time(ap_context_t *p, ap_time_t t, const char *fmt, int gmt)
+API_EXPORT(char *) ap_ht_time(ap_pool_t *p, ap_time_t t, const char *fmt, int gmt)
{
ap_size_t retcode;
char ts[MAX_STRING_LEN];
@@ -256,7 +256,7 @@
return APR_SUCCESS;
}
-API_EXPORT(regex_t *) ap_pregcomp(ap_context_t *p, const char *pattern,
+API_EXPORT(regex_t *) ap_pregcomp(ap_pool_t *p, const char *pattern,
int cflags)
{
regex_t *preg = ap_palloc(p, sizeof(regex_t));
@@ -270,7 +270,7 @@
return preg;
}
-API_EXPORT(void) ap_pregfree(ap_context_t *p, regex_t * reg)
+API_EXPORT(void) ap_pregfree(ap_pool_t *p, regex_t * reg)
{
ap_block_alarms();
regfree(reg);
@@ -342,7 +342,7 @@
* AT&T V8 regexp package.
*/
-API_EXPORT(char *) ap_pregsub(ap_context_t *p, const char *input, const char *source,
+API_EXPORT(char *) ap_pregsub(ap_pool_t *p, const char *input, const char *source,
size_t nmatch, regmatch_t pmatch[])
{
const char *src = input;
@@ -529,7 +529,7 @@
/*
* return the parent directory name including trailing / of the file s
*/
-API_EXPORT(char *) ap_make_dirstr_parent(ap_context_t *p, const char *s)
+API_EXPORT(char *) ap_make_dirstr_parent(ap_pool_t *p, const char *s)
{
char *last_slash = strrchr(s, '/');
char *d;
@@ -551,7 +551,7 @@
* This function is deprecated. Use one of the preceeding two functions
* which are faster.
*/
-API_EXPORT(char *) ap_make_dirstr(ap_context_t *p, const char *s, int n)
+API_EXPORT(char *) ap_make_dirstr(ap_pool_t *p, const char *s, int n)
{
register int x, f;
char *res;
@@ -602,12 +602,12 @@
* error... ah well. */
}
-API_EXPORT(char *) ap_getword_nc(ap_context_t *atrans, char **line, char stop)
+API_EXPORT(char *) ap_getword_nc(ap_pool_t *atrans, char **line, char stop)
{
return ap_getword(atrans, (const char **) line, stop);
}
-API_EXPORT(char *) ap_getword(ap_context_t *atrans, const char **line, char stop)
+API_EXPORT(char *) ap_getword(ap_pool_t *atrans, const char **line, char stop)
{
char *pos = strchr(*line, stop);
char *res;
@@ -629,12 +629,12 @@
return res;
}
-API_EXPORT(char *) ap_getword_white_nc(ap_context_t *atrans, char **line)
+API_EXPORT(char *) ap_getword_white_nc(ap_pool_t *atrans, char **line)
{
return ap_getword_white(atrans, (const char **) line);
}
-API_EXPORT(char *) ap_getword_white(ap_context_t *atrans, const char **line)
+API_EXPORT(char *) ap_getword_white(ap_pool_t *atrans, const char **line)
{
int pos = -1, x;
char *res;
@@ -663,12 +663,12 @@
return res;
}
-API_EXPORT(char *) ap_getword_nulls_nc(ap_context_t *atrans, char **line, char stop)
+API_EXPORT(char *) ap_getword_nulls_nc(ap_pool_t *atrans, char **line, char stop)
{
return ap_getword_nulls(atrans, (const char **) line, stop);
}
-API_EXPORT(char *) ap_getword_nulls(ap_context_t *atrans, const char **line, char stop)
+API_EXPORT(char *) ap_getword_nulls(ap_pool_t *atrans, const char **line, char stop)
{
char *pos = strchr(*line, stop);
char *res;
@@ -692,7 +692,7 @@
* all honored
*/
-static char *substring_conf(ap_context_t *p, const char *start, int len, char quote)
+static char *substring_conf(ap_pool_t *p, const char *start, int len, char quote)
{
char *result = ap_palloc(p, len + 2);
char *resp = result;
@@ -714,12 +714,12 @@
#endif
}
-API_EXPORT(char *) ap_getword_conf_nc(ap_context_t *p, char **line)
+API_EXPORT(char *) ap_getword_conf_nc(ap_pool_t *p, char **line)
{
return ap_getword_conf(p, (const char **) line);
}
-API_EXPORT(char *) ap_getword_conf(ap_context_t *p, const char **line)
+API_EXPORT(char *) ap_getword_conf(ap_pool_t *p, const char **line)
{
const char *str = *line, *strend;
char *res;
@@ -767,7 +767,7 @@
* empty string. Any unrecognized construct is not
* replaced and silently ignored.
*/
-API_EXPORT(char *) ap_resolve_env(ap_context_t *p, const char * word)
+API_EXPORT(char *) ap_resolve_env(ap_pool_t *p, const char * word)
{
char tmp[ MAX_STRING_LEN ];
char * s, * e;
@@ -828,7 +828,7 @@
}
/* Open a configfile_t as FILE, return open configfile_t struct pointer */
-API_EXPORT(ap_status_t) ap_pcfg_openfile(configfile_t **ret_cfg, ap_context_t *p, const char *name)
+API_EXPORT(ap_status_t) ap_pcfg_openfile(configfile_t **ret_cfg, ap_pool_t *p, const char *name)
{
configfile_t *new_cfg;
ap_file_t *file = NULL;
@@ -889,7 +889,7 @@
/* Allocate a configfile_t handle with user defined functions and params */
-API_EXPORT(configfile_t *) ap_pcfg_open_custom(ap_context_t *p, const char *descr,
+API_EXPORT(configfile_t *) ap_pcfg_open_custom(ap_pool_t *p, const char *descr,
void *param,
int(*getch)(void *param),
void *(*getstr) (void *buf, size_t bufsiz, void *param),
@@ -1120,7 +1120,7 @@
* the converted list item (or NULL if none) and the address pointed to by
* field is shifted to the next non-comma, non-whitespace.
*/
-API_EXPORT(char *) ap_get_list_item(ap_context_t *p, const char **field)
+API_EXPORT(char *) ap_get_list_item(ap_pool_t *p, const char **field)
{
const char *tok_start;
const unsigned char *ptr;
@@ -1209,7 +1209,7 @@
* This would be much more efficient if we stored header fields as
* an array of list items as they are received instead of a plain string.
*/
-API_EXPORT(int) ap_find_list_item(ap_context_t *p, const char *line, const char *tok)
+API_EXPORT(int) ap_find_list_item(ap_pool_t *p, const char *line, const char *tok)
{
const unsigned char *pos;
const unsigned char *ptr = (const unsigned char *)line;
@@ -1312,7 +1312,7 @@
* by whitespace at the caller's option.
*/
-API_EXPORT(char *) ap_get_token(ap_context_t *p, const char **accept_line, int accept_white)
+API_EXPORT(char *) ap_get_token(ap_pool_t *p, const char **accept_line, int accept_white)
{
const char *ptr = *accept_line;
const char *tok_start;
@@ -1352,7 +1352,7 @@
/* find http tokens, see the definition of token from RFC2068 */
-API_EXPORT(int) ap_find_token(ap_context_t *p, const char *line, const char *tok)
+API_EXPORT(int) ap_find_token(ap_pool_t *p, const char *line, const char *tok)
{
const unsigned char *start_token;
const unsigned char *s;
@@ -1386,7 +1386,7 @@
}
-API_EXPORT(int) ap_find_last_token(ap_context_t *p, const char *line, const char *tok)
+API_EXPORT(int) ap_find_last_token(ap_pool_t *p, const char *line, const char *tok)
{
int llen, tlen, lidx;
@@ -1404,7 +1404,7 @@
return (strncasecmp(&line[lidx], tok, tlen) == 0);
}
-API_EXPORT(char *) ap_escape_shell_cmd(ap_context_t *p, const char *str)
+API_EXPORT(char *) ap_escape_shell_cmd(ap_pool_t *p, const char *str)
{
char *cmd;
unsigned char *d;
@@ -1502,7 +1502,7 @@
return OK;
}
-API_EXPORT(char *) ap_construct_server(ap_context_t *p, const char *hostname,
+API_EXPORT(char *) ap_construct_server(ap_pool_t *p, const char *hostname,
unsigned port, const request_rec *r)
{
if (ap_is_default_port(port, r))
@@ -1547,7 +1547,7 @@
* something with a '/' in it (and thus does not prefix "./").
*/
-API_EXPORT(char *) ap_escape_path_segment(ap_context_t *p, const char *segment)
+API_EXPORT(char *) ap_escape_path_segment(ap_pool_t *p, const char *segment)
{
char *copy = ap_palloc(p, 3 * strlen(segment) + 1);
const unsigned char *s = (const unsigned char *)segment;
@@ -1567,7 +1567,7 @@
return copy;
}
-API_EXPORT(char *) ap_os_escape_path(ap_context_t *p, const char *path, int partial)
+API_EXPORT(char *) ap_os_escape_path(ap_pool_t *p, const char *path, int partial)
{
char *copy = ap_palloc(p, 3 * strlen(path) + 3);
const unsigned char *s = (const unsigned char *)path;
@@ -1598,7 +1598,7 @@
/* ap_escape_uri is now a macro for os_escape_path */
-API_EXPORT(char *) ap_escape_html(ap_context_t *p, const char *s)
+API_EXPORT(char *) ap_escape_html(ap_pool_t *p, const char *s)
{
int i, j;
char *x;
@@ -1644,7 +1644,7 @@
return (S_ISDIR(finfo.st_mode));
}
-API_EXPORT(char *) ap_make_full_path(ap_context_t *a, const char *src1,
+API_EXPORT(char *) ap_make_full_path(ap_pool_t *a, const char *src1,
const char *src2)
{
register int x;
@@ -1933,7 +1933,7 @@
}
-static char *find_fqdn(ap_context_t *a, struct hostent *p)
+static char *find_fqdn(ap_pool_t *a, struct hostent *p)
{
int x;
@@ -1948,7 +1948,7 @@
return ap_pstrdup(a, (void *) p->h_name);
}
-char *ap_get_local_host(ap_context_t *a)
+char *ap_get_local_host(ap_pool_t *a)
{
#ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN 256
@@ -1981,7 +1981,7 @@
/* simple 'pool' alloc()ing glue to ap_base64.c
*/
-API_EXPORT(char *) ap_pbase64decode(ap_context_t *p, const char *bufcoded)
+API_EXPORT(char *) ap_pbase64decode(ap_pool_t *p, const char *bufcoded)
{
char *decoded;
int l;
@@ -1993,7 +1993,7 @@
return decoded;
}
-API_EXPORT(char *) ap_pbase64encode(ap_context_t *p, char *string)
+API_EXPORT(char *) ap_pbase64encode(ap_pool_t *p, char *string)
{
char *encoded;
int l = strlen(string);
@@ -2007,12 +2007,12 @@
/* deprecated names for the above two functions, here for compatibility
*/
-API_EXPORT(char *) ap_uudecode(ap_context_t *p, const char *bufcoded)
+API_EXPORT(char *) ap_uudecode(ap_pool_t *p, const char *bufcoded)
{
return ap_pbase64decode(p, bufcoded);
}
-API_EXPORT(char *) ap_uuencode(ap_context_t *p, char *string)
+API_EXPORT(char *) ap_uuencode(ap_pool_t *p, char *string)
{
return ap_pbase64encode(p, string);
}
@@ -2057,7 +2057,7 @@
/*
* Given a string, replace any bare " with \" .
*/
-API_EXPORT(char *) ap_escape_quotes (ap_context_t *p, const char *instring)
+API_EXPORT(char *) ap_escape_quotes (ap_pool_t *p, const char *instring)
{
int newlen = 0;
const char *inchr = instring;
1.11 +5 -5 apache-2.0/src/main/util_md5.c
Index: util_md5.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util_md5.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- util_md5.c 2000/03/31 08:44:21 1.10
+++ util_md5.c 2000/04/14 15:58:57 1.11
@@ -90,7 +90,7 @@
#include "httpd.h"
#include "util_md5.h"
-API_EXPORT(char *) ap_md5_binary(ap_context_t *p, const unsigned char *buf, int length)
+API_EXPORT(char *) ap_md5_binary(ap_pool_t *p, const unsigned char *buf, int length)
{
const char *hex = "0123456789abcdef";
AP_MD5_CTX my_md5;
@@ -115,7 +115,7 @@
return ap_pstrdup(p, result);
}
-API_EXPORT(char *) ap_md5(ap_context_t *p, const unsigned char *string)
+API_EXPORT(char *) ap_md5(ap_pool_t *p, const unsigned char *string)
{
return ap_md5_binary(p, string, (int) strlen((char *)string));
}
@@ -165,7 +165,7 @@
static char basis_64[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-API_EXPORT(char *) ap_md5contextTo64(ap_context_t *a, AP_MD5_CTX * context)
+API_EXPORT(char *) ap_md5contextTo64(ap_pool_t *a, AP_MD5_CTX * context)
{
unsigned char digest[18];
char *encodedDigest;
@@ -192,7 +192,7 @@
#ifdef CHARSET_EBCDIC
-API_EXPORT(char *) ap_md5digest(ap_context_t *p, ap_file_t *infile, int convert)
+API_EXPORT(char *) ap_md5digest(ap_pool_t *p, ap_file_t *infile, int convert)
{
AP_MD5_CTX context;
unsigned char buf[1000];
@@ -214,7 +214,7 @@
#else
-API_EXPORT(char *) ap_md5digest(ap_context_t *p, ap_file_t *infile)
+API_EXPORT(char *) ap_md5digest(ap_pool_t *p, ap_file_t *infile)
{
AP_MD5_CTX context;
unsigned char buf[1000];
1.29 +4 -4 apache-2.0/src/main/util_script.c
Index: util_script.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- util_script.c 2000/03/31 08:44:21 1.28
+++ util_script.c 2000/04/14 15:58:57 1.29
@@ -99,7 +99,7 @@
* are handled in create_argv.
*
*/
-static char **create_argv(ap_context_t *p, char *path, char *user, char *group,
+static char **create_argv(ap_pool_t *p, char *path, char *user, char *group,
char *av0, const char *args)
{
int x, numwords;
@@ -142,7 +142,7 @@
}
#endif /* defined(OS2) || defined(WIN32) */
-static char *http2env(ap_context_t *a, char *w)
+static char *http2env(ap_pool_t *a, char *w)
{
char *res = ap_pstrcat(a, "HTTP_", w, NULL);
char *cp = res;
@@ -159,7 +159,7 @@
return res;
}
-API_EXPORT(char **) ap_create_environment(ap_context_t *p, ap_table_t *t)
+API_EXPORT(char **) ap_create_environment(ap_pool_t *p, ap_table_t *t)
{
ap_array_header_t *env_arr = ap_table_elts(t);
ap_table_entry_t *elts = (ap_table_entry_t *) env_arr->elts;
@@ -667,7 +667,7 @@
}
#if defined(OS2) || defined(WIN32)
-static char **create_argv_cmd(ap_context_t *p, char *av0, const char *args, char *path)
+static char **create_argv_cmd(ap_pool_t *p, char *av0, const char *args, char *path)
{
register int x, n;
char **av;
1.9 +6 -6 apache-2.0/src/main/util_uri.c
Index: util_uri.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util_uri.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- util_uri.c 2000/03/31 08:44:21 1.8
+++ util_uri.c 2000/04/14 15:58:57 1.9
@@ -107,7 +107,7 @@
* from a call to gethostbyname() and lives in static storage.
* By creating a copy we can tuck it away for later use.
*/
-API_EXPORT(struct hostent *) ap_pduphostent(ap_context_t *p, const struct hostent *hp)
+API_EXPORT(struct hostent *) ap_pduphostent(ap_pool_t *p, const struct hostent *hp)
{
struct hostent *newent;
char **ptrs;
@@ -160,7 +160,7 @@
* COPY OF the hostent structure, intended to be stored and used later.
* (gethostbyname() uses static storage that would be overwritten on each call)
*/
-API_EXPORT(struct hostent *) ap_pgethostbyname(ap_context_t *p, const char *hostname)
+API_EXPORT(struct hostent *) ap_pgethostbyname(ap_pool_t *p, const char *hostname)
{
struct hostent *hp = gethostbyname(hostname);
return (hp == NULL) ? NULL : ap_pduphostent(p, hp);
@@ -170,7 +170,7 @@
/* Unparse a uri_components structure to an URI string.
* Optionally suppress the password for security reasons.
*/
-API_EXPORT(char *) ap_unparse_uri_components(ap_context_t *p, const uri_components *uptr, unsigned flags)
+API_EXPORT(char *) ap_unparse_uri_components(ap_pool_t *p, const uri_components *uptr, unsigned flags)
{
char *ret = "";
@@ -302,7 +302,7 @@
* - fills in fields of uri_components *uptr
* - none on any of the r->* fields
*/
-API_EXPORT(int) ap_parse_uri_components(ap_context_t *p, const char *uri, uri_components *uptr)
+API_EXPORT(int) ap_parse_uri_components(ap_pool_t *p, const char *uri, uri_components *uptr)
{
int ret;
regmatch_t match[10]; /* This must have at least as much elements
@@ -444,7 +444,7 @@
* - fills in fields of uri_components *uptr
* - none on any of the r->* fields
*/
-API_EXPORT(int) ap_parse_uri_components(ap_context_t *p, const char *uri, uri_components *uptr)
+API_EXPORT(int) ap_parse_uri_components(ap_pool_t *p, const char *uri, uri_components *uptr)
{
const char *s;
const char *s1;
@@ -568,7 +568,7 @@
* currently at http://www.mcom.com/newsref/std/tunneling_ssl.html
* for the format of the "CONNECT host:port HTTP/1.0" request
*/
-API_EXPORT(int) ap_parse_hostinfo_components(ap_context_t *p, const char *hostinfo, uri_components *uptr)
+API_EXPORT(int) ap_parse_hostinfo_components(ap_pool_t *p, const char *hostinfo, uri_components *uptr)
{
const char *s;
char *endstr;
1.8 +14 -14 apache-2.0/src/modules/example/mod_example.c
Index: mod_example.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/example/mod_example.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_example.c 2000/03/31 09:05:02 1.7
+++ mod_example.c 2000/04/14 15:58:59 1.8
@@ -126,8 +126,8 @@
* freed each time we modify the trace. That way previous layers of trace
* data don't get lost.
*/
-static ap_context_t *example_pool = NULL;
-static ap_context_t *example_subpool = NULL;
+static ap_pool_t *example_pool = NULL;
+static ap_pool_t *example_subpool = NULL;
/*
* Declare ourselves so the configuration routines can find and know us.
@@ -295,7 +295,7 @@
* If we haven't already allocated our module-private pool, do so now.
*/
if (example_pool == NULL) {
- ap_create_context(&example_pool, NULL);
+ ap_create_pool(&example_pool, NULL);
};
/*
* Likewise for the ap_table_t of routine/environment pairs we visit outside of
@@ -315,7 +315,7 @@
* The list can be displayed by the example_handler() routine.
*
* If the call occurs within a request context (i.e., we're passed a request
- * record), we put the trace into the request ap_context_t and attach it to the
+ * record), we put the trace into the request ap_pool_t and attach it to the
* request via the notes mechanism. Otherwise, the trace gets added
* to the static (non-request-specific) list.
*
@@ -333,7 +333,7 @@
const char *sofar;
char *addon;
char *where;
- ap_context_t *p;
+ ap_pool_t *p;
const char *trace_copy;
/*
@@ -360,7 +360,7 @@
* Make a new sub-pool and copy any existing trace to it. Point the
* trace cell at the copied value.
*/
- ap_create_context(&p, example_pool);
+ ap_create_pool(&p, example_pool);
if (trace != NULL) {
trace = ap_pstrdup(p, trace);
}
@@ -627,8 +627,8 @@
/*
* All our module initialiser does is add its trace to the log.
*/
-static void example_init(ap_context_t *p, ap_context_t *ptemp,
- ap_context_t *plog, server_rec *s)
+static void example_init(ap_pool_t *p, ap_pool_t *ptemp,
+ ap_pool_t *plog, server_rec *s)
{
char *note;
@@ -659,7 +659,7 @@
/*
* All our process initialiser does is add its trace to the log.
*/
-static void example_child_init(ap_context_t *p, server_rec *s)
+static void example_child_init(ap_pool_t *p, server_rec *s)
{
char *note;
@@ -690,7 +690,7 @@
/*
* All our process-death routine does is add its trace to the log.
*/
-static void example_child_exit(server_rec *s, ap_context_t *p)
+static void example_child_exit(server_rec *s, ap_pool_t *p)
{
char *note;
@@ -717,7 +717,7 @@
* The return value is a pointer to the created module-specific
* structure.
*/
-static void *example_create_dir_config(ap_context_t *p, char *dirspec)
+static void *example_create_dir_config(ap_pool_t *p, char *dirspec)
{
excfg *cfg;
@@ -758,7 +758,7 @@
* The return value is a pointer to the created module-specific structure
* containing the merged values.
*/
-static void *example_merge_dir_config(ap_context_t *p, void *parent_conf,
+static void *example_merge_dir_config(ap_pool_t *p, void *parent_conf,
void *newloc_conf)
{
@@ -803,7 +803,7 @@
* The return value is a pointer to the created module-specific
* structure.
*/
-static void *example_create_server_config(ap_context_t *p, server_rec *s)
+static void *example_create_server_config(ap_pool_t *p, server_rec *s)
{
excfg *cfg;
@@ -839,7 +839,7 @@
* The return value is a pointer to the created module-specific structure
* containing the merged values.
*/
-static void *example_merge_server_config(ap_context_t *p, void *server1_conf,
+static void *example_merge_server_config(ap_pool_t *p, void *server1_conf,
void *server2_conf)
{
1.9 +4 -4 apache-2.0/src/modules/experimental/mod_mmap_static.c
Index: mod_mmap_static.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/experimental/mod_mmap_static.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_mmap_static.c 2000/03/31 09:05:03 1.8
+++ mod_mmap_static.c 2000/04/14 15:59:00 1.9
@@ -130,7 +130,7 @@
char *filename;
struct stat finfo;
} a_file;
-ap_context_t *context;
+ap_pool_t *context;
typedef struct {
ap_array_header_t *files;
@@ -138,7 +138,7 @@
} a_server_config;
-static void *create_server_config(ap_context_t *p, server_rec *s)
+static void *create_server_config(ap_pool_t *p, server_rec *s)
{
a_server_config *sconf = ap_palloc(p, sizeof(*sconf));
@@ -227,8 +227,8 @@
return c;
}
-static void mmap_post_config(ap_context_t *p, ap_context_t *plog,
- ap_context_t *ptemp, server_rec *s)
+static void mmap_post_config(ap_pool_t *p, ap_pool_t *plog,
+ ap_pool_t *ptemp, server_rec *s)
{
a_server_config *sconf;
ap_array_header_t *inodes;
1.69 +12 -12 apache-2.0/src/modules/mpm/dexter/dexter.c
Index: dexter.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- dexter.c 2000/04/05 01:23:50 1.68
+++ dexter.c 2000/04/14 15:59:00 1.69
@@ -141,9 +141,9 @@
int raise_sigstop_flags;
#endif
-static ap_context_t *pconf; /* Pool for config stuff */
-static ap_context_t *pchild; /* Pool for httpd child stuff */
-static ap_context_t *thread_pool_parent; /* Parent of per-thread pools */
+static ap_pool_t *pconf; /* Pool for config stuff */
+static ap_pool_t *pchild; /* Pool for httpd child stuff */
+static ap_pool_t *thread_pool_parent; /* Parent of per-thread pools */
static pthread_mutex_t thread_pool_parent_mutex;
static int child_num;
@@ -593,7 +593,7 @@
* Child process main loop.
*/
-static void process_socket(ap_context_t *p, ap_socket_t *sock, long conn_id)
+static void process_socket(ap_pool_t *p, ap_socket_t *sock, long conn_id)
{
BUFF *conn_io;
conn_rec *current_conn;
@@ -699,8 +699,8 @@
static void *worker_thread(void *arg)
{
ap_socket_t *csd = NULL;
- ap_context_t *tpool; /* Pool for this thread */
- ap_context_t *ptrans; /* Pool for per-transaction stuff */
+ ap_pool_t *tpool; /* Pool for this thread */
+ ap_pool_t *ptrans; /* Pool for per-transaction stuff */
ap_socket_t *sd = NULL;
int srv;
int curr_pollfd, last_pollfd = 0;
@@ -710,9 +710,9 @@
ap_status_t rv;
pthread_mutex_lock(&thread_pool_parent_mutex);
- ap_create_context(&tpool, thread_pool_parent);
+ ap_create_pool(&tpool, thread_pool_parent);
pthread_mutex_unlock(&thread_pool_parent_mutex);
- ap_create_context(&ptrans, tpool);
+ ap_create_pool(&ptrans, tpool);
while (!workers_may_exit) {
workers_may_exit |= (max_requests_per_child != 0) && (requests_this_child <= 0);
@@ -857,7 +857,7 @@
my_pid = getpid();
child_num = child_num_arg;
- ap_create_context(&pchild, pconf);
+ ap_create_pool(&pchild, pconf);
/*stuff to do before we switch id's, so we have permissions.*/
@@ -908,7 +908,7 @@
for (i = 0; i < max_threads; i++) {
worker_thread_free_ids[i] = i;
}
- ap_create_context(&thread_pool_parent, pchild);
+ ap_create_pool(&thread_pool_parent, pchild);
pthread_mutex_init(&thread_pool_parent_mutex, NULL);
pthread_mutex_init(&idle_thread_count_mutex, NULL);
pthread_mutex_init(&worker_thread_count_mutex, NULL);
@@ -1158,7 +1158,7 @@
return APR_SUCCESS;
}
-int ap_mpm_run(ap_context_t *_pconf, ap_context_t *plog, server_rec *s)
+int ap_mpm_run(ap_pool_t *_pconf, ap_pool_t *plog, server_rec *s)
{
int remaining_children_to_start;
int i;
@@ -1317,7 +1317,7 @@
return 0;
}
-static void dexter_pre_config(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp)
+static void dexter_pre_config(ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp)
{
static int restart_num = 0;
1.13 +12 -12 apache-2.0/src/modules/mpm/dexter/scoreboard.c
Index: scoreboard.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/scoreboard.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scoreboard.c 2000/03/31 09:05:04 1.12
+++ scoreboard.c 2000/04/14 15:59:00 1.13
@@ -139,7 +139,7 @@
return BaseAddress;
}
-static void setup_shared_mem(ap_context_t *p)
+static void setup_shared_mem(ap_pool_t *p)
{
caddr_t m;
@@ -162,7 +162,7 @@
ap_scoreboard_image = (scoreboard *) m;
}
-API_EXPORT(void) reopen_scoreboard(ap_context_t *p)
+API_EXPORT(void) reopen_scoreboard(ap_pool_t *p)
{
caddr_t m;
int rc;
@@ -215,7 +215,7 @@
shm_unlink(ap_scoreboard_fname);
}
-static void setup_shared_mem(ap_context_t *p)
+static void setup_shared_mem(ap_pool_t *p)
{
char buf[512];
caddr_t m;
@@ -249,13 +249,13 @@
ap_scoreboard_image = (scoreboard *) m;
}
-API_EXPORT(void) reopen_scoreboard(ap_context_t *p)
+API_EXPORT(void) reopen_scoreboard(ap_pool_t *p)
{
}
#elif defined(USE_MMAP_SCOREBOARD)
-static void setup_shared_mem(ap_context_t *p)
+static void setup_shared_mem(ap_pool_t *p)
{
caddr_t m;
@@ -333,7 +333,7 @@
ap_scoreboard_image = (scoreboard *) m;
}
-API_EXPORT(void) reopen_scoreboard(ap_context_t *p)
+API_EXPORT(void) reopen_scoreboard(ap_pool_t *p)
{
}
@@ -341,7 +341,7 @@
static key_t shmkey = IPC_PRIVATE;
static int shmid = -1;
-static void setup_shared_mem(ap_context_t *p)
+static void setup_shared_mem(ap_pool_t *p)
{
struct shmid_ds shmbuf;
const server_rec * server_conf = ap_get_server_conf();
@@ -427,14 +427,14 @@
#endif
}
-API_EXPORT(void) reopen_scoreboard(ap_context_t *p)
+API_EXPORT(void) reopen_scoreboard(ap_pool_t *p)
{
}
#endif
/* Called by parent process */
-void reinit_scoreboard(ap_context_t *p)
+void reinit_scoreboard(ap_pool_t *p)
{
if (ap_scoreboard_image == NULL) {
setup_shared_mem(p);
@@ -491,7 +491,7 @@
return NULL;
}
-ap_array_header_t *ap_get_connections(ap_context_t *p)
+ap_array_header_t *ap_get_connections(ap_pool_t *p)
{
int i;
ap_array_header_t *connection_list;
@@ -510,7 +510,7 @@
return connection_list;
}
-ap_array_header_t *ap_get_connection_keys(ap_context_t *p, long conn_id)
+ap_array_header_t *ap_get_connection_keys(ap_pool_t *p, long conn_id)
{
int i = 0;
status_table_entry *ss;
@@ -562,7 +562,7 @@
return;
}
-ap_array_header_t *ap_get_status_table(ap_context_t *p)
+ap_array_header_t *ap_get_status_table(ap_pool_t *p)
{
int i, j;
ap_array_header_t *server_status;
1.7 +2 -2 apache-2.0/src/modules/mpm/dexter/scoreboard.h
Index: scoreboard.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/scoreboard.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scoreboard.h 2000/03/31 09:05:05 1.6
+++ scoreboard.h 2000/04/14 15:59:00 1.7
@@ -72,13 +72,13 @@
#include "mpm_default.h" /* For HARD_.*_LIMIT */
/* The generic shared memory chunk code */
-void reinit_scoreboard(ap_context_t *p);
+void reinit_scoreboard(ap_pool_t *p);
#if defined(USE_OS2_SCOREBOARD)
caddr_t create_shared_heap(const char *name, size_t size);
caddr_t get_shared_heap(const char *Name);
#endif
-API_EXPORT(void) reopen_scoreboard(ap_context_t *p);
+API_EXPORT(void) reopen_scoreboard(ap_pool_t *p);
/* The stuff for Dexter's status table */
1.21 +11 -11 apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c
Index: mpmt_beos.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mpmt_beos.c 2000/03/31 09:05:08 1.20
+++ mpmt_beos.c 2000/04/14 15:59:01 1.21
@@ -97,8 +97,8 @@
static struct pollfd *listenfds;
ap_lock_t *accept_mutex = NULL;
-static ap_context_t *pconf; /* Pool for config stuff */
-static ap_context_t *pchild; /* Pool for httpd child stuff */
+static ap_pool_t *pconf; /* Pool for config stuff */
+static ap_pool_t *pchild; /* Pool for httpd child stuff */
static int my_pid; /* Linux getpid() doesn't work except in main thread. Use
this instead */
@@ -112,7 +112,7 @@
int pid;
thread_id tid;
int sd;
- ap_context_t *tpool; /* "pthread" would be confusing */
+ ap_pool_t *tpool; /* "pthread" would be confusing */
} proc_info;
#define SERVER_DEAD 0
@@ -630,7 +630,7 @@
* Child process main loop.
*/
-static void process_socket(ap_context_t *p, ap_socket_t *sock, int my_child_num, int my_thread_num)
+static void process_socket(ap_pool_t *p, ap_socket_t *sock, int my_child_num, int my_thread_num)
{
BUFF *conn_io;
conn_rec *current_conn;
@@ -668,10 +668,10 @@
proc_info * ti = dummy;
int process_slot = ti->pid;
int thread_slot = ti->tid;
- ap_context_t *tpool = ti->tpool;
+ ap_pool_t *tpool = ti->tpool;
struct sockaddr sa_client;
ap_socket_t *csd = NULL;
- ap_context_t *ptrans; /* Pool for per-transaction stuff */
+ ap_pool_t *ptrans; /* Pool for per-transaction stuff */
ap_socket_t *sd = NULL;
int srv;
int curr_pollfd, last_pollfd = 0;
@@ -684,7 +684,7 @@
sigfillset(&sig_mask);
sigprocmask(SIG_BLOCK, &sig_mask, NULL);
- ap_create_context(&ptrans, tpool);
+ ap_create_pool(&ptrans, tpool);
ap_lock(worker_thread_count_mutex);
worker_thread_count++;
@@ -778,7 +778,7 @@
ap_status_t rv;
my_pid = getpid();
- ap_create_context(&pchild, pconf);
+ ap_create_pool(&pchild, pconf);
if (beosd_setup_child()) {
clean_child_exit(APEXIT_CHILDFATAL);
@@ -822,7 +822,7 @@
my_info->pid = my_child_num;
my_info->tid = i;
my_info->sd = 0;
- ap_create_context(&my_info->tpool, pchild);
+ ap_create_pool(&my_info->tpool, pchild);
/* We are creating threads right now */
@@ -1038,7 +1038,7 @@
}
}
-int ap_mpm_run(ap_context_t *_pconf, ap_context_t *plog, server_rec *s)
+int ap_mpm_run(ap_pool_t *_pconf, ap_pool_t *plog, server_rec *s)
{
int remaining_children_to_start;
ap_status_t rv;
@@ -1180,7 +1180,7 @@
return 0;
}
-static void mpmt_beos_pre_config(ap_context_t *pconf, ap_context_t *plog, ap_context_t *ptemp)
+static void mpmt_beos_pre_config(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp)
{
static int restart_num = 0;
1.6 +5 -5 apache-2.0/src/modules/mpm/mpmt_beos/scoreboard.c
Index: scoreboard.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/scoreboard.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scoreboard.c 2000/03/31 09:05:08 1.5
+++ scoreboard.c 2000/04/14 15:59:01 1.6
@@ -68,10 +68,10 @@
#include "scoreboard.h"
scoreboard *ap_scoreboard_image = NULL;
-extern ap_context_t * pconf;
+extern ap_pool_t * pconf;
static int maintain_connection_status = 1;
-void reinit_scoreboard(ap_context_t *p)
+void reinit_scoreboard(ap_pool_t *p)
{
ap_assert(!ap_scoreboard_image);
ap_scoreboard_image = (scoreboard *) malloc(SCOREBOARD_SIZE);
@@ -161,7 +161,7 @@
return NULL;
}
-ap_array_header_t *ap_get_connections(ap_context_t *p)
+ap_array_header_t *ap_get_connections(ap_pool_t *p)
{
int i;
ap_array_header_t *connection_list;
@@ -177,7 +177,7 @@
return connection_list;
}
-ap_array_header_t *ap_get_connection_keys(ap_context_t *p, long conn_id)
+ap_array_header_t *ap_get_connection_keys(ap_pool_t *p, long conn_id)
{
int i = 0;
status_table_entry *ss;
@@ -197,7 +197,7 @@
return key_list;
}
-ap_array_header_t *ap_get_status_table(ap_context_t *p)
+ap_array_header_t *ap_get_status_table(ap_pool_t *p)
{
int i, j;
ap_array_header_t *server_status;
1.5 +2 -2 apache-2.0/src/modules/mpm/mpmt_beos/scoreboard.h
Index: scoreboard.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/scoreboard.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scoreboard.h 2000/03/31 09:05:08 1.4
+++ scoreboard.h 2000/04/14 15:59:01 1.5
@@ -67,11 +67,11 @@
#include "mpm_default.h" /* For HARD_.*_LIMIT */
API_EXPORT(int) ap_exists_scoreboard_image(void);
-void reinit_scoareboard(ap_context_t *p);
+void reinit_scoareboard(ap_pool_t *p);
void cleanup_scoreboard(void);
void ap_mpmt_beos_set_maintain_connection_status(int flag);
void ap_mpmt_beos_force_reset_connection_status(long conn_id);
-void reinit_scoreboard(ap_context_t *p);
+void reinit_scoreboard(ap_pool_t *p);
void update_scoreboard_global(void);
API_EXPORT(int) find_child_by_pid(int pid);
int ap_update_child_status(int child_num, int thread_num, int status, request_rec *r);
1.63 +11 -11 apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
Index: mpmt_pthread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- mpmt_pthread.c 2000/04/06 02:00:52 1.62
+++ mpmt_pthread.c 2000/04/14 15:59:02 1.63
@@ -104,7 +104,7 @@
int pid;
int tid;
int sd;
- ap_context_t *tpool; /* "pthread" would be confusing */
+ ap_pool_t *tpool; /* "pthread" would be confusing */
} proc_info;
/*
@@ -140,8 +140,8 @@
int raise_sigstop_flags;
#endif
-static ap_context_t *pconf; /* Pool for config stuff */
-static ap_context_t *pchild; /* Pool for httpd child stuff */
+static ap_pool_t *pconf; /* Pool for config stuff */
+static ap_pool_t *pchild; /* Pool for httpd child stuff */
static int my_pid; /* Linux getpid() doesn't work except in main thread. Use
this instead */
@@ -589,7 +589,7 @@
* Child process main loop.
*/
-static void process_socket(ap_context_t *p, ap_socket_t *sock, int my_child_num, int my_thread_num)
+static void process_socket(ap_pool_t *p, ap_socket_t *sock, int my_child_num, int my_thread_num)
{
BUFF *conn_io;
conn_rec *current_conn;
@@ -655,9 +655,9 @@
proc_info * ti = dummy;
int process_slot = ti->pid;
int thread_slot = ti->tid;
- ap_context_t *tpool = ti->tpool;
+ ap_pool_t *tpool = ti->tpool;
ap_socket_t *csd = NULL;
- ap_context_t *ptrans; /* Pool for per-transaction stuff */
+ ap_pool_t *ptrans; /* Pool for per-transaction stuff */
ap_socket_t *sd = NULL;
int n;
int curr_pollfd, last_pollfd = 0;
@@ -666,7 +666,7 @@
free(ti);
- ap_create_context(&ptrans, tpool);
+ ap_create_pool(&ptrans, tpool);
pthread_mutex_lock(&worker_thread_count_mutex);
worker_thread_count++;
@@ -804,7 +804,7 @@
my_pid = getpid();
- ap_create_context(&pchild, pconf);
+ ap_create_pool(&pchild, pconf);
/*stuff to do before we switch id's, so we have permissions.*/
reopen_scoreboard(pchild);
@@ -860,7 +860,7 @@
my_info->pid = my_child_num;
my_info->tid = i;
my_info->sd = 0;
- ap_create_context(&my_info->tpool, pchild);
+ ap_create_pool(&my_info->tpool, pchild);
/* We are creating threads right now */
(void) ap_update_child_status(my_child_num, i, SERVER_STARTING,
@@ -1172,7 +1172,7 @@
}
}
-int ap_mpm_run(ap_context_t *_pconf, ap_context_t *plog, server_rec *s)
+int ap_mpm_run(ap_pool_t *_pconf, ap_pool_t *plog, server_rec *s)
{
int remaining_children_to_start;
ap_status_t rv;
@@ -1342,7 +1342,7 @@
return 0;
}
-static void mpmt_pthread_pre_config(ap_context_t *pconf, ap_context_t *plog, ap_context_t *ptemp)
+static void mpmt_pthread_pre_config(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp)
{
static int restart_num = 0;
1.21 +6 -6 apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c
Index: scoreboard.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- scoreboard.c 2000/04/14 02:39:08 1.20
+++ scoreboard.c 2000/04/14 15:59:02 1.21
@@ -94,7 +94,7 @@
ap_shm_destroy(scoreboard_shm);
}
-static void setup_shared_mem(ap_context_t *p)
+static void setup_shared_mem(ap_pool_t *p)
{
char buf[512];
const char *fname;
@@ -119,13 +119,13 @@
ap_scoreboard_image->global.running_generation = 0;
}
-void reopen_scoreboard(ap_context_t *p)
+void reopen_scoreboard(ap_pool_t *p)
{
}
#endif /* APR_SHARED_MEM */
/* Called by parent process */
-void reinit_scoreboard(ap_context_t *p)
+void reinit_scoreboard(ap_pool_t *p)
{
int running_gen = 0;
if (ap_scoreboard_image)
@@ -331,7 +331,7 @@
return NULL;
}
-ap_array_header_t *ap_get_connections(ap_context_t *p)
+ap_array_header_t *ap_get_connections(ap_pool_t *p)
{
int i;
ap_array_header_t *connection_list;
@@ -351,7 +351,7 @@
return connection_list;
}
-ap_array_header_t *ap_get_connection_keys(ap_context_t *p, long conn_id)
+ap_array_header_t *ap_get_connection_keys(ap_pool_t *p, long conn_id)
{
int i = 0;
status_table_entry *ss;
@@ -401,7 +401,7 @@
return;
}
-ap_array_header_t *ap_get_status_table(ap_context_t *p)
+ap_array_header_t *ap_get_status_table(ap_pool_t *p)
{
int i, j;
ap_array_header_t *server_status;
1.12 +3 -3 apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h
Index: scoreboard.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scoreboard.h 2000/03/31 09:05:09 1.11
+++ scoreboard.h 2000/04/14 15:59:02 1.12
@@ -216,7 +216,7 @@
#endif
API_EXPORT(int) ap_exists_scoreboard_image(void);
-void reinit_scoareboard(ap_context_t *p);
+void reinit_scoareboard(ap_pool_t *p);
void cleanup_scoreboard(void);
API_EXPORT(void) ap_sync_scoreboard_image(void);
void ap_mpmt_pthread_force_reset_connection_status(long conn_id);
@@ -228,10 +228,10 @@
#elif defined(USE_POSIX_SCOREBOARD)
static void cleanup_shared_mem(void *d);
#else
-void reinit_scoreboard(ap_context_t *p);
+void reinit_scoreboard(ap_pool_t *p);
#endif
-API_EXPORT(void) reopen_scoreboard(ap_context_t *p);
+API_EXPORT(void) reopen_scoreboard(ap_pool_t *p);
ap_inline void ap_sync_scoreboard_image(void);
void increment_counts(int child_num, int thread_num, request_rec *r);
1.77 +24 -24 apache-2.0/src/modules/mpm/prefork/prefork.c
Index: prefork.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- prefork.c 2000/04/06 02:10:05 1.76
+++ prefork.c 2000/04/14 15:59:03 1.77
@@ -158,8 +158,8 @@
static int one_process = 0;
-static ap_context_t *pconf; /* Pool for config stuff */
-static ap_context_t *pchild; /* Pool for httpd child stuff */
+static ap_pool_t *pconf; /* Pool for config stuff */
+static ap_pool_t *pchild; /* Pool for httpd child stuff */
static int my_pid; /* it seems silly to call getpid all the time */
#ifndef MULTITHREAD
@@ -226,7 +226,7 @@
}
#if defined(USE_FCNTL_SERIALIZED_ACCEPT) || defined(USE_FLOCK_SERIALIZED_ACCEPT)
-static void expand_lock_fname(ap_context_t *p)
+static void expand_lock_fname(ap_pool_t *p)
{
/* XXXX possibly bogus cast */
ap_lock_fname = ap_psprintf(p, "%s.%lu",
@@ -242,7 +242,7 @@
#define accept_mutex_child_init(x)
-static void accept_mutex_init(ap_context_t *p)
+static void accept_mutex_init(ap_pool_t *p)
{
ptrdiff_t old;
usptr_t *us;
@@ -320,7 +320,7 @@
}
}
-static void accept_mutex_child_init(ap_context_t *p)
+static void accept_mutex_child_init(ap_pool_t *p)
{
ap_register_cleanup(p, NULL, accept_mutex_child_cleanup, ap_null_cleanup);
}
@@ -334,7 +334,7 @@
accept_mutex = (void *)(caddr_t)-1;
}
-static void accept_mutex_init(ap_context_t *p)
+static void accept_mutex_init(ap_pool_t *p)
{
pthread_mutexattr_t mattr;
int fd;
@@ -453,7 +453,7 @@
#define accept_mutex_child_init(x)
-static void accept_mutex_init(ap_context_t *p)
+static void accept_mutex_init(ap_pool_t *p)
{
union semun ick;
struct semid_ds buf;
@@ -525,7 +525,7 @@
* Initialize mutex lock.
* Must be safe to call this on a restart.
*/
-static void accept_mutex_init(ap_context_t *p)
+static void accept_mutex_init(ap_pool_t *p)
{
ap_file_t *tempfile = NULL;
lock_it.l_whence = SEEK_SET; /* from current point */
@@ -600,7 +600,7 @@
* Initialize mutex lock.
* Done by each child at it's birth
*/
-static void accept_mutex_child_init(ap_context_t *p)
+static void accept_mutex_child_init(ap_pool_t *p)
{
ap_file_t *tempfile = NULL;
ap_status_t ret;
@@ -618,7 +618,7 @@
* Initialize mutex lock.
* Must be safe to call this on a restart.
*/
-static void accept_mutex_init(ap_context_t *p)
+static void accept_mutex_init(ap_pool_t *p)
{
ap_file_t *tempfile = NULL;
ap_status_t ret;
@@ -673,7 +673,7 @@
* Initialize mutex lock.
* Done by each child at it's birth
*/
-static void accept_mutex_child_init(ap_context_t *p)
+static void accept_mutex_child_init(ap_pool_t *p)
{
int rc = DosOpenMutexSem(NULL, &lock_sem);
@@ -690,7 +690,7 @@
* Initialize mutex lock.
* Must be safe to call this on a restart.
*/
-static void accept_mutex_init(ap_context_t *p)
+static void accept_mutex_init(ap_pool_t *p)
{
int rc = DosCreateMutexSem(NULL, &lock_sem, DC_SEM_SHARED, FALSE);
@@ -737,7 +737,7 @@
#define accept_mutex_init(x)
-static void accept_mutex_child_init(ap_context_t *p)
+static void accept_mutex_child_init(ap_pool_t *p)
{
ap_register_cleanup(p, NULL, accept_mutex_cleanup, ap_null_cleanup);
tpf_core_held = 0;
@@ -796,7 +796,7 @@
return APR_SUCCESS;
}
-static void setup_shared_mem(ap_context_t *p)
+static void setup_shared_mem(ap_pool_t *p)
{
char buf[512];
const char *fname;
@@ -821,13 +821,13 @@
ap_scoreboard_image->global.running_generation = 0;
}
-static void reopen_scoreboard(ap_context_t *p)
+static void reopen_scoreboard(ap_pool_t *p)
{
}
#endif
/* Called by parent process */
-static void reinit_scoreboard(ap_context_t *p)
+static void reinit_scoreboard(ap_pool_t *p)
{
int running_gen = 0;
if (ap_scoreboard_image)
@@ -1405,7 +1405,7 @@
ap_listen_rec *lr;
ap_listen_rec *last_lr;
ap_listen_rec *first_lr;
- ap_context_t *ptrans;
+ ap_pool_t *ptrans;
conn_rec *current_conn;
ap_iol *iol;
ap_status_t stat;
@@ -1420,9 +1420,9 @@
/* Get a sub context for global allocations in this child, so that
* we can have cleanups occur when the child exits.
*/
- ap_create_context(&pchild, pconf);
+ ap_create_pool(&pchild, pconf);
- ap_create_context(&ptrans, pchild);
+ ap_create_pool(&ptrans, pchild);
/* needs to be done before we switch UIDs so we have permissions */
reopen_scoreboard(pchild);
@@ -2034,7 +2034,7 @@
* Executive routines.
*/
-int ap_mpm_run(ap_context_t *_pconf, ap_context_t *plog, server_rec *s)
+int ap_mpm_run(ap_pool_t *_pconf, ap_pool_t *plog, server_rec *s)
{
int remaining_children_to_start;
@@ -2247,7 +2247,7 @@
return 0;
}
-static void prefork_pre_config(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp)
+static void prefork_pre_config(ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp)
{
static int restart_num = 0;
@@ -2445,7 +2445,7 @@
return NULL;
}
-ap_array_header_t *ap_get_connections(ap_context_t *p)
+ap_array_header_t *ap_get_connections(ap_pool_t *p)
{
int i;
ap_array_header_t *connection_list;
@@ -2464,7 +2464,7 @@
return connection_list;
}
-ap_array_header_t *ap_get_connection_keys(ap_context_t *p, long conn_id)
+ap_array_header_t *ap_get_connection_keys(ap_pool_t *p, long conn_id)
{
int i = 0;
status_table_entry *ss;
@@ -2516,7 +2516,7 @@
return;
}
-ap_array_header_t *ap_get_status_table(ap_context_t *p)
+ap_array_header_t *ap_get_status_table(ap_pool_t *p)
{
int i, j;
ap_array_header_t *server_status;
1.33 +12 -12 apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c
Index: spmt_os2.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- spmt_os2.c 2000/03/31 09:05:11 1.32
+++ spmt_os2.c 2000/04/14 15:59:03 1.33
@@ -128,12 +128,12 @@
static other_child_rec *other_children;
#endif
-static ap_context_t *pconf; /* Pool for config stuff */
+static ap_pool_t *pconf; /* Pool for config stuff */
static scoreboard *ap_scoreboard_image = NULL;
struct thread_globals {
int child_num;
- ap_context_t *pchild; /* Pool for httpd child stuff */
+ ap_pool_t *pchild; /* Pool for httpd child stuff */
int usr1_just_die;
};
@@ -142,7 +142,7 @@
#define THREAD_GLOBAL(gvar) ((*ppthread_globals)->gvar)
-void reinit_scoreboard(ap_context_t *p)
+void reinit_scoreboard(ap_pool_t *p)
{
if (ap_scoreboard_image == NULL) {
ap_scoreboard_image = (scoreboard *) malloc(SCOREBOARD_SIZE);
@@ -190,7 +190,7 @@
* Initialize mutex lock.
* Done by each child at it's birth
*/
-static void accept_mutex_child_init(ap_context_t *p)
+static void accept_mutex_child_init(ap_pool_t *p)
{
int rc = DosOpenMutexSem(NULL, &lock_sem);
@@ -207,7 +207,7 @@
* Initialize mutex lock.
* Must be safe to call this on a restart.
*/
-static void accept_mutex_init(ap_context_t *p)
+static void accept_mutex_init(ap_pool_t *p)
{
int rc = DosCreateMutexSem(NULL, &lock_sem, DC_SEM_SHARED, FALSE);
@@ -878,7 +878,7 @@
-static int setup_listeners(ap_context_t *pchild, ap_pollfd_t **listen_poll)
+static int setup_listeners(ap_pool_t *pchild, ap_pollfd_t **listen_poll)
{
ap_listen_rec *lr;
int numfds = 0;
@@ -901,10 +901,10 @@
{
ap_listen_rec *lr = NULL;
ap_listen_rec *first_lr = NULL;
- ap_context_t *ptrans;
+ ap_pool_t *ptrans;
conn_rec *current_conn;
ap_iol *iol;
- ap_context_t *pchild;
+ ap_pool_t *pchild;
parent_score *sc_parent_rec;
int requests_this_child = 0;
ap_pollfd_t *listen_poll;
@@ -924,12 +924,12 @@
/* Get a sub pool for global allocations in this child, so that
* we can have cleanups occur when the child exits.
*/
- ap_create_context(&pchild, pconf);
+ ap_create_pool(&pchild, pconf);
*ppthread_globals = (struct thread_globals *)ap_palloc(pchild, sizeof(struct thread_globals));
THREAD_GLOBAL(child_num) = (int)child_num_arg;
sc_parent_rec = ap_scoreboard_image->parent + THREAD_GLOBAL(child_num);
THREAD_GLOBAL(pchild) = pchild;
- ap_create_context(&ptrans, pchild);
+ ap_create_pool(&ptrans, pchild);
if (setup_listeners(pchild, &listen_poll)) {
clean_child_exit(1);
@@ -1392,7 +1392,7 @@
* Executive routines.
*/
-int ap_mpm_run(ap_context_t *_pconf, ap_context_t *plog, server_rec *s)
+int ap_mpm_run(ap_pool_t *_pconf, ap_pool_t *plog, server_rec *s)
{
int remaining_children_to_start;
int i;
@@ -1612,7 +1612,7 @@
return 0;
}
-static void spmt_os2_pre_config(ap_context_t *pconf, ap_context_t *plog, ap_context_t *ptemp)
+static void spmt_os2_pre_config(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp)
{
one_process = !!getenv("ONE_PROCESS");
1.51 +11 -11 apache-2.0/src/modules/mpm/winnt/winnt.c
Index: winnt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- winnt.c 2000/04/13 00:37:55 1.50
+++ winnt.c 2000/04/14 15:59:04 1.51
@@ -86,7 +86,7 @@
static int num_listenfds = 0;
static SOCKET listenmaxfd = INVALID_SOCKET;
-static ap_context_t *pconf; /* Pool for config stuff */
+static ap_pool_t *pconf; /* Pool for config stuff */
static char ap_coredump_dir[MAX_STRING_LEN];
@@ -760,7 +760,7 @@
"win9x_get_connection: ap_pcalloc() failed. Process will exit.");
return NULL;
}
- ap_create_context(&context->ptrans, pconf);
+ ap_create_pool(&context->ptrans, pconf);
}
@@ -837,7 +837,7 @@
}
}
}
-static int create_acceptex_context(ap_context_t *_pconf, ap_listen_rec *lr)
+static int create_acceptex_context(ap_pool_t *_pconf, ap_listen_rec *lr)
{
PCOMP_CONTEXT context;
DWORD BytesRead;
@@ -866,7 +866,7 @@
"create_acceptex_context: socket() failed. Process will exit.");
return -1;
}
- ap_create_context(&context->ptrans, _pconf);
+ ap_create_pool(&context->ptrans, _pconf);
context->conn_io = ap_bcreate(context->ptrans, B_RDWR);
context->recv_buf = context->conn_io->inbase;
context->recv_buf_size = context->conn_io->bufsiz - 2*PADDED_ADDR_SIZE;
@@ -1148,7 +1148,7 @@
ap_status_t status;
time_t end_time;
int i;
- ap_context_t *pchild;
+ ap_pool_t *pchild;
/* This is the child process or we are running in single process
* mode.
@@ -1177,7 +1177,7 @@
ap_assert(start_mutex);
ap_assert(exit_event);
- ap_create_context(&pchild, pconf);
+ ap_create_pool(&pchild, pconf);
if (listenmaxfd == INVALID_SOCKET) {
@@ -1336,7 +1336,7 @@
(*processes)--;
}
-static int create_process(ap_context_t *p, HANDLE *handles, HANDLE *events, int *processes)
+static int create_process(ap_pool_t *p, HANDLE *handles, HANDLE *events, int *processes)
{
int rv;
@@ -1631,7 +1631,7 @@
/*
* winnt_pre_config() hook
*/
-static void winnt_pre_config(ap_context_t *pconf, ap_context_t *plog, ap_context_t *ptemp)
+static void winnt_pre_config(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp)
{
char *pid;
@@ -1663,12 +1663,12 @@
}
-static void winnt_post_config(ap_context_t *pconf, ap_context_t *plog, ap_context_t *ptemp, server_rec* server_conf)
+static void winnt_post_config(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec* server_conf)
{
server_conf = server_conf;
}
-API_EXPORT(int) ap_mpm_run(ap_context_t *_pconf, ap_context_t *plog, server_rec *s )
+API_EXPORT(int) ap_mpm_run(ap_pool_t *_pconf, ap_pool_t *plog, server_rec *s )
{
static int restart = 0; /* Default is "not a restart" */
// time_t tmstart;
@@ -1876,7 +1876,7 @@
/* NOP */
}
-API_EXPORT(ap_array_header_t *) ap_get_status_table(ap_context_t *p)
+API_EXPORT(ap_array_header_t *) ap_get_status_table(ap_pool_t *p)
{
/* NOP */
return NULL;
1.10 +1 -1 apache-2.0/src/modules/mpm/winnt/winnt.h
Index: winnt.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- winnt.h 2000/03/31 09:05:12 1.9
+++ winnt.h 2000/04/14 15:59:04 1.10
@@ -73,7 +73,7 @@
BUFF *conn_io;
char *recv_buf;
int recv_buf_size;
- ap_context_t *ptrans;
+ ap_pool_t *ptrans;
struct sockaddr *sa_server;
int sa_server_len;
struct sockaddr *sa_client;
1.6 +2 -2 apache-2.0/src/modules/proxy/mod_proxy.c
Index: mod_proxy.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/proxy/mod_proxy.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_proxy.c 2000/03/31 09:05:13 1.5
+++ mod_proxy.c 2000/04/14 15:59:05 1.6
@@ -234,7 +234,7 @@
return OK; /* otherwise; we've done the best we can */
}
-static void proxy_init(server_rec *r, ap_context_t *p)
+static void proxy_init(server_rec *r, ap_pool_t *p)
{
ap_proxy_garbage_init(r, p);
}
@@ -405,7 +405,7 @@
/* Setup configurable data */
static void *
- create_proxy_config(ap_context_t *p, server_rec *s)
+ create_proxy_config(ap_pool_t *p, server_rec *s)
{
proxy_server_conf *ps = ap_pcalloc(p, sizeof(proxy_server_conf));
1.5 +8 -8 apache-2.0/src/modules/proxy/mod_proxy.h
Index: mod_proxy.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/proxy/mod_proxy.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_proxy.h 2000/03/31 09:05:13 1.4
+++ mod_proxy.h 2000/04/14 15:59:05 1.5
@@ -289,11 +289,11 @@
int ap_proxy_hex2c(const char *x);
void ap_proxy_c2hex(int ch, char *x);
-char *ap_proxy_canonenc(ap_context_t *p, const char *x, int len, enum enctype t,
+char *ap_proxy_canonenc(ap_pool_t *p, const char *x, int len, enum enctype t,
int isenc);
-char *ap_proxy_canon_netloc(ap_context_t *p, char **const urlp, char **userp,
+char *ap_proxy_canon_netloc(ap_pool_t *p, char **const urlp, char **userp,
char **passwordp, char **hostp, int *port);
-const char *ap_proxy_date_canon(ap_context_t *p, const char *x);
+const char *ap_proxy_date_canon(ap_pool_t *p, const char *x);
table *ap_proxy_read_headers(request_rec *r, char *buffer, int size, BUFF *f);
long int ap_proxy_send_fb(BUFF *f, request_rec *r, cache_req *c);
void ap_proxy_send_headers(request_rec *r, const char *respline, ap_table_t *hdrs);
@@ -304,12 +304,12 @@
cache_req *ap_proxy_cache_error(cache_req *r);
int ap_proxyerror(request_rec *r, int statuscode, const char *message);
const char *ap_proxy_host2addr(const char *host, struct hostent *reqhp);
-int ap_proxy_is_ipaddr(struct dirconn_entry *This, ap_context_t *p);
-int ap_proxy_is_domainname(struct dirconn_entry *This, ap_context_t *p);
-int ap_proxy_is_hostname(struct dirconn_entry *This, ap_context_t *p);
-int ap_proxy_is_word(struct dirconn_entry *This, ap_context_t *p);
+int ap_proxy_is_ipaddr(struct dirconn_entry *This, ap_pool_t *p);
+int ap_proxy_is_domainname(struct dirconn_entry *This, ap_pool_t *p);
+int ap_proxy_is_hostname(struct dirconn_entry *This, ap_pool_t *p);
+int ap_proxy_is_word(struct dirconn_entry *This, ap_pool_t *p);
int ap_proxy_doconnect(int sock, struct sockaddr_in *addr, request_rec *r);
-int ap_proxy_garbage_init(server_rec *, ap_context_t *);
+int ap_proxy_garbage_init(server_rec *, ap_pool_t *);
/* This function is called by ap_table_do() for all header lines */
int ap_proxy_send_hdr_line(void *p, const char *key, const char *value);
unsigned ap_proxy_bputs2(const char *data, BUFF *client, cache_req *cache);
1.8 +1 -1 apache-2.0/src/modules/proxy/proxy_cache.c
Index: proxy_cache.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- proxy_cache.c 2000/03/31 09:05:13 1.7
+++ proxy_cache.c 2000/04/14 15:59:05 1.8
@@ -107,7 +107,7 @@
static pthread_mutex_t garbage_mutex = PTHREAD_MUTEX_INITIALIZER;
-int ap_proxy_garbage_init(server_rec *r, ap_context_t *p)
+int ap_proxy_garbage_init(server_rec *r, ap_pool_t *p)
{
return (0);
}
1.7 +2 -2 apache-2.0/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- proxy_ftp.c 2000/03/31 09:05:13 1.6
+++ proxy_ftp.c 2000/04/14 15:59:05 1.7
@@ -119,7 +119,7 @@
int ap_proxy_ftp_canon(request_rec *r, char *url)
{
char *user, *password, *host, *path, *parms, *strp, sport[7];
- ap_context_t *p = r->pool;
+ ap_pool_t *p = r->pool;
const char *err;
int port;
@@ -461,7 +461,7 @@
ap_table_t *resp_hdrs;
BUFF *f;
BUFF *data = NULL;
- ap_context_t *p = r->pool;
+ ap_pool_t *p = r->pool;
int one = 1;
const long int zero = 0L;
NET_SIZE_T clen;
1.6 +2 -2 apache-2.0/src/modules/proxy/proxy_http.c
Index: proxy_http.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_http.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- proxy_http.c 2000/03/31 09:05:13 1.5
+++ proxy_http.c 2000/04/14 15:59:05 1.6
@@ -135,7 +135,7 @@
}
/* Clear all connection-based headers from the incoming headers ap_table_t */
-static void clear_connection(ap_context_t *p, ap_table_t *headers)
+static void clear_connection(ap_pool_t *p, ap_table_t *headers)
{
const char *name;
char *next = ap_pstrdup(p, ap_table_get(headers, "Connection"));
@@ -182,7 +182,7 @@
BUFF *f;
char buffer[HUGE_STRING_LEN];
char portstr[32];
- ap_context_t *p = r->pool;
+ ap_pool_t *p = r->pool;
const long int zero = 0L;
int destport = 0;
char *destportstr = NULL;
1.10 +7 -7 apache-2.0/src/modules/proxy/proxy_util.c
Index: proxy_util.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_util.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- proxy_util.c 2000/03/31 09:05:13 1.9
+++ proxy_util.c 2000/04/14 15:59:05 1.10
@@ -137,7 +137,7 @@
* those which must not be touched.
*/
char *
- ap_proxy_canonenc(ap_context_t *p, const char *x, int len, enum enctype t, int isenc)
+ ap_proxy_canonenc(ap_pool_t *p, const char *x, int len, enum enctype t, int isenc)
{
int i, j, ch;
char *y;
@@ -213,7 +213,7 @@
* Returns an error string.
*/
char *
- ap_proxy_canon_netloc(ap_context_t *p, char **const urlp, char **userp,
+ ap_proxy_canon_netloc(ap_pool_t *p, char **const urlp, char **userp,
char **passwordp, char **hostp, int *port)
{
int i;
@@ -311,7 +311,7 @@
* formatted, then it exits very quickly.
*/
const char *
- ap_proxy_date_canon(ap_context_t *p, const char *x)
+ ap_proxy_date_canon(ap_pool_t *p, const char *x)
{
int wk, mday, year, hour, min, sec, mon;
char *q, month[4], zone[4], week[4];
@@ -907,7 +907,7 @@
}
/* Return TRUE if addr represents an IP address (or an IP network address) */
-int ap_proxy_is_ipaddr(struct dirconn_entry *This, ap_context_t *p)
+int ap_proxy_is_ipaddr(struct dirconn_entry *This, ap_pool_t *p)
{
const char *addr = This->name;
long ip_addr[4];
@@ -1103,7 +1103,7 @@
}
/* Return TRUE if addr represents a domain name */
-int ap_proxy_is_domainname(struct dirconn_entry *This, ap_context_t *p)
+int ap_proxy_is_domainname(struct dirconn_entry *This, ap_pool_t *p)
{
char *addr = This->name;
int i;
@@ -1157,7 +1157,7 @@
}
/* Return TRUE if addr represents a host name */
-int ap_proxy_is_hostname(struct dirconn_entry *This, ap_context_t *p)
+int ap_proxy_is_hostname(struct dirconn_entry *This, ap_pool_t *p)
{
struct hostent host;
char *addr = This->name;
@@ -1224,7 +1224,7 @@
}
/* Return TRUE if addr is to be matched as a word */
-int ap_proxy_is_word(struct dirconn_entry *This, ap_context_t *p)
+int ap_proxy_is_word(struct dirconn_entry *This, ap_pool_t *p)
{
This->matcher = proxy_match_word;
return 1;
1.9 +1 -1 apache-2.0/src/modules/standard/mod_access.c
Index: mod_access.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_access.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_access.c 2000/03/31 09:05:15 1.8
+++ mod_access.c 2000/04/14 15:59:07 1.9
@@ -107,7 +107,7 @@
module MODULE_VAR_EXPORT access_module;
-static void *create_access_dir_config(ap_context_t *p, char *dummy)
+static void *create_access_dir_config(ap_pool_t *p, char *dummy)
{
access_dir_conf *conf =
(access_dir_conf *) ap_pcalloc(p, sizeof(access_dir_conf));
1.10 +2 -2 apache-2.0/src/modules/standard/mod_actions.c
Index: mod_actions.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_actions.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_actions.c 2000/03/31 09:05:15 1.9
+++ mod_actions.c 2000/04/14 15:59:07 1.10
@@ -95,7 +95,7 @@
module action_module;
-static void *create_action_dir_config(ap_context_t *p, char *dummy)
+static void *create_action_dir_config(ap_pool_t *p, char *dummy)
{
action_dir_config *new =
(action_dir_config *) ap_palloc(p, sizeof(action_dir_config));
@@ -106,7 +106,7 @@
return new;
}
-static void *merge_action_dir_configs(ap_context_t *p, void *basev, void *addv)
+static void *merge_action_dir_configs(ap_pool_t *p, void *basev, void *addv)
{
action_dir_config *base = (action_dir_config *) basev;
action_dir_config *add = (action_dir_config *) addv;
1.8 +4 -4 apache-2.0/src/modules/standard/mod_alias.c
Index: mod_alias.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_alias.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_alias.c 2000/03/31 09:05:15 1.7
+++ mod_alias.c 2000/04/14 15:59:07 1.8
@@ -88,7 +88,7 @@
module MODULE_VAR_EXPORT alias_module;
-static void *create_alias_config(ap_context_t *p, server_rec *s)
+static void *create_alias_config(ap_pool_t *p, server_rec *s)
{
alias_server_conf *a =
(alias_server_conf *) ap_pcalloc(p, sizeof(alias_server_conf));
@@ -98,7 +98,7 @@
return a;
}
-static void *create_alias_dir_config(ap_context_t *p, char *d)
+static void *create_alias_dir_config(ap_pool_t *p, char *d)
{
alias_dir_conf *a =
(alias_dir_conf *) ap_pcalloc(p, sizeof(alias_dir_conf));
@@ -106,7 +106,7 @@
return a;
}
-static void *merge_alias_config(ap_context_t *p, void *basev, void *overridesv)
+static void *merge_alias_config(ap_pool_t *p, void *basev, void *overridesv)
{
alias_server_conf *a =
(alias_server_conf *) ap_pcalloc(p, sizeof(alias_server_conf));
@@ -117,7 +117,7 @@
return a;
}
-static void *merge_alias_dir_config(ap_context_t *p, void *basev, void *overridesv)
+static void *merge_alias_dir_config(ap_pool_t *p, void *basev, void *overridesv)
{
alias_dir_conf *a =
(alias_dir_conf *) ap_pcalloc(p, sizeof(alias_dir_conf));
1.16 +4 -4 apache-2.0/src/modules/standard/mod_auth.c
Index: mod_auth.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_auth.c 2000/03/31 09:05:15 1.15
+++ mod_auth.c 2000/04/14 15:59:07 1.16
@@ -85,7 +85,7 @@
int auth_authoritative;
} auth_config_rec;
-static void *create_auth_dir_config(ap_context_t *p, char *d)
+static void *create_auth_dir_config(ap_pool_t *p, char *d)
{
auth_config_rec *sec =
(auth_config_rec *) ap_pcalloc(p, sizeof(auth_config_rec));
@@ -147,11 +147,11 @@
return NULL;
}
-static ap_table_t *groups_for_user(ap_context_t *p, char *user, char *grpfile)
+static ap_table_t *groups_for_user(ap_pool_t *p, char *user, char *grpfile)
{
configfile_t *f;
ap_table_t *grps = ap_make_table(p, 15);
- ap_context_t *sp;
+ ap_pool_t *sp;
char l[MAX_STRING_LEN];
const char *group_name, *ll, *w;
ap_status_t status;
@@ -162,7 +162,7 @@
return NULL;
}
- ap_create_context(&sp, p);
+ ap_create_pool(&sp, p);
while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) {
if ((l[0] == '#') || (!l[0]))
1.11 +1 -1 apache-2.0/src/modules/standard/mod_auth_anon.c
Index: mod_auth_anon.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_anon.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_auth_anon.c 2000/03/31 09:05:15 1.10
+++ mod_auth_anon.c 2000/04/14 15:59:07 1.11
@@ -117,7 +117,7 @@
} anon_auth_config_rec;
-static void *create_anon_auth_dir_config(ap_context_t *p, char *d)
+static void *create_anon_auth_dir_config(ap_pool_t *p, char *d)
{
anon_auth_config_rec *sec = (anon_auth_config_rec *)
ap_pcalloc(p, sizeof(anon_auth_config_rec));
1.11 +1 -1 apache-2.0/src/modules/standard/mod_auth_db.c
Index: mod_auth_db.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_db.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_auth_db.c 2000/04/05 17:27:57 1.10
+++ mod_auth_db.c 2000/04/14 15:59:07 1.11
@@ -118,7 +118,7 @@
int auth_dbauthoritative;
} db_auth_config_rec;
-static void *create_db_auth_dir_config(ap_context_t *p, char *d)
+static void *create_db_auth_dir_config(ap_pool_t *p, char *d)
{
db_auth_config_rec *sec
= (db_auth_config_rec *) ap_pcalloc(p, sizeof(db_auth_config_rec));
1.11 +1 -1 apache-2.0/src/modules/standard/mod_auth_dbm.c
Index: mod_auth_dbm.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_dbm.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_auth_dbm.c 2000/03/31 09:05:15 1.10
+++ mod_auth_dbm.c 2000/04/14 15:59:07 1.11
@@ -104,7 +104,7 @@
} dbm_auth_config_rec;
-static void *create_dbm_auth_dir_config(ap_context_t *p, char *d)
+static void *create_dbm_auth_dir_config(ap_pool_t *p, char *d)
{
dbm_auth_config_rec *sec
= (dbm_auth_config_rec *) ap_pcalloc(p, sizeof(dbm_auth_config_rec));
1.9 +8 -8 apache-2.0/src/modules/standard/mod_auth_digest.c
Index: mod_auth_digest.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_digest.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_auth_digest.c 2000/03/31 09:05:15 1.8
+++ mod_auth_digest.c 2000/04/14 15:59:07 1.9
@@ -434,8 +434,8 @@
}
#endif /* HAVE_SHMEM_MM */
-static void initialize_module(ap_context_t *p, ap_context_t *plog,
- ap_context_t *ptemp, server_rec *s)
+static void initialize_module(ap_pool_t *p, ap_pool_t *plog,
+ ap_pool_t *ptemp, server_rec *s)
{
/* keep from doing the init more than once at startup, and delay
* the init until the second round
@@ -468,7 +468,7 @@
* configuration code
*/
-static void *create_digest_dir_config(ap_context_t *p, char *dir)
+static void *create_digest_dir_config(ap_pool_t *p, char *dir)
{
digest_config_rec *conf;
@@ -999,7 +999,7 @@
/* The nonce has the format b64(time)+hash .
*/
-static const char *gen_nonce(ap_context_t *p, time_t now, const char *opaque,
+static const char *gen_nonce(ap_pool_t *p, time_t now, const char *opaque,
const server_rec *server,
const digest_config_rec *conf)
{
@@ -1128,7 +1128,7 @@
* Authorization challenge generation code (for WWW-Authenticate)
*/
-static const char *guess_domain(ap_context_t *p, const char *uri,
+static const char *guess_domain(ap_pool_t *p, const char *uri,
const char *filename, const char *dir)
{
size_t u_len = strlen(uri), f_len = strlen(filename), d_len = strlen(dir);
@@ -1193,7 +1193,7 @@
}
-static const char *ltox(ap_context_t *p, unsigned long num)
+static const char *ltox(ap_pool_t *p, unsigned long num)
{
if (num != 0)
return ap_psprintf(p, "%lx", num);
@@ -1675,7 +1675,7 @@
{
configfile_t *f;
ap_table_t *grps = ap_make_table(r->pool, 15);
- ap_context_t *sp;
+ ap_pool_t *sp;
char l[MAX_STRING_LEN];
const char *group_name, *ll, *w;
ap_status_t sts;
@@ -1686,7 +1686,7 @@
return NULL;
}
- if (ap_create_context(&sp, r->pool) != APR_SUCCESS)
+ if (ap_create_pool(&sp, r->pool) != APR_SUCCESS)
return NULL;
while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) {
1.28 +4 -4 apache-2.0/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mod_autoindex.c 2000/04/06 23:53:59 1.27
+++ mod_autoindex.c 2000/04/14 15:59:08 1.28
@@ -568,7 +568,7 @@
{NULL}
};
-static void *create_autoindex_config(ap_context_t *p, char *dummy)
+static void *create_autoindex_config(ap_pool_t *p, char *dummy)
{
autoindex_config_rec *new =
(autoindex_config_rec *) ap_pcalloc(p, sizeof(autoindex_config_rec));
@@ -591,7 +591,7 @@
return (void *) new;
}
-static void *merge_autoindex_configs(ap_context_t *p, void *basev, void *addv)
+static void *merge_autoindex_configs(ap_pool_t *p, void *basev, void *addv)
{
autoindex_config_rec *new;
autoindex_config_rec *base = (autoindex_config_rec *) basev;
@@ -1283,12 +1283,12 @@
char *name = r->uri;
char *tp;
int static_columns = (autoindex_opts & SUPPRESS_COLSORT);
- ap_context_t *scratch;
+ ap_pool_t *scratch;
int name_width;
char *name_scratch;
char *pad_scratch;
- ap_create_context(&scratch, r->pool);
+ ap_create_pool(&scratch, r->pool);
if (name[0] == '\0') {
name = "/";
}
1.11 +2 -2 apache-2.0/src/modules/standard/mod_cern_meta.c
Index: mod_cern_meta.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cern_meta.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_cern_meta.c 2000/03/31 09:05:16 1.10
+++ mod_cern_meta.c 2000/04/14 15:59:08 1.11
@@ -176,7 +176,7 @@
char *metafiles;
} cern_meta_dir_config;
-static void *create_cern_meta_dir_config(ap_context_t *p, char *dummy)
+static void *create_cern_meta_dir_config(ap_pool_t *p, char *dummy)
{
cern_meta_dir_config *new =
(cern_meta_dir_config *) ap_palloc(p, sizeof(cern_meta_dir_config));
@@ -188,7 +188,7 @@
return new;
}
-static void *merge_cern_meta_dir_configs(ap_context_t *p, void *basev, void *addv)
+static void *merge_cern_meta_dir_configs(ap_pool_t *p, void *basev, void *addv)
{
cern_meta_dir_config *base = (cern_meta_dir_config *) basev;
cern_meta_dir_config *add = (cern_meta_dir_config *) addv;
1.35 +6 -6 apache-2.0/src/modules/standard/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgi.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mod_cgi.c 2000/04/06 23:53:59 1.34
+++ mod_cgi.c 2000/04/14 15:59:08 1.35
@@ -111,7 +111,7 @@
int bufbytes;
} cgi_server_conf;
-static void *create_cgi_config(ap_context_t *p, server_rec *s)
+static void *create_cgi_config(ap_pool_t *p, server_rec *s)
{
cgi_server_conf *c =
(cgi_server_conf *) ap_pcalloc(p, sizeof(cgi_server_conf));
@@ -123,7 +123,7 @@
return c;
}
-static void *merge_cgi_config(ap_context_t *p, void *basev, void *overridesv)
+static void *merge_cgi_config(ap_pool_t *p, void *basev, void *overridesv)
{
cgi_server_conf *base = (cgi_server_conf *) basev, *overrides = (cgi_server_conf *) overridesv;
@@ -291,7 +291,7 @@
return ret;
}
static ap_status_t run_cgi_child(BUFF **script_out, BUFF **script_in, BUFF **script_err,
- char *command, char *const argv[], request_rec *r, ap_context_t *p)
+ char *command, char *const argv[], request_rec *r, ap_pool_t *p)
{
char **env;
ap_procattr_t *procattr;
@@ -381,7 +381,7 @@
ap_unblock_alarms();
return (rc);
}
-static ap_status_t build_argv_list(char ***argv, request_rec *r, ap_context_t *p)
+static ap_status_t build_argv_list(char ***argv, request_rec *r, ap_pool_t *p)
{
int numwords, x, idx;
char *w;
@@ -416,7 +416,7 @@
return APR_SUCCESS;
}
-static ap_status_t build_command_line(char **c, request_rec *r, ap_context_t *p)
+static ap_status_t build_command_line(char **c, request_rec *r, ap_pool_t *p)
{
#ifdef WIN32
char *quoted_filename = NULL;
@@ -461,7 +461,7 @@
char argsbuffer[HUGE_STRING_LEN];
int is_included = !strcmp(r->protocol, "INCLUDED");
void *sconf = r->server->module_config;
- ap_context_t *p;
+ ap_pool_t *p;
cgi_server_conf *conf =
(cgi_server_conf *) ap_get_module_config(sconf, &cgi_module);
1.7 +9 -9 apache-2.0/src/modules/standard/mod_cgid.c
Index: mod_cgid.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgid.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_cgid.c 2000/04/05 02:09:43 1.6
+++ mod_cgid.c 2000/04/14 15:59:08 1.7
@@ -104,10 +104,10 @@
module MODULE_VAR_EXPORT cgid_module;
-static void cgid_init(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp, server_rec *main_server);
+static void cgid_init(ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *main_server);
static int once_through = 0;
-static ap_context_t *pcgi;
+static ap_pool_t *pcgi;
/* KLUDGE --- for back-combatibility, we don't have to check Execcgid
* in ScriptAliased directories, which means we need to know if this
@@ -150,7 +150,7 @@
* are handled in create_argv.
*
*/
-static char **create_argv(ap_context_t *p, char *path, char *user, char *group,
+static char **create_argv(ap_pool_t *p, char *path, char *user, char *group,
char *av0, const char *args)
{
int x, numwords;
@@ -484,10 +484,10 @@
char *argv0;
char *filename;
char **env;
- ap_context_t *p;
+ ap_pool_t *p;
request_rec *r;
- ap_create_context(&p, pcgi);
+ ap_create_pool(&p, pcgi);
r = ap_pcalloc(p, sizeof(request_rec));
r->pool = p;
dup2(sd, STDIN_FILENO);
@@ -563,7 +563,7 @@
return -1;
}
-static void cgid_init(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp, server_rec *main_server)
+static void cgid_init(ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *main_server)
{
int pid;
int tempfd;
@@ -572,7 +572,7 @@
main_server->module_config, &cgid_module);
if (once_through > 0) {
- ap_create_context(&pcgi, p);
+ ap_create_pool(&pcgi, p);
tempfd = creat(sconf->sockname, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
close(tempfd);
@@ -591,7 +591,7 @@
else once_through++;
}
-static void *create_cgid_config(ap_context_t *p, server_rec *s)
+static void *create_cgid_config(ap_pool_t *p, server_rec *s)
{
cgid_server_conf *c =
(cgid_server_conf *) ap_pcalloc(p, sizeof(cgid_server_conf));
@@ -604,7 +604,7 @@
return c;
}
-static void *merge_cgid_config(ap_context_t *p, void *basev, void *overridesv)
+static void *merge_cgid_config(ap_pool_t *p, void *basev, void *overridesv)
{
cgid_server_conf *base = (cgid_server_conf *) basev, *overrides = (cgid_server_conf *) overridesv;
1.10 +1 -1 apache-2.0/src/modules/standard/mod_digest.c
Index: mod_digest.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_digest.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_digest.c 2000/03/31 09:05:16 1.9
+++ mod_digest.c 2000/04/14 15:59:08 1.10
@@ -84,7 +84,7 @@
char *digest;
} digest_header_rec;
-static void *create_digest_dir_config(ap_context_t *p, char *d)
+static void *create_digest_dir_config(ap_pool_t *p, char *d)
{
return ap_pcalloc(p, sizeof(digest_config_rec));
}
1.10 +2 -2 apache-2.0/src/modules/standard/mod_dir.c
Index: mod_dir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_dir.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_dir.c 2000/03/31 09:05:16 1.9
+++ mod_dir.c 2000/04/14 15:59:08 1.10
@@ -97,7 +97,7 @@
{NULL}
};
-static void *create_dir_config(ap_context_t *p, char *dummy)
+static void *create_dir_config(ap_pool_t *p, char *dummy)
{
dir_config_rec *new =
(dir_config_rec *) ap_pcalloc(p, sizeof(dir_config_rec));
@@ -106,7 +106,7 @@
return (void *) new;
}
-static void *merge_dir_configs(ap_context_t *p, void *basev, void *addv)
+static void *merge_dir_configs(ap_pool_t *p, void *basev, void *addv)
{
dir_config_rec *new = (dir_config_rec *) ap_pcalloc(p, sizeof(dir_config_rec));
dir_config_rec *base = (dir_config_rec *) basev;
1.19 +1 -1 apache-2.0/src/modules/standard/mod_echo.c
Index: mod_echo.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_echo.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mod_echo.c 2000/03/31 09:05:17 1.18
+++ mod_echo.c 2000/04/14 15:59:08 1.19
@@ -69,7 +69,7 @@
int bEnabled;
} EchoConfig;
-static void *create_echo_server_config(ap_context_t *p,server_rec *s)
+static void *create_echo_server_config(ap_pool_t *p,server_rec *s)
{
EchoConfig *pConfig=ap_pcalloc(p,sizeof *pConfig);
1.8 +2 -2 apache-2.0/src/modules/standard/mod_env.c
Index: mod_env.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_env.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_env.c 2000/03/31 09:05:17 1.7
+++ mod_env.c 2000/04/14 15:59:08 1.8
@@ -115,7 +115,7 @@
module MODULE_VAR_EXPORT env_module;
-static void *create_env_dir_config(ap_context_t *p, char *dummy)
+static void *create_env_dir_config(ap_pool_t *p, char *dummy)
{
env_dir_config_rec *new =
(env_dir_config_rec *) ap_palloc(p, sizeof(env_dir_config_rec));
@@ -125,7 +125,7 @@
return (void *) new;
}
-static void *merge_env_dir_configs(ap_context_t *p, void *basev, void *addv)
+static void *merge_env_dir_configs(ap_pool_t *p, void *basev, void *addv)
{
env_dir_config_rec *base = (env_dir_config_rec *) basev;
env_dir_config_rec *add = (env_dir_config_rec *) addv;
1.13 +3 -3 apache-2.0/src/modules/standard/mod_expires.c
Index: mod_expires.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_expires.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_expires.c 2000/03/31 09:05:17 1.12
+++ mod_expires.c 2000/04/14 15:59:08 1.13
@@ -218,7 +218,7 @@
module MODULE_VAR_EXPORT expires_module;
-static void *create_dir_expires_config(ap_context_t *p, char *dummy)
+static void *create_dir_expires_config(ap_pool_t *p, char *dummy)
{
expires_dir_config *new =
(expires_dir_config *) ap_pcalloc(p, sizeof(expires_dir_config));
@@ -244,7 +244,7 @@
* string. If we return NULL then real_code contains code converted
* to the cnnnn format.
*/
-static char *check_code(ap_context_t *p, const char *code, char **real_code)
+static char *check_code(ap_pool_t *p, const char *code, char **real_code)
{
char *word;
char base = 'X';
@@ -381,7 +381,7 @@
{NULL}
};
-static void *merge_expires_dir_configs(ap_context_t *p, void *basev, void *addv)
+static void *merge_expires_dir_configs(ap_pool_t *p, void *basev, void *addv)
{
expires_dir_config *new = (expires_dir_config *) ap_pcalloc(p, sizeof(expires_dir_config));
expires_dir_config *base = (expires_dir_config *) basev;
1.7 +3 -3 apache-2.0/src/modules/standard/mod_headers.c
Index: mod_headers.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_headers.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_headers.c 2000/03/31 09:05:17 1.6
+++ mod_headers.c 2000/04/14 15:59:09 1.7
@@ -129,7 +129,7 @@
module MODULE_VAR_EXPORT headers_module;
-static void *create_headers_config(ap_context_t *p, server_rec *s)
+static void *create_headers_config(ap_pool_t *p, server_rec *s)
{
headers_conf *a =
(headers_conf *) ap_pcalloc(p, sizeof(headers_conf));
@@ -138,12 +138,12 @@
return a;
}
-static void *create_headers_dir_config(ap_context_t *p, char *d)
+static void *create_headers_dir_config(ap_pool_t *p, char *d)
{
return (headers_conf *) create_headers_config(p, NULL);
}
-static void *merge_headers_config(ap_context_t *p, void *basev, void *overridesv)
+static void *merge_headers_config(ap_pool_t *p, void *basev, void *overridesv)
{
headers_conf *a =
(headers_conf *) ap_pcalloc(p, sizeof(headers_conf));
1.12 +2 -2 apache-2.0/src/modules/standard/mod_imap.c
Index: mod_imap.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_imap.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_imap.c 2000/03/31 09:05:17 1.11
+++ mod_imap.c 2000/04/14 15:59:09 1.12
@@ -126,7 +126,7 @@
char *imap_base;
} imap_conf_rec;
-static void *create_imap_dir_config(ap_context_t *p, char *dummy)
+static void *create_imap_dir_config(ap_pool_t *p, char *dummy)
{
imap_conf_rec *icr =
(imap_conf_rec *) ap_palloc(p, sizeof(imap_conf_rec));
@@ -138,7 +138,7 @@
return icr;
}
-static void *merge_imap_dir_configs(ap_context_t *p, void *basev, void *addv)
+static void *merge_imap_dir_configs(ap_pool_t *p, void *basev, void *addv)
{
imap_conf_rec *new = (imap_conf_rec *) ap_pcalloc(p, sizeof(imap_conf_rec));
imap_conf_rec *base = (imap_conf_rec *) basev;
1.27 +6 -6 apache-2.0/src/modules/standard/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_include.c 2000/03/31 09:05:17 1.26
+++ mod_include.c 2000/04/14 15:59:09 1.27
@@ -363,7 +363,7 @@
* the tag value is html decoded if dodecode is non-zero
*/
-static char *get_tag(ap_context_t *p, ap_file_t *in, char *tag, int tagbuf_len, int dodecode)
+static char *get_tag(ap_pool_t *p, ap_file_t *in, char *tag, int tagbuf_len, int dodecode)
{
char *t = tag, *tag_val, c, term;
@@ -449,7 +449,7 @@
return ap_pstrdup(p, tag_val);
}
-static int get_directive(ap_file_t *in, char *dest, size_t len, ap_context_t *p)
+static int get_directive(ap_file_t *in, char *dest, size_t len, ap_pool_t *p)
{
char *d = dest;
char c;
@@ -779,7 +779,7 @@
-static ap_status_t build_argv_list(char ***argv, request_rec *r, ap_context_t *p)
+static ap_status_t build_argv_list(char ***argv, request_rec *r, ap_pool_t *p)
{
int numwords, x, idx;
char *w;
@@ -1413,14 +1413,14 @@
} *root, *current, *new;
const char *parse;
char buffer[MAX_STRING_LEN];
- ap_context_t *expr_pool;
+ ap_pool_t *expr_pool;
int retval = 0;
if ((parse = expr) == (char *) NULL) {
return (0);
}
root = current = (struct parse_node *) NULL;
- if (ap_create_context(&expr_pool, r->pool) != APR_SUCCESS)
+ if (ap_create_pool(&expr_pool, r->pool) != APR_SUCCESS)
return 0;
/* Create Parse Tree */
@@ -2338,7 +2338,7 @@
#define DEFAULT_XBITHACK xbithack_off
#endif
-static void *create_includes_dir_config(ap_context_t *p, char *dummy)
+static void *create_includes_dir_config(ap_pool_t *p, char *dummy)
{
enum xbithack *result = (enum xbithack *) ap_palloc(p, sizeof(enum xbithack));
*result = DEFAULT_XBITHACK;
1.10 +3 -3 apache-2.0/src/modules/standard/mod_info.c
Index: mod_info.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_info.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_info.c 2000/03/31 09:05:17 1.9
+++ mod_info.c 2000/04/14 15:59:09 1.10
@@ -106,7 +106,7 @@
module MODULE_VAR_EXPORT info_module;
extern module *top_module;
-static void *create_info_config(ap_context_t *p, server_rec *s)
+static void *create_info_config(ap_pool_t *p, server_rec *s)
{
info_svr_conf *conf = (info_svr_conf *) ap_pcalloc(p, sizeof(info_svr_conf));
@@ -114,7 +114,7 @@
return conf;
}
-static void *merge_info_config(ap_context_t *p, void *basev, void *overridesv)
+static void *merge_info_config(ap_pool_t *p, void *basev, void *overridesv)
{
info_svr_conf *new = (info_svr_conf *) ap_pcalloc(p, sizeof(info_svr_conf));
info_svr_conf *base = (info_svr_conf *) basev;
@@ -162,7 +162,7 @@
return (buf);
}
-static info_cfg_lines *mod_info_load_config(ap_context_t *p, const char *filename,
+static info_cfg_lines *mod_info_load_config(ap_pool_t *p, const char *filename,
request_rec *r)
{
char s[MAX_STRING_LEN];
1.5 +3 -3 apache-2.0/src/modules/standard/mod_log_agent.c
Index: mod_log_agent.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_log_agent.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_log_agent.c 2000/03/31 09:05:17 1.4
+++ mod_log_agent.c 2000/04/14 15:59:09 1.5
@@ -75,7 +75,7 @@
int agent_fd;
} agent_log_state;
-static void *make_agent_log_state(ap_context_t *p, server_rec *s)
+static void *make_agent_log_state(ap_pool_t *p, server_rec *s)
{
agent_log_state *cls =
(agent_log_state *) ap_palloc(p, sizeof(agent_log_state));
@@ -102,7 +102,7 @@
{NULL}
};
-static void open_agent_log(server_rec *s, ap_context_t *p)
+static void open_agent_log(server_rec *s, ap_pool_t *p)
{
agent_log_state *cls = ap_get_module_config(s->module_config,
&agent_log_module);
@@ -132,7 +132,7 @@
}
}
-static void init_agent_log(server_rec *s, ap_context_t *p)
+static void init_agent_log(server_rec *s, ap_pool_t *p)
{
for (; s; s = s->next)
open_agent_log(s, p);
1.19 +10 -10 apache-2.0/src/modules/standard/mod_log_config.c
Index: mod_log_config.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_log_config.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mod_log_config.c 2000/03/31 09:05:17 1.18
+++ mod_log_config.c 2000/04/14 15:59:09 1.19
@@ -264,12 +264,12 @@
ap_array_header_t *conditions;
} log_format_item;
-static char *format_integer(ap_context_t *p, int i)
+static char *format_integer(ap_pool_t *p, int i)
{
return ap_psprintf(p, "%d", i);
}
-static char *pfmt(ap_context_t *p, int i)
+static char *pfmt(ap_pool_t *p, int i)
{
if (i <= 0) {
return "-";
@@ -549,7 +549,7 @@
return NULL;
}
-static char *parse_log_misc_string(ap_context_t *p, log_format_item *it,
+static char *parse_log_misc_string(ap_pool_t *p, log_format_item *it,
const char **sa)
{
const char *s;
@@ -607,7 +607,7 @@
return NULL;
}
-static char *parse_log_item(ap_context_t *p, log_format_item *it, const char **sa)
+static char *parse_log_item(ap_pool_t *p, log_format_item *it, const char **sa)
{
const char *s = *sa;
@@ -692,7 +692,7 @@
return "Ran off end of LogFormat parsing args to some directive";
}
-static ap_array_header_t *parse_log_string(ap_context_t *p, const char *s, const char **err)
+static ap_array_header_t *parse_log_string(ap_pool_t *p, const char *s, const char **err)
{
ap_array_header_t *a = ap_make_array(p, 30, sizeof(log_format_item));
char *res;
@@ -880,7 +880,7 @@
* Module glue...
*/
-static void *make_config_log_state(ap_context_t *p, server_rec *s)
+static void *make_config_log_state(ap_pool_t *p, server_rec *s)
{
multi_log_state *mls;
@@ -901,7 +901,7 @@
* vhosts inherit any globally-defined format names.
*/
-static void *merge_config_log_state(ap_context_t *p, void *basev, void *addv)
+static void *merge_config_log_state(ap_pool_t *p, void *basev, void *addv)
{
multi_log_state *base = (multi_log_state *) basev;
multi_log_state *add = (multi_log_state *) addv;
@@ -1003,7 +1003,7 @@
{NULL}
};
-static config_log_state *open_config_log(server_rec *s, ap_context_t *p,
+static config_log_state *open_config_log(server_rec *s, ap_pool_t *p,
config_log_state *cls,
ap_array_header_t *default_format)
{
@@ -1042,7 +1042,7 @@
return cls;
}
-static config_log_state *open_multi_logs(server_rec *s, ap_context_t *p)
+static config_log_state *open_multi_logs(server_rec *s, ap_pool_t *p)
{
int i;
multi_log_state *mls = ap_get_module_config(s->module_config,
@@ -1096,7 +1096,7 @@
return NULL;
}
-static void init_config_log(ap_context_t *pc, ap_context_t *p, ap_context_t *pt, server_rec *s)
+static void init_config_log(ap_pool_t *pc, ap_pool_t *p, ap_pool_t *pt, server_rec *s)
{
/* First, do "physical" server, which gets default log fd and format
* for the virtual servers, if they don't override...
1.5 +3 -3 apache-2.0/src/modules/standard/mod_log_referer.c
Index: mod_log_referer.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_log_referer.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_log_referer.c 2000/03/31 09:05:17 1.4
+++ mod_log_referer.c 2000/04/14 15:59:10 1.5
@@ -77,7 +77,7 @@
ap_array_header_t *referer_ignore_list;
} referer_log_state;
-static void *make_referer_log_state(ap_context_t *p, server_rec *s)
+static void *make_referer_log_state(ap_pool_t *p, server_rec *s)
{
referer_log_state *cls =
(referer_log_state *) ap_palloc(p, sizeof(referer_log_state));
@@ -118,7 +118,7 @@
{NULL}
};
-static void open_referer_log(server_rec *s, ap_context_t *p)
+static void open_referer_log(server_rec *s, ap_pool_t *p)
{
referer_log_state *cls = ap_get_module_config(s->module_config,
&referer_log_module);
@@ -149,7 +149,7 @@
}
}
-static void init_referer_log(server_rec *s, ap_context_t *p)
+static void init_referer_log(server_rec *s, ap_pool_t *p)
{
for (; s; s = s->next)
open_referer_log(s, p);
1.15 +4 -4 apache-2.0/src/modules/standard/mod_mime.c
Index: mod_mime.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_mime.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_mime.c 2000/03/31 09:05:18 1.14
+++ mod_mime.c 2000/04/14 15:59:10 1.15
@@ -128,7 +128,7 @@
module MODULE_VAR_EXPORT mime_module;
-static void *create_mime_dir_config(ap_context_t *p, char *dummy)
+static void *create_mime_dir_config(ap_pool_t *p, char *dummy)
{
mime_dir_config *new =
(mime_dir_config *) ap_palloc(p, sizeof(mime_dir_config));
@@ -147,7 +147,7 @@
return new;
}
-static void *merge_mime_dir_configs(ap_context_t *p, void *basev, void *addv)
+static void *merge_mime_dir_configs(ap_pool_t *p, void *basev, void *addv)
{
mime_dir_config *base = (mime_dir_config *) basev;
mime_dir_config *add = (mime_dir_config *) addv;
@@ -298,7 +298,7 @@
static ap_table_t *hash_buckets[MIME_HASHSIZE];
-static void mime_post_config(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp, server_rec *s)
+static void mime_post_config(ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s)
{
configfile_t *f;
char l[MAX_STRING_LEN];
@@ -396,7 +396,7 @@
char *attribute, *value;
int quoted = 0;
server_rec * ss = r->server;
- ap_context_t * p = r->pool;
+ ap_pool_t * p = r->pool;
content_type *ctp;
param *pp, *npp;
1.17 +11 -11 apache-2.0/src/modules/standard/mod_mime_magic.c
Index: mod_mime_magic.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_mime_magic.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mod_mime_magic.c 2000/03/31 09:05:18 1.16
+++ mod_mime_magic.c 2000/04/14 15:59:10 1.17
@@ -96,7 +96,7 @@
* modified from the free "file" command.
* - all-in-one file for compilation convenience when moving from one
* version of Apache to the next.
- * - Memory allocation is done through the Apache API's ap_context_t structure.
+ * - Memory allocation is done through the Apache API's ap_pool_t structure.
* - All functions have had necessary Apache API request or server
* structures passed to them where necessary to call other Apache API
* routines. (i.e. usually for logging, files, or memory allocation in
@@ -251,7 +251,7 @@
static int getvalue(server_rec *, struct magic *, char **);
static int hextoint(int);
static char *getstr(server_rec *, char *, char *, int, int *);
-static int parse(server_rec *, ap_context_t *p, char *, int);
+static int parse(server_rec *, ap_pool_t *p, char *, int);
static int match(request_rec *, unsigned char *, int);
static int mget(request_rec *, union VALUETYPE *, unsigned char *,
@@ -501,13 +501,13 @@
module mime_magic_module;
-static void *create_magic_server_config(ap_context_t *p, server_rec *d)
+static void *create_magic_server_config(ap_pool_t *p, server_rec *d)
{
/* allocate the config - use pcalloc because it needs to be zeroed */
return ap_pcalloc(p, sizeof(magic_server_config_rec));
}
-static void *merge_magic_server_config(ap_context_t *p, void *basev, void *addv)
+static void *merge_magic_server_config(ap_pool_t *p, void *basev, void *addv)
{
magic_server_config_rec *base = (magic_server_config_rec *) basev;
magic_server_config_rec *add = (magic_server_config_rec *) addv;
@@ -935,7 +935,7 @@
* apprentice - load configuration from the magic file r
* API request record
*/
-static int apprentice(server_rec *s, ap_context_t *p)
+static int apprentice(server_rec *s, ap_pool_t *p)
{
ap_file_t *f = NULL;
ap_status_t result;
@@ -1075,7 +1075,7 @@
/*
* parse one line from magic file, put into magic[index++] if valid
*/
-static int parse(server_rec *serv, ap_context_t *p, char *l, int lineno)
+static int parse(server_rec *serv, ap_pool_t *p, char *l, int lineno)
{
struct magic *m;
char *t, *s;
@@ -2145,14 +2145,14 @@
int method;
};
-static int uncompress_child(struct uncompress_parms *parm, ap_context_t *cntxt,
+static int uncompress_child(struct uncompress_parms *parm, ap_pool_t *cntxt,
BUFF **script_in)
{
int rc = 1;
char *new_argv[4];
char **env;
request_rec *r = parm->r;
- ap_context_t *child_context = cntxt;
+ ap_pool_t *child_context = cntxt;
ap_procattr_t *procattr;
ap_proc_t *procnew = NULL;
ap_file_t *file = NULL;
@@ -2213,7 +2213,7 @@
{
struct uncompress_parms parm;
BUFF *bout = NULL;
- ap_context_t *sub_context;
+ ap_pool_t *sub_context;
ap_status_t rv;
parm.r = r;
@@ -2223,7 +2223,7 @@
* there are cases (i.e. generating directory indicies with mod_autoindex)
* where we would end up with LOTS of zombies.
*/
- if (ap_create_context(&sub_context, r->pool) != APR_SUCCESS)
+ if (ap_create_pool(&sub_context, r->pool) != APR_SUCCESS)
return -1;
if ((rv = uncompress_child(&parm, sub_context, &bout)) != APR_SUCCESS) {
@@ -2393,7 +2393,7 @@
/*
* initialize the module
*/
-static void magic_init(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp, server_rec *main_server)
+static void magic_init(ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *main_server)
{
int result;
magic_server_config_rec *conf;
1.26 +6 -6 apache-2.0/src/modules/standard/mod_negotiation.c
Index: mod_negotiation.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_negotiation.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mod_negotiation.c 2000/04/06 23:53:59 1.25
+++ mod_negotiation.c 2000/04/14 15:59:10 1.26
@@ -88,7 +88,7 @@
module MODULE_VAR_EXPORT negotiation_module;
-static void *create_neg_dir_config(ap_context_t *p, char *dummy)
+static void *create_neg_dir_config(ap_pool_t *p, char *dummy)
{
neg_dir_config *new = (neg_dir_config *) ap_palloc(p, sizeof(neg_dir_config));
@@ -96,7 +96,7 @@
return new;
}
-static void *merge_neg_dir_configs(ap_context_t *p, void *basev, void *addv)
+static void *merge_neg_dir_configs(ap_pool_t *p, void *basev, void *addv)
{
neg_dir_config *base = (neg_dir_config *) basev;
neg_dir_config *add = (neg_dir_config *) addv;
@@ -217,7 +217,7 @@
*/
typedef struct {
- ap_context_t *pool;
+ ap_pool_t *pool;
request_rec *r;
char *dir_name;
int accept_q; /* 1 if an Accept item has a q= param */
@@ -318,7 +318,7 @@
* enter the values we recognize into the argument accept_rec
*/
-static const char *get_entry(ap_context_t *p, accept_rec *result,
+static const char *get_entry(ap_pool_t *p, accept_rec *result,
const char *accept_line)
{
result->quality = 1.0f;
@@ -425,7 +425,7 @@
* where charset is only valid in Accept.
*/
-static ap_array_header_t *do_header_line(ap_context_t *p, const char *accept_line)
+static ap_array_header_t *do_header_line(ap_pool_t *p, const char *accept_line)
{
ap_array_header_t *accept_recs;
@@ -447,7 +447,7 @@
* return an array containing the languages of this variant
*/
-static ap_array_header_t *do_languages_line(ap_context_t *p, const char **lang_line)
+static ap_array_header_t *do_languages_line(ap_pool_t *p, const char **lang_line)
{
ap_array_header_t *lang_recs = ap_make_array(p, 2, sizeof(char *));
1.23 +21 -21 apache-2.0/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mod_rewrite.c 2000/04/14 01:36:59 1.22
+++ mod_rewrite.c 2000/04/14 15:59:10 1.23
@@ -247,7 +247,7 @@
**
*/
-static void *config_server_create(ap_context_t *p, server_rec *s)
+static void *config_server_create(ap_pool_t *p, server_rec *s)
{
rewrite_server_conf *a;
@@ -266,7 +266,7 @@
return (void *)a;
}
-static void *config_server_merge(ap_context_t *p, void *basev, void *overridesv)
+static void *config_server_merge(ap_pool_t *p, void *basev, void *overridesv)
{
rewrite_server_conf *a, *base, *overrides;
@@ -322,7 +322,7 @@
**
*/
-static void *config_perdir_create(ap_context_t *p, char *path)
+static void *config_perdir_create(ap_pool_t *p, char *path)
{
rewrite_perdir_conf *a;
@@ -350,7 +350,7 @@
return (void *)a;
}
-static void *config_perdir_merge(ap_context_t *p, void *basev, void *overridesv)
+static void *config_perdir_merge(ap_pool_t *p, void *basev, void *overridesv)
{
rewrite_perdir_conf *a, *base, *overrides;
@@ -425,7 +425,7 @@
return err;
}
-static const char *cmd_rewriteoptions_setoption(ap_context_t *p, int *options,
+static const char *cmd_rewriteoptions_setoption(ap_pool_t *p, int *options,
char *name)
{
if (strcasecmp(name, "inherit") == 0) {
@@ -644,7 +644,7 @@
return NULL;
}
-static const char *cmd_rewritecond_parseflagfield(ap_context_t *p,
+static const char *cmd_rewritecond_parseflagfield(ap_pool_t *p,
rewritecond_entry *cfg,
char *str)
{
@@ -696,7 +696,7 @@
return NULL;
}
-static const char *cmd_rewritecond_setflag(ap_context_t *p, rewritecond_entry *cfg,
+static const char *cmd_rewritecond_setflag(ap_pool_t *p, rewritecond_entry *cfg,
char *key, char *val)
{
if ( strcasecmp(key, "nocase") == 0
@@ -800,7 +800,7 @@
return NULL;
}
-static const char *cmd_rewriterule_parseflagfield(ap_context_t *p,
+static const char *cmd_rewriterule_parseflagfield(ap_pool_t *p,
rewriterule_entry *cfg,
char *str)
{
@@ -852,7 +852,7 @@
return NULL;
}
-static const char *cmd_rewriterule_setflag(ap_context_t *p, rewriterule_entry *cfg,
+static const char *cmd_rewriterule_setflag(ap_pool_t *p, rewriterule_entry *cfg,
char *key, char *val)
{
int status = 0;
@@ -957,9 +957,9 @@
**
*/
-static void init_module(ap_context_t *p,
- ap_context_t *plog,
- ap_context_t *ptemp,
+static void init_module(ap_pool_t *p,
+ ap_pool_t *plog,
+ ap_pool_t *ptemp,
server_rec *s)
{
/* check if proxy module is available */
@@ -995,7 +995,7 @@
**
*/
-static void init_child(ap_context_t *p, server_rec *s)
+static void init_child(ap_pool_t *p, server_rec *s)
{
if (lockname != NULL && *(lockname) != '\0')
@@ -2516,7 +2516,7 @@
**
*/
-static void expand_backref_inbuffer(ap_context_t *p, char *buf, int nbuf,
+static void expand_backref_inbuffer(ap_pool_t *p, char *buf, int nbuf,
backrefinfo *bri, char c)
{
register int i;
@@ -3146,7 +3146,7 @@
*/
-static void open_rewritelog(server_rec *s, ap_context_t *p)
+static void open_rewritelog(server_rec *s, ap_pool_t *p)
{
rewrite_server_conf *conf;
const char *fname;
@@ -3306,7 +3306,7 @@
#define REWRITELOCK_MODE ( APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD )
-static void rewritelock_create(server_rec *s, ap_context_t *p)
+static void rewritelock_create(server_rec *s, ap_pool_t *p)
{
ap_status_t rc;
@@ -3353,7 +3353,7 @@
** +-------------------------------------------------------+
*/
-static void run_rewritemap_programs(server_rec *s, ap_context_t *p)
+static void run_rewritemap_programs(server_rec *s, ap_pool_t *p)
{
rewrite_server_conf *conf;
ap_file_t *fpin = NULL;
@@ -3405,7 +3405,7 @@
}
/* child process code */
-static int rewritemap_program_child(ap_context_t *p, char *progname,
+static int rewritemap_program_child(ap_pool_t *p, char *progname,
ap_file_t **fpout, ap_file_t **fpin,
ap_file_t **fperr)
{
@@ -3693,7 +3693,7 @@
rsub = subrecfunc(r->filename, r); \
/* now recursively lookup the variable in the sub_req */ \
result = lookup_variable(rsub, var+5); \
- /* copy it up to our scope before we destroy sub_req's ap_context_t */ \
+ /* copy it up to our scope before we destroy sub_req's ap_pool_t */ \
result = ap_pstrdup(r->pool, result); \
/* cleanup by destroying the subrequest */ \
ap_destroy_sub_req(rsub); \
@@ -3790,12 +3790,12 @@
*/
-static cache *init_cache(ap_context_t *p)
+static cache *init_cache(ap_pool_t *p)
{
cache *c;
c = (cache *)ap_palloc(p, sizeof(cache));
- if (ap_create_context(&c->pool, p) != APR_SUCCESS)
+ if (ap_create_pool(&c->pool, p) != APR_SUCCESS)
return NULL;
c->lists = ap_make_array(c->pool, 2, sizeof(cachelist));
return c;
1.8 +20 -20 apache-2.0/src/modules/standard/mod_rewrite.h
Index: mod_rewrite.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_rewrite.h 2000/03/31 09:05:18 1.7
+++ mod_rewrite.h 2000/04/14 15:59:10 1.8
@@ -309,7 +309,7 @@
} cachelist;
typedef struct cache {
- ap_context_t *pool;
+ ap_pool_t *pool;
ap_array_header_t *lists;
} cache;
@@ -331,10 +331,10 @@
*/
/* config structure handling */
-static void *config_server_create(ap_context_t *p, server_rec *s);
-static void *config_server_merge (ap_context_t *p, void *basev, void *overridesv);
-static void *config_perdir_create(ap_context_t *p, char *path);
-static void *config_perdir_merge (ap_context_t *p, void *basev, void *overridesv);
+static void *config_server_create(ap_pool_t *p, server_rec *s);
+static void *config_server_merge (ap_pool_t *p, void *basev, void *overridesv);
+static void *config_perdir_create(ap_pool_t *p, char *path);
+static void *config_perdir_merge (ap_pool_t *p, void *basev, void *overridesv);
/* config directive handling */
static const char *cmd_rewriteengine(cmd_parms *cmd,
@@ -342,7 +342,7 @@
static const char *cmd_rewriteoptions(cmd_parms *cmd,
rewrite_perdir_conf *dconf,
char *option);
-static const char *cmd_rewriteoptions_setoption(ap_context_t *p, int *options,
+static const char *cmd_rewriteoptions_setoption(ap_pool_t *p, int *options,
char *name);
static const char *cmd_rewritelog (cmd_parms *cmd, void *dconf, char *a1);
static const char *cmd_rewriteloglevel(cmd_parms *cmd, void *dconf, char *a1);
@@ -353,25 +353,25 @@
char *a1);
static const char *cmd_rewritecond(cmd_parms *cmd, rewrite_perdir_conf *dconf,
char *str);
-static const char *cmd_rewritecond_parseflagfield(ap_context_t *p,
+static const char *cmd_rewritecond_parseflagfield(ap_pool_t *p,
rewritecond_entry *new,
char *str);
-static const char *cmd_rewritecond_setflag(ap_context_t *p, rewritecond_entry *cfg,
+static const char *cmd_rewritecond_setflag(ap_pool_t *p, rewritecond_entry *cfg,
char *key, char *val);
static const char *cmd_rewriterule(cmd_parms *cmd, rewrite_perdir_conf *dconf,
char *str);
-static const char *cmd_rewriterule_parseflagfield(ap_context_t *p,
+static const char *cmd_rewriterule_parseflagfield(ap_pool_t *p,
rewriterule_entry *new,
char *str);
-static const char *cmd_rewriterule_setflag(ap_context_t *p, rewriterule_entry *cfg,
+static const char *cmd_rewriterule_setflag(ap_pool_t *p, rewriterule_entry *cfg,
char *key, char *val);
/* initialisation */
-static void init_module(ap_context_t *p,
- ap_context_t *plog,
- ap_context_t *ptemp,
+static void init_module(ap_pool_t *p,
+ ap_pool_t *plog,
+ ap_pool_t *ptemp,
server_rec *s);
-static void init_child(ap_context_t *p, server_rec *s);
+static void init_child(ap_pool_t *p, server_rec *s);
/* runtime hooks */
static int hook_uri2file (request_rec *r);
@@ -392,7 +392,7 @@
static void splitout_queryargs(request_rec *r, int qsappend);
static void fully_qualify_uri(request_rec *r);
static void reduce_uri(request_rec *r);
-static void expand_backref_inbuffer(ap_context_t *p, char *buf, int nbuf,
+static void expand_backref_inbuffer(ap_pool_t *p, char *buf, int nbuf,
backrefinfo *bri, char c);
static char *expand_tildepaths(request_rec *r, char *uri);
static void expand_map_lookups(request_rec *r, char *uri, int uri_len);
@@ -417,18 +417,18 @@
static int rewrite_rand(int l, int h);
/* rewriting logfile support */
-static void open_rewritelog(server_rec *s, ap_context_t *p);
+static void open_rewritelog(server_rec *s, ap_pool_t *p);
static void rewritelog(request_rec *r, int level, const char *text, ...)
__attribute__((format(printf,3,4)));
static char *current_logtime(request_rec *r);
/* rewriting lockfile support */
-static void rewritelock_create(server_rec *s, ap_context_t *p);
+static void rewritelock_create(server_rec *s, ap_pool_t *p);
static ap_status_t rewritelock_remove(void *data);
/* program map support */
-static void run_rewritemap_programs(server_rec *s, ap_context_t *p);
-static int rewritemap_program_child(ap_context_t *p, char *progname,
+static void run_rewritemap_programs(server_rec *s, ap_pool_t *p);
+static int rewritemap_program_child(ap_pool_t *p, char *progname,
ap_file_t **fpout, ap_file_t **fpin,
ap_file_t **fperr);
@@ -439,7 +439,7 @@
static char *lookup_header(request_rec *r, const char *name);
/* caching functions */
-static cache *init_cache(ap_context_t *p);
+static cache *init_cache(ap_pool_t *p);
static char *get_cache_string(cache *c, char *res, int mode, time_t mtime,
char *key);
static void set_cache_string(cache *c, char *res, int mode, time_t mtime,
1.9 +2 -2 apache-2.0/src/modules/standard/mod_setenvif.c
Index: mod_setenvif.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_setenvif.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_setenvif.c 2000/03/31 09:05:18 1.8
+++ mod_setenvif.c 2000/04/14 15:59:10 1.9
@@ -148,7 +148,7 @@
module MODULE_VAR_EXPORT setenvif_module;
-static void *create_setenvif_config(ap_context_t *p, server_rec *dummy)
+static void *create_setenvif_config(ap_pool_t *p, server_rec *dummy)
{
sei_cfg_rec *new = (sei_cfg_rec *) ap_palloc(p, sizeof(sei_cfg_rec));
@@ -156,7 +156,7 @@
return (void *) new;
}
-static void *merge_setenvif_config(ap_context_t *p, void *basev, void *overridesv)
+static void *merge_setenvif_config(ap_pool_t *p, void *basev, void *overridesv)
{
sei_cfg_rec *a = ap_pcalloc(p, sizeof(sei_cfg_rec));
sei_cfg_rec *base = basev, *overrides = overridesv;
1.13 +2 -2 apache-2.0/src/modules/standard/mod_so.c
Index: mod_so.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_so.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_so.c 2000/04/05 15:45:33 1.12
+++ mod_so.c 2000/04/14 15:59:10 1.13
@@ -150,7 +150,7 @@
ap_array_header_t *loaded_modules;
} so_server_conf;
-static void *so_sconf_create(ap_context_t *p, server_rec *s)
+static void *so_sconf_create(ap_pool_t *p, server_rec *s)
{
so_server_conf *soc;
@@ -287,7 +287,7 @@
ap_add_loaded_module(modp);
/*
- * Register a cleanup in the config ap_context_t (normally pconf). When
+ * Register a cleanup in the config ap_pool_t (normally pconf). When
* we do a restart (or shutdown) this cleanup will cause the
* shared object to be unloaded.
*/
1.12 +6 -6 apache-2.0/src/modules/standard/mod_speling.c
Index: mod_speling.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_speling.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_speling.c 2000/03/31 09:05:18 1.11
+++ mod_speling.c 2000/04/14 15:59:10 1.12
@@ -102,7 +102,7 @@
* bother to have such a function.
*/
-static void *mkconfig(ap_context_t *p)
+static void *mkconfig(ap_pool_t *p)
{
spconfig *cfg = ap_pcalloc(p, sizeof(spconfig));
@@ -114,7 +114,7 @@
* Respond to a callback to create configuration record for a server or
* vhost environment.
*/
-static void *create_mconfig_for_server(ap_context_t *p, server_rec *s)
+static void *create_mconfig_for_server(ap_pool_t *p, server_rec *s)
{
return mkconfig(p);
}
@@ -122,7 +122,7 @@
/*
* Respond to a callback to create a config record for a specific directory.
*/
-static void *create_mconfig_for_directory(ap_context_t *p, char *dir)
+static void *create_mconfig_for_directory(ap_pool_t *p, char *dir)
{
return mkconfig(p);
}
@@ -441,9 +441,9 @@
* returned.
*/
else {
- ap_context_t *p;
+ ap_pool_t *p;
ap_table_t *notes;
- ap_context_t *sub_pool;
+ ap_pool_t *sub_pool;
ap_array_header_t *t;
ap_array_header_t *v;
@@ -457,7 +457,7 @@
notes = r->main->notes;
}
- if (ap_create_context(&sub_pool, p) != APR_SUCCESS)
+ if (ap_create_pool(&sub_pool, p) != APR_SUCCESS)
return DECLINED;
t = ap_make_array(sub_pool, candidates->nelts * 8 + 8,
1.8 +2 -2 apache-2.0/src/modules/standard/mod_unique_id.c
Index: mod_unique_id.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_unique_id.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_unique_id.c 2000/03/31 09:05:19 1.7
+++ mod_unique_id.c 2000/04/14 15:59:11 1.8
@@ -162,7 +162,7 @@
unique_id_rec_total_size,
unique_id_rec_size_uu;
-static void unique_id_global_init(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp, server_rec *main_server)
+static void unique_id_global_init(ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *main_server)
{
#ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN 256
@@ -246,7 +246,7 @@
#endif
}
-static void unique_id_child_init(ap_context_t *p, server_rec *s)
+static void unique_id_child_init(ap_pool_t *p, server_rec *s)
{
pid_t pid;
#ifdef HAVE_GETTIMEOFDAY
1.10 +1 -1 apache-2.0/src/modules/standard/mod_userdir.c
Index: mod_userdir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_userdir.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_userdir.c 2000/03/31 09:05:19 1.9
+++ mod_userdir.c 2000/04/14 15:59:11 1.10
@@ -119,7 +119,7 @@
* explicit) disablement, and the replacement string for all others.
*/
-static void *create_userdir_config(ap_context_t *p, server_rec *s)
+static void *create_userdir_config(ap_pool_t *p, server_rec *s)
{
userdir_config
* newcfg = (userdir_config *) ap_pcalloc(p, sizeof(userdir_config));
1.13 +2 -2 apache-2.0/src/modules/standard/mod_usertrack.c
Index: mod_usertrack.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_usertrack.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_usertrack.c 2000/03/31 09:05:19 1.12
+++ mod_usertrack.c 2000/04/14 15:59:11 1.13
@@ -191,7 +191,7 @@
return OK; /* We set our cookie */
}
-static void *make_cookie_log_state(ap_context_t *p, server_rec *s)
+static void *make_cookie_log_state(ap_pool_t *p, server_rec *s)
{
cookie_log_state *cls =
(cookie_log_state *) ap_palloc(p, sizeof(cookie_log_state));
@@ -201,7 +201,7 @@
return (void *) cls;
}
-static void *make_cookie_dir(ap_context_t *p, char *d)
+static void *make_cookie_dir(ap_pool_t *p, char *d)
{
cookie_dir_rec *dcfg;
1.6 +2 -2 apache-2.0/src/modules/standard/mod_vhost_alias.c
Index: mod_vhost_alias.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_vhost_alias.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_vhost_alias.c 2000/03/31 09:05:19 1.5
+++ mod_vhost_alias.c 2000/04/14 15:59:11 1.6
@@ -102,7 +102,7 @@
mva_mode_e cgi_root_mode;
} mva_sconf_t;
-static void *mva_create_server_config(ap_context_t *p, server_rec *s)
+static void *mva_create_server_config(ap_pool_t *p, server_rec *s)
{
mva_sconf_t *conf;
@@ -114,7 +114,7 @@
return conf;
}
-static void *mva_merge_server_config(ap_context_t *p, void *parentv, void *childv)
+static void *mva_merge_server_config(ap_pool_t *p, void *parentv, void *childv)
{
mva_sconf_t *parent = (mva_sconf_t *) parentv;
mva_sconf_t *child = (mva_sconf_t *) childv;
1.5 +1 -1 apache-2.0/src/modules/test/mod_test_util_uri.c
Index: mod_test_util_uri.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/test/mod_test_util_uri.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_test_util_uri.c 2000/03/31 09:05:25 1.4
+++ mod_test_util_uri.c 2000/04/14 15:59:16 1.5
@@ -139,7 +139,7 @@
static unsigned iterate_pieces(request_rec *r, const test_uri_t *pieces, int row)
{
unsigned u;
- ap_context_t *sub;
+ ap_pool_t *sub;
char *input_uri;
char *strp;
uri_components result;
1.5 +1 -1 apache-2.0/src/os/bs2000/bs2login.c
Index: bs2login.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/bs2000/bs2login.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bs2login.c 2000/03/31 09:17:10 1.4
+++ bs2login.c 2000/04/14 15:59:16 1.5
@@ -169,7 +169,7 @@
/* This routine is called by http_core for the BS2000Account directive */
/* It stores the account name for later use */
-const char *os_set_account(ap_context_t *p, const char *account)
+const char *os_set_account(ap_pool_t *p, const char *account)
{
char account_temp[ACCT_LEN+1];
1.8 +3 -3 apache-2.0/src/os/os2/os.h
Index: os.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/os2/os.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- os.h 2000/03/31 09:17:13 1.7
+++ os.h 2000/04/14 15:59:16 1.8
@@ -89,9 +89,9 @@
extern int ap_os_is_path_absolute(const char *file);
#endif
-char *ap_os_canonical_filename(ap_context_t *p, const char *file);
-char *ap_os_case_canonical_filename(ap_context_t *p, const char *szFile);
-char *ap_os_systemcase_filename(ap_context_t *p, const char *szFile);
+char *ap_os_canonical_filename(ap_pool_t *p, const char *file);
+char *ap_os_case_canonical_filename(ap_pool_t *p, const char *szFile);
+char *ap_os_systemcase_filename(ap_pool_t *p, const char *szFile);
/* FIXME: the following should be implemented on this platform */
#define ap_os_is_filename_valid(f) (1)
1.11 +3 -3 apache-2.0/src/os/os2/util_os2.c
Index: util_os2.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/os2/util_os2.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- util_os2.c 2000/03/31 09:17:13 1.10
+++ util_os2.c 2000/04/14 15:59:16 1.11
@@ -69,7 +69,7 @@
#include <string.h>
-API_EXPORT(char *)ap_os_case_canonical_filename(ap_context_t *pPool, const char *szFile)
+API_EXPORT(char *)ap_os_case_canonical_filename(ap_pool_t *pPool, const char *szFile)
{
char buf[HUGE_STRING_LEN];
char buf2[HUGE_STRING_LEN];
@@ -119,7 +119,7 @@
-char *ap_os_systemcase_canonical_filename(ap_context_t *pPool, const char *szFile)
+char *ap_os_systemcase_canonical_filename(ap_pool_t *pPool, const char *szFile)
{
char *szCanonicalFile = ap_os_case_canonical_filename(pPool, szFile);
int startslash = 2, slashnum=0;
@@ -149,7 +149,7 @@
-char *ap_os_canonical_filename(ap_context_t *pPool, const char *szFile)
+char *ap_os_canonical_filename(ap_pool_t *pPool, const char *szFile)
{
char *szCanonicalFile = ap_os_systemcase_canonical_filename(pPool, szFile);
strlwr(szCanonicalFile);
1.6 +2 -2 apache-2.0/src/os/tpf/os.c
Index: os.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/tpf/os.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- os.c 2000/03/31 09:17:15 1.5
+++ os.c 2000/04/14 15:59:17 1.6
@@ -212,7 +212,7 @@
-int ap_tpf_spawn_child(ap_context_t *p, int (*func) (void *, child_info *),
+int ap_tpf_spawn_child(ap_pool_t *p, int (*func) (void *, child_info *),
void *data, enum kill_conditions kill_how,
int *pipe_in, int *pipe_out, int *pipe_err,
int out_fds[], int in_fds[], int err_fds[])
@@ -396,7 +396,7 @@
return 0;
}
-void os_note_additional_cleanups(ap_context_t *p, int sd) {
+void os_note_additional_cleanups(ap_pool_t *p, int sd) {
char sockfilename[50];
/* write the socket to file so that TPF socket device driver will close socket in case
we happen to abend. */
1.14 +1 -1 apache-2.0/src/os/win32/iol_socket.c
Index: iol_socket.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/iol_socket.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- iol_socket.c 2000/04/13 00:37:57 1.13
+++ iol_socket.c 2000/04/14 15:59:17 1.14
@@ -146,7 +146,7 @@
win32_shutdown
};
-ap_iol *win32_attach_socket(ap_context_t *p, ap_socket_t *sock)
+ap_iol *win32_attach_socket(ap_pool_t *p, ap_socket_t *sock)
{
iol_socket *iol;
1.7 +1 -1 apache-2.0/src/os/win32/iol_socket.h
Index: iol_socket.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/iol_socket.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iol_socket.h 2000/03/31 09:17:18 1.6
+++ iol_socket.h 2000/04/14 15:59:17 1.7
@@ -59,7 +59,7 @@
#ifndef OS_WIN32_IOL_SOCKET_H
#define OS_WIN32_IOL_SOCKET_H
-ap_iol *win32_attach_socket(ap_context_t *p, ap_socket_t *sock);
+ap_iol *win32_attach_socket(ap_pool_t *p, ap_socket_t *sock);
#endif
1.12 +5 -5 apache-2.0/src/os/win32/main_win32.c
Index: main_win32.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/main_win32.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- main_win32.c 2000/03/31 09:17:18 1.11
+++ main_win32.c 2000/04/14 15:59:17 1.12
@@ -78,7 +78,7 @@
__declspec(dllexport) int apache_main(int argc, char *argv[]);
#define DEFAULTSERVICENAME "Apache"
-static const char* read_config_cmd(char *filename, char *cmd, ap_context_t *p)
+static const char* read_config_cmd(char *filename, char *cmd, ap_pool_t *p)
{
ap_status_t rc;
char l[MAX_STRING_LEN];
@@ -108,7 +108,7 @@
return s;
}
static void signal_parent(const char* file, const char* signal,
- ap_context_t *p)
+ ap_pool_t *p)
{
HANDLE event;
char prefix[20];
@@ -163,7 +163,7 @@
}
int main(int argc, char *argv[])
{
- ap_context_t *pwincmd;
+ ap_pool_t *pwincmd;
int c;
char *ch;
char *service_name = NULL; //DEFAULTSERVICENAME;
@@ -188,10 +188,10 @@
exit(0); /* nothing to clean up */
}
- status = ap_create_context(&pwincmd, NULL);
+ status = ap_create_pool(&pwincmd, NULL);
if (status != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, status, NULL,
- "ap_create_context() failure");
+ "ap_create_pool() failure");
cleanup_and_exit();
}
1.7 +1 -1 apache-2.0/src/os/win32/mod_dll.c
Index: mod_dll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/mod_dll.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_dll.c 2000/03/31 09:17:18 1.6
+++ mod_dll.c 2000/04/14 15:59:17 1.7
@@ -157,7 +157,7 @@
return NULL;
}
-static void check_loaded_modules (ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp, server_rec *dummy)
+static void check_loaded_modules (ap_pool_t *p, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *dummy)
{
if (been_there_done_that) return;
1.21 +3 -3 apache-2.0/src/os/win32/os.h
Index: os.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/os.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- os.h 2000/04/03 20:41:14 1.20
+++ os.h 2000/04/14 15:59:17 1.21
@@ -160,9 +160,9 @@
}
/* OS-dependent filename routines in util_win32.c */
-API_EXPORT(char *) ap_os_canonical_filename(ap_context_t *p, const char *file);
-API_EXPORT(char *) ap_os_case_canonical_filename(ap_context_t *pPool, const char *szFile);
-API_EXPORT(char *) ap_os_systemcase_filename(ap_context_t *pPool, const char *szFile);
+API_EXPORT(char *) ap_os_canonical_filename(ap_pool_t *p, const char *file);
+API_EXPORT(char *) ap_os_case_canonical_filename(ap_pool_t *pPool, const char *szFile);
+API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pPool, const char *szFile);
int ap_os_is_filename_valid(const char *file);
int os_strftime(char *, size_t , const char *, const struct tm *);
1.13 +7 -7 apache-2.0/src/os/win32/registry.c
Index: registry.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/registry.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- registry.c 2000/04/01 01:14:23 1.12
+++ registry.c 2000/04/14 15:59:18 1.13
@@ -126,13 +126,13 @@
*
* If ppValue is NULL, allocate space for the value and return it in
* *pValue. The return value is the number of bytes in the value.
- * The first argument is the ap_context_t to use to allocate space for the value.
+ * The first argument is the ap_pool_t to use to allocate space for the value.
*
* If pValue is not NULL, assume it is a buffer of nSizeValue bytes,
* and write the value into the buffer. The return value is the number
* of bytes in the value (so if the return value is greater than
* the supplied nSizeValue, the caller knows that *pValue is truncated).
- * The ap_context_t argument is ignored.
+ * The ap_pool_t argument is ignored.
*
* The return value is the number of bytes in the successfully retreived
* key if everything worked, or:
@@ -149,7 +149,7 @@
* message will be logged at priority "warning".
*/
-static int ap_registry_get_key_int(ap_context_t *p, char *key, char *name, char *pBuffer, int nSizeBuffer, char **ppValue)
+static int ap_registry_get_key_int(ap_pool_t *p, char *key, char *name, char *pBuffer, int nSizeBuffer, char **ppValue)
{
long rv;
HKEY hKey;
@@ -256,7 +256,7 @@
* an error getting the key.
*/
#if 0
-int ap_registry_get_server_root(ap_context_t *p, char *dir, int size)
+int ap_registry_get_server_root(ap_pool_t *p, char *dir, int size)
{
int rv;
@@ -268,7 +268,7 @@
return (rv < -1) ? -1 : 0;
}
#else
-int ap_registry_get_server_root(ap_context_t *p, char **buf)
+int ap_registry_get_server_root(ap_pool_t *p, char **buf)
{
int rv;
@@ -291,7 +291,7 @@
return(key);
}
#if 0
-int ap_registry_get_service_conf(ap_context_t *p, char *dir, int size, char *service_name)
+int ap_registry_get_service_conf(ap_pool_t *p, char *dir, int size, char *service_name)
{
int rv;
char *key = ap_get_service_key(service_name);
@@ -305,7 +305,7 @@
return (rv < -1) ? -1 : 0;
}
#else
-int ap_registry_get_service_conf(ap_context_t *p, char **buf, char *service_name)
+int ap_registry_get_service_conf(ap_pool_t *p, char **buf, char *service_name)
{
int rv;
char *key = ap_get_service_key(service_name);
1.6 +2 -2 apache-2.0/src/os/win32/registry.h
Index: registry.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/registry.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- registry.h 2000/03/31 09:17:18 1.5
+++ registry.h 2000/04/14 15:59:18 1.6
@@ -60,7 +60,7 @@
* Declarations for users of the functions defined in registry.c
*/
-extern int ap_registry_get_server_root(ap_context_t *p, char **buf);
+extern int ap_registry_get_server_root(ap_pool_t *p, char **buf);
extern int ap_registry_set_server_root(char *dir);
-extern int ap_registry_get_service_conf(ap_context_t *p, char **buf, char *service_name);
+extern int ap_registry_get_service_conf(ap_pool_t *p, char **buf, char *service_name);
extern int ap_registry_set_service_conf(char *dir, char *service_name);
1.6 +2 -2 apache-2.0/src/os/win32/service.c
Index: service.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/service.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- service.c 2000/03/31 09:17:18 1.5
+++ service.c 2000/04/14 15:59:18 1.6
@@ -130,9 +130,9 @@
char **new, *server_root, *tmp;
char *server_confname = SERVER_CONFIG_FILE;
ap_array_header_t *cmdtbl;
- ap_context_t *pwincmd;
+ ap_pool_t *pwincmd;
- ap_create_context(&pwincmd, NULL);
+ ap_create_pool(&pwincmd, NULL);
if (pwincmd == NULL) {
exit(0);
}
1.7 +3 -3 apache-2.0/src/os/win32/util_win32.c
Index: util_win32.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/util_win32.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- util_win32.c 2000/03/31 09:17:18 1.6
+++ util_win32.c 2000/04/14 15:59:18 1.7
@@ -87,7 +87,7 @@
* is present on the existing path. This routine also
* converts alias names to long names.
*/
-API_EXPORT(char *) ap_os_systemcase_filename(ap_context_t *pPool,
+API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pPool,
const char *szFile)
{
char buf[HUGE_STRING_LEN];
@@ -207,7 +207,7 @@
/* Perform canonicalization with the exception that the
* input case is preserved.
*/
-API_EXPORT(char *) ap_os_case_canonical_filename(ap_context_t *pPool,
+API_EXPORT(char *) ap_os_case_canonical_filename(ap_pool_t *pPool,
const char *szFile)
{
char *pNewStr;
@@ -326,7 +326,7 @@
/* Perform complete canonicalization.
*/
-API_EXPORT(char *) ap_os_canonical_filename(ap_context_t *pPool, const char *szFile)
+API_EXPORT(char *) ap_os_canonical_filename(ap_pool_t *pPool, const char *szFile)
{
char *pNewName;
pNewName = ap_os_case_canonical_filename(pPool, szFile);
1.3 +1 -1 apache-2.0/src/test/test_find.c
Index: test_find.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/test/test_find.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test_find.c 1999/08/31 05:35:47 1.2
+++ test_find.c 2000/04/14 15:59:20 1.3
@@ -41,7 +41,7 @@
int main (void)
{
- ap_context_t *p;
+ ap_pool_t *p;
char line[512];
char tok[512];
1.3 +1 -1 apache-2.0/src/test/test_parser.c
Index: test_parser.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/test/test_parser.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test_parser.c 1999/08/31 05:35:50 1.2
+++ test_parser.c 2000/04/14 15:59:20 1.3
@@ -41,7 +41,7 @@
int main (void)
{
- ap_context_t *p;
+ ap_pool_t *p;
const char *field;
char *newstr;
char instr[512];