cvs commit: apr/threadproc/win32 proc.c

[ak...@locus.apache.org]

ake         00/12/15 07:02:40

  Modified:    .        CHANGES
               modules/generators mod_cgi.c
               threadproc/win32 proc.c
  Log:
  Get exe CGI's working again on Windows
  
  Revision  Changes    Path
  1.7       +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CHANGES	2000/12/13 13:30:39	1.6
  +++ CHANGES	2000/12/15 15:02:34	1.7
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0b1
   
  +  *) Get exe CGI's working again on Windows.
  +     [Allan Edwards]
  +
     *) Get mod_cgid and mod_rewrite to work as DSOs by changing the way
        they keep track of whether or not their  post config hook has been
        called before.  Instead of a static variable (which is replaced when 
  
  
  
  1.73      +2 -2      httpd-2.0/modules/generators/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- mod_cgi.c	2000/11/27 22:30:34	1.72
  +++ mod_cgi.c	2000/12/15 15:02:38	1.73
  @@ -477,7 +477,7 @@
       /*
        * Build the command string to pass to ap_os_create_privileged_process()
        */
  -    quoted_filename = apr_pstrcat(p, "\"", argv0, "\"", NULL);
  +    quoted_filename = apr_pstrcat(p, "\"", r->filename, "\"", NULL);
       if (interpreter && *interpreter) {
           if (arguments && *arguments)
               *cmd = apr_pstrcat(p, interpreter, " ", quoted_filename, " ", 
  @@ -492,7 +492,7 @@
           *cmd = apr_pstrcat(p, quoted_filename, NULL);
       }
   #else
  -    *cmd = argv0;
  +    *cmd = apr_pstrcat(p, r->filename, NULL);
   #endif
       return APR_SUCCESS;
   }
  
  
  
  1.40      +1 -1      apr/threadproc/win32/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/win32/proc.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- proc.c	2000/11/26 02:03:12	1.39
  +++ proc.c	2000/12/15 15:02:40	1.40
  @@ -282,7 +282,7 @@
               ptr++;
           }
   
  -        if (*ptr == '\\' || *++ptr == ':') {
  +        if (*ptr == '\\' || *ptr == '/' || *++ptr == ':') {
               cmdline = apr_pstrdup(cont, progname);
           }
           else if (attr->currdir == NULL) {