Author: markt
Date: Fri May 14 19:43:29 2010
New Revision: 944424
URL: http://svn.apache.org/viewvc?rev=944424&view=rev
Log:
Correct the SSL session timeout attribute name so the code agrees with the
documentation.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=944424&r1=944423&r2=944424&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri May 14 19:43:29 2010
@@ -115,14 +115,6 @@ PATCHES PROPOSED TO BACKPORT:
kkolinko: We have to mention the new parameter in
jasper-howto.html#Configuration
-* Correct SSL session timeout attribute name
- http://people.apache.org/~markt/patches/2010-04-07-SslSessionTimeout.patch
- +1: markt, kkolinko, rjung
- -1:
- kkolinko: Generally, I would be against renaming some attributes, but this
- one is already documented as "sessionTimeout" in config/http.xml, though,
- still, renaming might break someone's configurations.
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48840
If CDPATH is set, cd may result in output to stdout.
Swallow the output. This is safe since the script outputs the value used for
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=944424&r1=944423&r2=944424&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri
May 14 19:43:29 2010
@@ -649,9 +649,9 @@ public class NioEndpoint {
public int getSessionCacheSize() { return sessionCacheSize;}
public void setSessionCacheSize(int i) { sessionCacheSize = i;}
- protected int sessionCacheTimeout = 86400;
- public int getSessionCacheTimeout() { return sessionCacheTimeout;}
- public void setSessionCacheTimeout(int i) { sessionCacheTimeout = i;}
+ protected int sessionTimeout = 86400;
+ public int getSessionTimeout() { return sessionTimeout;}
+ public void setSessionTimeout(int i) { sessionTimeout = i;}
/**
* SSL engine.
@@ -852,7 +852,7 @@ public class NioEndpoint {
sslContext.getServerSessionContext();
if (sessionContext != null) {
sessionContext.setSessionCacheSize(sessionCacheSize);
- sessionContext.setSessionTimeout(sessionCacheTimeout);
+ sessionContext.setSessionTimeout(sessionTimeout);
}
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=944424&r1=944423&r2=944424&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Fri May 14 19:43:29 2010
@@ -431,18 +431,18 @@ public class JSSESocketFactory
} else {
sessionCacheSize = defaultSessionCacheSize;
}
- int sessionCacheTimeout;
- if (attributes.get("sessionCacheTimeout") != null) {
- sessionCacheTimeout = Integer.parseInt(
- (String)attributes.get("sessionCacheTimeout"));
+ int sessionTimeout;
+ if (attributes.get("sessionTimeout") != null) {
+ sessionTimeout = Integer.parseInt(
+ (String)attributes.get("sessionTimeout"));
} else {
- sessionCacheTimeout = defaultSessionTimeout;
+ sessionTimeout = defaultSessionTimeout;
}
SSLSessionContext sessionContext =
context.getServerSessionContext();
if (sessionContext != null) {
sessionContext.setSessionCacheSize(sessionCacheSize);
- sessionContext.setSessionTimeout(sessionCacheTimeout);
+ sessionContext.setSessionTimeout(sessionTimeout);
}
// create proxy
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=944424&r1=944423&r2=944424&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri May 14 19:43:29 2010
@@ -131,6 +131,10 @@
(regardless of keep-alive) so client can differentiate between complete
and partial responses. (markt)
</add>
+ <fix>
+ Correct the SSL session timeout attribute name so the code agrees with
+ the documentation. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
