cvs commit: jahia/core/src/java/org/jahia/params ParamBean.java ProcessingContext.java

[Marc Cardle]

mcardle     2006/01/06 02:18:24 CET

  Modified files:
    core/src/java/org/jahia/params ParamBean.java 
                                   ProcessingContext.java 
  Log:
  * Exit admin menu forwards to correct Jahia URL when ESI mode is active but 
we are not going through the ESI proxy
  
  Revision  Changes    Path
  1.50      +5 -1      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.49&r2=1.50&f=h
  1.24      +5 -4      
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.23&r2=1.24&f=h
  
  
  
  Index: ProcessingContext.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ProcessingContext.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ProcessingContext.java    28 Dec 2005 18:14:50 -0000      1.23
  +++ ProcessingContext.java    6 Jan 2006 01:18:23 -0000       1.24
  @@ -2659,13 +2659,15 @@
               serverNameValid = false;
           }
   
  +        boolean isRequestFromEsiServer = 
getParameter("Surrogate-Capability")!=null
  +                                                     || 
getParameter("Surrogate-Capabilities")!=null;
  +
           String esiPort = null;
  -        if (settings().lookupBoolean(SettingsBean.ESI_CACHE_ACTIVATED)) {
  +        if (settings().lookupBoolean(SettingsBean.ESI_CACHE_ACTIVATED)
  +             && isRequestFromEsiServer ) {
                 esiPort =  EsiInvalidation.getEsiServerPorts()[0];
           }
   
  -
  -
           final StringBuffer newSiteURL = new StringBuffer(getScheme() + 
"://");
           if (serverNameValid) {
               // let's construct an URL by deconstruct our current URL and
  @@ -2690,7 +2692,6 @@
                   newSiteURL.append(getServerPort());
               }
   
  -
               newSiteURL.append(getContextPath());
               newSiteURL.append(Jahia.getServletPath());
           } else {
  
  
  
  Index: ParamBean.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ParamBean.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- ParamBean.java    28 Dec 2005 18:14:50 -0000      1.49
  +++ ParamBean.java    6 Jan 2006 01:18:23 -0000       1.50
  @@ -2757,6 +2757,9 @@
           String sessionIDStr = null;
           String esiPort = null;
   
  +        boolean isRequestFromEsiServer = 
getRealRequest().getParameter("Surrogate-Capability")!=null
  +                                             || 
getRealRequest().getParameter("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.
  @@ -2770,7 +2773,8 @@
               //If ESI is active, replace '${request.serverPort}' string
               //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)) {
  +            if (settings().lookupBoolean(SettingsBean.ESI_CACHE_ACTIVATED)
  +                && !isRequestFromEsiServer ) {
                   esiPort =  EsiInvalidation.getEsiServerPorts()[0];
                   expr = expr.replaceFirst("\\${request\\.serverPort}", 
esiPort );
               }