Author: kkolinko
Date: Fri Nov 21 10:08:12 2014
New Revision: 1640885
URL: http://svn.apache.org/r1640885
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57239
Correct several message typos. Includes patch by vladk.
Merged r1640884 from tomcat/tc8.0.x/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1640700-1640883
Merged /tomcat/tc8.0.x/trunk:r1640884
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties?rev=1640885&r1=1640884&r2=1640885&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties Fri
Nov 21 10:08:12 2014
@@ -22,7 +22,7 @@ err.io.nullArray=Null passed for byte ar
err.io.indexOutOfBounds=Invalid offset [{0}] and / or length [{1}] specified
for array of size [{2}]
err.io.short_read=Short Read
-http.method_not_implemented=Method {0} is not is not implemented by this
servlet for this URI
+http.method_not_implemented=Method {0} is not implemented by this servlet for
this URI
http.method_get_not_supported=HTTP method GET is not supported by this URL
http.method_post_not_supported=HTTP method POST is not supported by this URL
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1640885&r1=1640884&r2=1640885&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
Fri Nov 21 10:08:12 2014
@@ -67,7 +67,7 @@ coyoteRequest.attributeEvent=Exception t
coyoteRequest.parseParameters=Exception thrown whilst processing POSTed
parameters
coyoteRequest.postTooLarge=Parameters were not parsed because the size of the
posted data was too big. Use the maxPostSize attribute of the connector to
resolve this if the application should accept large POSTs.
coyoteRequest.chunkedPostTooLarge=Parameters were not parsed because the size
of the posted data was too big. Because this request was a chunked request, it
could not be processed further. Use the maxPostSize attribute of the connector
to resolve this if the application should accept large POSTs.
-coyoteRequest.alreadyAuthenticated=This is request has already been
authenticated
+coyoteRequest.alreadyAuthenticated=This request has already been authenticated
coyoteRequest.authenticate.ise=Cannot call authenticate() after the reponse
has been committed
coyoteRequest.uploadLocationInvalid=The temporary upload location [{0}] is not
valid
coyoteRequest.sessionEndAccessFail=Exception triggered ending access to
session while recycling request
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1640885&r1=1640884&r2=1640885&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Nov 21 10:08:12 2014
@@ -76,6 +76,10 @@
Correct message that is logged when load-on-startup servlet fails
to load. It was logging a wrong name. (kkolinko)
</fix>
+ <fix>
+ <bug>57239</bug>: Correct several message typos. Includes patch by
+ vladk. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
