You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2004/08/23 17:07:19 UTC
cvs commit: httpd-2.0/support suexec.c apachectl.in
jorton 2004/08/23 08:07:19
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
support Tag: APACHE_2_0_BRANCH suexec.c apachectl.in
Log:
Backport from HEAD:
* support/apachectl.in: Fix a problem finding envvars if sbindir !=
bindir.
* support/suexec.c: Pass the SERVER_SIGNATURE envvar through to CGIs.
PR: 30723
Submitted by: Friedrich Haubensak, Zvi Har'El
Reviewed by: trawick, jorton, nd, slive
Revision Changes Path
No revision
No revision
1.988.2.328 +6 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.327
retrieving revision 1.988.2.328
diff -d -w -u -r1.988.2.327 -r1.988.2.328
--- CHANGES 23 Aug 2004 14:59:50 -0000 1.988.2.327
+++ CHANGES 23 Aug 2004 15:07:17 -0000 1.988.2.328
@@ -1,5 +1,11 @@
Changes with Apache 2.0.51
+ *) suexec: Pass the SERVER_SIGNATURE envvar through to CGIs.
+ [Zvi Har'El <rl math.technion.ac.il>]
+
+ *) apachectl: Fix a problem finding envvars if sbindir != bindir.
+ PR 30723. [Friedrich Haubensak <hsk imb-jena.de>]
+
*) mod_ssl: Build on RHEL 3. PR 18989. [Justin Erenkrantz]
*) SECURITY: CAN-2004-0748 (cve.mitre.org)
1.751.2.998 +1 -15 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.997
retrieving revision 1.751.2.998
diff -d -w -u -r1.751.2.997 -r1.751.2.998
--- STATUS 23 Aug 2004 14:59:51 -0000 1.751.2.997
+++ STATUS 23 Aug 2004 15:07:18 -0000 1.751.2.998
@@ -73,24 +73,10 @@
[ please place file names and revisions from HEAD here, so it is easy to
identify exactly what the proposed changes are! ]
- *) Fix mod_userdir vs mod_suexec identity hook ordering.
- http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/mappers/mod_userdir.c?r1=1.58&r2=1.59
- PR: 18156
- +1: jorton, slive, nd
-
*) [SECURITY] mod_ssl: Fix potential input filter segfaults in SPECULATIVE mode.
http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/ssl/ssl_engine_io.c?r1=1.125&r2=1.126
PR: 30134
+1: jorton
-
- *) apachectl: Fix a problem finding envvars if sbindir != bindir.
- PR 30723. [Friedrich Haubensak <hsk imb-jena.de>]
- http://cvs.apache.org/viewcvs.cgi/httpd-2.0/support/apachectl.in?r1=1.22&r2=1.23
- +1: trawick, jorton, nd
-
- *) suexec: Pass the SERVER_SIGNATURE envvar through to CGIs.
- http://cvs.apache.org/viewcvs.cgi/httpd-2.0/support/suexec.c?r1=1.32&r2=1.33
- +1: trawick, jorton, slive, nd
*) Proposal: Several folks want to aggressively backport changes
from mod_cache, mod_mem_cache and mod_file_cache from Apache
No revision
No revision
1.21.2.8 +1 -0 httpd-2.0/support/suexec.c
Index: suexec.c
===================================================================
RCS file: /home/cvs/httpd-2.0/support/suexec.c,v
retrieving revision 1.21.2.7
retrieving revision 1.21.2.8
diff -d -w -u -r1.21.2.7 -r1.21.2.8
--- suexec.c 9 Feb 2004 20:59:49 -0000 1.21.2.7
+++ suexec.c 23 Aug 2004 15:07:18 -0000 1.21.2.8
@@ -134,6 +134,7 @@
"SERVER_ADDR=",
"SERVER_PORT=",
"SERVER_PROTOCOL=",
+ "SERVER_SIGNATURE=",
"SERVER_SOFTWARE=",
"UNIQUE_ID=",
"USER_NAME=",
1.17.2.5 +2 -2 httpd-2.0/support/apachectl.in
Index: apachectl.in
===================================================================
RCS file: /home/cvs/httpd-2.0/support/apachectl.in,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.5
diff -d -w -u -r1.17.2.4 -r1.17.2.5
--- apachectl.in 9 Feb 2004 20:59:49 -0000 1.17.2.4
+++ apachectl.in 23 Aug 2004 15:07:18 -0000 1.17.2.5
@@ -43,8 +43,8 @@
HTTPD='@exp_sbindir@/@progname@'
#
# pick up any necessary environment variables
-if test -f @exp_bindir@/envvars; then
- . @exp_bindir@/envvars
+if test -f @exp_sbindir@/envvars; then
+ . @exp_sbindir@/envvars
fi
#
# a command that outputs a formatted text version of the HTML at the