Release-6-2-1

micw · Sep 25, 2010 · 6714ae0 · 6714ae0
1 parent c75156c
commit 6714ae0
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 34 deletions.
diff --git a/examples/php+jsp/PhpRenderTaskHTML.php b/examples/php+jsp/PhpRenderTaskHTML.php
@@ -1,8 +1,10 @@
 <?php
 
-define ("JAVA_HOSTS", "127.0.0.1:8080");
-define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
-$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
+if (!(get_cfg_var('java.web_inf_dir'))) {
+  define ("JAVA_HOSTS", "127.0.0.1:8080");
+  define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
+}
+$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["PHP_SELF"];
 $path_parts = pathinfo($pth);
 $imageURLPrefix = $path_parts['dirname'] ."/sessionChartImages/";
 require_once("java/Java.inc");

diff --git a/examples/php+jsp/PhpRenderTaskHTMLOnePage.php b/examples/php+jsp/PhpRenderTaskHTMLOnePage.php
@@ -1,8 +1,10 @@
 <?php
 
-define ("JAVA_HOSTS", "127.0.0.1:8080");
-define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
-$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
+if (!(get_cfg_var('java.web_inf_dir'))) {
+  define ("JAVA_HOSTS", "127.0.0.1:8080");
+  define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
+}
+$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["PHP_SELF"];
 $path_parts = pathinfo($pth);
 $imageURLPrefix = $path_parts['dirname'] ."/sessionChartImages/";
 require_once("java/Java.inc");

diff --git a/examples/php+jsp/PhpRunAndRenderHTML.php b/examples/php+jsp/PhpRunAndRenderHTML.php
@@ -1,8 +1,10 @@
 <?php
 
-define ("JAVA_HOSTS", "127.0.0.1:8080");
-define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
-$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
+if (!(get_cfg_var('java.web_inf_dir'))) {
+  define ("JAVA_HOSTS", "127.0.0.1:8080");
+  define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
+}
+$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["PHP_SELF"];
 $path_parts = pathinfo($pth);
 $imageURLPrefix = $path_parts['dirname'] ."/sessionChartImages/";
 require_once("java/Java.inc");

diff --git a/examples/php+jsp/PhpRunAndRenderHTMLDrillDetail.php b/examples/php+jsp/PhpRunAndRenderHTMLDrillDetail.php
@@ -1,8 +1,10 @@
 <?php
 
-define ("JAVA_HOSTS", "127.0.0.1:8080");
-define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
-$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
+if (!(get_cfg_var('java.web_inf_dir'))) {
+  define ("JAVA_HOSTS", "127.0.0.1:8080");
+  define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
+}
+$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["PHP_SELF"];
 $path_parts = pathinfo($pth);
 $imageURLPrefix = $path_parts['dirname'] ."/sessionChartImages/";
 require_once("java/Java.inc");

diff --git a/examples/php+jsp/PhpRunAndRenderHTMLDrillThrough.php b/examples/php+jsp/PhpRunAndRenderHTMLDrillThrough.php
@@ -1,8 +1,10 @@
 <?php
 
-define ("JAVA_HOSTS", "127.0.0.1:8080");
-define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
-$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
+if (!(get_cfg_var('java.web_inf_dir'))) {
+  define ("JAVA_HOSTS", "127.0.0.1:8080");
+  define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
+}
+$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["PHP_SELF"];
 $path_parts = pathinfo($pth);
 $imageURLPrefix = $path_parts['dirname'] ."/sessionChartImages/";
 $URLPrefix = $path_parts['dirname'] . "/PhpRunAndRenderHTMLDrillDetail.php";

diff --git a/examples/php+jsp/PhpRunAndRenderHTMLEmbed.php b/examples/php+jsp/PhpRunAndRenderHTMLEmbed.php
@@ -1,8 +1,10 @@
 <?php
 
-define ("JAVA_HOSTS", "127.0.0.1:8080");
-define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
-$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
+if (!(get_cfg_var('java.web_inf_dir'))) {
+  define ("JAVA_HOSTS", "127.0.0.1:8080");
+  define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
+}
+$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["PHP_SELF"];
 $path_parts = pathinfo($pth);
 $imageURLPrefix = $path_parts['dirname'] ."/sessionChartImages/";
 require_once("java/Java.inc");

diff --git a/examples/php+jsp/PhpRunAndRenderXLSToFile.php b/examples/php+jsp/PhpRunAndRenderXLSToFile.php
@@ -1,9 +1,11 @@
 <?php
-define ("JAVA_HOSTS", "127.0.0.1:8080");
-define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
+if (!(get_cfg_var('java.web_inf_dir'))) {
+  define ("JAVA_HOSTS", "127.0.0.1:8080");
+  define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
+}
 require_once("java/Java.inc");
 
