Author: markt
Date: Thu May 1 13:53:19 2008
New Revision: 652658
URL: http://svn.apache.org/viewvc?rev=652658&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43366
Provide backwards compatibility for manager sessions command
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.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=652658&r1=652657&r2=652658&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 13:53:19 2008
@@ -81,12 +81,6 @@
+1: billbarker, markt, remm, fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43366
- provide backwards compatibility for manager sessions command
- http://svn.apache.org/viewvc?rev=651988&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43142
Don't assume a directory named xxx.war is a war file
http://svn.apache.org/viewvc?rev=652441&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=652658&r1=652657&r2=652658&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Thu May 1 13:53:19 2008
@@ -101,6 +101,7 @@
* descriptions from the user database connected to the <code>users</code>
* resource reference.
* <li><b>/serverinfo</b> - Display system OS and JVM properties.
+ * <li><b>/sessions</b> - Deprecated. Use expire.
* <li><b>/expire?path=/xxx</b> - List session idle timeinformation about the
* web application attached to context path <code>/xxx</code> for this
* virtual host.</li>
@@ -368,6 +369,8 @@
save(writer, path);
} else if (command.equals("/serverinfo")) {
serverinfo(writer);
+ } else if (command.equals("/sessions")) {
+ expireSessions(writer, path, request);
} else if (command.equals("/expire")) {
expireSessions(writer, path, request);
} else if (command.equals("/start")) {
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=652658&r1=652657&r2=652658&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 1 13:53:19 2008
@@ -212,6 +212,10 @@
updated commons-pool and commons-DBCP. (markt)
</fix>
<fix>
+ <bug>43366</bug>: Provide backwards compatibility for manager sessions
+ command. (markt)
+ </fix>
+ <fix>
<bug>44541</bug>: Document packetSize attribute for AJP connector.
(markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
