Commit 55fafb5e authored by Doug MacEachern's avatar Doug MacEachern
Browse files

remove ap_{post_config,child_init}_hook 

replace usage with ap_run_{post_config,child_init}
PR:
Obtained from:
Submitted by:
Reviewed by:


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

include/http_config.h

+0 −19
Original line number Diff line number Diff line
@@ -791,16 +791,6 @@ AP_DECLARE(void) ap_show_modules(void); 
 */

AP_DECLARE(server_rec *) ap_read_config(process_rec *process, apr_pool_t *temp_pool, const char *config_name, ap_directive_t **conftree);



/**

 * Run all post config hooks for loaded modules.

 * @param pconf The configuration pool

 * @param plog The logging pool

 * @param ptemp The temporary pool

 * @param s The list of server_rec structures

 * @deffunc void ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)

 */

AP_DECLARE(void) ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s);



/**

 * Run all rewrite args hooks for loaded modules

 * @param process The process currently running the server
@@ -906,15 +896,6 @@ void ap_process_resource_config(server_rec *s, const char *fname, 
AP_DECLARE(void) ap_process_config_tree(server_rec *s, ap_directive_t *conftree,

                                        apr_pool_t *p, apr_pool_t *ptemp);





/* For individual MPMs... */

/**

 * Run all child init hooks

 * @param pchild The pool for child process allocations

 * @param s The list of all server_recs

 */

void ap_child_init_hook(apr_pool_t *pchild, server_rec *s);



/* Module-method dispatchers, also for http_request.c */

/**

 * Run the handler phase of each module until a module accepts the

server/config.c

+0 −13
Original line number Diff line number Diff line
@@ -1624,19 +1624,6 @@ AP_DECLARE(void) ap_run_rewrite_args(process_rec *process) 
            (*m->rewrite_args) (process);

}



AP_DECLARE(void) ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)

{

    ap_run_post_config(pconf,plog,ptemp,s); 

}



void ap_child_init_hook(apr_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 */



    ap_run_child_init(pchild,s);

}



/********************************************************************

 * Configuration directives are restricted in terms of where they may

 * appear in the main configuration files and/or .htaccess files according

server/main.c

+2 −2
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ int main(int argc, const char * const argv[]) 
    }

    apr_pool_clear(plog);

    ap_run_open_logs(pconf, plog, ptemp, server_conf);

    ap_post_config_hook(pconf, plog, ptemp, server_conf);

    ap_run_post_config(pconf, plog, ptemp, server_conf);

    apr_pool_destroy(ptemp);



    for (;;) {
@@ -420,7 +420,7 @@ int main(int argc, const char * const argv[]) 
        apr_sort_hooks();

	apr_pool_clear(plog);

	ap_run_open_logs(pconf, plog, ptemp, server_conf);

	ap_post_config_hook(pconf, plog, ptemp, server_conf);

	ap_run_post_config(pconf, plog, ptemp, server_conf);

	apr_pool_destroy(ptemp);



	ap_run_optional_fn_retrieve();

server/mpm/beos/beos.c

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
     * a seperate pool of it's own to use.

     */

    apr_pool_create(&pchild, pconf);

    ap_child_init_hook(pchild, ap_server_conf);

    ap_run_child_init(pchild, ap_server_conf);



    /* Now that we have the child pool (pchild) we can allocate

     * the listenfds and creat the pollset...

server/mpm/experimental/perchild/perchild.c

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ static void child_main(int child_num_arg) 
	clean_child_exit(APEXIT_CHILDFATAL);

    }



    ap_child_init_hook(pchild, ap_server_conf);

    ap_run_child_init(pchild, ap_server_conf);



    /*done with init critical section */