httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r759699 - in /httpd/httpd/trunk: modules/arch/unix/mod_unixd.c os/netware/os.h os/unix/os.h os/win32/os.h server/core.c server/mpm/event/event.c server/mpm/prefork/prefork.c server/mpm/worker/worker.c
Date Sun, 29 Mar 2009 14:41:02 GMT
Author: trawick
Date: Sun Mar 29 14:41:02 2009
New Revision: 759699

URL: http://svn.apache.org/viewvc?rev=759699&view=rev
Log:
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.

Modified:
    httpd/httpd/trunk/modules/arch/unix/mod_unixd.c
    httpd/httpd/trunk/os/netware/os.h
    httpd/httpd/trunk/os/unix/os.h
    httpd/httpd/trunk/os/win32/os.h
    httpd/httpd/trunk/server/core.c
    httpd/httpd/trunk/server/mpm/event/event.c
    httpd/httpd/trunk/server/mpm/prefork/prefork.c
    httpd/httpd/trunk/server/mpm/worker/worker.c

Modified: httpd/httpd/trunk/modules/arch/unix/mod_unixd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/unix/mod_unixd.c?rev=759699&r1=759698&r2=759699&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/unix/mod_unixd.c (original)
+++ httpd/httpd/trunk/modules/arch/unix/mod_unixd.c Sun Mar 29 14:41:02 2009
@@ -354,8 +354,7 @@
 };
 
 module AP_MODULE_DECLARE_DATA unixd_module = {
-    MPM20_MODULE_STUFF,
-    ap_mpm_rewrite_args,
+    STANDARD20_MODULE_STUFF,
     NULL,
     NULL,
     NULL,

Modified: httpd/httpd/trunk/os/netware/os.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/netware/os.h?rev=759699&r1=759698&r2=759699&view=diff
==============================================================================
--- httpd/httpd/trunk/os/netware/os.h (original)
+++ httpd/httpd/trunk/os/netware/os.h Sun Mar 29 14:41:02 2009
@@ -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*/

Modified: httpd/httpd/trunk/os/unix/os.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/unix/os.h?rev=759699&r1=759698&r2=759699&view=diff
==============================================================================
--- httpd/httpd/trunk/os/unix/os.h (original)
+++ httpd/httpd/trunk/os/unix/os.h Sun Mar 29 14:41:02 2009
@@ -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

Modified: httpd/httpd/trunk/os/win32/os.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/os.h?rev=759699&r1=759698&r2=759699&view=diff
==============================================================================
--- httpd/httpd/trunk/os/win32/os.h (original)
+++ httpd/httpd/trunk/os/win32/os.h Sun Mar 29 14:41:02 2009
@@ -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

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=759699&r1=759698&r2=759699&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Sun Mar 29 14:41:02 2009
@@ -3949,7 +3949,8 @@
 }
 
 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 */

Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=759699&r1=759698&r2=759699&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Sun Mar 29 14:41:02 2009
@@ -2856,7 +2856,7 @@
 
 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 */

Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=759699&r1=759698&r2=759699&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Sun Mar 29 14:41:02 2009
@@ -1536,7 +1536,7 @@
 
 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 */

Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=759699&r1=759698&r2=759699&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Sun Mar 29 14:41:02 2009
@@ -2354,7 +2354,7 @@
 
 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 */



Mime
View raw message