From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 6 Jan 2009 15:22:38 +0000 (+0000)
Subject: eliminating 9x legacy code from mod_win32
X-Git-Tag: 2.3.2~215
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53dd6cf3a2336fc3b1490585a6c34da2a98530ee;p=thirdparty%2Fapache%2Fhttpd.git

eliminating 9x legacy code from mod_win32

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

diff --git a/modules/arch/win32/mod_win32.c b/modules/arch/win32/mod_win32.c
index 181f66d766e..394095877b4 100644
--- a/modules/arch/win32/mod_win32.c
+++ b/modules/arch/win32/mod_win32.c
@@ -32,9 +32,6 @@
 #include "apr_lib.h"
 #include "ap_regkey.h"
 
-extern OSVERSIONINFO osver; /* hiding in mpm_winnt.c */
-static int win_nt;
-
 /*
  * CGI Script stuff for Win32...
  */
@@ -263,9 +260,7 @@ static apr_array_header_t *split_argv(apr_pool_t *p, const char *interp,
                     break;
                 }
                 ap_unescape_url(w);
-                if (win_nt) {
-                   prep_string(&w, p);
-                }
+                prep_string(&w, p);
                 arg = (const char**)apr_array_push(args);
                 *arg = ap_escape_shell_cmd(p, w);
             }
@@ -358,9 +353,7 @@ static apr_array_header_t *split_argv(apr_pool_t *p, const char *interp,
                 break;
             }
             ap_unescape_url(w);
-            if (win_nt) {
-                prep_string(&w, p);
-            }
+            prep_string(&w, p);
             arg = (const char**)apr_array_push(args);
             *arg = ap_escape_shell_cmd(p, w);
         }
@@ -528,7 +521,7 @@ static apr_status_t ap_cgi_build_command(const char **cmd, const char ***argv,
      * application (following the OEM or Ansi code page in effect.)
      */
     for (i = 0; i < elts_arr->nelts; ++i) {
-        if (win_nt && elts[i].key && *elts[i].key
+        if (elts[i].key && *elts[i].key
                 && (strncmp(elts[i].key, "HTTP_", 5) == 0
                  || strncmp(elts[i].key, "SERVER_", 7) == 0
                  || strncmp(elts[i].key, "REQUEST_", 8) == 0
@@ -541,16 +534,9 @@ static apr_status_t ap_cgi_build_command(const char **cmd, const char ***argv,
     return APR_SUCCESS;
 }
 
-static int win32_pre_config(apr_pool_t *pconf_, apr_pool_t *plog, apr_pool_t *ptemp)
-{
-    win_nt = (osver.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS);
-    return OK;
-}
-
 static void register_hooks(apr_pool_t *p)
 {
     APR_REGISTER_OPTIONAL_FN(ap_cgi_build_command);
-    ap_hook_pre_config(win32_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
 static const command_rec win32_cmds[] = {