You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/05/13 22:42:03 UTC
svn commit: r1679272 - in /tomcat/trunk/java/org/apache/coyote/http2:
Http2UpgradeHandler.java LocalStrings.properties
Author: markt
Date: Wed May 13 20:42:03 2015
New Revision: 1679272
URL: http://svn.apache.org/r1679272
Log:
Fix some i18n TODOs
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1679272&r1=1679271&r2=1679272&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed May 13 20:42:03 2015
@@ -274,8 +274,9 @@ public class Http2UpgradeHandler extends
try {
hpackDecoder.decode(headerReadBuffer);
} catch (HpackException hpe) {
- // TODO i18n
- throw new Http2Exception("", 0, Http2Exception.PROTOCOL_ERROR);
+ throw new Http2Exception(
+ sm.getString("upgradeHandler.processFrameHeaders.decodingFailed"),
+ 0, Http2Exception.PROTOCOL_ERROR);
}
// switches to write mode
headerReadBuffer.compact();
@@ -283,8 +284,9 @@ public class Http2UpgradeHandler extends
}
// Should be empty at this point
if (headerReadBuffer.position() > 0) {
- // TODO i18n
- throw new Http2Exception("", 0, Http2Exception.PROTOCOL_ERROR);
+ throw new Http2Exception(
+ sm.getString("upgradeHandler.processFrameHeaders.decodingDataLeft"),
+ 0, Http2Exception.PROTOCOL_ERROR);
}
if (padLength > 0) {
Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1679272&r1=1679271&r2=1679272&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Wed May 13 20:42:03 2015
@@ -31,11 +31,14 @@ hpackdecoder.zeroNotValidHeaderTableInde
hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS=Huffman encoded value in HPACK headers did not end with EOS padding
stream.header.debug=Stream [{0}] recieved HTTP header [{1}] with value [{2}]
+
upgradeHandler.connectionError=An error occurred that requires the HTTP/2 connection to be closed.
upgradeHandler.payloadTooBig=The payload is [{0}] bytes long but the maximum frame size is [{1}]
upgradeHandler.processFrame=Processing frame of type [{0}] for stream [{2}] with flags [{1}] and payload size [{3}]
upgradeHandler.processFrame.ioerror=An I/O error occurred while reading an incoming HTTP/2 frame
upgradeHandler.processFrameHeaders.invalidStream=Headers frame received for stream [0]
+upgradeHandler.processFrameHeaders.decodingFailed=There was an error during the HPACK decoding of HTTP headers
+upgradeHandler.processFrameHeaders.decodingDataLeft=Data left over after HPACK decoding - it should have been consumed
upgradeHandler.processFramePriority.invalidPayloadSize=Priority frame received with an invalid payload size of [{0}] (should be 5)
upgradeHandler.processFramePriority.invalidStream=Priority frame received for stream [0]
upgradeHandler.processFrameSettings.ackWithNonZeroPayload=Settings frame received with the ACK flag set and payload present
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org