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.
77 lines
2.7 KiB
77 lines
2.7 KiB
--- apache_1.3.28/configure.orig Tue May 21 14:24:59 2002 |
|
+++ apache_1.3.28/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.28/src/Configure.dist 2003-06-11 11:59:51.000000000 +0200 |
|
+++ apache_1.3.28/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.28/src/main/alloc.c.dist 2003-07-29 15:23:08.000000000 +0200 |
|
+++ apache_1.3.28/src/main/alloc.c 2003-07-29 15:25:08.000000000 +0200 |
|
@@ -2858,13 +2858,11 @@ |
|
for (p = procs; p; p = p->next) { |
|
if ((p->kill_how == kill_after_timeout) |
|
|| (p->kill_how == kill_only_once)) { |
|
- /* Subprocess may be dead already. Only need the timeout if not. */ |
|
- if (ap_os_kill(p->pid, SIGTERM) == -1) { |
|
- p->kill_how = kill_never; |
|
- } |
|
- else { |
|
- need_timeout = 1; |
|
- } |
|
+ /* Dead subprocesses still need a waitpid to remove the zombie |
|
+ * so we have to ignore errors returned by ap_os_kill() |
|
+ */ |
|
+ ap_os_kill(p->pid, SIGTERM); |
|
+ need_timeout = 1; |
|
} |
|
else if (p->kill_how == kill_always) { |
|
kill(p->pid, SIGKILL); |
|
--- apache_1.3.28/src/main/util_script.c.orig Mon Jul 28 17:13:56 2003 |
|
+++ apache_1.3.28/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; |
|
}
|
|
|