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, 13 Apr 2002 19:55:00 GMT
wrowe       02/04/13 12:55:00

  Modified:    modules/arch/win32 mod_win32.c
  Log:
    If we have a registry command or a shebang line invocation, correct the
    invocation type to APR_PROGRAM_PATH so we will both search the path, and
    accept undecorated names, e.g. "perl" should be acceptable for "perl.exe".
  
  Revision  Changes    Path
  1.13      +6 -1      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_win32.c	13 Apr 2002 19:50:46 -0000	1.12
  +++ mod_win32.c	13 Apr 2002 19:55:00 -0000	1.13
  @@ -435,6 +435,7 @@
       
       /* If the file has an extension and it is not .com and not .exe and
        * we've been instructed to search the registry, then do so.
  +     * Let apr_proc_create do all of the .bat/.cmd dirty work.
        */
       if (ext && (!strcasecmp(ext,".exe") || !strcasecmp(ext,".com")
                   || !strcasecmp(ext,".bat") || !strcasecmp(ext,".cmd"))) {
  @@ -450,7 +451,10 @@
                         == INTERPRETER_SOURCE_REGISTRY_STRICT);
           interpreter = get_interpreter_from_win32_registry(r->pool, ext,
                                                             strict);
  -        if (!interpreter) {
  +        if (interpreter) {
  +            *type = APR_PROGRAM_PATH;
  +        }
  +        else {
               ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, r->server,
                    strict ? "No ExecCGI verb found for files of type '%s'."
                           : "No ExecCGI or Open verb found for files of type '%s'.", 
  @@ -490,6 +494,7 @@
                   while (isspace(*interpreter)) {
                       ++interpreter;
                   }
  +                *type = APR_PROGRAM_PATH;
               }
           }
           else {
  
  
  

Mime
View raw message