httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/standard mod_cgi.c mod_include.c
Date Wed, 24 May 2000 00:15:13 GMT
rbb         00/05/23 17:15:11

  Modified:    src/lib/apr/include apr_thread_proc.h
               src/lib/apr/threadproc/unix proc.c
               src/main http_log.c
               src/modules/standard mod_cgi.c mod_include.c
  Log:
  Rename stdin, stdout, stderr from new ap_proc_t to in, out, and err because
  Windows was having problems with the original names.
  
  Revision  Changes    Path
  1.33      +3 -3      apache-2.0/src/lib/apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- apr_thread_proc.h	2000/05/23 21:03:56	1.32
  +++ apr_thread_proc.h	2000/05/24 00:15:03	1.33
  @@ -89,9 +89,9 @@
   
   typedef struct ap_proc_t {
       pid_t pid;
  -    ap_file_t *stdin;          /* Parent's side of pipe to child's stdin */
  -    ap_file_t *stdout;         /* Parent's side of pipe to child's stdout */
  -    ap_file_t *stderr;         /* Parent's side of pipe to child's stdouterr */
  +    ap_file_t *in;          /* Parent's side of pipe to child's stdin */
  +    ap_file_t *out;         /* Parent's side of pipe to child's stdout */
  +    ap_file_t *err;         /* Parent's side of pipe to child's stdouterr */
   } ap_proc_t;
   
   typedef struct ap_thread_t           ap_thread_t;
  
  
  
  1.29      +9 -9      apache-2.0/src/lib/apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/proc.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- proc.c	2000/05/23 21:03:59	1.28
  +++ proc.c	2000/05/24 00:15:05	1.29
  @@ -200,15 +200,15 @@
       }
       else if (pid == 0) {
           proc->pid = pid;
  -        proc->stdin = NULL; 
  -        proc->stdout = NULL; 
  -        proc->stderr = NULL; 
  +        proc->in = NULL; 
  +        proc->out = NULL; 
  +        proc->err = NULL; 
           return APR_INCHILD;
       }
       proc->pid = pid;
  -    proc->stdin = NULL; 
  -    proc->stdout = NULL; 
  -    proc->stderr = NULL; 
  +    proc->in = NULL; 
  +    proc->out = NULL; 
  +    proc->err = NULL; 
       return APR_INPARENT;
   }
   
  @@ -221,9 +221,9 @@
       my_stupid_string *newargs;
       ap_proc_t pgrp; 
   
  -    new->stdin = attr->parent_in;
  -    new->stderr = attr->parent_err;
  -    new->stdout = attr->parent_out;
  +    new->in = attr->parent_in;
  +    new->err = attr->parent_err;
  +    new->out = attr->parent_out;
       if ((new->pid = fork()) < 0) {
           return errno;
       }
  
  
  
  1.50      +1 -1      apache-2.0/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- http_log.c	2000/05/23 21:04:00	1.49
  +++ http_log.c	2000/05/24 00:15:06	1.50
  @@ -193,7 +193,7 @@
       
           if (rc == APR_SUCCESS) {
               ap_note_subprocess(p, &procnew, kill_after_timeout);
  -            (*fpin) = procnew.stdin;
  +            (*fpin) = procnew.in;
           }
       }
   
  
  
  
  1.40      +3 -3      apache-2.0/src/modules/standard/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgi.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- mod_cgi.c	2000/05/23 21:04:03	1.39
  +++ mod_cgi.c	2000/05/24 00:15:08	1.40
  @@ -352,7 +352,7 @@
               ap_note_subprocess(p, &procnew, kill_after_timeout);
   
               /* Fill in BUFF structure for parents pipe to child's stdout */
  -            file = procnew.stdout;
  +            file = procnew.out;
               iol = ap_create_file_iol(file);
               if (!iol)
                   return APR_EBADF;
  @@ -361,7 +361,7 @@
               ap_bsetopt(*script_in, BO_TIMEOUT, &r->server->timeout);
   
               /* Fill in BUFF structure for parents pipe to child's stdin */
  -            file = procnew.stdin;
  +            file = procnew.in;
               iol = ap_create_file_iol(file);
               if (!iol)
                   return APR_EBADF;
  @@ -370,7 +370,7 @@
               ap_bsetopt(*script_out, BO_TIMEOUT, &r->server->timeout);
   
               /* Fill in BUFF structure for parents pipe to child's stderr */
  -            file = procnew.stderr;
  +            file = procnew.err;
               iol = ap_create_file_iol(file);
               if (!iol)
                   return APR_EBADF;
  
  
  
  1.32      +1 -1      apache-2.0/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- mod_include.c	2000/05/23 21:04:03	1.31
  +++ mod_include.c	2000/05/24 00:15:09	1.32
  @@ -882,7 +882,7 @@
           else {
               ap_note_subprocess(r->pool, &procnew, kill_after_timeout);
               /* Fill in BUFF structure for parents pipe to child's stdout */
  -            file = procnew.stdout;
  +            file = procnew.out;
               iol = ap_create_file_iol(file);
               if (!iol)
                   return APR_EBADF;
  
  
  

Mime
View raw message