You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
106 lines
3.5 KiB
106 lines
3.5 KiB
--- apache_1.3.31/configure.orig Tue May 21 14:24:59 2002 |
|
+++ apache_1.3.31/configure Mon Feb 10 11:08:40 2003 |
|
@@ -1216,10 +1216,10 @@ |
|
## or we cannot support the case where the relative |
|
## path is just the emtpy one, i.e. ""] |
|
## |
|
-runtimedir_relative=`echo $runtimedir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'` |
|
-logfiledir_relative=`echo $logfiledir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'` |
|
-sysconfdir_relative=`echo $sysconfdir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'` |
|
-libexecdir_relative=`echo $libexecdir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'` |
|
+runtimedir_relative="$runtimedir/" |
|
+logfiledir_relative="$logfiledir/" |
|
+sysconfdir_relative="$sysconfdir/" |
|
+libexecdir_relative="$libexecdir/" |
|
|
|
## |
|
## check and debug |
|
--- apache_1.3.31/src/Configure.dist 2003-06-11 11:59:51.000000000 +0200 |
|
+++ apache_1.3.31/src/Configure 2003-06-11 12:46:14.000000000 +0200 |
|
@@ -1190,14 +1190,20 @@ |
|
SHLIB_SUFFIX_DEPTH=0 |
|
;; |
|
*-solaris2*) |
|
- if [ "x`$CC -v 2>&1 | grep gcc`" != "x" ]; then |
|
- CFLAGS_SHLIB="-fPIC" |
|
- else |
|
- CFLAGS_SHLIB="-KPIC" |
|
- fi |
|
+ CFLAGS_SHLIB="-KPIC" |
|
LDFLAGS_SHLIB="-G" |
|
- LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB |
|
LDFLAGS_SHLIB_EXPORT="" |
|
+ for word in `$CC -v 2>&1` ; do |
|
+ case $word in |
|
+ --with-gnu-ld) |
|
+ LDFLAGS_SHLIB="-shared" |
|
+ ;; |
|
+ *gcc*) |
|
+ CFLAGS_SHLIB="-fPIC" |
|
+ ;; |
|
+ esac |
|
+ done |
|
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB |
|
SHLIB_SUFFIX_DEPTH=1 |
|
;; |
|
*-sunos4*) |
|
--- apache_1.3.31/src/main/util_script.c.orig Mon Jul 28 17:13:56 2003 |
|
+++ apache_1.3.31/src/main/util_script.c Tue Jul 29 15:55:27 2003 |
|
@@ -246,6 +246,7 @@ |
|
} |
|
} |
|
|
|
+ if (!(env_path = ap_pstrdup(r->pool, ap_table_get(r->subprocess_env, "PATH")))) |
|
if (!(env_path = ap_pstrdup(r->pool, getenv("PATH")))) { |
|
env_path = DEFAULT_PATH; |
|
} |
|
|
|
=================================================================== |
|
SA-2004.029-apache CAN-2004-0492 |
|
|
|
RCS file: /home/cvspublic/apache-1.3/src/modules/proxy/proxy_http.c,v |
|
retrieving revision 1.106 |
|
retrieving revision 1.107 |
|
diff -u -r1.106 -r1.107 |
|
--- apache_1.3.31/src/modules/proxy/proxy_http.c 2004/03/29 17:47:15 1.106 |
|
+++ apache_1.3.31/src/modules/proxy/proxy_http.c 2004/06/11 07:54:38 1.107 |
|
@@ -485,6 +485,13 @@ |
|
content_length = ap_table_get(resp_hdrs, "Content-Length"); |
|
if (content_length != NULL) { |
|
c->len = ap_strtol(content_length, NULL, 10); |
|
+ |
|
+ if (c->len < 0) { |
|
+ ap_kill_timeout(r); |
|
+ return ap_proxyerror(r, HTTP_BAD_GATEWAY, ap_pstrcat(r->pool, |
|
+ "Invalid Content-Length from remote server", |
|
+ NULL)); |
|
+ } |
|
} |
|
|
|
} |
|
|
|
Index: Configure |
|
--- apache_1.3.31/src/Configure.orig 2004-04-09 19:01:50 +0200 |
|
+++ apache_1.3.31/src/Configure 2004-07-06 22:05:44 +0200 |
|
@@ -1869,19 +1875,8 @@ |
|
fi |
|
|
|
if [ "x$RULE_EXPAT" = "xyes" ]; then |
|
- if ./helpers/TestCompile lib expat; then |
|
- echo " + using system Expat" |
|
- LIBS="$LIBS -lexpat" |
|
- else |
|
- if [ ! -d ./lib/expat-lite/ ]; then |
|
- echo "ERROR: RULE_EXPAT set to \"yes\" but is not available." |
|
- exit 1 |
|
- fi |
|
- echo " + using builtin Expat" |
|
- EXPATLIB="lib/expat-lite/libexpat.a" |
|
- APLIBDIRS="expat-lite $APLIBDIRS" |
|
- CFLAGS="$CFLAGS -DUSE_EXPAT -I\$(SRCDIR)/lib/expat-lite" |
|
- fi |
|
+ echo " + using system Expat" |
|
+ LIBS="$LIBS -lexpat" |
|
fi |
|
|
|
####################################################################
|
|
|