Author: markt
Date: Wed Jun 3 18:48:40 2015
New Revision: 1683413
URL: http://svn.apache.org/r1683413
Log:
Correct error code for decoding issues
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1683413&r1=1683412&r2=1683413&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Wed Jun 3
18:48:40 2015
@@ -234,7 +234,7 @@ class Http2Parser {
} catch (HpackException hpe) {
throw new Http2Exception(
sm.getString("http2Parser.processFrameHeaders.decodingFailed"),
- 0, ErrorCode.PROTOCOL_ERROR);
+ 0, ErrorCode.COMPRESSION_ERROR);
}
// switches to write mode
headerReadBuffer.compact();
@@ -244,7 +244,7 @@ class Http2Parser {
if (headerReadBuffer.position() > 0) {
throw new Http2Exception(
sm.getString("http2Parser.processFrameHeaders.decodingDataLeft"),
- 0, ErrorCode.PROTOCOL_ERROR);
+ 0, ErrorCode.COMPRESSION_ERROR);
}
swallow(padLength);
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java?rev=1683413&r1=1683412&r2=1683413&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_3.java Wed Jun
3 18:48:40 2015
@@ -52,7 +52,8 @@ public class TestHttp2Section_4_3 extend
parser.readFrame(true);
Assert.assertTrue(output.getTrace(),
- output.getTrace().startsWith("0-Goaway-[2147483647]-[1]-["));
+ output.getTrace().startsWith("0-Goaway-[2147483647]-[" +
+ ErrorCode.COMPRESSION_ERROR.getErrorCode() + "]-["));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