-$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
+$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["PHP_SELF"];
 $path_parts = pathinfo($pth);
 $filePrefix = $path_parts['dirname'] ."/myreport.xls";
 

diff --git a/examples/php+jsp/PhpRunTask.php b/examples/php+jsp/PhpRunTask.php
@@ -1,6 +1,8 @@
 <?php
-define ("JAVA_HOSTS", "127.0.0.1:8080");
-define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
+if (!(get_cfg_var('java.web_inf_dir'))) {
+  define ("JAVA_HOSTS", "127.0.0.1:8080");
+  define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
+}
 
 require_once("java/Java.inc");
 

diff --git a/examples/php+jsp/PhpUseBirtLib.php b/examples/php+jsp/PhpUseBirtLib.php
@@ -1,8 +1,10 @@
 <?php
 
-define ("JAVA_HOSTS", "127.0.0.1:8080");
-define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
-$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
+if (!(get_cfg_var('java.web_inf_dir'))) {
+  define ("JAVA_HOSTS", "127.0.0.1:8080");
+  define ("JAVA_SERVLET", "/JavaBridge/JavaBridge.phpjavabridge");
+}
+$pth = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["PHP_SELF"];
 $path_parts = pathinfo($pth);
 $imageURLPrefix = $path_parts['dirname'] ."/sessionChartImages/";
 require_once("java/Java.inc");

diff --git a/...servlet/PhpCompiledHttpScriptContext.java → .../script/servlet/PhpHttpScriptContext.java b/...servlet/PhpCompiledHttpScriptContext.java → .../script/servlet/PhpHttpScriptContext.java
@@ -1,7 +1,7 @@
-/*-*- mode: Java; tab-width:8 -*-*/
-
 package php.java.script.servlet;
 
+/*-*- mode: Java; tab-width:8 -*-*/
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Reader;
@@ -27,6 +27,8 @@
 import php.java.script.PhpScriptContextDecorator;
 import php.java.script.PhpScriptWriter;
 import php.java.script.ResultProxy;
+import php.java.script.servlet.HttpFastCGIProxy;
+import php.java.script.servlet.PhpScriptLogWriter;
 import php.java.servlet.ContextLoaderListener;
 import php.java.servlet.ServletUtil;
 
@@ -67,14 +69,14 @@
  * @author jostb
  *
  */
-public class PhpCompiledHttpScriptContext extends PhpScriptContextDecorator {
+public class PhpHttpScriptContext extends PhpScriptContextDecorator {
 
     /**
      * Create a new PhpCompiledScriptContext using an existing
      * PhpScriptContext
      * @param ctx the script context to be decorated
      */
-    public PhpCompiledHttpScriptContext(ScriptContext ctx, Servlet servlet, ServletContext context, HttpServletRequest request, HttpServletResponse response) {
+    public PhpHttpScriptContext(ScriptContext ctx, Servlet servlet, ServletContext context, HttpServletRequest request, HttpServletResponse response) {
 	super((IPhpScriptContext)ctx);
 	this.request = request;
 	this.response = response;

diff --git a/server/php/java/servlet/ContextLoaderListener.java b/server/php/java/servlet/ContextLoaderListener.java
@@ -327,7 +327,7 @@ private void createPhpFiles () {
 	    } catch (Exception e) {
 		e.printStackTrace();
 	    }
-
+/* no longer part of the PHP/Java Bridge
 	    File phpDebuggerFile = new File (javaDir, "PHPDebugger.php");
 	    try {
 		if (!phpDebuggerFile.exists()) {
@@ -340,7 +340,7 @@ private void createPhpFiles () {
 	    } catch (Exception e) {
 		e.printStackTrace();
 	    }
-
+*/	    
 	    File javaProxyFile = new File (javaDir, "JavaProxy.php");
 	    try {
 		if (!javaProxyFile.exists()) {

diff --git a/server/php/java/servlet/PhpJavaServlet.java b/server/php/java/servlet/PhpJavaServlet.java
@@ -245,8 +245,8 @@ protected void handlePut (HttpServletRequest req, HttpServletResponse res)
 
     	if(Util.logLevel>3) Util.logDebug("doPut:"+req.getRequestURL()); 
     	boolean isLocal = LOCAL_ADDR.equals(req.getRemoteAddr());
-
-    	if(contextServer!=null && contextServer.isAvailable(null) && (isLocal || (!isLocal && promiscuous))) 
+    	boolean isHttps = req.isSecure();
+    	if(contextServer!=null && contextServer.isAvailable(null) && (isLocal || (!isLocal && promiscuous)) && !isHttps) 
     	    handleLocalConnection(req, res); /* re-direct */
     	else
     	    handleHttpConnection(req, res);