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 2012/12/26 19:33:54 UTC
svn commit: r1425985 -
/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
Author: markt
Date: Wed Dec 26 18:33:54 2012
New Revision: 1425985
URL: http://svn.apache.org/viewvc?rev=1425985&view=rev
Log:
Make sure reason phrases will fit into a control frame payload
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1425985&r1=1425984&r2=1425985&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Wed Dec 26 18:33:54 2012
@@ -21,7 +21,7 @@ serverContainer.servletContextMissing=No
uriTemplate.noMatch=The input template [{0}] generated the pattern [{1}] which did not match the supplied pathInfo [{2}]
wsFrame.byteToLongFail=Too many bytes ([{0}]) were provided to be converted into a long
wsFrame.controlFragmented=A fragmented control frame was received but control frames may not be fragmented
-wsFrame.controlPayloadTooBig=A control frame was sent with a payload of length [{0}] which is larger than the maximum length permitted of 125 bytes
+wsFrame.controlPayloadTooBig=A control frame was sent with a payload of size [{0}] which is larger than the maximum permitted of 125 bytes
wsFrame.controlNoFin=A control frame was sent that did not have the fin bit set. Control frames are not permitted to use continuation frames.
wsFrame.invalidOpCode= A WebSocket frame was sent with an unrecognised opCode of [{0}]
wsFrame.invalidUtf8=A WebSocket text frame was received that could not be decoded to UTF-8 because it contained invalid byte sequences
@@ -29,5 +29,5 @@ wsFrame.invalidUtf8Close=A WebSocket clo
wsFrame.noContinuation=A new message was started when a continuation frame was expected
wsFrame.notMasked=The client frame was not masked but all client frames must be masked
wsFrame.oneByteCloseCode=The client sent a close frame with a single byte payload which is not valid
-wsFrame.textMessageTooBig=The decoded text message was too big to fit in the output text message buffer and the endpoint does not support delivery of partial messages
+wsFrame.textMessageTooBig=The decoded text message was too big for the output buffer and the endpoint does not support partial messages
wsFrame.wrongRsv=The client frame set the reserved bits to [{0}] which was not supported by this endpoint
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1425985 - /tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
Posted by Mark Thomas <ma...@apache.org>.
On 27/12/2012 23:47, Konstantin Kolinko wrote:
> If I understand this correctly, you had to trim the text of
> "wsFrame.textMessageTooBig" message?
Correct.
> Maybe add some comment there to warn future translators?
Done.
> Maybe automatically truncate the i18n'ed message if it is too long?
I'd rather not add the overhead and complexity - even for an error message.
Thanks for the review.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1425985 - /tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
Posted by Konstantin Kolinko <kn...@gmail.com>.
If I understand this correctly, you had to trim the text of
"wsFrame.textMessageTooBig" message?
Maybe add some comment there to warn future translators? Maybe
automatically truncate the i18n'ed message if it is too long?
2012/12/26 <ma...@apache.org>:
> Author: markt
> Date: Wed Dec 26 18:33:54 2012
> New Revision: 1425985
>
> URL: http://svn.apache.org/viewvc?rev=1425985&view=rev
> Log:
> Make sure reason phrases will fit into a control frame payload
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
>
> Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1425985&r1=1425984&r2=1425985&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties (original)
> +++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Wed Dec 26 18:33:54 2012
> @@ -21,7 +21,7 @@ serverContainer.servletContextMissing=No
> uriTemplate.noMatch=The input template [{0}] generated the pattern [{1}] which did not match the supplied pathInfo [{2}]
> wsFrame.byteToLongFail=Too many bytes ([{0}]) were provided to be converted into a long
> wsFrame.controlFragmented=A fragmented control frame was received but control frames may not be fragmented
> -wsFrame.controlPayloadTooBig=A control frame was sent with a payload of length [{0}] which is larger than the maximum length permitted of 125 bytes
> +wsFrame.controlPayloadTooBig=A control frame was sent with a payload of size [{0}] which is larger than the maximum permitted of 125 bytes
> wsFrame.controlNoFin=A control frame was sent that did not have the fin bit set. Control frames are not permitted to use continuation frames.
> wsFrame.invalidOpCode= A WebSocket frame was sent with an unrecognised opCode of [{0}]
> wsFrame.invalidUtf8=A WebSocket text frame was received that could not be decoded to UTF-8 because it contained invalid byte sequences
> @@ -29,5 +29,5 @@ wsFrame.invalidUtf8Close=A WebSocket clo
> wsFrame.noContinuation=A new message was started when a continuation frame was expected
> wsFrame.notMasked=The client frame was not masked but all client frames must be masked
> wsFrame.oneByteCloseCode=The client sent a close frame with a single byte payload which is not valid
> -wsFrame.textMessageTooBig=The decoded text message was too big to fit in the output text message buffer and the endpoint does not support delivery of partial messages
> +wsFrame.textMessageTooBig=The decoded text message was too big for the output buffer and the endpoint does not support partial messages
> wsFrame.wrongRsv=The client frame set the reserved bits to [{0}] which was not supported by this endpoint
> \ No newline at end of file
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org