Commit 7edd7652 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages 

on Linux, but probably breaks somewhere.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84963 13f79535-47bb-0310-9956-ffa450edef68
parent 604a17e6

include/ap_mpm.h

+3 −3
Changes for include/ap_mpm.h: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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 @@ void ap_start_restart(int graceful); 
/* 

 * 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

/*

include/http_config.h

+22 −22
Changes for include/http_config.h: 22 added lines, 22 removed lines.
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ typedef struct { 


    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 @@ typedef struct module_struct { 
                                 * 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 @@ API_EXPORT_NONSTD(const char *) ap_set_file_slot(cmd_parms *, char *, char *); 
 * 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 @@ extern API_VAR_EXPORT module **ap_loaded_modules; 


/* 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 @@ CORE_EXPORT(const char *) ap_handle_command(cmd_parms *parms, void *config, cons 
  /* 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

}

include/http_connection.h

+2 −2
Changes for include/http_connection.h: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -63,10 +63,10 @@ extern "C" { 
#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 *);

include/http_core.h

+2 −2
Changes for include/http_core.h: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ API_EXPORT(const char *) ap_get_remote_logname(request_rec *r); 
/* 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 @@ typedef struct { 
} 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);

include/http_log.h

+4 −4
Changes for include/http_log.h: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ extern "C" { 


#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 @@ API_EXPORT(void) ap_log_rerror(const char *file, int line, int level, 
			    __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 @@ API_EXPORT(void) ap_log_reason(const char *reason, const char *fname, 
			    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 @@ typedef struct piped_log { 
#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])