rbb 99/12/13 12:52:30
Modified: src/main http_log.c
src/modules/standard mod_cgi.c mod_include.c
mod_mime_magic.c
Log:
Get rid of more platform dependant code.
Revision Changes Path
1.22 +1 -9 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- http_log.c 1999/12/13 14:01:34 1.21
+++ http_log.c 1999/12/13 20:52:26 1.22
@@ -166,7 +166,6 @@
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 @@
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);
}
}
1.20 +2 -9 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mod_cgi.c 1999/12/02 18:36:36 1.19
+++ mod_cgi.c 1999/12/13 20:52:28 1.20
@@ -284,7 +284,6 @@
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 @@
"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);
1.10 +1 -9 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_include.c 1999/12/02 18:36:37 1.9
+++ mod_include.c 1999/12/13 20:52:28 1.10
@@ -816,7 +816,6 @@
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 @@
"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);
1.10 +1 -10 apache-2.0/src/modules/standard/mod_mime_magic.c
Index: mod_mime_magic.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_mime_magic.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_mime_magic.c 1999/12/02 18:36:39 1.9
+++ mod_mime_magic.c 1999/12/13 20:52:28 1.10
@@ -2153,7 +2153,6 @@
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 @@
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);
