svn commit: r1846398 [3/5] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/connector/ java/org/apache/catali...

[ma...@apache.org]

Modified: tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,18 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-parameterMap.locked=No modifications are allowed to a locked ParameterMap
-resourceSet.locked=No modifications are allowed to a locked ResourceSet
-hexUtil.bad=Bad hexadecimal digit
-hexUtil.odd=Odd number of hexadecimal digits
+SecurityUtil.doAsPrivilege=An exception occurs when running the PrivilegedExceptionAction block.
+
 customObjectInputStream.logRequired=A valid logger is required for class name filtering with logging
 customObjectInputStream.nomatch=The class [{0}] did not match the regular expression [{1}] for classes allowed to be deserialized
-#Default Messages Utilized by the ExtensionValidator
-extensionValidator.web-application-manifest=Web Application Manifest
+
 extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]: Required extension [{2}] not found.
 extensionValidator.extension-validation-error=ExtensionValidator[{0}]: Failure to find [{1}] required extension(s).
 extensionValidator.failload=Failure loading extension [{0}]
+extensionValidator.web-application-manifest=Web Application Manifest
+
+hexUtil.bad=Bad hexadecimal digit
+hexUtil.odd=Odd number of hexadecimal digits
+
 introspection.classLoadFailed=Failed to load class [{0}]
+
 lifecycleBase.alreadyDestroyed=The destroy() method was called on component [{0}] after destroy() had already been called. The second call will be ignored.
 lifecycleBase.alreadyStarted=The start() method was called on component [{0}] after start() had already been called. The second call will be ignored.
 lifecycleBase.alreadyStopped=The stop() method was called on component [{0}] after stop() had already been called. The second call will be ignored.
@@ -35,6 +38,7 @@ lifecycleBase.invalidTransition=An inval
 lifecycleBase.setState=Setting state for [{0}] to [{1}]
 lifecycleBase.startFail=Failed to start component [{0}]
 lifecycleBase.stopFail=Failed to stop component [{0}]
+
 lifecycleMBeanBase.registerFail=Failed to register object [{0}] with name [{1}] during component initialisation
 lifecycleMBeanBase.unregisterFail=Failed to unregister MBean with name [{0}] during component destruction
 lifecycleMBeanBase.unregisterNoServer=No MBean server was available to unregister the MBean [{0}]
@@ -44,7 +48,10 @@ netmask.cidrNotNumeric=The CIDR [{0}] is
 netmask.cidrTooBig=The CIDR [{0}] is greater than the address length [{1}]
 netmask.invalidAddress=The address [{0}] is not valid
 
-SecurityUtil.doAsPrivilege=An exception occurs when running the PrivilegedExceptionAction block.
+parameterMap.locked=No modifications are allowed to a locked ParameterMap
+
+resourceSet.locked=No modifications are allowed to a locked ResourceSet
+
 sessionIdGeneratorBase.createRandom=Creation of SecureRandom instance for session ID generation using [{0}] took [{1}] milliseconds.
 sessionIdGeneratorBase.random=Exception initializing random number generator of class [{0}]. Falling back to java.secure.SecureRandom
 sessionIdGeneratorBase.randomAlgorithm=Exception initializing random number generator using algorithm [{0}]

Modified: tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,135 +13,126 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jdbcAccessLogValve.close=Failed to close database
-jdbcAccessLogValve.exception=Exception performing insert access entry
-
-# Access log valve
-accessLogValve.openFail=Failed to open access log file [{0}]
+accessLogValve.alreadyExists=Failed to rename access log from [{0}] to [{1}], file already exists.
 accessLogValve.closeFail=Failed to close access log file
 accessLogValve.deleteFail=Failed to delete old access log [{0}]
+accessLogValve.invalidLocale=Failed to set locale to [{0}]
+accessLogValve.invalidPortType=Invalid port type [{0}], using server (local) port
 accessLogValve.openDirFail=Failed to create directory [{0}] for access logs
-accessLogValve.rotateFail=Failed to rotate access log
+accessLogValve.openFail=Failed to open access log file [{0}]
 accessLogValve.renameFail=Failed to rename access log from [{0}] to [{1}]
-accessLogValve.alreadyExists=Failed to rename access log from [{0}] to [{1}], file already exists.
-accessLogValve.invalidLocale=Failed to set locale to [{0}]
+accessLogValve.rotateFail=Failed to rotate access log
 accessLogValve.unsupportedEncoding=Failed to set encoding to [{0}], will use the system default character set.
-accessLogValve.invalidPortType=Invalid port type [{0}], using server (local) port
 accessLogValve.writeFail=Failed to write log message [{0}]
 
-# Error report valve
 # Default error page should not have '[' ']' symbols around substituted text fragments.
 # https://bz.apache.org/bugzilla/show_bug.cgi?id=61134
-errorReportValve.statusHeader=HTTP Status {0} – {1}
-errorReportValve.type=Type
-errorReportValve.exceptionReport=Exception Report
-errorReportValve.statusReport=Status Report
-errorReportValve.message=Message
 errorReportValve.description=Description
