Author: markt
Date: Mon Mar 6 12:27:25 2017
New Revision: 1785641
URL: http://svn.apache.org/viewvc?rev=1785641&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60573
Remove the reason phrase when sending a 100 response status for consistency
with other response status lines.
Patch provided by Michael Osipov.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Constants.java
tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Constants.java?rev=1785641&r1=1785640&r2=1785641&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Constants.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Constants.java Mon Mar 6
12:27:25 2017
@@ -107,8 +107,7 @@ public final class Constants {
public static final String KEEPALIVE = "keep-alive";
public static final byte[] KEEPALIVE_BYTES =
ByteChunk.convertToBytes(KEEPALIVE);
public static final String CHUNKED = "chunked";
- public static final byte[] ACK_BYTES =
- ByteChunk.convertToBytes("HTTP/1.1 100 Continue" + CRLF + CRLF);
+ public static final byte[] ACK_BYTES = ByteChunk.convertToBytes("HTTP/1.1
100 " + CRLF + CRLF);
public static final String TRANSFERENCODING = "Transfer-Encoding";
public static final byte[] _200_BYTES = ByteChunk.convertToBytes("200");
public static final byte[] _400_BYTES = ByteChunk.convertToBytes("400");
Modified: tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java?rev=1785641&r1=1785640&r2=1785641&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java Mon Mar 6
12:27:25 2017
@@ -32,7 +32,7 @@ public class TestByteChunk {
@Test
public void testConvertToBytes() throws UnsupportedEncodingException {
- String string = "HTTP/1.1 100 Continue\r\n";
+ String string = "HTTP/1.1 100 \r\n\r\n";
byte[] bytes = ByteChunk.convertToBytes(string);
byte[] expected = string.getBytes("ISO-8859-1");
assertTrue(Arrays.equals(bytes, expected));
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1785641&r1=1785640&r2=1785641&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Mar 6 12:27:25 2017
@@ -56,6 +56,11 @@
<bug>60490</bug>: Various formatting and layout improvements for the
<code>ErrorReportValve</code>. Patch provided by Michael Osipov.
(markt)
</fix>
+ <fix>
+ <bug>60573</bug>: Remove the reason phrase when sending a
+ <code>100</code> response status for consistency with other response
+ status lines. Patch provided by Michael Osipov. (markt)
+ </fix>
<update>
<bug>60596</bug>: Improve performance of DefaultServlet when sendfile
feature is disabled on connector. (kkolinko)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
