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/filters mod_include.c
Date Tue, 09 Jan 2001 05:12:41 GMT
trawick     01/01/08 21:12:41

  Modified:    modules/filters mod_include.c
  Log:
  get rid of some invalid errno references; use the apr_status_t instead
  
  Revision  Changes    Path
  1.85      +7 -7      httpd-2.0/modules/filters/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- mod_include.c	2001/01/07 19:55:56	1.84
  +++ mod_include.c	2001/01/09 05:12:40	1.85
  @@ -1020,10 +1020,10 @@
                     ap_escape_shell_cmd(r->pool, arg_copy));
       }
   
  -    if ((apr_createprocattr_init(&procattr, r->pool) != APR_SUCCESS) ||
  -        (apr_setprocattr_io(procattr, APR_NO_PIPE, 
  -                           APR_FULL_BLOCK, APR_NO_PIPE) != APR_SUCCESS) ||
  -        (apr_setprocattr_dir(procattr, ap_make_dirstr_parent(r->pool, r->filename))
!= APR_SUCCESS) ||
  +    if (((rc = apr_createprocattr_init(&procattr, r->pool)) != APR_SUCCESS) ||
  +        ((rc = apr_setprocattr_io(procattr, APR_NO_PIPE, 
  +                                  APR_FULL_BLOCK, APR_NO_PIPE)) != APR_SUCCESS) ||
  +        ((rc = apr_setprocattr_dir(procattr, ap_make_dirstr_parent(r->pool, r->filename)))
!= APR_SUCCESS) ||
   #ifdef RLIMIT_CPU
           ((rc = apr_setprocattr_limit(procattr, APR_LIMIT_CPU, conf->limit_cpu)) != APR_SUCCESS)
||
   #endif
  @@ -1033,9 +1033,9 @@
   #ifdef RLIMIT_NPROC
           ((rc = apr_setprocattr_limit(procattr, APR_LIMIT_NPROC, conf->limit_nproc))
!= APR_SUCCESS) ||
   #endif
  -        (apr_setprocattr_cmdtype(procattr, APR_SHELLCMD) != APR_SUCCESS)) {
  +        ((rc = apr_setprocattr_cmdtype(procattr, APR_SHELLCMD)) != APR_SUCCESS)) {
           /* Something bad happened, tell the world. */
  -	ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
               "couldn't initialize proc attributes: %s %s", r->filename, s);
           rc = !APR_SUCCESS;
       }
  @@ -1050,7 +1050,7 @@
   
           if (rc != APR_SUCCESS) {
               /* Bad things happened. Everyone should have cleaned up. */
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
                           "couldn't create child process: %d: %s", rc, s);
           }
           else {
  
  
  

Mime
View raw message