Core can specify a platform-specific rewrite args hook. Use that on Unix.

Windows continues to specify this in the MPM, at least until someone
can separate out the MPM-specific bits.

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

diff --git a/modules/arch/unix/mod_unixd.c b/modules/arch/unix/mod_unixd.c
index 08446b01eeacb904ddb8d3a2f041bdfb1b699c72..31dec8568c42b5f1448f8dc3b2ee58f203dacef7 100644 (file)
--- a/modules/arch/unix/mod_unixd.c
+++ b/modules/arch/unix/mod_unixd.c
@@ -354,8 +354,7 @@ static const command_rec unixd_cmds[] = {
 };
 
 module AP_MODULE_DECLARE_DATA unixd_module = {
-    MPM20_MODULE_STUFF,
-    ap_mpm_rewrite_args,
+    STANDARD20_MODULE_STUFF,
     NULL,
     NULL,
     NULL,

diff --git a/os/netware/os.h b/os/netware/os.h
index 71af7790fd84f59fb552dc15e3a9971dc2f8bb78..86a93fa6d231b57d5243f6103213f69645ba2698 100644 (file)
--- a/os/netware/os.h
+++ b/os/netware/os.h
@@ -32,6 +32,13 @@
 #define PLATFORM "NETWARE"
 #endif
 
+/* Define command-line rewriting for this platform, handled by core.
+ * For Netware, this is currently handled inside the Netware MPM.
+ * XXX To support a choice of MPMs, extract common platform behavior
+ * into a function specified here.
+ */
+#define AP_PLATFORM_REWRITE_ARGS_HOOK NULL
+
 #include <screen.h>
 
 AP_DECLARE_DATA extern int hold_screen_on_exit; /* Indicates whether the screen should be held open on exit*/

diff --git a/os/unix/os.h b/os/unix/os.h
index 029b1113d1533dfb39298eebc6674fe7a36200f5..5c7fbdff32c1df0e81b52718d2516cd2ccbb3542 100644 (file)
--- a/os/unix/os.h
+++ b/os/unix/os.h
@@ -40,6 +40,10 @@
  * parent process. */
 #define AP_NEED_SET_MUTEX_PERMS 1
 
+/* Define command-line rewriting for this platform, handled by core.
+ */
+#define AP_PLATFORM_REWRITE_ARGS_HOOK ap_mpm_rewrite_args
+
 #ifdef _OSD_POSIX
 pid_t os_fork(const char *user);
 #endif

diff --git a/os/win32/os.h b/os/win32/os.h
index ea5a9e74c534bad933ea64d41dd06107490eb484..0b433996d8eb6322de4c65d0df61fac9f18d6492 100644 (file)
--- a/os/win32/os.h
+++ b/os/win32/os.h
@@ -40,6 +40,13 @@
 
 #define PLATFORM "Win32"
 
+/* Define command-line rewriting for this platform, handled by core.
+ * For Windows, this is currently handled inside the WinNT MPM.
+ * XXX To support a choice of MPMs, extract common platform behavior
+ * into a function specified here.
+ */
+#define AP_PLATFORM_REWRITE_ARGS_HOOK NULL
+
 /* going away shortly... */
 #define HAVE_DRIVE_LETTERS
 #define HAVE_UNC_PATHS

diff --git a/server/core.c b/server/core.c
index 3c42e2040c82fedfc0308616b434090c24c52b48..b9deb75da0a2d1440f480eb61d0527d3142c72c0 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -3949,7 +3949,8 @@ static void register_hooks(apr_pool_t *p)
 }
 
 AP_DECLARE_DATA module core_module = {
-    STANDARD20_MODULE_STUFF,
+    MPM20_MODULE_STUFF,
+    AP_PLATFORM_REWRITE_ARGS_HOOK, /* hook to run before apache parses args */
     create_core_dir_config,       /* create per-directory config structure */
     merge_core_dir_configs,       /* merge per-directory config structures */
     create_core_server_config,    /* create per-server config structure */

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index d01207347bd6fa97fadd60f868526029a20a240c..71c7bd90fb5de3fcdc4e5b5fafe13a0f6543ab43 100644 (file)
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -2856,7 +2856,7 @@ static const command_rec event_cmds[] = {
 
 module AP_MODULE_DECLARE_DATA mpm_event_module = {
     MPM20_MODULE_STUFF,
-    ap_mpm_rewrite_args,        /* hook to run before apache parses args */
+    NULL,                       /* hook to run before apache parses args */
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */
     NULL,                       /* create per-server config structure */

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index e2f7d5b470a61d2fc300f8fa60c30512efac100d..553355deacad89e3e78926a12be6962747d12a18 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1536,7 +1536,7 @@ AP_GRACEFUL_SHUTDOWN_TIMEOUT_COMMAND,
 
 module AP_MODULE_DECLARE_DATA mpm_prefork_module = {
     MPM20_MODULE_STUFF,
-    ap_mpm_rewrite_args,        /* hook to run before apache parses args */
+    NULL,                       /* hook to run before apache parses args */
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */
     NULL,                       /* create per-server config structure */

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 3a9efb60bbfd0e2172c7bbed40a74135d29538fa..f486c9762e7620a528dbac4866fc92143db801c9 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -2354,7 +2354,7 @@ AP_GRACEFUL_SHUTDOWN_TIMEOUT_COMMAND,
 
 module AP_MODULE_DECLARE_DATA mpm_worker_module = {
     MPM20_MODULE_STUFF,
-    ap_mpm_rewrite_args,        /* hook to run before apache parses args */
+    NULL,                       /* hook to run before apache parses args */
     NULL,                       /* create per-directory config structure */
     NULL,                       /* merge per-directory config structures */
     NULL,                       /* create per-server config structure */