[patch] Proposed patch for Tomcat 6 v2

bug51550-tc6-v2.patch (text/plain), 3.95 KB, created by Mark Thomas on 2011-07-26 08:02:17 UTC

(hide)

Description: Proposed patch for Tomcat 6 v2

Filename:

MIME Type:

Creator: Mark Thomas

Created: 2011-07-26 08:02:17 UTC

Size: 3.95 KB

patch

obsolete

>Index: java/org/apache/catalina/connector/CoyoteAdapter.java >=================================================================== >--- java/org/apache/catalina/connector/CoyoteAdapter.java (revision 1149270) >+++ java/org/apache/catalina/connector/CoyoteAdapter.java (working copy) >@@ -318,8 +318,6 @@ > > } catch (IOException e) { > ; >- } catch (Throwable t) { >- log.error(sm.getString("coyoteAdapter.service"), t); > } finally { > req.getRequestProcessor().setWorkerThreadName(null); > // Recycle the wrapper request and response >Index: java/org/apache/catalina/connector/LocalStrings.properties >=================================================================== >--- java/org/apache/catalina/connector/LocalStrings.properties (revision 1149270) >+++ java/org/apache/catalina/connector/LocalStrings.properties (working copy) >@@ -34,7 +34,6 @@ > # > # CoyoteAdapter > # >-coyoteAdapter.service=An exception or error occurred in the container during the request processing > coyoteAdapter.read=The servlet did not read all available bytes during the processing of the read event > coyoteAdapter.parseSession=Unable to parse the session ID using encoding [{0}]. The session ID in the URL will be ignored. > coyoteAdapter.parsePathParam=Unable to parse the path parameters using encoding [{0}]. The path parameters in the URL will be ignored. >Index: java/org/apache/catalina/connector/LocalStrings_es.properties >=================================================================== >--- java/org/apache/catalina/connector/LocalStrings_es.properties (revision 1149270) >+++ java/org/apache/catalina/connector/LocalStrings_es.properties (working copy) >@@ -29,7 +29,6 @@ > coyoteConnector.protocolUnregistrationFailed = Ha fallado la parada del manejador de protocolo > # > # CoyoteAdapter >-coyoteAdapter.service = Ha tenido lugar una excepci\u00F3n o error en el contenedor durante el procesamiento del requerimiento > coyoteAdapter.read = El servlet no ley\u00F3 todos los bytes disponibles durante el procesamiento del evento de lectura > # > # CoyoteResponse >Index: java/org/apache/catalina/connector/LocalStrings_fr.properties >=================================================================== >--- java/org/apache/catalina/connector/LocalStrings_fr.properties (revision 1149270) >+++ java/org/apache/catalina/connector/LocalStrings_fr.properties (working copy) >@@ -31,12 +31,6 @@ > coyoteConnector.protocolHandlerResumeFailed=Le red\u00e9marrage du gestionnaire de protocole a \u00e9chou\u00e9 > > # >-# CoyoteAdapter >-# >- >-coyoteAdapter.service=Une exception ou une erreur s''est produite dans le conteneur durant le traitement de la requ\u00eate >- >-# > # CoyoteResponse > # > >Index: java/org/apache/catalina/connector/LocalStrings_ja.properties >=================================================================== >--- java/org/apache/catalina/connector/LocalStrings_ja.properties (revision 1149270) >+++ java/org/apache/catalina/connector/LocalStrings_ja.properties (working copy) >@@ -31,12 +31,6 @@ > coyoteConnector.protocolHandlerResumeFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\u30f3\u30c9\u30e9\u306e\u518d\u958b\u306b\u5931\u6557\u3057\u307e\u3057\u305f > > # >-# CoyoteAdapter >-# >- >-coyoteAdapter.service=\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u51e6\u7406\u4e2d\u306b\u30b3\u30cd\u30af\u30bf\u3067\u4f8b\u5916\u307e\u305f\u306f\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f >- >-# > # CoyoteResponse > # > >Index: java/org/apache/jk/server/JkCoyoteHandler.java >=================================================================== >--- java/org/apache/jk/server/JkCoyoteHandler.java (revision 1149270) >+++ java/org/apache/jk/server/JkCoyoteHandler.java (working copy) >@@ -189,6 +189,7 @@ > try { > adapter.service( req, res ); > } catch( Exception ex ) { >+ ep.setStatus(MsgContext.JK_STATUS_ERROR); > log.info("Error servicing request " + req,ex); > } > if(ep.getStatus() != MsgContext.JK_STATUS_CLOSED) { View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]