brian 98/05/19 15:49:05
Modified:.STATUS
src CHANGES
src/modules/standard mod_include.c mod_log_agent.c
mod_log_referer.c mod_mime_magic.c
Log:
Two things: replaced the use of spawn_child with ap_spawn_child_err_buff
in various modules (to be safe under Win32) and modified the agent and
referer logging modules to use ap_open_piped_logs rather than try and do
it on their own.
I'm not sure that uncompress_child in mod_mime_magic is correct; could
someone look at it?
Also, Ralf, mod_rewrite.c needs similar treatment. I was off to do it but
it looked more complex than the other changes, and I'm sure once you see
the changes made here you can understand which mod_rewrite changes to make.
Revision ChangesPath
1.402 +9 -10 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- STATUS1998/05/16 16:35:33 1.401
+++ STATUS1998/05/19 22:48:52 1.402
@@ -17,14 +17,11 @@
for buffer overflow, someone should rewrite or verify
they're safe
- * SSI: mod_include has had cmd disabled pending rewrite to use
- new Win32 spawning.
+* CGI: chdir() needs to be reinstated for CGI.
- * CGI: chdir() needs to be reinstated for CGI.
+* Child process: eliminate spawn_child() and spawn_child_err() which
+ are unsafe in mod_rewrite.c
- * Child process: eliminate spawn_child() and spawn_child_err() which
- are unsafe.
-
Documentation that needs writing:
* Documentation for:
@@ -218,8 +215,7 @@
really bad
* chdir() for CGI scripts and mod_include #exec needs to be
- re-implemented. This requires either serializing chdir/spawn
- or using a native Win32 CreateProcess(?) call.
+ re-implemented now that CreateProcess is being used.
* process/thread model
- need dynamic thread creation/destruction, similar to
@@ -247,8 +243,6 @@
* we don't mmap on NT. Use TransmitFile?
* CGIs
-- hangs on multiple CGI execution? PR#1607,1129
- Marc can't repeat...
- docs on how they work w/scripts
- use registry to find interpreter?
- WTF is the buffering coming from?
@@ -369,4 +363,9 @@
5) would be nice if the proxy used Via and Max-Forwards, even as
HTTP/1.0
* #ifdef __EMX__ -- #ifdef OS2.
+
+* use of spawnvp in uncompress_child in mod_mime_magic - doesn't
+ use the new child_info structure, is this still safe? Needs to be
+ looked at.
+
1.853 +9 -2 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.852
retrieving revision 1.853
diff -u -r1.852 -r1.853
--- CHANGES 1998/05/18 21:56:06 1.852
+++ CHANGES 1998/05/19 22:48:57 1.853
@@ -1,5 +1,12 @@
Changes with Apache 1.3b7
+ *) Mod_log_agent, mod_log_referer now use ap_open_piped_log for piped logs.
+ [Brian Behlendorf]
+
+ *) Replace use of spawn_child with ap_spawn_child_err_buff, to make
everything
+ safe under Win32. In: mod_include.c, mod_mime_magic.c
+ [Brian Behlendorf]
+
*) Improve RFC1413 support. [Bob Beck [EMAIL PROTECTED]]
*) Fix support script `dbmmanage': It was unable to handle some sort
@@ -11,8 +18,8 @@
*) WIN32: CGIs could cause a hang (because of a deadlock in the standard C
library), so CGI handling has been changed to use Win32 native handles
- instead of C file descriptors.
- [Ben Laurie and Bill Stoddard [EMAIL PROTECTED]] PR#1129, 1607
+ instead of C file descriptors.
+ [Ben Laurie and Bill Stoddard [EMAIL PROTECTED]] PR#1129, 1607
*) The proxy cache would store an incorrect content-length in the cached
file copy after a cache update. That resulted in repeated fetching
1.89 +6 -13 apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- mod_include.c 1998/05/19 19:19:01 1.88
+++ mod_include.c 1998/05/19 22:49:03 1.89
@@ -786,7 +786,7 @@
#endif
ap_cleanup_for_exec();
/* set shellcmd flag to pass arg to SHELL_PATH */
-child_pid = ap_call_exec(r, NULL, s, ap_create_environment(r-pool, env),
+child_pid = ap_call_exec(r, pinfo, s, ap_create_environment(r-pool,
env),
