Get rid of more platform dependant code.

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

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index df3dfd6b66fa1616530589b7e074be65314b48e4..05f73fd3b5624823eaf8ed4590301952ad840757 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -816,7 +816,6 @@ static int include_cmd(char *s, request_rec *r)
     ap_status_t rc;
     ap_table_t *env = r->subprocess_env;
     char **argv;
-    ap_os_proc_t pid;
     ap_file_t *file;
     ap_iol *iol;
 
@@ -870,14 +869,7 @@ static int include_cmd(char *s, request_rec *r)
                         "couldn't create child process: %d: %s", rc, r->filename);
         }
         else {
-#ifndef WIN32
-            /* pjr - this is a cheap hack for now to get the basics working in
-             *       stages. ap_note_subprocess and free_proc need to be redone
-             *       to make use of ap_proc_t instead of pid.
-             */
-            ap_get_os_proc(&pid, procnew);
-            ap_note_subprocess(r->pool, pid, kill_after_timeout);
-#endif
+            ap_note_subprocess(r->pool, procnew, kill_after_timeout);
             /* Fill in BUFF structure for parents pipe to child's stdout */
             ap_get_childout(&file, procnew);
             iol = ap_create_file_iol(file);

diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index b0debe113db9d53eb593da9323df6b4db6ef1ee7..c0ee8aa7f6ddf0a508cb3feeabe67bb5212d36f2 100644 (file)
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -284,7 +284,6 @@ static ap_status_t run_cgi_child(BUFF **script_out, BUFF **script_in, BUFF **scr
     char **env;
     ap_procattr_t *procattr;
     ap_proc_t *procnew;
-    ap_os_proc_t fred;
     ap_status_t rc = APR_SUCCESS;
     ap_file_t *file;
     ap_iol *iol;
@@ -340,14 +339,8 @@ static ap_status_t run_cgi_child(BUFF **script_out, BUFF **script_in, BUFF **scr
                         "couldn't create child process: %d: %s", rc, r->filename);
         }
         else {
-#ifndef WIN32
-            /* pjr - this is a cheap hack for now to get the basics working in
-             *       stages. ap_note_subprocess and free_proc need to be redone
-             *       to make use of ap_proc_t instead of pid.
-             */
-            ap_get_os_proc(&fred, procnew);
-            ap_note_subprocess(p, fred, kill_after_timeout);
-#endif
+            ap_note_subprocess(p, procnew, kill_after_timeout);
+
             /* Fill in BUFF structure for parents pipe to child's stdout */
             ap_get_childout(&file, procnew);
             iol = ap_create_file_iol(file);

diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c
index 30f0743e84ef84c8a882478cfca2891ddb2714ea..ee553d7a6889254b575a84c65f15f88a0c57f535 100644 (file)
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -2153,7 +2153,6 @@ static int uncompress_child(struct uncompress_parms *parm, ap_context_t *cntxt,
     ap_context_t *child_context = cntxt;
     ap_procattr_t *procattr;
     ap_proc_t *procnew = NULL;
-    ap_os_proc_t fred;
     ap_file_t *file;
     ap_iol *iol;
 
@@ -2190,15 +2189,7 @@ static int uncompress_child(struct uncompress_parms *parm, ap_context_t *cntxt,
                           compr[parm->method].argv[0]);
         }
         else {
-#ifndef WIN32
-            /* pjr - this is a cheap hack for now to get the basics working in
-             *       stages. ap_note_subprocess and free_proc need to be redon
-
-             *       to make use of ap_proc_t instead of pid.
-             */
-            ap_get_os_proc(&fred, procnew);
-            ap_note_subprocess(child_context, fred, kill_after_timeout);
-#endif
+            ap_note_subprocess(child_context, procnew, kill_after_timeout);
             /* Fill in BUFF structure for parents pipe to child's stdout */
             ap_get_childout(&file, procnew);
             iol = ap_create_file_iol(file);

diff --git a/server/log.c b/server/log.c
index 7bb695ac826983971c3f5a1b34d39e4e86c2e9f3..0180fb0bcf4d302c6e713a436d50c06642e36bd2 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -166,7 +166,6 @@ static int log_child(ap_context_t *p, const char *progname,
     int rc = -1;
     ap_procattr_t *procattr;
     ap_proc_t *procnew;
-    ap_os_proc_t fred;
 
     ap_block_alarms();
     ap_cleanup_for_exec();
@@ -189,14 +188,7 @@ static int log_child(ap_context_t *p, const char *progname,
         rc = ap_create_process(&procnew, progname, NULL, NULL, procattr, p);
     
         if (rc == APR_SUCCESS) {
-#ifndef WIN32
-            /* pjr - this is a cheap hack for now to get the basics working in
-             *       stages. ap_note_subprocess and free_proc need to be redone
-             *       to make use of ap_proc_t instead of pid.
-             */
-            ap_get_os_proc(&fred, procnew);
-            ap_note_subprocess(p, fred, kill_after_timeout);
-#endif
+            ap_note_subprocess(p, procnew, kill_after_timeout);
             ap_get_childin(fpin, procnew);
         }
     }