Author: markt
Date: Mon Oct 17 19:45:55 2016
New Revision: 1765358
URL: http://svn.apache.org/viewvc?rev=1765358&view=rev
Log:
Correctly test for control characters when reading the provided shutdown
password.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1765358&r1=1765357&r2=1765358&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Mon Oct 17
19:45:55 2016
@@ -500,8 +500,10 @@ public final class StandardServer extend
log.warn("StandardServer.await: read: ", e);
ch = -1;
}
- if (ch < 32) // Control character or EOF terminates
loop
+ // Control character or EOF (-1) terminates loop
+ if (ch < 32 || ch == 127) {
break;
+ }
command.append((char) ch);
expected--;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1765358&r1=1765357&r2=1765358&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Oct 17 19:45:55 2016
@@ -76,6 +76,10 @@
<bug>60161</bug>: Allow creating subcategories of the container logger,
and use it for the rewrite valve. (remm)
</fix>
+ <fix>
+ Correctly test for control characters when reading the provided
shutdown
+ password. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
