Author: markt
Date: Wed Mar 1 15:12:38 2017
New Revision: 1784963
URL: http://svn.apache.org/viewvc?rev=1784963&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60784
Update all unit tests that test the HTTP status line to check for the required
space after the status code.
Patch provided by Michael Osipov.
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java?rev=1784963&r1=1784962&r2=1784963&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java Wed
Mar 1 15:12:38 2017
@@ -109,7 +109,7 @@ public class TestKeepAliveCount extends
for (int i=0; i<5; i++) {
processRequest(false); // blocks until response has been read
- assertTrue(getResponseLine()!=null &&
getResponseLine().trim().startsWith("HTTP/1.1 200"));
+ assertTrue(getResponseLine()!=null &&
getResponseLine().startsWith("HTTP/1.1 200 "));
}
boolean passed = (this.readLine()==null);
// Close the connection
Modified: tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java?rev=1784963&r1=1784962&r2=1784963&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java Wed Mar
1 15:12:38 2017
@@ -46,18 +46,18 @@ public abstract class SimpleHttpClient {
public static final String LF = "\n";
public static final String CRLF = CR + LF;
- public static final String INFO_100 = "HTTP/1.1 100";
- public static final String OK_200 = "HTTP/1.1 200";
- public static final String REDIRECT_302 = "HTTP/1.1 302";
- public static final String REDIRECT_303 = "HTTP/1.1 303";
- public static final String FAIL_400 = "HTTP/1.1 400";
- public static final String FAIL_404 = "HTTP/1.1 404";
- public static final String TIMEOUT_408 = "HTTP/1.1 408";
- public static final String FAIL_413 = "HTTP/1.1 413";
- public static final String FAIL_417 = "HTTP/1.1 417";
+ public static final String INFO_100 = "HTTP/1.1 100 ";
+ public static final String OK_200 = "HTTP/1.1 200 ";
+ public static final String REDIRECT_302 = "HTTP/1.1 302 ";
+ public static final String REDIRECT_303 = "HTTP/1.1 303 ";
+ public static final String FAIL_400 = "HTTP/1.1 400 ";
+ public static final String FAIL_404 = "HTTP/1.1 404 ";
+ public static final String TIMEOUT_408 = "HTTP/1.1 408 ";
+ public static final String FAIL_413 = "HTTP/1.1 413 ";
+ public static final String FAIL_417 = "HTTP/1.1 417 ";
public static final String FAIL_50X = "HTTP/1.1 50";
- public static final String FAIL_500 = "HTTP/1.1 500";
- public static final String FAIL_501 = "HTTP/1.1 501";
+ public static final String FAIL_500 = "HTTP/1.1 500 ";
+ public static final String FAIL_501 = "HTTP/1.1 501 ";
private static final String CONTENT_LENGTH_HEADER_PREFIX =
"Content-Length: ";
Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1784963&r1=1784962&r2=1784963&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Wed Mar 1
15:12:38 2017
@@ -545,7 +545,7 @@ public abstract class Http2TestBase exte
if (responseHeaders.length < 3) {
return false;
}
- if (!responseHeaders[0].startsWith("HTTP/1.1 101")) {
+ if (!responseHeaders[0].startsWith("HTTP/1.1 101 ")) {
return false;
}
@@ -617,7 +617,7 @@ public abstract class Http2TestBase exte
void parseHttp11Response() throws IOException {
String[] responseHeaders = readHttpResponseHeaders();
- Assert.assertTrue(responseHeaders[0],
responseHeaders[0].startsWith("HTTP/1.1 200"));
+ Assert.assertTrue(responseHeaders[0],
responseHeaders[0].startsWith("HTTP/1.1 200 "));
// Find the content length (chunked responses not handled)
for (int i = 1; i < responseHeaders.length; i++) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1784963&r1=1784962&r2=1784963&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar 1 15:12:38 2017
@@ -262,6 +262,11 @@
Update the packaged version of the Tomcat Native Library to 1.2.12 to
pick up the latest Windows binaries built with OpenSSL 1.0.2k.
(violetagg)
</update>
+ <add>
+ <bug>60784</bug>: Update all unit tests that test the HTTP status line
+ to check for the required space after the status code. Patch provided
by
+ Michael Osipov. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
