Commit 1c13cb81 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Fix the warnings associated with the pre_config patch. 


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

include/http_config.h

+1 −1
Changes for include/http_config.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ 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, server_rec *s);

    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);

server/config.c

+2 −3
Changes for server/config.c: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -1308,14 +1308,13 @@ void ap_single_module_configure(ap_context_t *p, server_rec *s, module *m) 
                             (*m->create_dir_config)(p, NULL));

}



void run_pre_config(ap_context_t *p, ap_context_t *plog,

                       ap_context_t *ptemp, server_rec *s)

void run_pre_config(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp)

{

    module *m;



    for (m = top_module; m; m = m->next)

        if (m->pre_config)

            (*m->pre_config) (p, plog, ptemp, s);

            (*m->pre_config) (p, plog, ptemp);

    init_handlers(p);

}

server/main.c

+2 −2
Changes for server/main.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ API_EXPORT_NONSTD(int) main(int argc, char *argv[]) 
       for example, to settle down. */



    ap_server_root = def_server_root;

    run_pre_config(pconf, plog, ptemp, server_conf);

    run_pre_config(pconf, plog, ptemp);

    server_conf = ap_read_config(process, ptemp, confname);

    if (configtestonly) {

	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "Syntax OK\n");
@@ -383,7 +383,7 @@ API_EXPORT_NONSTD(int) main(int argc, char *argv[]) 
	}

	ap_create_context(&ptemp, pconf);

	ap_server_root = def_server_root;

	run_pre_config(pconf, plog, ptemp, server_conf);

	run_pre_config(pconf, plog, ptemp);

	server_conf = ap_read_config(process, ptemp, confname);

	ap_clear_pool(plog);

	ap_run_open_logs(pconf, plog, ptemp, server_conf);