Rename stdin, stdout, stderr from new ap_proc_t to in, out, and err because

Windows was having problems with the original names.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85285 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index adc298d66d0d7911ec184f7bdd44629919afe8cd..dbfa41ad8f85810ebd490f082f2547b5392ad680 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -882,7 +882,7 @@ static int include_cmd(char *s, request_rec *r)
         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;

diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index 8bc39979b4ddb2affb1e79af1f2381db32d6efec..4ab25957c329f7f0b488afd75cf9184d97d0c4c4 100644 (file)
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -352,7 +352,7 @@ static ap_status_t run_cgi_child(BUFF **script_out, BUFF **script_in, BUFF **scr
             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 @@ static ap_status_t run_cgi_child(BUFF **script_out, BUFF **script_in, BUFF **scr
             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 @@ static ap_status_t run_cgi_child(BUFF **script_out, BUFF **script_in, BUFF **scr
             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;

diff --git a/server/log.c b/server/log.c
index 89d52981b978ec566ec028cf9d57da5aa3df234d..2dbd9ce726cde2eb1bc9a55597ff20d909085201 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -193,7 +193,7 @@ static int log_child(ap_pool_t *p, const char *progname,
     
         if (rc == APR_SUCCESS) {
             ap_note_subprocess(p, &procnew, kill_after_timeout);
-            (*fpin) = procnew.stdin;
+            (*fpin) = procnew.in;
         }
     }