diff --git a/VERSION.txt b/VERSION.txt index 383fcefa9e7..6652b981a0e 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -16,6 +16,7 @@ jetty-7.3.2-SNAPSHOT + Ensure generated fragment names are unique + JETTY-1245 Pooled Buffers implementation + 341206 Stop order is wrong in HandlerWrapper + + 341255 org.eclipse.http usage in AJP/SessionId linkage jetty-7.3.1.v20110307 7 March 2011 + 316382 Support a more strict SSL option with certificates diff --git a/jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13Parser.java b/jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13Parser.java index 6201495ba2f..d51a52f08b6 100644 --- a/jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13Parser.java +++ b/jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13Parser.java @@ -384,11 +384,9 @@ public class Ajp13Parser implements Parser break; case Ajp13RequestHeaders.JVM_ROUTE_ATTR: - // XXX Using old Jetty 5 key, - // should change! - // Note used in - // org.eclipse.jetty.servlet.HashSessionIdManager - _handler.parsedRequestAttribute("org.eclipse.http.ajp.JVMRoute", Ajp13RequestPacket.getString(_buffer, _tok1)); + // moved to Eclipse naming usage + // used in org.eclipse.jetty.servlet.HashSessionIdManager + _handler.parsedRequestAttribute("org.eclipse.jetty.ajp.JVMRoute", Ajp13RequestPacket.getString(_buffer, _tok1)); break; case Ajp13RequestHeaders.SSL_CERT_ATTR: diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionIdManager.java index 9043ad1e2fe..de64eedbbd9 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionIdManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionIdManager.java @@ -50,7 +50,8 @@ public class HashSessionIdManager extends AbstractSessionIdManager */ public String getNodeId(String clusterId,HttpServletRequest request) { - String worker=request==null?null:(String)request.getAttribute("org.eclipse.http.ajp.JVMRoute"); + // used in Ajp13Parser + String worker=request==null?null:(String)request.getAttribute("org.eclipse.jetty.ajp.JVMRoute"); if (worker!=null) return clusterId+'.'+worker;