Commit a97be514 authored by Joe Orton's avatar Joe Orton
Browse files

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104769 13f79535-47bb-0310-9956-ffa450edef68
parent a189e7ee

CHANGES

+6 −0
Changes for CHANGES: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line 
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)


































STATUS



+1
−15



























Changes for STATUS: 1 added line, 15 removed lines.



Original line number
Diff line number
Diff line









APACHE 2.0 STATUS:                                              -*-text-*-









Last modified at [$Date: 2004/08/23 14:59:51 $]









Last modified at [$Date: 2004/08/23 15:07:18 $]



















Release:




















@@ -73,25 +73,11 @@ PATCHES TO BACKPORT FROM 2.1







  [ 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









       2.1 back into the 2.0 tree. Proposal is this: Lets drop the 


































support/apachectl.in



+2
−2



























Changes for support/apachectl.in: 2 added lines, 2 removed lines.



Original line number
Diff line number
Diff line







@@ -43,8 +43,8 @@ ARGV="$@"







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


































support/suexec.c



+1
−0



























Changes for support/suexec.c: 1 added line, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -134,6 +134,7 @@ char *safe_env_lst[] =







    "SERVER_ADDR=",









    "SERVER_PORT=",









    "SERVER_PROTOCOL=",









    "SERVER_SIGNATURE=",









    "SERVER_SOFTWARE=",









    "UNIQUE_ID=",









    "USER_NAME=",