Patch by Giuseppe Tanzilli <g.tanzilli@gruppocsf.com>.

diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index 105baf377c0abc689a0378799bebded7d14a5b87..c65ad0a55de2b1b4cd603b75d5c979ff8fa7991a 100644 (file)
--- 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 1a0282017ed34efa7d63c436c11239aaa5fb9e64..6635f64085b4a6ba719498e3a3b3ad1a9f54a5f0 100644 (file)
--- 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 03a3c7acad6acb10c77952116ac653e87c6fa7c7..8cfbc294060b036a256d0b02ea68b41d226bf1f4 100644 (file)
--- 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 {