PR:

Obtained from:
Submitted by:
Reviewed by:

  Migrate the 'real' pre_config hook update from winnt.c to mpm_winnt.c
  and correct newly required symbols for http_main.c

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

diff --git a/include/http_config.h b/include/http_config.h
index d1c70d1bba764925dcdea8ce6b6e699e921ac78a..330c82208682ae507347d49db7caf8e72971af1c 100644 (file)
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -405,8 +405,8 @@ CORE_EXPORT(const char *) ap_init_virtual_host(ap_pool_t *p, const char *hostnam
                                server_rec *main_server, server_rec **);
 void ap_process_resource_config(server_rec *s, const char *fname, 
                  ap_directive_t **conftree, ap_pool_t *p, ap_pool_t *ptemp);
-void ap_process_config_tree(server_rec *s, ap_directive_t *conftree,
-                            ap_pool_t *p, ap_pool_t *ptemp);
+API_EXPORT(void) ap_process_config_tree(server_rec *s, ap_directive_t *conftree,
+                                        ap_pool_t *p, ap_pool_t *ptemp);
 
 
 /* For individual MPMs... */

diff --git a/server/config.c b/server/config.c
index dd99ebd0c92fce6d41c570043138999f3a4d8c05..7a2cf302222895c9366689250173ad85ad0f4f63 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -1331,8 +1331,8 @@ void ap_process_resource_config(server_rec *s, const char *fname,
     ap_cfg_closefile(cfp);
 }
 
-void ap_process_config_tree(server_rec *s, ap_directive_t *conftree,
-                            ap_pool_t *p, ap_pool_t *ptemp)
+API_EXPORT(void)ap_process_config_tree(server_rec *s, ap_directive_t *conftree,
+                                       ap_pool_t *p, ap_pool_t *ptemp)
 {
     const char *errmsg;
     cmd_parms parms;

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index fac7a1508740458f9a1aa0320870108afd6ec9c1..288d29abf475070f7f06579949352185ffd4d78b 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -2173,6 +2173,7 @@ API_EXPORT(int) ap_mpm_run(ap_pool_t *_pconf, ap_pool_t *plog, server_rec *s )
 static void winnt_hooks(void)
 {
     one_process = 0;
+    ap_hook_pre_config(winnt_pre_config, NULL, NULL, AP_HOOK_MIDDLE);
     ap_hook_post_config(winnt_post_config, NULL, NULL, 0);
 }
 
@@ -2285,7 +2286,6 @@ LISTEN_COMMANDS
 MODULE_VAR_EXPORT module mpm_winnt_module = {
     MPM20_MODULE_STUFF,
     winnt_rewrite_args,         /* hook to run before apache parses args */
-    winnt_pre_config,           /* hook run before configuration is read */
     NULL,                      /* create per-directory config structure */
     NULL,                      /* merge per-directory config structures */
     NULL,                      /* create per-server config structure */