httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/generators mod_cgid.c
Date Mon, 26 Nov 2001 14:38:03 GMT
trawick     01/11/26 06:38:03

  Modified:    modules/generators mod_cgid.c
  Log:
  very minor tweaks:
  . convert a comment to English
  . zap an unnecessary '.' from a log message
  . rearrange the setting of some variables controlling pipes and cmd-type
    in the cgi process so that the differences in their values for ssi vs. cgi
    can be more readily seen
  
  Revision  Changes    Path
  1.105     +14 -9     httpd-2.0/modules/generators/mod_cgid.c
  
  Index: mod_cgid.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -u -r1.104 -r1.105
  --- mod_cgid.c	2001/11/23 22:29:09	1.104
  +++ mod_cgid.c	2001/11/26 14:38:03	1.105
  @@ -505,11 +505,11 @@
           char *argv0; 
           char **env; 
           const char * const *argv; 
  -        apr_int32_t   in_pipe  = APR_CHILD_BLOCK;
  -        apr_int32_t   out_pipe = APR_CHILD_BLOCK;
  -        apr_int32_t   err_pipe = APR_CHILD_BLOCK;
  -        apr_cmdtype_e cmd_type = APR_PROGRAM;
  -        request_rec *r; 
  +        apr_int32_t in_pipe;
  +        apr_int32_t out_pipe;
  +        apr_int32_t err_pipe;
  +        apr_cmdtype_e cmd_type;
  +        request_rec *r;
           apr_procattr_t *procattr = NULL;
           apr_proc_t *procnew = NULL;
           apr_file_t *inout;
  @@ -522,7 +522,7 @@
               if (errno != EINTR) {
                   ap_log_error(APLOG_MARK, APLOG_ERR, errno, 
                                (server_rec *)data,
  -                             "Error accepting on cgid socket.");
  +                             "Error accepting on cgid socket");
               }
               continue;
           }
  @@ -540,6 +540,12 @@
               err_pipe = APR_NO_PIPE;
               cmd_type = APR_SHELLCMD;
           }
  +        else {
  +            in_pipe  = APR_CHILD_BLOCK;
  +            out_pipe = APR_CHILD_BLOCK;
  +            err_pipe = APR_CHILD_BLOCK;
  +            cmd_type = APR_PROGRAM;
  +        }
   
           if (((rc = apr_procattr_create(&procattr, ptrans)) != APR_SUCCESS) ||
               ((req_type == CGI_REQ) && 
  @@ -564,8 +570,8 @@
           else {
               argv = (const char * const *)create_argv(r->pool, NULL, NULL, NULL, argv0,
r->args);
   
  -           /* We want to sd2 close for new CGI process too.
  -            * If it's remained open it'll make ap_pass_brigade() block
  +           /* We want to close sd2 for the new CGI process too.
  +            * If it is left open it'll make ap_pass_brigade() block
               * waiting for EOF if CGI forked something running long.
               * close(sd2) here should be okay, as CGI channel
               * is already dup()ed by apr_procattr_child_{in,out}_set()
  @@ -608,7 +614,6 @@
           total_modules = 0;
           for (m = ap_preloaded_modules; *m != NULL; m++)
               total_modules++;
  -
   
           if ((pid = fork()) < 0) {
               ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server, 
  
  
  

Mime
View raw message