Author: markt
Date: Mon Jul 25 19:45:04 2011
New Revision: 1150864
URL: http://svn.apache.org/viewvc?rev=1150864&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51550
Stop the adaptor swallowing internal errors.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1150864&r1=1150863&r2=1150864&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Mon Jul
25 19:45:04 2011
@@ -443,9 +443,6 @@ public class CoyoteAdapter implements Ad
} catch (IOException e) {
// Ignore
- } catch (Throwable t) {
- ExceptionUtils.handleThrowable(t);
- log.error(sm.getString("coyoteAdapter.service"), t);
} finally {
req.getRequestProcessor().setWorkerThreadName(null);
// Recycle the wrapper request and response
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1150864&r1=1150863&r2=1150864&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Mon
Jul 25 19:45:04 2011
@@ -33,7 +33,6 @@ coyoteConnector.parseBodyMethodNoTrace=T
#
# 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.parsePathParam=Unable to parse the path parameters using
encoding [{0}]. The path parameters in the URL will be ignored.
coyoteAdapter.debug=The variable [{0}] has value [{1}]
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties?rev=1150864&r1=1150863&r2=1150864&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
Mon Jul 25 19:45:04 2011
@@ -27,7 +27,6 @@ coyoteConnector.protocolUnregistrationFa
coyoteConnector.parseBodyMethodNoTrace = El m\u00E9todo TRACE NO DEBE DE
incluir una entidad (vea RFC 2616 Secci\u00F3n 9.6)
#
# 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
coyoteAdapter.parsePathParam = No puedo analizar los par\u00E1metros de ruta
mediante la codificaci\u00F3n [{0}]. Se ignoran los par\u00E1metros de la URL.
coyoteAdapter.debug = La variable [{0}] tiene el valor [{1}]
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties?rev=1150864&r1=1150863&r2=1150864&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
Mon Jul 25 19:45:04 2011
@@ -28,12 +28,6 @@ coyoteConnector.protocolHandlerPauseFail
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
#
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties?rev=1150864&r1=1150863&r2=1150864&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
Mon Jul 25 19:45:04 2011
@@ -28,12 +28,6 @@ coyoteConnector.protocolHandlerPauseFail
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
#
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1150864&r1=1150863&r2=1150864&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 25 19:45:04 2011
@@ -80,6 +80,12 @@
to the <code>org.apache.catalina.filters</code> package so it is
available for all web applications. (markt)
</add>
+ <fix>
+ <bug>51550</bug>: Internal errors in Tomcat components that process
+ requests before they are passed to a web application, such as
+ Authenticators, now return a 500 response rather than a 200 response.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
