You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2004/01/12 19:31:31 UTC
cvs commit: httpd-2.0/modules/generators mod_cgid.c
trawick 2004/01/12 10:31:31
Modified: . Tag: APACHE_2_0_BRANCH STATUS CHANGES
modules/generators Tag: APACHE_2_0_BRANCH mod_cgid.c
Log:
backport this fix from 2.1-dev:
Fix a long delay with CGI requests and keepalive connections on
AIX.
Reviewed by: stoddard, jerenkrantz
Revision Changes Path
No revision
No revision
1.751.2.630 +1 -7 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.629
retrieving revision 1.751.2.630
diff -u -r1.751.2.629 -r1.751.2.630
--- STATUS 12 Jan 2004 15:54:35 -0000 1.751.2.629
+++ STATUS 12 Jan 2004 18:31:30 -0000 1.751.2.630
@@ -298,12 +298,6 @@
modules/experimental/cache_cache.c r1.5
+1: jwoolley, bnicholes, rederpj
- * Fix a long delay with CGI requests and keepalive connections on
- AIX.
- modules/generators/mod_cgid.c r1.159
- jerenkrantz: Could we do this on other platforms, too?
- +1: trawick, stoddard, jerenkrantz
-
CURRENT RELEASE NOTES:
* Backwards compatibility is expected of future Apache 2.0 releases,
1.988.2.218 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.217
retrieving revision 1.988.2.218
diff -u -r1.988.2.217 -r1.988.2.218
--- CHANGES 12 Jan 2004 15:54:35 -0000 1.988.2.217
+++ CHANGES 12 Jan 2004 18:31:30 -0000 1.988.2.218
@@ -1,5 +1,8 @@
Changes with Apache 2.0.49
+ *) Fix a long delay with CGI requests and keepalive connections on
+ AIX. [Jeff Trawick]
+
*) mod_autoindex: Add 'XHTML' option in order to allow switching between
HTML 3.2 and XHTML 1.0 output. PR 23747. [Andr� Malo]
No revision
No revision
1.145.2.11 +10 -0 httpd-2.0/modules/generators/mod_cgid.c
Index: mod_cgid.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
retrieving revision 1.145.2.10
retrieving revision 1.145.2.11
diff -u -r1.145.2.10 -r1.145.2.11
--- mod_cgid.c 1 Jan 2004 13:30:39 -0000 1.145.2.10
+++ mod_cgid.c 12 Jan 2004 18:31:31 -0000 1.145.2.11
@@ -1161,7 +1161,17 @@
apr_interval_time_t total = 0;
do {
+#ifdef _AIX
+ /* On AIX, for processes like mod_cgid's script children where
+ * SIGCHLD is ignored, kill(pid,0) returns success for up to
+ * one second after the script child exits, based on when a
+ * daemon runs to clean up unnecessary process table entries.
+ * getpgid() can report the proper info (-1/ESRCH) immediately.
+ */
+ if (getpgid(pid) < 0) {
+#else
if (kill(pid, 0) < 0) {
+#endif
return APR_SUCCESS;
}
apr_sleep(interval);