mcardle 2006/01/06 15:20:47 CET
Modified files:
core/src/java/org/jahia/params ParamBean.java
ProcessingContext.java
Log:
* fix for Exit admin menu
Revision Changes Path
1.51 +3 -4 jahia/core/src/java/org/jahia/params/ParamBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/params/ParamBean.java.diff?r1=1.50&r2=1.51&f=h
1.25 +2 -3
jahia/core/src/java/org/jahia/params/ProcessingContext.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/params/ProcessingContext.java.diff?r1=1.24&r2=1.25&f=h
Index: ParamBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ParamBean.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ParamBean.java 6 Jan 2006 01:18:23 -0000 1.50
+++ ParamBean.java 6 Jan 2006 14:20:47 -0000 1.51
@@ -2757,9 +2757,8 @@
String sessionIDStr = null;
String esiPort = null;
- boolean isRequestFromEsiServer =
getRealRequest().getParameter("Surrogate-Capability")!=null
- ||
getRealRequest().getParameter("Surrogate-Capabilities")!=null;
-
+ boolean isRequestFromEsiServer =
getRealRequest().getHeader("Surrogate-Capability")!=null
+ ||
getRealRequest().getHeader("Surrogate-Capabilities")!=null;
// let's check if we can resolve the site's server name address and
if
// it points to a Jahia installation. For this we connect to an URL
and
// try to retrieve a header specific to Jahia.
@@ -2774,7 +2773,7 @@
//by the first port defined in the esiServerPorts property (see
jahia.skeleton for details)
String expr = settings().getSiteServerNameTestURLExpr();
if (settings().lookupBoolean(SettingsBean.ESI_CACHE_ACTIVATED)
- && !isRequestFromEsiServer ) {
+ && isRequestFromEsiServer ) {
esiPort = EsiInvalidation.getEsiServerPorts()[0];
expr = expr.replaceFirst("\\${request\\.serverPort}",
esiPort );
}
Index: ProcessingContext.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ProcessingContext.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ProcessingContext.java 6 Jan 2006 01:18:23 -0000 1.24
+++ ProcessingContext.java 6 Jan 2006 14:20:47 -0000 1.25
@@ -2659,9 +2659,8 @@
serverNameValid = false;
}
- boolean isRequestFromEsiServer =
getParameter("Surrogate-Capability")!=null
- ||
getParameter("Surrogate-Capabilities")!=null;
-
+ boolean isRequestFromEsiServer =
((ParamBean)this).getRealRequest().getHeader("Surrogate-Capability")!=null
+ ||
((ParamBean)this).getRealRequest().getHeader("Surrogate-Capabilities")!=null;
String esiPort = null;
if (settings().lookupBoolean(SettingsBean.ESI_CACHE_ACTIVATED)
&& isRequestFromEsiServer ) {
