cvs commit: httpd-2.0/modules/generators mod_cgi.c mod_cgi.h

[cl...@apache.org]

clar        2004/07/09 13:28:48

  Modified:    modules/arch/netware mod_netware.c
               modules/generators mod_cgi.c mod_cgi.h
  Log:
  Overloading detached field in cgi_exec_info_t stuct in order to use same field to set detached and addrspace values for proc to be started.
  
  Revision  Changes    Path
  1.19      +2 -2      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_netware.c	14 Jun 2004 17:28:25 -0000	1.18
  +++ mod_netware.c	9 Jul 2004 20:28:48 -0000	1.19
  @@ -141,6 +141,7 @@
   
       /* check if we have a registered command for the extension*/
       new_cmd = apr_table_get(d->file_type_handlers, ext);
  +    e_info->detached = 1;
       if (new_cmd == NULL) {
           ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                     "Could not find a command associated with the %s extension", ext);
  @@ -153,12 +154,11 @@
   
           /* Run in its own address space if specified */
           if(apr_table_get(d->file_handler_mode, ext))
  -            e_info->addrspace = 1;
  +            e_info->detached |= 2;
       }
   
       /* Tokenize the full command string into its arguments */
       apr_tokenize_to_argv(*cmd, (char***)argv, p);
  -    e_info->detached = 1;
   
       /* The first argument should be the executible */
       *cmd = ap_server_root_relative(p, *argv[0]);
  
  
  
  1.165     +1 -3      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.164
  retrieving revision 1.165
  diff -u -r1.164 -r1.165
  --- mod_cgi.c	14 Jun 2004 17:28:25 -0000	1.164
  +++ mod_cgi.c	9 Jul 2004 20:28:48 -0000	1.165
  @@ -433,7 +433,7 @@
           ((rc = apr_procattr_detach_set(procattr,
                                           e_info->detached)) != APR_SUCCESS) ||
           ((rc = apr_procattr_addrspace_set(procattr,
  -                                        e_info->addrspace)) != APR_SUCCESS) ||
  +                                        e_info->detached)) != APR_SUCCESS) ||
           ((rc = apr_procattr_child_errfn_set(procattr, cgi_child_errfn)) != APR_SUCCESS)) {
           /* Something bad happened, tell the world. */
           ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
  @@ -790,7 +790,6 @@
       e_info.bb          = NULL;
       e_info.ctx         = NULL;
       e_info.next        = NULL;
  -    e_info.addrspace   = 0;
   
       /* build the command line */
       if ((rv = cgi_build_command(&command, &argv, r, p, &e_info)) != APR_SUCCESS) {
  @@ -1058,7 +1057,6 @@
       e_info.bb          = &bb;
       e_info.ctx         = ctx;
       e_info.next        = f->next;
  -    e_info.addrspace   = 0;
   
       if ((rv = cgi_build_command(&command, &argv, r, r->pool,
                                   &e_info)) != APR_SUCCESS) {
  
  
  
  1.15      +0 -1      httpd-2.0/modules/generators/mod_cgi.h
  
  Index: mod_cgi.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mod_cgi.h	14 Jun 2004 17:28:25 -0000	1.14
  +++ mod_cgi.h	9 Jul 2004 20:28:48 -0000	1.15
  @@ -31,7 +31,6 @@
       apr_bucket_brigade **bb;
       include_ctx_t       *ctx;
       ap_filter_t         *next;
  -    apr_int32_t          addrspace;
   } cgi_exec_info_t;
   
   /**