+errorReportValve.errorPageIOException=Unable to display error page at [{0}] due to an exception
+errorReportValve.errorPageNotFound=Unable to find a static error page at [{0}]
 errorReportValve.exception=Exception
-errorReportValve.rootCause=Root Cause
+errorReportValve.exceptionReport=Exception Report
+errorReportValve.message=Message
+errorReportValve.noDescription=No description available
 errorReportValve.note=Note
+errorReportValve.rootCause=Root Cause
 errorReportValve.rootCauseInLogs=The full stack trace of the root cause is available in the server logs.
+errorReportValve.statusHeader=HTTP Status {0} – {1}
+errorReportValve.statusReport=Status Report
+errorReportValve.type=Type
 errorReportValve.unknownReason=Unknown Reason
-errorReportValve.noDescription=No description available
-errorReportValve.errorPageIOException=Unable to display error page at [{0}] due to an exception
-errorReportValve.errorPageNotFound=Unable to find a static error page at [{0}]
-
-remoteCidrValve.invalid=Invalid configuration provided for [{0}]. See previous messages for details.
-remoteCidrValve.noRemoteIp=Client does not have an IP address. Request denied.
 
-# Remote IP valve
-remoteIpValve.invalidPortHeader=Invalid value [{0}] found for port in HTTP header [{1}]
-
-# Request filter valve - RemoteAddrValve, RemoteHostValve
-requestFilterValve.configInvalid=One or more invalid configuration settings were provided for the Remote[Addr|Host]Valve which prevented the Valve and its parent containers from starting
-requestFilterValve.deny=Denied request for [{0}] based on property [{1}]
-
-sslValve.certError=Failed to process certificate string [{0}] to create a java.security.cert.X509Certificate object
-sslValve.invalidProvider=The SSL provider specified on the connector associated with this request of [{0}] is invalid. The certificate data could not be processed.
-
-#Stuck thread detection Valve
-stuckThreadDetectionValve.notifyStuckThreadDetected=Thread [{0}] (id=[{6}]) has been active for [{1}] milliseconds (since [{2}]) to serve the same request for [{4}] and may be stuck (configured threshold for this StuckThreadDetectionValve is [{5}] seconds). There is/are [{3}] thread(s) in total that are monitored by this Valve and may be stuck.
-stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread [{0}] (id=[{3}]) was previously reported to be stuck but has completed. It was active for approximately [{1}] milliseconds.{2,choice,0#|0< There is/are still [{2}] thread(s) that are monitored by this Valve and may be stuck.}
-stuckThreadDetectionValve.notifyStuckThreadInterrupted=Thread [{0}] (id=[{5}]) has been interrupted because it was active for [{1}] milliseconds (since [{2}]) to serve the same request for [{3}] and was probably stuck (configured interruption threshold for this StuckThreadDetectionValve is [{4}] seconds).
-
-# HTTP status reports (error codes only)
-# All status codes registered with IANA can be found at
-# http://www.iana.org/assignments/http-status-codes/http-status-codes.xml
-http.400.reason=Bad Request
 http.400.desc=The server cannot or will not process the request due to something that is perceived to be a client error (e.g., malformed request syntax, invalid request message framing, or deceptive request routing).
-http.401.reason=Unauthorized
+http.400.reason=Bad Request
 http.401.desc=The request has not been applied because it lacks valid authentication credentials for the target resource.
-http.402.reason=Payment Required
+http.401.reason=Unauthorized
 http.402.desc=This status code is reserved for future use.
-http.403.reason=Forbidden
+http.402.reason=Payment Required
 http.403.desc=The server understood the request but refuses to authorize it.
-http.404.reason=Not Found
+http.403.reason=Forbidden
 http.404.desc=The origin server did not find a current representation for the target resource or is not willing to disclose that one exists.
-http.405.reason=Method Not Allowed
+http.404.reason=Not Found
 http.405.desc=The method received in the request-line is known by the origin server but not supported by the target resource.
+http.405.reason=Method Not Allowed
+http.406.desc=The target resource does not have a current representation that would be acceptable to the user agent, according to the proactive negotiation header fields received in the request, and the server is unwilling to supply a default representation.
 http.406.reason=Not Acceptable
-http.406.desc= The target resource does not have a current representation that would be acceptable to the user agent, according to the proactive negotiation header fields received in the request, and the server is unwilling to supply a default representation.
-http.407.reason=Proxy Authentication Required
 http.407.desc=This status code is similar to 401 (Unauthorized), but it indicates that the client needs to authenticate itself in order to use a proxy.
+http.407.reason=Proxy Authentication Required
+http.408.desc=The server did not receive a complete request message within the time that it was prepared to wait.
 http.408.reason=Request Timeout
-http.408.desc= The server did not receive a complete request message within the time that it was prepared to wait.
-http.409.reason=Conflict
 http.409.desc=The request could not be completed due to a conflict with the current state of the target resource.
+http.409.reason=Conflict
+http.410.desc=Access to the target resource is no longer available at the origin server and that this condition is likely to be permanent.
 http.410.reason=Gone
-http.410.desc= Access to the target resource is no longer available at the origin server and that this condition is likely to be permanent.
-http.411.reason=Length Required
 http.411.desc=The server refuses to accept the request without a defined Content-Length.
-http.412.reason=Precondition Failed
+http.411.reason=Length Required
 http.412.desc=One or more conditions given in the request header fields evaluated to false when tested on the server.
-http.413.reason=Payload Too Large
+http.412.reason=Precondition Failed
 http.413.desc=The server is refusing to process a request because the request payload is larger than the server is willing or able to process.
-http.414.reason=URI Too Long
+http.413.reason=Payload Too Large
 http.414.desc=The server is refusing to service the request because the request-target is longer than the server is willing to interpret.
-http.415.reason=Unsupported Media Type
+http.414.reason=URI Too Long
 http.415.desc=The origin server is refusing to service the request because the payload is in a format not supported by this method on the target resource.
-http.416.reason=Range Not Satisfiable
+http.415.reason=Unsupported Media Type
 http.416.desc=None of the ranges in the request's Range header field overlap the current extent of the selected resource or that the set of ranges requested has been rejected due to invalid ranges or an excessive request of small or overlapping ranges.
-http.417.reason=Expectation Failed
+http.416.reason=Range Not Satisfiable
 http.417.desc=The expectation given in the request's Expect header field could not be met by at least one of the inbound servers.
-http.421.reason=Misdirected Request
+http.417.reason=Expectation Failed
 http.421.desc=The request was directed at a server that is not able to produce a response.
-http.422.reason=Unprocessable Entity
+http.421.reason=Misdirected Request
 http.422.desc=The server understands the content type of the request entity, and the syntax of the request entity is correct but was unable to process the contained instructions.
-http.423.reason=Locked
+http.422.reason=Unprocessable Entity
 http.423.desc=The source or destination resource of a method is locked.
-http.424.reason=Failed Dependency
+http.423.reason=Locked
 http.424.desc=The method could not be performed on the resource because the requested action depended on another action and that action failed.
-http.426.reason=Upgrade Required
+http.424.reason=Failed Dependency
 http.426.desc=the server refuses to perform the request using the current protocol but might be willing to do so after the client upgrades to a different protocol.
-http.428.reason=Precondition Required
+http.426.reason=Upgrade Required
 http.428.desc=The origin server requires the request to be conditional.
-http.429.reason=Too Many Requests
+http.428.reason=Precondition Required
 http.429.desc=The user has sent too many requests in a given amount of time ("rate limiting").
-http.431.reason=Request Header Fields Too Large
+http.429.reason=Too Many Requests
 http.431.desc=The server is unwilling to process the request because its header fields are too large.
-http.451.reason=Unavailable For Legal Reasons
+http.431.reason=Request Header Fields Too Large
 http.451.desc=The server refused this request for legal reasons.
-http.500.reason=Internal Server Error
+http.451.reason=Unavailable For Legal Reasons
 http.500.desc=The server encountered an unexpected condition that prevented it from fulfilling the request.
-http.501.reason=Not Implemented
+http.500.reason=Internal Server Error
 http.501.desc=The server does not support the functionality required to fulfill the request.
-http.502.reason=Bad Gateway
+http.501.reason=Not Implemented
 http.502.desc=The server, while acting as a gateway or proxy, received an invalid response from an inbound server it accessed while attempting to fulfill the request.
-http.503.reason=Service Unavailable
+http.502.reason=Bad Gateway
 http.503.desc=The server is currently unable to handle the request due to a temporary overload or scheduled maintenance, which will likely be alleviated after some delay.
-http.504.reason=Gateway Timeout
+http.503.reason=Service Unavailable
 http.504.desc=The server, while acting as a gateway or proxy, did not receive a timely response from an upstream server it needed to access in order to complete the request.
-http.505.reason=HTTP Version Not Supported
+http.504.reason=Gateway Timeout
 http.505.desc=The server does not support, or refuses to support, the major version of HTTP that was used in the request message.
-http.506.reason=Variant Also Negotiates
+http.505.reason=HTTP Version Not Supported
 http.506.desc=The server has an internal configuration error: the chosen variant resource is configured to engage in transparent content negotiation itself, and is thereforenot a proper end point in the negotiation process.
-http.507.reason=Insufficient Storage
+http.506.reason=Variant Also Negotiates
 http.507.desc=The method could not be performed on the resource because the server is unable to store the representation needed to successfully complete the request.
-http.508.reason=Loop Detected
+http.507.reason=Insufficient Storage
 http.508.desc=The server terminated an operation because it encountered an infinite loop while processing a request with "Depth: infinity".
-http.510.reason=Not Extended
+http.508.reason=Loop Detected
 http.510.desc=The policy for accessing the resource has not been met in the request
-http.511.reason=Network Authentication Required
+http.510.reason=Not Extended
 http.511.desc=The client needs to authenticate to gain network access.
+http.511.reason=Network Authentication Required
 
+jdbcAccessLogValve.close=Failed to close database
+jdbcAccessLogValve.exception=Exception performing insert access entry
+
+remoteCidrValve.invalid=Invalid configuration provided for [{0}]. See previous messages for details.
+remoteCidrValve.noRemoteIp=Client does not have an IP address. Request denied.
+
+remoteIpValve.invalidPortHeader=Invalid value [{0}] found for port in HTTP header [{1}]
+
+requestFilterValve.configInvalid=One or more invalid configuration settings were provided for the Remote[Addr|Host]Valve which prevented the Valve and its parent containers from starting
+requestFilterValve.deny=Denied request for [{0}] based on property [{1}]
+
+sslValve.certError=Failed to process certificate string [{0}] to create a java.security.cert.X509Certificate object
+sslValve.invalidProvider=The SSL provider specified on the connector associated with this request of [{0}] is invalid. The certificate data could not be processed.
+
+stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread [{0}] (id=[{3}]) was previously reported to be stuck but has completed. It was active for approximately [{1}] milliseconds.{2,choice,0#|0< There is/are still [{2}] thread(s) that are monitored by this Valve and may be stuck.}
+stuckThreadDetectionValve.notifyStuckThreadDetected=Thread [{0}] (id=[{6}]) has been active for [{1}] milliseconds (since [{2}]) to serve the same request for [{4}] and may be stuck (configured threshold for this StuckThreadDetectionValve is [{5}] seconds). There is/are [{3}] thread(s) in total that are monitored by this Valve and may be stuck.
+stuckThreadDetectionValve.notifyStuckThreadInterrupted=Thread [{0}] (id=[{5}]) has been interrupted because it was active for [{1}] milliseconds (since [{2}]) to serve the same request for [{3}] and was probably stuck (configured interruption threshold for this StuckThreadDetectionValve is [{4}] seconds).

Modified: tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -32,12 +32,13 @@ dirResourceSet.notDirectory=The director
 dirResourceSet.writeExists=The target of the write already exists
 dirResourceSet.writeNpe=The input stream may not be null
 
-extractingRoot.targetFailed=Failed to create the directory [{0}] for extracted JAR files
 extractingRoot.jarFailed=Failed to extract the JAR file [{0}]
+extractingRoot.targetFailed=Failed to create the directory [{0}] for extracted JAR files
 
 fileResource.getCanonicalPathFail=Unable to determine the canonical path for the resource [{0}]
 fileResource.getCreationFail=Unable to determine the creation time for the resource [{0}]
 fileResource.getUrlFail=Unable to determine a URL for the resource [{0}]
+
 fileResourceSet.notFile=The file specified by base and internal path [{0}]{1}[{2}] does not exist.
 
 jarResource.getInputStreamFail=Unable to obtain an InputStream for the resource [{0}] located in the JAR [{1}]
@@ -54,4 +55,4 @@ standardRoot.invalidPathNormal=The resou
 standardRoot.lockedFile=The web application [{0}] failed to close the file [{1}] opened via the following stack trace
 standardRoot.noContext=A Context has not been configured for this WebResourceRoot
 standardRoot.startInvalidMain=The main resource set specified [{0}] is not valid
-standardRoot.unsupportedProtocol=The URL protocol [{0}] is not supported by this web resources implementation
\ No newline at end of file
+standardRoot.unsupportedProtocol=The URL protocol [{0}] is not supported by this web resources implementation

Modified: tomcat/trunk/java/org/apache/coyote/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -16,16 +16,17 @@
 abstractConnectionHandler.connectionsGet=Found processor [{0}] for socket [{1}]
 abstractConnectionHandler.error=Error reading request, ignored
 abstractConnectionHandler.ioexception.debug=IOExceptions are normal, ignored
+abstractConnectionHandler.negotiatedProcessor.fail=Failed to create Processor for negotiated protocol [{0}]
 abstractConnectionHandler.process=Processing socket [{0}] with status [{1}]
 abstractConnectionHandler.processorPop=Popped processor [{0}] from cache
 abstractConnectionHandler.protocolexception.debug=ProtocolExceptions are normal, ignored
 abstractConnectionHandler.socketexception.debug=SocketExceptions are normal, ignored
-abstractConnectionHandler.negotiatedProcessor.fail=Failed to create Processor for negotiated protocol [{0}]
 abstractConnectionHandler.upgradeCreate=Created upgrade processor [{0}] for socket wrapper [{1}]
 
-abstractProcessor.fallToDebug=\n Note: further occurrences of request parsing errors will be logged at DEBUG level.
-abstractProcessor.httpupgrade.notsupported=HTTP upgrade is not supported by this protocol
+abstractProcessor.fallToDebug=\n\
+\ Note: further occurrences of request parsing errors will be logged at DEBUG level.
 abstractProcessor.hostInvalid=The host [{0}] is not valid
+abstractProcessor.httpupgrade.notsupported=HTTP upgrade is not supported by this protocol
 abstractProcessor.noExecute=Unable to transfer processing to a container thread because this Processor is not currently associated with a SocketWrapper
 abstractProcessor.nonContainerThreadError=An error occurred in processing while on a non-container thread. The connection will be closed immediately
 abstractProcessor.pushrequest.notsupported=Server push requests are not supported by this protocol
@@ -33,16 +34,16 @@ abstractProcessor.socket.ssl=Exception g
 
 abstractProtocol.mbeanDeregistrationFailed=Failed to deregister MBean named [{0}] from MBean server [{1}]
 
+abstractProtocolHandler.asyncTimeoutError=Error processing async timeouts
+abstractProtocolHandler.destroy=Destroying ProtocolHandler [{0}]
 abstractProtocolHandler.getAttribute=Get attribute [{0}] with value [{1}]
-abstractProtocolHandler.setAttribute=Set attribute [{0}] with value [{1}]
 abstractProtocolHandler.init=Initializing ProtocolHandler [{0}]
-abstractProtocolHandler.portOffset=ProtocolHandler [{0}] is configured with a base port of [{1}] and a port offset of [{2}]
-abstractProtocolHandler.start=Starting ProtocolHandler [{0}]
 abstractProtocolHandler.pause=Pausing ProtocolHandler [{0}]
+abstractProtocolHandler.portOffset=ProtocolHandler [{0}] is configured with a base port of [{1}] and a port offset of [{2}]
 abstractProtocolHandler.resume=Resuming ProtocolHandler [{0}]
+abstractProtocolHandler.setAttribute=Set attribute [{0}] with value [{1}]
+abstractProtocolHandler.start=Starting ProtocolHandler [{0}]
 abstractProtocolHandler.stop=Stopping ProtocolHandler [{0}]
-abstractProtocolHandler.destroy=Destroying ProtocolHandler [{0}]
-abstractProtocolHandler.asyncTimeoutError=Error processing async timeouts
 
 asyncStateMachine.invalidAsyncState=Calling [{0}] is not valid for a request with Async state [{1}]
 
@@ -51,8 +52,8 @@ request.nullReadListener=The listener pa
 request.readListenerSet=The non-blocking read listener has already been set
 
 response.encoding.invalid=The encoding [{0}] is not recognised by the JRE
+response.noTrailers.notSupported=A trailer fields supplier may not be set for this response. Either the underlying protocol does not support trailer fields or the protocol requires that the supplier is set before the response is committed
 response.notAsync=It is only valid to switch to non-blocking IO within async processing or HTTP upgrade processing
 response.notNonBlocking=It is invalid to call isReady() when the response has not been put into non-blocking mode
-response.noTrailers.notSupported=A trailer fields supplier may not be set for this response. Either the underlying protocol does not support trailer fields or the protocol requires that the supplier is set before the response is committed
 response.nullWriteListener=The listener passed to setWriteListener() may not be null
 response.writeListenerSet=The non-blocking write listener has already been set

Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,13 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ajpprotocol.noSSL=SSL is not supported with AJP. The SSL host configuration for [{0}] was ignored
-ajpprotocol.noUpgrade=Upgrade is not supported with AJP. The UpgradeProtocol configuration for [{0}] was ignored
-ajpprotocol.noUpgradeHandler=Upgrade is not supported with AJP. The HttpUpgradeHandler [{0}] can not be processed
+ajpMessage.invalidPos=Requested read of bytes at position [{0}] which is beyond the end of the AJP message
+
+ajpmessage.invalid=Invalid message received with signature [{0}]
+ajpmessage.invalidLength=Invalid message received with length [{0}]
+ajpmessage.null=Cannot append null value
+ajpmessage.overflow=Overflow error for buffer adding [{0}] bytes at position [{1}]
 
-ajpnioprotocol.releaseStart=Iterating through our connections to release a socket channel [{0}]
 ajpnioprotocol.releaseEnd=Done iterating through our connections to release a socket channel [{0}] released [{1}]
+ajpnioprotocol.releaseStart=Iterating through our connections to release a socket channel [{0}]
 
+ajpprocessor.certs.fail=Certificate conversion failed
 ajpprocessor.failedread=Socket read failed
 ajpprocessor.failedsend=Failed to send AJP message
 ajpprocessor.header.error=Header message parsing failed
@@ -27,11 +31,7 @@ ajpprocessor.header.tooLong=Header messa
 ajpprocessor.readtimeout=Timeout attempting to read data from the socket
 ajpprocessor.request.prepare=Error preparing request
 ajpprocessor.request.process=Error processing request
-ajpprocessor.certs.fail=Certificate conversion failed
-
-ajpmessage.null=Cannot append null value
-ajpmessage.overflow=Overflow error for buffer adding [{0}] bytes at position [{1}]
-ajpmessage.invalid=Invalid message received with signature [{0}]
-ajpmessage.invalidLength=Invalid message received with length [{0}]
-ajpMessage.invalidPos=Requested read of bytes at position [{0}] which is beyond the end of the AJP message
 
+ajpprotocol.noSSL=SSL is not supported with AJP. The SSL host configuration for [{0}] was ignored
+ajpprotocol.noUpgrade=Upgrade is not supported with AJP. The UpgradeProtocol configuration for [{0}] was ignored
+ajpprotocol.noUpgradeHandler=Upgrade is not supported with AJP. The HttpUpgradeHandler [{0}] can not be processed

Modified: tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -17,9 +17,11 @@ abstractHttp11Protocol.alpnConfigured=Th
 abstractHttp11Protocol.alpnWithNoAlpn=The upgrade handler [{0}] for [{1}] only supports upgrade via ALPN but has been configured for the [{2}] connector that does not support ALPN.
 abstractHttp11Protocol.httpUpgradeConfigured=The [{0}] connector has been configured to support HTTP upgrade to [{1}]
 
-http11processor.fallToDebug=\n Note: further occurrences of HTTP request parsing errors will be logged at DEBUG level.
+http11processor.fallToDebug=\n\
+\ Note: further occurrences of HTTP request parsing errors will be logged at DEBUG level.
 http11processor.header.parse=Error parsing HTTP request header
 http11processor.neverused=This method should never be used
+http11processor.request.finish=Error finishing request
 http11processor.request.inconsistentHosts=The host specified in the request line is not consistent with the host header
 http11processor.request.invalidScheme=The HTTP request contained an absolute URI with an invalid scheme
 http11processor.request.invalidUri==The HTTP request contained an invalid URI
@@ -28,19 +30,18 @@ http11processor.request.multipleHosts=Th
 http11processor.request.noHostHeader=The HTTP/1.1 request did not provide a host header
 http11processor.request.prepare=Error preparing request
 http11processor.request.process=Error processing request
-http11processor.request.finish=Error finishing request
 http11processor.response.finish=Error finishing response
-http11processor.socket.info=Exception getting socket information
 http11processor.sendfile.error=Error sending data using sendfile. May be caused by invalid request attributes for start/end points
+http11processor.socket.info=Exception getting socket information
 
 iib.available.readFail=A non-blocking read failed while attempting to determine if data was available
 iib.eof.error=Unexpected EOF read on the socket
 iib.failedread.apr=Read failed with APR/native error code [{0}]
 iib.filter.npe=You may not add a null filter
+iib.invalidHttpProtocol=Invalid character found in the HTTP protocol
+iib.invalidRequestTarget=Invalid character found in the request target. The valid characters are defined in RFC 7230 and RFC 3986
 iib.invalidheader=The HTTP header line [{0}] does not conform to RFC 7230 and has been ignored.
 iib.invalidmethod=Invalid character found in method name. HTTP method names must be tokens
-iib.invalidRequestTarget=Invalid character found in the request target. The valid characters are defined in RFC 7230 and RFC 3986
-iib.invalidHttpProtocol=Invalid character found in the HTTP protocol
 iib.parseheaders.ise.error=Unexpected state: headers already parsed. Buffer not recycled?
 iib.readtimeout=Timeout attempting to read data from the socket
 iib.requestheadertoolarge.error=Request header is too large

Modified: tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-chunkedInputFilter.error=No data available due to previous error
 chunkedInputFilter.eos=Unexpected end of stream while reading request body
 chunkedInputFilter.eosTrailer=Unexpected end of stream while reading trailer headers
+chunkedInputFilter.error=No data available due to previous error
 chunkedInputFilter.invalidCrlf=Invalid end of line sequence (character other than CR or LF found)
 chunkedInputFilter.invalidCrlfCRCR=Invalid end of line sequence (CRCR)
 chunkedInputFilter.invalidCrlfNoCR=Invalid end of line sequence (No CR before LF)
@@ -24,4 +24,4 @@ chunkedInputFilter.invalidHeader=Invalid
 chunkedInputFilter.maxExtension=maxExtensionSize exceeded
 chunkedInputFilter.maxTrailer=maxTrailerSize exceeded
 
-inputFilter.maxSwallow=maxSwallowSize exceeded
\ No newline at end of file
+inputFilter.maxSwallow=maxSwallowSize exceeded

Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,25 +13,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-upgradeProcessor.isCloseFail=Failed to close input stream associated with upgraded connection
-upgradeProcessor.osCloseFail=Failed to close output stream associated with upgraded connection
-upgradeProcessor.requiredClose=Closing upgraded connection due to closeRequired state of streams: Input [{0}], Output [{1}]
-upgradeProcessor.stop=Closing upgraded connection as incoming socket status was STOP
-upgradeProcessor.unexpectedState=Closing upgraded connection unexpectedly as incoming socket status was [{0}]
-
 upgrade.sis.errorCloseFail=Failed to close InputStream cleanly after a previous error
 upgrade.sis.isFinished.ise=It is illegal to call isFinished() when the ServletInputStream is not in non-blocking mode (i.e. setReadListener() must be called first)
 upgrade.sis.isReady.ise=It is illegal to call isReady() when the ServletInputStream is not in non-blocking mode (i.e. setReadListener() must be called first)
 upgrade.sis.onErrorFail=onError processing for the registered ReadListener triggered this further error which was swallowed
-upgrade.sis.readListener.null=It is illegal to pass null to setReadListener()
-upgrade.sis.readListener.set=It is illegal to call setReadListener() more than once for the same upgraded connection
 upgrade.sis.read.closed=The InputStream has been closed
 upgrade.sis.read.ise=It is illegal to call any of the read() methods in non-blocking mode without first checking that there is data available by calling isReady()
-upgrade.sos.errorCloseFail=Failed to close OutputStream cleanly after a previous error
+upgrade.sis.readListener.null=It is illegal to pass null to setReadListener()
+upgrade.sis.readListener.set=It is illegal to call setReadListener() more than once for the same upgraded connection
 upgrade.sos.canWrite.ise=It is illegal to call canWrite() when the ServletOutputStream is not in non-blocking mode (i.e. setWriteListener() must be called first)
+upgrade.sos.errorCloseFail=Failed to close OutputStream cleanly after a previous error
 upgrade.sos.onErrorFail=onError processing for the registered WriteListener triggered this further error which was swallowed
-upgrade.sos.writeListener.null=It is illegal to pass null to setWriteListener()
-upgrade.sos.writeListener.set=It is illegal to call setWriteListener() more than once for the same upgraded connection
 upgrade.sos.write.closed=The OutputStream has been closed
 upgrade.sos.write.ise=It is illegal to call any of the write() methods in non-blocking mode without first checking that there is space available by calling isReady()
+upgrade.sos.writeListener.null=It is illegal to pass null to setWriteListener()
+upgrade.sos.writeListener.set=It is illegal to call setWriteListener() more than once for the same upgraded connection
 
+upgradeProcessor.isCloseFail=Failed to close input stream associated with upgraded connection
+upgradeProcessor.osCloseFail=Failed to close output stream associated with upgraded connection
+upgradeProcessor.requiredClose=Closing upgraded connection due to closeRequired state of streams: Input [{0}], Output [{1}]
+upgradeProcessor.stop=Closing upgraded connection as incoming socket status was STOP
+upgradeProcessor.unexpectedState=Closing upgraded connection unexpectedly as incoming socket status was [{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=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties [UTF-8] Mon Nov 12 11:16:39 2018
@@ -34,12 +34,12 @@ frameType.checkStream=Invalid frame type
 hpack.integerEncodedOverTooManyOctets=HPACK variable length integer encoded over too many octets, max is [{0}]
 hpack.invalidCharacter=The Unicode character [{0}] at code point [{1}] cannot be encoded as it is outside the permitted range of 0 to 255.
 
+hpackEncoder.encodeHeader=Encoding header [{0}] with value [{1}]
+
 hpackdecoder.headerTableIndexInvalid=The header table index [{0}] is not valid as there are [{1}] static entries and [{2}] dynamic entries
 hpackdecoder.tableSizeUpdateNotAtStart=Any table size update must be sent at the start of a header block
 hpackdecoder.zeroNotValidHeaderTableIndex=Zero is not a valid header table index
 
-hpackEncoder.encodeHeader=Encoding header [{0}] with value [{1}]
-
 hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS=Huffman encoded value in HPACK headers did not end with EOS padding
 hpackhuffman.stringLiteralTooMuchPadding=More than 7 bits of EOS padding were provided at the end of an Huffman encoded string literal
 
@@ -47,6 +47,7 @@ http2Parser.headerLimitCount=Connection
 http2Parser.headerLimitSize=Connection [{0}], Stream [{1}], Total header size too big
 http2Parser.headers.wrongFrameType=Connection [{0}], headers in progress for stream [{1}] but a frame of type [{2}] was received
 http2Parser.headers.wrongStream=Connection [{0}], headers in progress for stream [{1}] but a frame for stream [{2}] was received
+http2Parser.invalidBuffers=Reading should be done with two buffers
 http2Parser.nonZeroPadding=Connection [{0}], Stream [{1}], Non-zero padding received
 http2Parser.payloadTooBig=The payload is [{0}] bytes long but the maximum frame size is [{1}]
 http2Parser.preface.invalid=Invalid connection preface [{0}] presented
@@ -58,8 +59,8 @@ http2Parser.processFrameContinuation.not
 http2Parser.processFrameData.lengths=Connection [{0}], Stream [{1}], Data length, [{2}], Padding length [{3}]
 http2Parser.processFrameData.window=Connection [{0}], Client sent more data than stream window allowed
 http2Parser.processFrameGoaway.payloadTooSmall=Connection [{0}]: Goaway payload size was [{1}] which is less than the minimum 8
-http2Parser.processFrameHeaders.decodingFailed=There was an error during the HPACK decoding of HTTP headers
 http2Parser.processFrameHeaders.decodingDataLeft=Data left over after HPACK decoding - it should have been consumed
+http2Parser.processFrameHeaders.decodingFailed=There was an error during the HPACK decoding of HTTP headers
 http2Parser.processFrameHeaders.payload=Connection [{0}], Stream [{1}], Processing headers payload size [{2}]
 http2Parser.processFramePing.invalidPayloadSize=Settings frame received with an invalid payload size of [{0}] (should be 8)
 http2Parser.processFramePriority.invalidParent=Connection [{0}], Stream [{1}], A stream may not depend on itself
@@ -71,7 +72,6 @@ http2Parser.processFrameWindowUpdate.deb
 http2Parser.processFrameWindowUpdate.invalidIncrement=Window update frame received with an invalid increment size of [0]
 http2Parser.processFrameWindowUpdate.invalidPayloadSize=Window update frame received with an invalid payload size of [{0}]
 http2Parser.swallow.debug=Connection [{0}], Stream [{1}], Swallowed [{2}] bytes
-http2Parser.invalidBuffers=Reading should be done with two buffers
 
 pingManager.roundTripTime=Connection [{0}] Round trip time measured as [{1}]ns
 
@@ -87,20 +87,18 @@ stream.header.required=Connection [{0}],
 stream.header.te=Connection [{0}], Stream [{1}], HTTP header [te] is not permitted to have the value [{2}] in an HTTP/2 request
 stream.header.unexpectedPseudoHeader=Connection [{0}], Stream [{1}], Pseudo header [{2}] received after a regular header
 stream.header.unknownPseudoHeader=Connection [{0}], Stream [{1}], Unknown pseudo header [{2}] received
-stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable
-stream.reprioritisation.debug=Connection [{0}], Stream [{1}], Exclusive [{2}], Parent [{3}], Weight [{4}]
-stream.reset.fail=Connection [{0}], Stream [{1}], Failed to reset stream
-stream.reset.receive=Connection [{0}], Stream [{1}], Reset received due to [{2}]
-stream.reset.send=Connection [{0}], Stream [{1}], Reset sent due to [{2}]
-stream.trailerHeader.noEndOfStream=Connection [{0}], Stream [{1}], The trailer headers did not include the end of stream flag
-
 stream.inputBuffer.copy=Copying [{0}] bytes from inBuffer to outBuffer
 stream.inputBuffer.dispatch=Data added to inBuffer when read interest is registered. Triggering a read dispatch
 stream.inputBuffer.empty=The Stream input buffer is empty. Waiting for more data
 stream.inputBuffer.reset=Stream reset
 stream.inputBuffer.signal=Data added to inBuffer when read thread is waiting. Signalling that thread to continue
-
+stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable
 stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
+stream.reprioritisation.debug=Connection [{0}], Stream [{1}], Exclusive [{2}], Parent [{3}], Weight [{4}]
+stream.reset.fail=Connection [{0}], Stream [{1}], Failed to reset stream
+stream.reset.receive=Connection [{0}], Stream [{1}], Reset received due to [{2}]
+stream.reset.send=Connection [{0}], Stream [{1}], Reset sent due to [{2}]
+stream.trailerHeader.noEndOfStream=Connection [{0}], Stream [{1}], The trailer headers did not include the end of stream flag
 
 streamProcessor.error.connection=Connection [{0}], Stream [{1}], An error occurred during processing that was fatal to the connection
 streamProcessor.error.stream=Connection [{0}], Stream [{1}], An error occurred during processing that was fatal to the stream
@@ -125,8 +123,8 @@ upgradeHandler.ioerror=Connection [{0}]
 upgradeHandler.noNewStreams=Connection [{0}], Stream [{1}], Stream ignored as no new streams are permitted on this connection
 upgradeHandler.notifyAll=Connection [{0}], Stream [{1}], notifyAll() called to release StreamOutputBuffer
 upgradeHandler.pause.entry=Connection [{0}] Pausing
-upgradeHandler.prefaceReceived=Connection [{0}], Connection preface received from client
 upgradeHandler.pingFailed=Connection [{0}] Failed to send ping to client
+upgradeHandler.prefaceReceived=Connection [{0}], Connection preface received from client
 upgradeHandler.pruneIncomplete=Connection [{0}] Failed to fully prune the connection because streams were active / used in the priority tree. There are [{1}] too many streams
 upgradeHandler.pruneStart=Connection [{0}] Starting pruning of old streams. Limit is [{1}] + 10% and there are currently [{2}] streams.
 upgradeHandler.pruned=Connection [{0}] Pruned completed stream [{1}]
@@ -146,11 +144,11 @@ upgradeHandler.upgrade=Connection [{0}],
 upgradeHandler.upgrade.fail=Connection [{0}], HTTP/1.1 upgrade failed
 upgradeHandler.upgradeDispatch.entry=Entry, Connection [{0}], SocketStatus [{1}]
 upgradeHandler.upgradeDispatch.exit=Exit, Connection [{0}], SocketState [{1}]
-upgradeHandler.windowSizeTooBig=Connection [{0}], Stream [{1}], Window size too big
 upgradeHandler.windowSizeReservationInterrupted=Connection [{0}], Stream [{1}], reservation for [{2}] bytes
+upgradeHandler.windowSizeTooBig=Connection [{0}], Stream [{1}], Window size too big
 upgradeHandler.writeBody=Connection [{0}], Stream [{1}], Data length [{2}]
 upgradeHandler.writeHeaders=Connection [{0}], Stream [{1}]
 upgradeHandler.writePushHeaders=Connection [{0}], Stream [{1}], Pushed stream [{2}], EndOfStream [{3}]
 
 writeStateMachine.endWrite.ise=It is illegal to specify [{0}] for the new state once a write has completed
-writeStateMachine.ise=It is illegal to call [{0}()] in state [{1}]
\ No newline at end of file
+writeStateMachine.ise=It is illegal to call [{0}()] in state [{1}]



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org