PR:

Obtained from:
Submitted by:
Reviewed by:

  How, precisely, was Apache going to do anything with rewritten args ;-?
  +1 on my personal oh-duh tally for the weekend.

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

diff --git a/server/gen_test_char.dsp b/server/gen_test_char.dsp
index f0ccfbb1a059de291f2efe33e32cf7bd20bbcbad..c8395f66397708c0b8e5bdff81b4008a033b8e93 100644 (file)
--- a/server/gen_test_char.dsp
+++ b/server/gen_test_char.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="gen_test_char" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
@@ -22,7 +22,6 @@ CFG=gen_test_char - Win32 Debug
 !MESSAGE 
 
 # Begin Project
-# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -65,8 +64,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "gen_test_char_D"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\include" /I "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /I "..\include" /I "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT CPP /Fr
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"

diff --git a/server/gen_uri_delims.dsp b/server/gen_uri_delims.dsp
index 043f04f81b30741d91e7a2140bdba83fca825fb2..e5293a8346f9fe3112ddd9506183a0d547b6574b 100644 (file)
--- a/server/gen_uri_delims.dsp
+++ b/server/gen_uri_delims.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="gen_uri_delims" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
@@ -22,7 +22,6 @@ CFG=gen_uri_delims - Win32 Debug
 !MESSAGE 
 
 # Begin Project
-# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -65,8 +64,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "gen_uri_delims_D"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe

diff --git a/server/main.c b/server/main.c
index d9b626380ba8ee4b1b285567ede7f93ebc145569..9993c4f79a2d1135e51c244824243a04e9a814c7 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -325,7 +325,8 @@ API_EXPORT(int)        main(int argc, char *argv[])
     /* Maintain AP_SERVER_BASEARGS list in http_main.h to allow the MPM 
      * to safely pass on our args from its rewrite_args() handler.
      */
-    while (ap_getopt(argc, argv, AP_SERVER_BASEARGS, &c, pcommands) 
+    while (ap_getopt(process->argc, process->argv, 
+                     AP_SERVER_BASEARGS, &c, pcommands) 
             == APR_SUCCESS) {
         char **new;
         switch (c) {