httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/arch/win32 mod_win32.c
Date Sat, 15 Jun 2002 00:36:05 GMT
wrowe       2002/06/14 17:36:05

  Modified:    modules/arch/win32 mod_win32.c
  Log:
    Fix serious brokenness... we abused prog_type rather than cmd_type on
    Win32 when handling APR_PROGRAM_PATH and APR_SHELLCMD style invocations.
  
  Revision  Changes    Path
  1.17      +4 -4      httpd-2.0/modules/arch/win32/mod_win32.c
  
  Index: mod_win32.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/arch/win32/mod_win32.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_win32.c	6 Jun 2002 00:22:45 -0000	1.16
  +++ mod_win32.c	15 Jun 2002 00:36:05 -0000	1.17
  @@ -457,8 +457,8 @@
                         == 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 @@
                   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;
                   }
               }
           }
  
  
  

Mime
View raw message