cvs: php4 /ext/rpc/java config.m4 /sapi/servlet Makefile.frag config.m4 servlet.c servlet.java

sebastian Sun Jan 12 03:01:42 2003 EDT Modified files: /php4/sapi/servlet Makefile.frag config.m4 servlet.c servlet.java /php4/ext/rpc/java config.m4 Log: Patch by Giuseppe Tanzilli <g.tanzilli@gruppocsf.com>. Index: php4/sapi/servlet/Makefile.frag diff -u php4/sapi/servlet/Makefile.frag:1.1 php4/sapi/servlet/Makefile.frag:1.2 --- php4/sapi/servlet/Makefile.frag:1.1 Thu Mar 7 09:19:58 2002 +++ php4/sapi/servlet/Makefile.frag Sun Jan 12 03:01:41 2003 @@ -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 Index: php4/sapi/servlet/config.m4 diff -u php4/sapi/servlet/config.m4:1.13 php4/sapi/servlet/config.m4:1.14 --- php4/sapi/servlet/config.m4:1.13 Thu Mar 7 09:20:00 2002 +++ php4/sapi/servlet/config.m4 Sun Jan 12 03:01:41 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.13 2002/03/07 14:20:00 sas Exp $ +dnl $Id: config.m4,v 1.14 2003/01/12 08:01:41 sebastian Exp $ dnl AC_MSG_CHECKING(for Servlet support) @@ -34,13 +34,15 @@ 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) Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.67 php4/sapi/servlet/servlet.c:1.68 --- php4/sapi/servlet/servlet.c:1.67 Tue Dec 31 10:59:13 2002 +++ php4/sapi/servlet/servlet.c Sun Jan 12 03:01:41 2003 @@ -258,7 +258,7 @@ 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; } Index: php4/sapi/servlet/servlet.java diff -u php4/sapi/servlet/servlet.java:1.19 php4/sapi/servlet/servlet.java:1.20 --- php4/sapi/servlet/servlet.java:1.19 Wed Feb 27 02:29:18 2002 +++ php4/sapi/servlet/servlet.java Sun Jan 12 03:01:41 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: servlet.java,v 1.19 2002/02/27 07:29:18 sebastian Exp $ */ +/* $Id: servlet.java,v 1.20 2003/01/12 08:01:41 sebastian Exp $ */ package net.php; @@ -107,6 +107,8 @@ 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 { Index: php4/ext/rpc/java/config.m4 diff -u php4/ext/rpc/java/config.m4:1.47 php4/ext/rpc/java/config.m4:1.48 --- php4/ext/rpc/java/config.m4:1.47 Fri Nov 29 08:30:28 2002 +++ php4/ext/rpc/java/config.m4 Sun Jan 12 03:01:42 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.47 2002/11/29 13:30:28 chregu Exp $ +dnl $Id: config.m4,v 1.48 2003/01/12 08:01:42 sebastian Exp $ dnl AC_DEFUN(JAVA_FIND_JAR, [ AC_MSG_CHECKING([Java Jar location]) @@ -97,7 +97,7 @@ 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 @@ fi PHP_SUBST(JAVA_CLASSPATH) + PHP_SUBST(JAVA_INCLUDE) + PHP_SUBST(JAVA_CFLAGS) PHP_ADD_MAKEFILE_FRAGMENT fi