[jbossweb-commits] JBossWeb SVN: r404 - trunk/java/org/jboss/web/php.
Author: jfrederic.clere(a)jboss.com
Date: 2008-01-21 10:28:26 -0500 (Mon, 21 Jan 2008)
New Revision: 404
Modified:
trunk/java/org/jboss/web/php/ScriptEnvironment.java
Log:
Arrange PHP_SELF and SCRIPT_NAME.
Modified: trunk/java/org/jboss/web/php/ScriptEnvironment.java
===================================================================
--- trunk/java/org/jboss/web/php/ScriptEnvironment.java 2008-01-18 23:47:09 UTC (rev 403)
+++ trunk/java/org/jboss/web/php/ScriptEnvironment.java 2008-01-21 15:28:26 UTC (rev 404)
@@ -213,13 +213,9 @@
+ File.separator + name;
// NOTE: Original CGI messes the Win path.
fullName = fullName.replace(File.separatorChar, '/');
- if (!fullName.equals(servletPath)) {
- if (".".equals(contextPath)) {
- scriptName = servletPath + fullName;
- }
- else {
- scriptName = contextPath + servletPath + fullName;
- }
+
+ if (contextPath != null && ! "".equals(contextPath)
&& ! "/".equals(contextPath)) {
+ scriptName = contextPath + fullName;
}
else {
// NOTE: set scriptName to fullName
@@ -493,8 +489,19 @@
scriptFullPath.lastIndexOf(File.separator)));
envp.put("SCRIPT_FILENAME", scriptFullPath);
- envp.put("PHP_SELF", nullsToBlanks(sFullName));
+ envp.put("CONTEXT_PATH", nullsToBlanks(contextPath));
+
+ String self = "";
+ if (contextPath != null && ! "".equals(contextPath) &&
! "/".equals(contextPath)) {
+ self = contextPath;
+ }
+ if (servletPath != null && ! "".equals(servletPath) &&
! "/".equals(servletPath)) {
+ self = self.concat(servletPath);
+ }
+
+ envp.put("PHP_SELF", nullsToBlanks(self));
+
if (req.isSecure()) {
envp.put("HTTPS", "ON");
envp.put("SSL_CIPHER", req.getAttribute(CIPHER_SUITE));