From: Jeff Trawick <trawick@apache.org>
Date: Wed, 25 Mar 2009 14:50:24 +0000 (+0000)
Subject: The rewrite-args hook isn't available to MPM DSOs.  Piggy-back on the
X-Git-Tag: 2.3.3~821
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7266edf61b20675c6785cca94fdca6e72a9fb7f;p=thirdparty%2Fapache%2Fhttpd.git

The rewrite-args hook isn't available to MPM DSOs.  Piggy-back on the
linked-in mod_unixd.c to handle that.

(The set of MPMs modified is the same set for which mod_unixd is enabled,
which is approximately equivalent to the set of Unix MPMs which anybody has
tried to maintain in recent memory.)


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

diff --git a/modules/arch/unix/mod_unixd.c b/modules/arch/unix/mod_unixd.c
index a33cf4bd998..256232b7347 100644
--- a/modules/arch/unix/mod_unixd.c
+++ b/modules/arch/unix/mod_unixd.c
@@ -389,7 +389,8 @@ static const command_rec unixd_cmds[] = {
 };
 
 module AP_MODULE_DECLARE_DATA unixd_module = {
-    STANDARD20_MODULE_STUFF,
+    MPM20_MODULE_STUFF,
+    ap_mpm_rewrite_args,
     NULL,
     NULL,
     NULL,
diff --git a/server/mpm/experimental/event/event.c b/server/mpm/experimental/event/event.c
index b1d3e9659c9..d11482e533d 100644
--- a/server/mpm/experimental/event/event.c
+++ b/server/mpm/experimental/event/event.c
@@ -2774,7 +2774,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 13acdb7769d..4be43569cdf 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1569,7 +1569,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/simple/simple_api.c b/server/mpm/simple/simple_api.c
index b6fb66b115f..f6d0e539399 100644
--- a/server/mpm/simple/simple_api.c
+++ b/server/mpm/simple/simple_api.c
@@ -270,7 +270,7 @@ static const command_rec simple_cmds[] = {
 
 module AP_MODULE_DECLARE_DATA mpm_simple_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 846f26da781..d5072fe8a4f 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -2352,7 +2352,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 */