From 9d8de3b6862e35343c50b83ac19b76ac65615c91 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 25 Jul 2011 19:45:04 +0000 Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51550 Stop the adaptor swallowing internal errors. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1150864 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/connector/CoyoteAdapter.java | 3 --- java/org/apache/catalina/connector/LocalStrings.properties | 1 - java/org/apache/catalina/connector/LocalStrings_es.properties | 1 - java/org/apache/catalina/connector/LocalStrings_fr.properties | 6 ------ java/org/apache/catalina/connector/LocalStrings_ja.properties | 6 ------ webapps/docs/changelog.xml | 6 ++++++ 6 files changed, 6 insertions(+), 17 deletions(-) diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java index 7f6bd4ff0..39b98e6b2 100644 --- a/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -443,9 +443,6 @@ public class CoyoteAdapter implements Adapter { } 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 diff --git a/java/org/apache/catalina/connector/LocalStrings.properties b/java/org/apache/catalina/connector/LocalStrings.properties index 034d9b09a..197f11de3 100644 --- a/java/org/apache/catalina/connector/LocalStrings.properties +++ b/java/org/apache/catalina/connector/LocalStrings.properties @@ -33,7 +33,6 @@ coyoteConnector.parseBodyMethodNoTrace=TRACE method MUST NOT include an entity ( # # 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}] diff --git a/java/org/apache/catalina/connector/LocalStrings_es.properties b/java/org/apache/catalina/connector/LocalStrings_es.properties index c5213057a..f5715161a 100644 --- a/java/org/apache/catalina/connector/LocalStrings_es.properties +++ b/java/org/apache/catalina/connector/LocalStrings_es.properties @@ -27,7 +27,6 @@ coyoteConnector.protocolUnregistrationFailed = Ha fallado la parada del manejado 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}] diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties b/java/org/apache/catalina/connector/LocalStrings_fr.properties index 93d3b351c..59a62e42f 100644 --- a/java/org/apache/catalina/connector/LocalStrings_fr.properties +++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties @@ -28,12 +28,6 @@ coyoteConnector.protocolHandlerPauseFailed=La suspension du gestionnaire de prot 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 # diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties b/java/org/apache/catalina/connector/LocalStrings_ja.properties index 30c7a7572..ec4f9a0c9 100644 --- a/java/org/apache/catalina/connector/LocalStrings_ja.properties +++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties @@ -28,12 +28,6 @@ coyoteConnector.protocolHandlerPauseFailed=\u30d7\u30ed\u30c8\u30b3\u30eb\u30cf\ 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 # diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index fe21e03c2..39554ad56 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -80,6 +80,12 @@ to the org.apache.catalina.filters package so it is available for all web applications. (markt) + + 51550: 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) + -- 2.11.0