Bug 341255 resolve naming issue between AJParser and HashSessionIdManager org.eclipse.http -> org.eclipse.ajp
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2923 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
parent
92156dcc2b
commit
6388c6b89d
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue