Fix sapi/servlet build on Unix

diff --git a/sapi/servlet/Makefile.frag b/sapi/servlet/Makefile.frag
index 6570d92bde5fe0fb262c66ea8c6ff5bf7638e28f..3ad40f86acf500e494f35cb4953cfdff166a2df3 100644 (file)
--- a/sapi/servlet/Makefile.frag
+++ b/sapi/servlet/Makefile.frag
@@ -1,19 +1,19 @@
 
-$(builddir)/java.c : $(srcdir)/../../ext/java/java.c
-       @cp $(srcdir)/../../ext/java/java.c $(builddir)
+sapi/servlet/java.c : sapi/servlet/../../ext/java/java.c sapi/servlet/phpsrvlt.jar
+       @cp sapi/servlet/../../ext/java/java.c sapi/servlet
 
-$(builddir)/phpsrvlt.jar : $(srcdir)/servlet.java $(srcdir)/../../ext/java/reflect.java
-       $(mkinstalldirs) $(builddir)/net/php
-       @echo library=php4 > $(builddir)/net/php/reflect.properties
-       @echo library=php4 > $(builddir)/net/php/servlet.properties
-       @cp $(builddir)/formatter.java $(builddir)/net/php
-       @cp $(builddir)/servlet.java $(builddir)/net/php
-       @cp $(srcdir)/../../ext/java/reflect.java $(builddir)/net/php
-       cd $(builddir) && javac net/php/reflect.java
-       @test ! -f $(builddir)/reflect.class || mv $(builddir)/reflect.class $(builddir)/net/php # bug in KJC javac
-       javac -classpath .:$(SERVLET_CLASSPATH):$(CLASSPATH) $(builddir)/net/php/servlet.java
-       @test ! -f $(builddir)/servlet.class || mv $(builddir)/servlet.class $(builddir)/net/php # bug in KJC javac
-       javac -classpath .:$(SERVLET_CLASSPATH):$(CLASSPATH) $(builddir)/net/php/formatter.java
-       @test ! -f $(builddir)/formatter.class || mv $(builddir)/formatter.class $(builddir)/net/php # bug in KJC javac
-       cd $(builddir)/ && $(JAVA_JAR) phpsrvlt.jar net/php/*.class net/php/*.properties
-       @rm -rf $(builddir)/net
+sapi/servlet/phpsrvlt.jar : sapi/servlet/servlet.java sapi/servlet/../../ext/java/reflect.java
+       $(mkinstalldirs) sapi/servlet/net/php
+       @echo library=php4 > sapi/servlet/net/php/reflect.properties
+       @echo library=php4 > sapi/servlet/net/php/servlet.properties
+       @cp sapi/servlet/formatter.java sapi/servlet/net/php
+       @cp sapi/servlet/servlet.java sapi/servlet/net/php
+       @cp sapi/servlet/../../ext/java/reflect.java sapi/servlet/net/php
+       cd sapi/servlet && javac net/php/reflect.java
+       @test ! -f sapi/servlet/reflect.class || mv sapi/servlet/reflect.class sapi/servlet/net/php # bug in KJC javac
+       cd sapi/servlet && javac -classpath .:$(SERVLET_CLASSPATH):$(CLASSPATH):. net/php/servlet.java
+       @test ! -f sapi/servlet/servlet.class || mv sapi/servlet/servlet.class sapi/servlet/net/php # bug in KJC javac
+       cd sapi/servlet && javac -classpath .:$(SERVLET_CLASSPATH):$(CLASSPATH):. net/php/formatter.java
+       @test ! -f sapi/servlet/formatter.class || mv sapi/servlet/formatter.class sapi/servlet/net/php # bug in KJC javac
+       cd sapi/servlet/ && $(JAVA_JAR) phpsrvlt.jar net/php/*.class net/php/*.properties
+       @rm -rf sapi/servlet/net

diff --git a/sapi/servlet/config.m4 b/sapi/servlet/config.m4
index 46219bee001f3182374d0e6141c163272a9b7d15..05ebd70fad9deb19943bfd6d18386978dda6af7e 100644 (file)
--- a/sapi/servlet/config.m4
+++ b/sapi/servlet/config.m4
@@ -34,13 +34,15 @@ AC_ARG_WITH(servlet,
     AC_DEFINE(SAPI_SERVLET, 1, [Whether you use Servlet])
 
     INSTALL_IT="\$(mkinstalldirs) \$(libdir)"
-    INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/sapi/servlet/phpsrvlt.jar \$(libdir)"
+    INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(top_srcdir)/sapi/servlet/phpsrvlt.jar \$(libdir)"
     INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 $SAPI_SHARED \$(libdir)"
     PHP_SAPI=servlet
     PHP_BUILD_THREAD_SAFE
+    EXTRA_INCLUDES="$EXTRA_INCLUDES \$(JAVA_INCLUDE)"
     PHP_SELECT_SAPI(servlet, shared, servlet.c)
-    PHP_ADD_SOURCES(/sapi/servlet, java.c,,sapi)
+    PHP_ADD_SOURCES(/sapi/servlet, java.c,, sapi)
     PHP_ADD_MAKEFILE_FRAGMENT(sapi/servlet/Makefile.frag)
+
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)

diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index d255cf5be37108b75a7debb39a59abeead28417f..6aa0133b1a830b8eaef29fbe14b83e74d581f741 100644 (file)
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -71,11 +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 *))
 
 /***************************************************************************/
 
@@ -261,7 +256,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_startup
 
        sapi_startup(&servlet_sapi_module);
 
-       if (php_module_startup(&servlet_sapi_module, additional_php_extensions, EXTCOUNT)==FAILURE) {
+       if (php_module_startup(&servlet_sapi_module, &java_module_entry, 1)==FAILURE) {
                ThrowServletException(jenv,"module startup failure");
                return;
        }

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 {