From: Sebastian Bergmann Date: Sun, 12 Jan 2003 08:03:18 +0000 (+0000) Subject: Patch by Giuseppe Tanzilli . X-Git-Tag: PHP_5_0_dev_before_13561_fix~304 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17c15187928df2e6c502f124e078d52c4cacc716;p=php Patch by Giuseppe Tanzilli . --- diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4 index 105baf377c..c65ad0a55d 100644 --- a/ext/rpc/java/config.m4 +++ b/ext/rpc/java/config.m4 @@ -97,7 +97,7 @@ AC_DEFUN(JAVA_CHECK_LIB, [ dnl We have to find everything dnl for i in `find $PHP_JAVA/include -type d`; do - test -f $i/jni.h && JAVA_INCLUDE=-I$i + test -f $i/jni.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i" test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i" done @@ -178,6 +178,8 @@ if test "$PHP_JAVA" != "no"; then fi PHP_SUBST(JAVA_CLASSPATH) + PHP_SUBST(JAVA_INCLUDE) + PHP_SUBST(JAVA_CFLAGS) PHP_ADD_MAKEFILE_FRAGMENT fi diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c index 1a0282017e..6635f64085 100644 --- a/sapi/servlet/servlet.c +++ b/sapi/servlet/servlet.c @@ -71,12 +71,6 @@ typedef struct { extern zend_module_entry java_module_entry; -static zend_module_entry *additional_php_extensions[] = { - &java_module_entry -}; - -#define EXTCOUNT (sizeof(additional_php_extensions)/sizeof(zend_module_entry *)) - /***************************************************************************/ /* diff --git a/sapi/servlet/servlet.java b/sapi/servlet/servlet.java index 03a3c7acad..8cfbc29406 100644 --- a/sapi/servlet/servlet.java +++ b/sapi/servlet/servlet.java @@ -107,6 +107,8 @@ public class servlet extends HttpServlet { else if (data.startsWith("Location: ")) { response.sendRedirect(data.substring(data.indexOf(" ") + 1)); + } else if (data.startsWith("HTTP/1")) { + return; // this one is added from servlet container (Tomcat 4.1), we have to check for others } else {