cvs commit: httpd-2.0/modules/arch/netware mod_netware.c

[bn...@apache.org]

bnicholes    2002/07/25 12:06:13

  Modified:    modules/arch/netware mod_netware.c
  Log:
  Fixed the ap_cgi_build_command() function for NetWare so that it correctly
  builds both the CGI and SSI command strings.
  
  Revision  Changes    Path
  1.4       +11 -3     httpd-2.0/modules/arch/netware/mod_netware.c
  
  Index: mod_netware.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/arch/netware/mod_netware.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_netware.c	10 Jun 2002 16:22:36 -0000	1.3
  +++ mod_netware.c	25 Jul 2002 19:06:13 -0000	1.4
  @@ -125,7 +125,8 @@
                                            request_rec *r, apr_pool_t *p, 
                                            cgi_exec_info_t *e_info)
   {
  -    const char *ext = NULL;
  +    char *ext = NULL;
  +    char *cmd_only, *ptr;
       const char *detached = NULL;
       netware_dir_config *d;
       apr_file_t *fh;
  @@ -147,7 +148,13 @@
               args = r->args;
           }
       }
  -    ext = strrchr(apr_filename_of_pathname(*cmd), '.');
  +    cmd_only = apr_pstrdup(p, *cmd);
  +
  +    /* truncate any arguments from the cmd */
  +    for (ptr = cmd_only; *ptr && (*ptr != ' '); ptr++);
  +    *ptr = '\0';
  +
  +    ext = strrchr(apr_filename_of_pathname(cmd_only), '.');
       
       if (*ext == '.')
           ++ext;
  @@ -166,8 +173,9 @@
           }
       }
   
  -    apr_tokenize_to_argv(r->filename, (char***)argv, p);
  +    apr_tokenize_to_argv(*cmd, (char***)argv, p);
       e_info->cmd_type = APR_PROGRAM;
  +    *cmd = ap_server_root_relative(p, cmd_only);
   
       return APR_SUCCESS;
   }