Fix serious brokenness... we abused prog_type rather than cmd_type on

  Win32 when handling APR_PROGRAM_PATH and APR_SHELLCMD style invocations.

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

diff --git a/modules/arch/win32/mod_win32.c b/modules/arch/win32/mod_win32.c
index 0884668c09043eb725daebd0611268d922924571..eee6bf1616c9752f8743b897dc90ee55899c8631 100644 (file)
--- a/modules/arch/win32/mod_win32.c
+++ b/modules/arch/win32/mod_win32.c
@@ -457,8 +457,8 @@ static apr_status_t ap_cgi_build_command(const char **cmd, const char ***argv,
                       == INTERPRETER_SOURCE_REGISTRY_STRICT);
         interpreter = get_interpreter_from_win32_registry(r->pool, ext,
                                                           strict);
-        if (interpreter && e_info->prog_type != APR_SHELLCMD) {
-            e_info->prog_type = APR_PROGRAM_PATH;
+        if (interpreter && e_info->cmd_type != APR_SHELLCMD) {
+            e_info->cmd_type = APR_PROGRAM_PATH;
         }
         else {
             ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
@@ -499,8 +499,8 @@ static apr_status_t ap_cgi_build_command(const char **cmd, const char ***argv,
                 while (isspace(*interpreter)) {
                     ++interpreter;
                 }
-                if (e_info->prog_type != APR_SHELLCMD) {
-                    e_info->prog_type = APR_PROGRAM_PATH;
+                if (e_info->cmd_type != APR_SHELLCMD) {
+                    e_info->cmd_type = APR_PROGRAM_PATH;
                 }
             }
         }