fielding 99/03/08 12:03:21
Modified: . STATUS configure
src CHANGES
Log:
Do not append the target name to the directory path if
the path already contains "apache".
Submitted by: Ralf S. Engelschall
Reviewed by: Roy Fielding, Lars Eilebrecht
Revision Changes Path
1.641 +1 -5 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.640
retrieving revision 1.641
diff -u -r1.640 -r1.641
--- STATUS 1999/03/08 15:53:20 1.640
+++ STATUS 1999/03/08 20:03:16 1.641
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/03/08 15:53:20 $]
+ Last modified at [$Date: 1999/03/08 20:03:16 $]
Release:
@@ -61,10 +61,6 @@
ftp://ftp.kame.net/pub/kame/misc/apache-134-v6-19990118.diff.gz
Message-ID: <[EMAIL PROTECTED]>
Status: Lars +1 (on concept)
-
- * Ralf's patch to fix append of target name to layout paths
- Message-ID: <[EMAIL PROTECTED]>
- Status: Ralf +1, Roy +1, Lars +1
* Fred's PATCH: Add cgidir, htdocsdir, iconsdir variables in
Makefile.tmpl
Message-ID: <[EMAIL PROTECTED]>
1.74 +13 -4 apache-1.3/configure
Index: configure
===================================================================
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- configure 1999/01/16 22:00:41 1.73
+++ configure 1999/03/08 20:03:17 1.74
@@ -946,10 +946,19 @@
eval "$var=\"$val\""
# expand value
eval "val=\$$var"
- # add target suffix when requested
- if [ ".`echo $val | grep $thetarget`" = . ]; then
- eval "autosuffix=\$autosuffix_$var"
- if [ "x$autosuffix" = "xyes" ]; then
+ # automatically add target suffix to path when it's
+ # requested (path has a trailing plus in config.layout) and
+ # looks reasonable (i.e. when "apache" or target-name
+ # still not part of path)
+ eval "autosuffix=\$autosuffix_$var"
+ if [ "x$autosuffix" = "xyes" ]; then
+ addtarget=no
+ if [ "x`echo $val | grep apache`" = "x" ]; then
+ if [ "x`echo $val | grep $thetarget`" = "x" ]; then
+ addtarget=yes
+ fi
+ fi
+ if [ "x$addtarget" = "xyes" ]; then
eval "$var=\"\$$var/$thetarget\""
fi
fi
1.1266 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1265
retrieving revision 1.1266
diff -u -r1.1265 -r1.1266
--- CHANGES 1999/03/08 15:43:57 1.1265
+++ CHANGES 1999/03/08 20:03:19 1.1266
@@ -1,5 +1,8 @@
Changes with Apache 1.3.5
+ *) In configure, do not append the target name to the directory path if
+ the path already contains "apache". [Ralf S. Engelschall]
+
*) SIGPIPE is now ignored by the server core. The request write routines
(ap_rputc, ap_rputs, ap_rvputs, ap_rwrite, ap_rprintf, ap_rflush) now
correctly check for output errors and mark the connection as aborted.
