httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject cvs commit: httpd-2.0/modules/generators mod_cgi.c mod_cgi.h
Date Mon, 12 Jul 2004 16:53:24 GMT
clar        2004/07/12 09:53:24

  Modified:    modules/arch/netware mod_netware.c
               modules/generators mod_cgi.c mod_cgi.h
  Log:
  rev back to previous version, removing chnges to overload detach field , putting back addrspace
field
  
  Revision  Changes    Path
  1.20      +1 -1      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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_netware.c	9 Jul 2004 20:28:48 -0000	1.19
  +++ mod_netware.c	12 Jul 2004 16:53:24 -0000	1.20
  @@ -154,7 +154,7 @@
   
           /* Run in its own address space if specified */
           if(apr_table_get(d->file_handler_mode, ext))
  -            e_info->detached |= 2;
  +            e_info->addrspace = 1;
       }
   
       /* Tokenize the full command string into its arguments */
  
  
  
  1.166     +3 -1      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.165
  retrieving revision 1.166
  diff -u -r1.165 -r1.166
  --- mod_cgi.c	9 Jul 2004 20:28:48 -0000	1.165
  +++ mod_cgi.c	12 Jul 2004 16:53:24 -0000	1.166
  @@ -433,7 +433,7 @@
           ((rc = apr_procattr_detach_set(procattr,
                                           e_info->detached)) != APR_SUCCESS) ||
           ((rc = apr_procattr_addrspace_set(procattr,
  -                                        e_info->detached)) != APR_SUCCESS) ||
  +                                        e_info->addrspace)) != 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,6 +790,7 @@
       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)
{
  @@ -1057,6 +1058,7 @@
       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.16      +1 -0      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_cgi.h	9 Jul 2004 20:28:48 -0000	1.15
  +++ mod_cgi.h	12 Jul 2004 16:53:24 -0000	1.16
  @@ -31,6 +31,7 @@
       apr_bucket_brigade **bb;
       include_ctx_t       *ctx;
       ap_filter_t         *next;
  +    apr_int32_t          addrspace;
   } cgi_exec_info_t;
   
   /**
  
  
  

Mime
View raw message