View | Details | Raw Unified | Return to bug 60490
Collapse All | Expand All

(-)java/org/apache/catalina/valves/ErrorReportValve.java (-42 / +42 lines)
Lines 28-33 Link Here
28
import org.apache.catalina.connector.Response;
28
import org.apache.catalina.connector.Response;
29
import org.apache.catalina.util.RequestUtil;
29
import org.apache.catalina.util.RequestUtil;
30
import org.apache.catalina.util.ServerInfo;
30
import org.apache.catalina.util.ServerInfo;
31
import org.apache.catalina.util.TomcatCSS;
31
import org.apache.coyote.ActionCode;
32
import org.apache.coyote.ActionCode;
32
import org.apache.tomcat.util.ExceptionUtils;
33
import org.apache.tomcat.util.ExceptionUtils;
33
import org.apache.tomcat.util.res.StringManager;
34
import org.apache.tomcat.util.res.StringManager;
Lines 161-210 Link Here
161
            }
162
            }
162
        }
163
        }
163
164
164
        // Do nothing if there is no report for the specified status code and
165
        // Do nothing if there is no reason phrase for the specified status code and
165
        // no error message provided
166
        // no error message provided
166
        String report = null;
167
        String reason = null;
168
        String description = null;
167
        StringManager smClient = StringManager.getManager(
169
        StringManager smClient = StringManager.getManager(
168
                Constants.Package, request.getLocales());
170
                Constants.Package, request.getLocales());
169
        response.setLocale(smClient.getLocale());
171
        response.setLocale(smClient.getLocale());
170
        try {
172
        try {
171
            report = smClient.getString("http." + statusCode);
173
            reason = smClient.getString("http." + statusCode + ".reason");
174
            description = smClient.getString("http." + statusCode + ".desc");
172
        } catch (Throwable t) {
175
        } catch (Throwable t) {
173
            ExceptionUtils.handleThrowable(t);
176
            ExceptionUtils.handleThrowable(t);
174
        }
177
        }
175
        if (report == null) {
178
        if (reason == null || description == null) {
176
            if (message.length() == 0) {
179
            if (message.isEmpty()) {
177
                return;
180
                return;
178
            } else {
181
            } else {
179
                report = smClient.getString("errorReportValve.noDescription");
182
                reason = smClient.getString("errorReportValve.unknownReason");
183
                description = smClient.getString("errorReportValve.noDescription");
180
            }
184
            }
181
        }
185
        }
182
186
183
        StringBuilder sb = new StringBuilder();
187
        StringBuilder sb = new StringBuilder();
184
188
185
        sb.append("<!DOCTYPE html><html><head>");
189
        sb.append("<!doctype html><html lang=\"");
186
        if(showServerInfo || showReport){
190
        sb.append(smClient.getLocale().getLanguage()).append("\">");
187
            sb.append("<title>");
191
        sb.append("<head>");
188
            if(showServerInfo) {
192
        sb.append("<title>");
189
                sb.append(ServerInfo.getServerInfo()).append(" - ");
193
        sb.append(smClient.getString("errorReportValve.statusHeader",
190
            }
194
                String.valueOf(statusCode), reason));
191
            sb.append(smClient.getString("errorReportValve.errorReport"));
195
        sb.append("</title>");
192
            sb.append("</title>");
196
        sb.append("<style type=\"text/css\">");
193
            sb.append("<style type=\"text/css\">");
197
        sb.append(TomcatCSS.TOMCAT_CSS);
194
            sb.append(org.apache.catalina.util.TomcatCSS.TOMCAT_CSS);
198
        sb.append("</style>");
195
            sb.append("</style> ");
196
        } else {
197
            sb.append("<title>");
198
            sb.append(smClient.getString("errorReportValve.errorReport"));
199
            sb.append("</title>");
200
        }
201
        sb.append("</head><body>");
199
        sb.append("</head><body>");
202
        sb.append("<h1>");
200
        sb.append("<h1>");
203
        sb.append(smClient.getString("errorReportValve.statusHeader",
201
        sb.append(smClient.getString("errorReportValve.statusHeader",
204
                String.valueOf(statusCode), message)).append("</h1>");
202
                String.valueOf(statusCode), reason)).append("</h1>");
205
        if (showReport) {
203
        if (isShowReport()) {
206
            sb.append("<div class=\"line\"></div>");
204
            sb.append("<hr class=\"line\" />");
207
            sb.append("<p><b>type</b> ");
205
            sb.append("<p><b>");
206
            sb.append(smClient.getString("errorReportValve.type"));
207
            sb.append("</b> ");
208
            if (throwable != null) {
208
            if (throwable != null) {
209
                sb.append(smClient.getString("errorReportValve.exceptionReport"));
209
                sb.append(smClient.getString("errorReportValve.exceptionReport"));
210
            } else {
210
            } else {
Lines 211-227 Link Here
211
                sb.append(smClient.getString("errorReportValve.statusReport"));
211
                sb.append(smClient.getString("errorReportValve.statusReport"));
212
            }
212
            }
213
            sb.append("</p>");
213
            sb.append("</p>");
214
            if (!message.isEmpty()) {
215
                sb.append("<p><b>");
216
                sb.append(smClient.getString("errorReportValve.message"));
217
                sb.append("</b> ");
218
                sb.append(message).append("</p>");
219
            }
214
            sb.append("<p><b>");
220
            sb.append("<p><b>");
215
            sb.append(smClient.getString("errorReportValve.message"));
216
            sb.append("</b> <u>");
217
            sb.append(message).append("</u></p>");
218
            sb.append("<p><b>");
219
            sb.append(smClient.getString("errorReportValve.description"));
221
            sb.append(smClient.getString("errorReportValve.description"));
220
            sb.append("</b> <u>");
222
            sb.append("</b> ");
221
            sb.append(report);
223
            sb.append(description);
222
            sb.append("</u></p>");
224
            sb.append("</p>");
223
            if (throwable != null) {
225
            if (throwable != null) {
224
225
                String stackTrace = getPartialServletStackTrace(throwable);
226
                String stackTrace = getPartialServletStackTrace(throwable);
226
                sb.append("<p><b>");
227
                sb.append("<p><b>");
227
                sb.append(smClient.getString("errorReportValve.exception"));
228
                sb.append(smClient.getString("errorReportValve.exception"));
Lines 245-259 Link Here
245
246
246
                sb.append("<p><b>");
247
                sb.append("<p><b>");
247
                sb.append(smClient.getString("errorReportValve.note"));
248
                sb.append(smClient.getString("errorReportValve.note"));
248
                sb.append("</b> <u>");
249
                sb.append("</b> ");
249
                sb.append(smClient.getString("errorReportValve.rootCauseInLogs",
250
                sb.append(smClient.getString("errorReportValve.rootCauseInLogs"));
250
                        showServerInfo?ServerInfo.getServerInfo():""));
251
                sb.append("</p>");
251
                sb.append("</u></p>");
252
252
253
            }
253
            }
254
            sb.append("<hr class=\"line\">");
254
            sb.append("<hr class=\"line\" />");
255
        }
255
        }
256
        if (showServerInfo) {
256
        if (isShowServerInfo()) {
257
            sb.append("<h3>").append(ServerInfo.getServerInfo()).append("</h3>");
257
            sb.append("<h3>").append(ServerInfo.getServerInfo()).append("</h3>");
258
        }
258
        }
259
        sb.append("</body></html>");
259
        sb.append("</body></html>");
Lines 292-298 Link Here
292
     */
292
     */
293
    protected String getPartialServletStackTrace(Throwable t) {
293
    protected String getPartialServletStackTrace(Throwable t) {
294
        StringBuilder trace = new StringBuilder();
294
        StringBuilder trace = new StringBuilder();
295
        trace.append(t.toString()).append('\n');
295
        trace.append(t.toString()).append(System.lineSeparator());
296
        StackTraceElement[] elements = t.getStackTrace();
296
        StackTraceElement[] elements = t.getStackTrace();
297
        int pos = elements.length;
297
        int pos = elements.length;
298
        for (int i = elements.length - 1; i >= 0; i--) {
298
        for (int i = elements.length - 1; i >= 0; i--) {
Lines 306-312 Link Here
306
        for (int i = 0; i < pos; i++) {
306
        for (int i = 0; i < pos; i++) {
307
            if (!(elements[i].getClassName().startsWith
307
            if (!(elements[i].getClassName().startsWith
308
                  ("org.apache.catalina.core."))) {
308
                  ("org.apache.catalina.core."))) {
309
                trace.append('\t').append(elements[i].toString()).append('\n');
309
                trace.append('\t').append(elements[i].toString()).append(System.lineSeparator());
310
            }
310
            }
311
        }
311
        }
312
        return trace.toString();
312
        return trace.toString();
(-)java/org/apache/catalina/valves/LocalStrings.properties (-68 / +85 lines)
Lines 29-44 Link Here
29
accessLogValve.writeFail=Failed to write log message [{0}]
29
accessLogValve.writeFail=Failed to write log message [{0}]
30
30
31
# Error report valve
31
# Error report valve
32
errorReportValve.errorReport=Error report
32
errorReportValve.statusHeader=HTTP Status {0} \u2013 {1}
33
errorReportValve.statusHeader=HTTP Status {0} - {1}
33
errorReportValve.type=Type
34
errorReportValve.exceptionReport=Exception report
34
errorReportValve.exceptionReport=Exception Report
35
errorReportValve.statusReport=Status report
35
errorReportValve.statusReport=Status Report
36
errorReportValve.message=message
36
errorReportValve.message=Message
37
errorReportValve.description=description
37
errorReportValve.description=Description
38
errorReportValve.exception=exception
38
errorReportValve.exception=Exception
39
errorReportValve.rootCause=root cause
39
errorReportValve.rootCause=Root Cause
40
errorReportValve.note=note
40
errorReportValve.note=Note
41
errorReportValve.rootCauseInLogs=The full stack trace of the root cause is available in the {0} logs.
41
errorReportValve.rootCauseInLogs=The full stack trace of the root cause is available in the server logs.
42
errorReportValve.unknownReason=Unknown Reason
42
errorReportValve.noDescription=No description available
43
errorReportValve.noDescription=No description available
43
44
44
# Remote IP valve
45
# Remote IP valve
Lines 59-119 Link Here
59
# HTTP status reports
60
# HTTP status reports
60
# All status codes registered with IANA can be found at
61
# All status codes registered with IANA can be found at
61
# http://www.iana.org/assignments/http-status-codes/http-status-codes.xml
62
# http://www.iana.org/assignments/http-status-codes/http-status-codes.xml
62
# The list might be kept in sync with the one in
63
http.400.reason=Bad Request
63
# org/apache/tomcat/util/http/res/LocalStrings.properties.
64
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).
64
http.100=The client may continue.
65
http.401.reason=Unauthorized
65
http.101=The server is switching protocols according to the "Upgrade" header.
66
http.401.desc=The request has not been applied because it lacks valid authentication credentials for the target resource.
66
http.102=The server has accepted the complete request, but has not yet completed it.
67
http.402.reason=Payment Required
67
http.201=The request succeeded and a new resource has been created on the server.
68
http.402.desc=This status code is reserved for future use.
68
http.202=This request was accepted for processing, but has not been completed.
69
http.403.reason=Forbidden
69
http.203=The meta information presented by the client did not originate from the server.
70
http.403.desc=The server understood the request but refuses to authorize it.
70
http.204=The request succeeded but there is no information to return.
71
http.404.reason=Not Found
71
http.205=The client should reset the document view which caused this request to be sent.
72
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.
72
http.206=The server has fulfilled a partial GET request for this resource.
73
http.405.reason=Method Not Allowed
73
http.207=Multiple status values have been returned.
74
http.405.desc=The method received in the request-line is known by the origin server but not supported by the target resource.
74
http.208=This collection binding was already reported.
75
http.406.reason=Not Acceptable
75
http.226=The response is a representation of the result of one or more instance-manipulations applied to the current instance.
76
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.
76
http.300=The requested resource corresponds to any one of a set of representations, each with its own specific location.
77
http.407.reason=Proxy Authentication Required
77
http.301=The requested resource has moved permanently to a new location.
78
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.
78
http.302=The requested resource has moved temporarily to a new location.
79
http.408.reason=Request Timeout
79
http.303=The response to this request can be found under a different URI.
80
http.408.desc= The server did not receive a complete request message within the time that it was prepared to wait.
80
http.304=The requested resource is available and has not been modified.
81
http.409.reason=Conflict
81
http.305=The requested resource must be accessed through the proxy given by the "Location" header.
82
http.409.desc=The request could not be completed due to a conflict with the current state of the target resource.
82
http.307=The requested resource resides temporarily under a different URI.
83
http.410.reason=Gone
83
http.308=The target resource has been assigned a new permanent URI and any future references to this resource SHOULD use one of the returned URIs.
84
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.
84
http.400=The request sent by the client was syntactically incorrect.
85
http.411.reason=Length Required
85
http.401=This request requires HTTP authentication.
86
http.411.desc=The server refuses to accept the request without a defined Content-Length.
86
http.402=Payment is required for access to this resource.
87
http.412.reason=Precondition Failed
87
http.403=Access to the specified resource has been forbidden.
88
http.412.desc=One or more conditions given in the request header fields evaluated to false when tested on the server.
88
http.404=The requested resource is not available.
89
http.413.reason=Payload Too Large
89
http.405=The specified HTTP method is not allowed for the requested resource.
90
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.
90
http.406=The resource identified by this request is only capable of generating responses with characteristics not acceptable according to the request "accept" headers.
91
http.414.reason=URI Too Long
91
http.407=The client must first authenticate itself with the proxy.
92
http.414.desc=The server is refusing to service the request because the request-target is longer than the server is willing to interpret.
92
http.408=The client did not produce a request within the time that the server was prepared to wait.
93
http.415.reason=Unsupported Media Type
93
http.409=The request could not be completed due to a conflict with the current state of the resource.
94
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.
94
http.410=The requested resource is no longer available, and no forwarding address is known.
95
http.416.reason=Range Not Satisfiable
95
http.411=This request cannot be handled without a defined content length.
96
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.
96
http.412=A specified precondition has failed for this request.
97
http.417.reason=Expectation Failed
97
http.413=The request entity is larger than the server is willing or able to process.
98
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.
98
http.414=The server refused this request because the request URI was too long.
99
http.421.reason=Misdirected Request
99
http.415=The server refused this request because the request entity is in a format not supported by the requested resource for the requested method.
100
http.421.desc=The request was directed at a server that is not able to produce a response.
100
http.416=The requested byte range cannot be satisfied.
101
http.422.reason=Unprocessable Entity
101
http.417=The expectation given in the "Expect" request header could not be fulfilled.
102
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.
102
http.422=The server understood the content type and syntax of the request but was unable to process the contained instructions.
103
http.423.reason=Locked
103
http.423=The source or destination resource of a method is locked.
104
http.423.desc=The source or destination resource of a method is locked.
104
http.424=The method could not be performed on the resource because the requested action depended on another action and that action failed.
105
http.424.reason=Failed Dependency
105
http.426=The request can only be completed after a protocol upgrade.
106
http.424.desc=The method could not be performed on the resource because the requested action depended on another action and that action failed.
106
http.428=The request is required to be conditional.
107
http.426.reason=Upgrade Required
107
http.429=The user has sent too many requests in a given amount of time.
108
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.
108
http.431=The server refused this request because the request header fields are too large.
109
http.428.reason=Precondition Required
109
http.500=The server encountered an internal error that prevented it from fulfilling this request.
110
http.428.desc=The origin server requires the request to be conditional.
110
http.501=The server does not support the functionality needed to fulfill this request.
111
http.429.reason=Too Many Requests
111
http.502=This server received an invalid response from a server it consulted when acting as a proxy or gateway.
112
http.429.desc=The user has sent too many requests in a given amount of time ("rate limiting").
112
http.503=The requested service is not currently available.
113
http.431.reason=Request Header Fields Too Large
113
http.504=The server received a timeout from an upstream server while acting as a gateway or proxy.
114
http.431.desc=The server is unwilling to process the request because its header fields are too large.
114
http.505=The server does not support the requested HTTP protocol version.
115
http.500.reason=Internal Server Error
115
http.506=The chosen variant resource is configured to engage in transparent content negotiation itself, and is therefore not a proper end point in the negotiation process.
116
http.500.desc=The server encountered an unexpected condition that prevented it from fulfilling the request.
116
http.507=The resource does not have sufficient space to record the state of the resource after execution of this method.
117
http.501.reason=Not Implemented
117
http.508=The server terminated an operation because it encountered an infinite loop.
118
http.501.desc=The server does not support the functionality required to fulfill the request.
118
http.510=The policy for accessing the resource has not been met in the request.
119
http.502.reason=Bad Gateway
119
http.511=The client needs to authenticate to gain network access.
120
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.
121
http.503.reason=Service Unavailable
122
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.
123
http.504.reason=Gateway Timeout
124
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.
125
http.505.reason=HTTP Version Not Supported
126
http.505.desc=The server does not support, or refuses to support, the major version of HTTP that was used in the request message.
127
http.506.reason=Variant Also Negotiates
128
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.
129
http.507.reason=Insufficient Storage
130
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.
131
http.508.reason=Loop Detected
132
http.508.desc=The server terminated an operation because it encountered an infinite loop while processing a request with "Depth: infinity".
133
http.510.reason=Not Extended
134
http.510.desc=The policy for accessing the resource has not been met in the request
135
http.511.reason=Network Authentication Required
136
http.511.desc=The client needs to authenticate to gain network access.
(-)java/org/apache/catalina/valves/LocalStrings_es.properties (-45 / +32 lines)
Lines 17-24 Link Here
17
accessLogValve.openDirFail = No pude crear directorio [{0}] para historiales de acceso
17
accessLogValve.openDirFail = No pude crear directorio [{0}] para historiales de acceso
18
accessLogValve.rotateFail = No pude rotar historial de acceso
18
accessLogValve.rotateFail = No pude rotar historial de acceso
19
# Error report valve
19
# Error report valve
20
errorReportValve.errorReport = Informe de Error
20
errorReportValve.statusHeader = Estado HTTP {0} \u2013 {1}
21
errorReportValve.statusHeader = Estado HTTP {0} - {1}
21
errorReportValve.type=Tipo
22
errorReportValve.exceptionReport = Informe de Excepci\u00F3n
22
errorReportValve.exceptionReport = Informe de Excepci\u00F3n
23
errorReportValve.statusReport = Informe de estado
23
errorReportValve.statusReport = Informe de estado
24
errorReportValve.message = mensaje
24
errorReportValve.message = mensaje
Lines 26-77 Link Here
26
errorReportValve.exception = excepci\u00F3n
26
errorReportValve.exception = excepci\u00F3n
27
errorReportValve.rootCause = causa ra\u00EDz
27
errorReportValve.rootCause = causa ra\u00EDz
28
errorReportValve.note = nota
28
errorReportValve.note = nota
29
errorReportValve.rootCauseInLogs = La traza completa de la causa de este error se encuentra en los archivos de diario de {0}.
29
errorReportValve.rootCauseInLogs = La traza completa de la causa de este error se encuentra en los archivos de diario del servidor.
30
30
remoteIpValve.invalidPortHeader = Valor inv\u00E1lido [{0}] hallado para el puerto en cabecera HTTP [{1}]
31
remoteIpValve.invalidPortHeader = Valor inv\u00E1lido [{0}] hallado para el puerto en cabecera HTTP [{1}]
31
sslValve.certError = No pude procesar cadena de certificado [{0}] para crear un objeto  java.security.cert.X509Certificate
32
sslValve.certError = No pude procesar cadena de certificado [{0}] para crear un objeto  java.security.cert.X509Certificate
32
sslValve.invalidProvider = El proveedor de SSL especificado en el conecto asociado con este requerimiento de [{0}] ies inv\u00E1lido. No se pueden procesar los datos del certificado.
33
sslValve.invalidProvider = El proveedor de SSL especificado en el conecto asociado con este requerimiento de [{0}] ies inv\u00E1lido. No se pueden procesar los datos del certificado.
33
stuckThreadDetectionValve.notifyStuckThreadDetected = El hilo  "{0}" (id={6}) ha estado activo durante {1} miilisegundos (desde {2}) para servir el mismo requerimiento para {4} y puede estar atascado (el umbral configurado para este StuckThreadDetectionValve es de {5} segundos). Hay {3} hilo(s) en total que son monitorizados por esta V\u00E1lvula y pueden estar atascados.
34
stuckThreadDetectionValve.notifyStuckThreadDetected = El hilo  "{0}" (id={6}) ha estado activo durante {1} miilisegundos (desde {2}) para servir el mismo requerimiento para {4} y puede estar atascado (el umbral configurado para este StuckThreadDetectionValve es de {5} segundos). Hay {3} hilo(s) en total que son monitorizados por esta V\u00E1lvula y pueden estar atascados.
34
stuckThreadDetectionValve.notifyStuckThreadCompleted = El hilo "{0}" (id={3}), que previamente se report\u00F3 como atascado, se ha completado. Estuvo activo por aproximadamente {1} milisegundos. {2, choice,0\#|0< Hay a\u00FAn {2} hilo(s) que son monitorizados por esta V\u00E1lvula y pueden estar atascados.}
35
stuckThreadDetectionValve.notifyStuckThreadCompleted = El hilo "{0}" (id={3}), que previamente se report\u00F3 como atascado, se ha completado. Estuvo activo por aproximadamente {1} milisegundos. {2, choice,0\#|0< Hay a\u00FAn {2} hilo(s) que son monitorizados por esta V\u00E1lvula y pueden estar atascados.}
36
35
# HTTP status reports
37
# HTTP status reports
36
http.100 = El cliente puede continuar.
38
http.400.desc = El requerimiento enviado por el cliente era sint\u00E1cticamente incorrecto.
37
http.101 = El servidor est\u00E1 conmutando protocolos con arreglo a la cabecera "Upgrade".
39
http.401.desc = Este requerimiento requiere autenticaci\u00F3n HTTP.
38
http.201 = El requerimiento tuvo \u00E9xito y un nuevo recurso ha sido creado en el servidor.
40
http.402.desc = Se requiere pago para acceder a este recurso.
39
http.202 = Este requerimiento ha sido aceptado para ser procesado, pero no ha sido completado.
41
http.403.desc = El acceso al recurso especificado ha sido prohibido.
40
http.203 = La informaci\u00F3n meta presentada por el cliente no se origin\u00F3 desde el servidor.
42
http.404.desc = El recurso requerido no est\u00E1 disponible.
41
http.204 = El requerimiento tuvo \u00E9xito pero no hay informaci\u00F3n que devolver.
43
http.405.desc = El m\u00E9todo HTTP especificado no est\u00E1 permitido para el recurso requerido.
42
http.205 = El cliente no deber\u00EDa de limpiar la vista del documento que caus\u00F3 que este requerimiento fuera enviado.
44
http.406.desc = El recurso identificado por este requerimiento s\u00F3lo es capaz de generar respuestas con caracter\u00EDsticas no aceptables con arreglo a las cabeceras "accept" de requerimiento.
43
http.206 = El servidor ha rellenado paci\u00E1lmente un requerimiento GET para este recurso.
45
http.407.desc = El cliente debe de ser primero autenticado en el apoderado.
44
http.207 = Se han devuelto valores m\u00FAltiples de estado.
46
http.408.desc = El cliente no produjo un requerimiento dentro del tiempo en que el servidor estaba preparado esperando.
45
http.300 = El recurso requerido corresponde a una cualquiera de un conjunto de representaciones, cada una con su propia localizaci\u00F3n espec\u00EDfica.
47
http.409.desc = El requerimiento no pudo ser completado debido a un conflicto con el estado actual del recurso.
46
http.301 = El recurso requerido ha sido movido perman\u00E9ntemente a una nueva localizaci\u00F3n.
48
http.410.desc = El recurso requerido ya no est\u00E1 disponible y no se conoce direcci\u00F3n de reenv\u00EDo.
47
http.302 = El recurso requerido ha sido movido tempor\u00E1lmente a una nueva localizaci\u00F3n.
49
http.411.desc = Este requerimiento no puede ser manejado sin un tama\u00F1o definido de contenido.
48
http.303 = La respuesta a este requerimiento se puede hallar bajo una URI diferente.
50
http.412.desc = Una precondici\u00F3n especificada ha fallado para este requerimiento.
49
http.304 = El recurso requerido est\u00E1 disponible y no ha sido modificado.
51
http.413.desc = La entidad de requerimiento es mayor de lo que el servidor quiere o puede procesar.
50
http.305 = El recurso requerido debe de ser accedido a trav\u00E9s del apoderado (proxy) dado mediante la cabecera "Location".
52
http.414.desc = El servidor rechaz\u00F3 este requerimiento porque la URI requerida era demasiado larga.
51
http.400 = El requerimiento enviado por el cliente era sint\u00E1cticamente incorrecto.
53
http.415.desc = El servidor rechaz\u00F3 este requerimiento porque la entidad requerida se encuentra en un formato no soportado por el recurso requerido para el m\u00E9todo requerido.
52
http.401 = Este requerimiento requiere autenticaci\u00F3n HTTP.
54
http.416.desc = El rango de byte requerido no puede ser satisfecho.
53
http.402 = Se requiere pago para acceder a este recurso.
55
http.417.desc = Lo que se espera dado por la cabecera "Expect" de requerimiento no pudo ser completado.
54
http.403 = El acceso al recurso especificado ha sido prohibido.
56
http.422.desc = El servidor entendi\u00F3 el tipo de contenido y la sint\u00E1xis del requerimiento pero no pudo procesar las instrucciones contenidas.
55
http.404 = El recurso requerido no est\u00E1 disponible.
57
http.423.desc = La fuente o recurso de destino de un m\u00E9todo est\u00E1 bloqueada.
56
http.405 = El m\u00E9todo HTTP especificado no est\u00E1 permitido para el recurso requerido.
58
http.500.desc = El servidor encontr\u00F3 un error interno que hizo que no pudiera rellenar este requerimiento.
57
http.406 = El recurso identificado por este requerimiento s\u00F3lo es capaz de generar respuestas con caracter\u00EDsticas no aceptables con arreglo a las cabeceras "accept" de requerimiento.
59
http.501.desc = El servidor no soporta la funcionalidad necesaria para rellenar este requerimiento.
58
http.407 = El cliente debe de ser primero autenticado en el apoderado.
60
http.502.desc = Este servidor recibi\u00F3 una respuesta inv\u00E1lida desde un servidor que consult\u00F3 cuando actuaba como apoderado o pasarela.
59
http.408 = El cliente no produjo un requerimiento dentro del tiempo en que el servidor estaba preparado esperando.
61
http.503.desc = El servicio requerido no est\u00E1 disponible en este momento.
60
http.409 = El requerimiento no pudo ser completado debido a un conflicto con el estado actual del recurso.
62
http.504.desc = El servidor recibi\u00F3 un Tiempo Agotado desde un servidor superior cuando actuaba como pasarela o apoderado.
61
http.410 = El recurso requerido ya no est\u00E1 disponible y no se conoce direcci\u00F3n de reenv\u00EDo.
63
http.505.desc = El servidor no soporta la versi\u00F3n de protocolo HTTP requerida.
62
http.411 = Este requerimiento no puede ser manejado sin un tama\u00F1o definido de contenido.
64
http.507.desc = El recurso no tiene espacio suficiente para registrar el estado del recurso tras la ejecuci\u00F3n de este m\u00E9todo.
63
http.412 = Una precondici\u00F3n especificada ha fallado para este requerimiento.
64
http.413 = La entidad de requerimiento es mayor de lo que el servidor quiere o puede procesar.
65
http.414 = El servidor rechaz\u00F3 este requerimiento porque la URI requerida era demasiado larga.
66
http.415 = El servidor rechaz\u00F3 este requerimiento porque la entidad requerida se encuentra en un formato no soportado por el recurso requerido para el m\u00E9todo requerido.
67
http.416 = El rango de byte requerido no puede ser satisfecho.
68
http.417 = Lo que se espera dado por la cabecera "Expect" de requerimiento no pudo ser completado.
69
http.422 = El servidor entendi\u00F3 el tipo de contenido y la sint\u00E1xis del requerimiento pero no pudo procesar las instrucciones contenidas.
70
http.423 = La fuente o recurso de destino de un m\u00E9todo est\u00E1 bloqueada.
71
http.500 = El servidor encontr\u00F3 un error interno que hizo que no pudiera rellenar este requerimiento.
72
http.501 = El servidor no soporta la funcionalidad necesaria para rellenar este requerimiento.
73
http.502 = Este servidor recibi\u00F3 una respuesta inv\u00E1lida desde un servidor que consult\u00F3 cuando actuaba como apoderado o pasarela.
74
http.503 = El servicio requerido no est\u00E1 disponible en este momento.
75
http.504 = El servidor recibi\u00F3 un Tiempo Agotado desde un servidor superior cuando actuaba como pasarela o apoderado.
76
http.505 = El servidor no soporta la versi\u00F3n de protocolo HTTP requerida.
77
http.507 = El recurso no tiene espacio suficiente para registrar el estado del recurso tras la ejecuci\u00F3n de este m\u00E9todo.
(-)java/org/apache/catalina/valves/LocalStrings_fr.properties (-45 / +30 lines)
Lines 14-21 Link Here
14
# limitations under the License.
14
# limitations under the License.
15
15
16
# Error report valve
16
# Error report valve
17
errorReportValve.errorReport=Rapport d''erreur
17
errorReportValve.statusHeader=\u00c9tat HTTP {0} \u2013 {1}
18
errorReportValve.statusHeader=Etat HTTP {0} - {1}
18
errorReportValve.type=Type
19
errorReportValve.exceptionReport=Rapport d''exception
19
errorReportValve.exceptionReport=Rapport d''exception
20
errorReportValve.statusReport=Rapport d''\u00e9tat
20
errorReportValve.statusReport=Rapport d''\u00e9tat
21
errorReportValve.message=message
21
errorReportValve.message=message
Lines 23-70 Link Here
23
errorReportValve.exception=exception
23
errorReportValve.exception=exception
24
errorReportValve.rootCause=cause m\u00e8re
24
errorReportValve.rootCause=cause m\u00e8re
25
errorReportValve.note=note
25
errorReportValve.note=note
26
errorReportValve.rootCauseInLogs=La trace compl\u00e8te de la cause m\u00e8re de cette erreur est disponible dans les fichiers journaux de {0}.
26
errorReportValve.rootCauseInLogs=La trace compl\u00e8te de la cause m\u00e8re de cette erreur est disponible dans les fichiers journaux de ce serveur.
27
27
28
# HTTP status reports
28
# HTTP status reports
29
http.100=Le client peut continuer.
29
http.400.desc=La requ\u00eate envoy\u00e9e par le client \u00e9tait syntaxiquement incorrecte.
30
http.101=Le serveur change de protocoles suivant la directive "Upgrade" de l''ent\u00eate.
30
http.401.desc=La requ\u00eate n\u00e9cessite une authentification HTTP.
31
http.201=La requ\u00eate a r\u00e9ussi et une nouvelle ressource a \u00e9t\u00e9 cr\u00e9\u00e9e sur le serveur.
31
http.402.desc=Un paiement est demand\u00e9 pour acc\u00e9der \u00e0 cette ressource.
32
http.202=La requ\u00eate a \u00e9t\u00e9 accept\u00e9e pour traitement, mais n''a pas \u00e9t\u00e9 termin\u00e9e.
32
http.403.desc=L''acc\u00e8s \u00e0 la ressource demand\u00e9e a \u00e9t\u00e9 interdit.
33
http.203=L''information meta pr\u00e9sent\u00e9e par le client n''a pas pour origine ce serveur.
33
http.404.desc=La ressource demand\u00e9e n''est pas disponible.
34
http.204=La requ\u00eate a r\u00e9ussi mais il n''y a aucune information \u00e0 retourner.
34
http.405.desc=La m\u00e9thode HTTP sp\u00e9cifi\u00e9e n''est pas autoris\u00e9e pour la ressource demand\u00e9e.
35
http.205=Le client doit remettre \u00e0 z\u00e9ro la vue de document qui a caus\u00e9 l''envoi de cette requ\u00eate.
35
http.406.desc=La ressource identifi\u00e9e par cette requ\u00eate n''est capable de g\u00e9n\u00e9rer des r\u00e9ponses qu''avec des caract\u00e9ristiques incompatible avec la directive "accept" pr\u00e9sente dans l''ent\u00eate de requ\u00eate.
36
http.206=Le serveur a satisfait une requ\u00eate GET partielle pour cette ressource.
36
http.407.desc=Le client doit d''abord s''authentifier aupr\u00e8s du relais.
37
http.207=Plusieurs valeurs d''\u00e9tats ont \u00e9t\u00e9 retourn\u00e9es.
37
http.408.desc=Le client n''a pas produit de requ\u00eate pendant le temps d''attente du serveur.
38
http.300=La ressource demand\u00e9e correspond \u00e0 plusieurs repr\u00e9sentations, chacune avec sa propre localisation.
38
http.409.desc=La requ\u00eate ne peut \u00eatre finalis\u00e9e suite \u00e0 un conflit li\u00e9 \u00e0 l''\u00e9tat de la ressource.
39
http.301=La ressource demand\u00e9e a \u00e9t\u00e9 d\u00e9plac\u00e9e de fa\u00e7on permanente vers une nouvelle localisation.
39
http.410.desc=La ressource demand\u00e9e n''est pas disponible, et aucune addresse de rebond (forwarding) n''est connue.
40
http.302=La ressource demand\u00e9e a \u00e9t\u00e9 d\u00e9plac\u00e9e de fa\u00e7on temporaire vers une nouvelle localisation.
40
http.411.desc=La requ\u00eate ne peut \u00eatre trait\u00e9e sans d\u00e9finition d''une taille de contenu (content length).
41
http.303=La r\u00e9ponse \u00e0 cette requ\u00eate peut \u00eatre trouv\u00e9e \u00e0 une URI diff\u00e9rente.
41
http.412.desc=Une condition pr\u00e9alable demand\u00e9e n''est pas satisfaite pour cette requ\u00eate.
42
http.304=La ressource demand\u00e9e est disponible et n''a pas \u00e9t\u00e9 modifi\u00e9e.
42
http.413.desc=L''entit\u00e9 de requ\u00eate est plus importante que ce que le serveur veut ou peut traiter.
43
http.305=La ressource demand\u00e9e doit \u00eatre acc\u00e9d\u00e9e au travers du relais indiqu\u00e9 par la directive "Location" de l''ent\u00eate.
43
http.414.desc=Le serveur a refus\u00e9 cette requ\u00eate car l''URI de requ\u00eate est trop longue.
44
http.400=La requ\u00eate envoy\u00e9e par le client \u00e9tait syntaxiquement incorrecte.
44
http.415.desc=Le serveur a refus\u00e9 cette requ\u00eate car l''entit\u00e9 de requ\u00eate est dans un format non support\u00e9 par la ressource demand\u00e9e avec la m\u00e9thode sp\u00e9cifi\u00e9e.
45
http.401=La requ\u00eate n\u00e9cessite une authentification HTTP.
45
http.416.desc=La plage d''octets demand\u00e9e (byte range) ne peut \u00eatre satisfaite.
46
http.402=Un paiement est demand\u00e9 pour acc\u00e9der \u00e0 cette ressource.
46
http.417.desc=L''attente indiqu\u00e9e dans la directive "Expect" de l''ent\u00eate de requ\u00eate ne peut \u00eatre satisfaite.
47
http.403=L''acc\u00e8s \u00e0 la ressource demand\u00e9e a \u00e9t\u00e9 interdit.
47
http.422.desc=Le serveur a compris le type de contenu (content type) ainsi que la syntaxe de la requ\u00eate mais a \u00e9t\u00e9 incapable de traiter les instructions contenues.
48
http.404=La ressource demand\u00e9e n''est pas disponible.
48
http.423.desc=La ressource source ou destination de la m\u00e9thode est verrouill\u00e9e.
49
http.405=La m\u00e9thode HTTP sp\u00e9cifi\u00e9e n''est pas autoris\u00e9e pour la ressource demand\u00e9e.
49
http.500.desc=Le serveur a rencontr\u00e9 une erreur interne qui l''a emp\u00each\u00e9 de satisfaire la requ\u00eate.
50
http.406=La ressource identifi\u00e9e par cette requ\u00eate n''est capable de g\u00e9n\u00e9rer des r\u00e9ponses qu''avec des caract\u00e9ristiques incompatible avec la directive "accept" pr\u00e9sente dans l''ent\u00eate de requ\u00eate.
50
http.501.desc=Le serveur ne supporte pas la fonctionnalit\u00e9 demand\u00e9e pour satisfaire cette requ\u00eate.
51
http.407=Le client doit d''abord s''authentifier aupr\u00e8s du relais.
51
http.502.desc=Le serveur a re\u00e7u une r\u00e9ponse invalide d''un serveur qu''il consultait en tant que relais ou passerelle.
52
http.408=Le client n''a pas produit de requ\u00eate pendant le temps d''attente du serveur.
52
http.503.desc=Le service demand\u00e9 n''est pas disponible actuellement.
53
http.409=La requ\u00eate ne peut \u00eatre finalis\u00e9e suite \u00e0 un conflit li\u00e9 \u00e0 l''\u00e9tat de la ressource.
53
http.504.desc=Le serveur a re\u00e7u un d\u00e9passement de delai (timeout) d''un serveur amont qu''il consultait en tant que relais ou passerelle.
54
http.410=La ressource demand\u00e9e n''est pas disponible, et aucune addresse de rebond (forwarding) n''est connue.
54
http.505.desc=Le serveur ne supporte pas la version demand\u00e9e du protocole HTTP.
55
http.411=La requ\u00eate ne peut \u00eatre trait\u00e9e sans d\u00e9finition d''une taille de contenu (content length).
55
http.507.desc=L''espace disponible est insuffisant pour enregistrer l''\u00e9tat de la ressource apr\u00e8s ex\u00e9cution de cette m\u00e9thode.
56
http.412=Une condition pr\u00e9alable demand\u00e9e n''est pas satisfaite pour cette requ\u00eate.
57
http.413=L''entit\u00e9 de requ\u00eate est plus importante que ce que le serveur veut ou peut traiter.
58
http.414=Le serveur a refus\u00e9 cette requ\u00eate car l''URI de requ\u00eate est trop longue.
59
http.415=Le serveur a refus\u00e9 cette requ\u00eate car l''entit\u00e9 de requ\u00eate est dans un format non support\u00e9 par la ressource demand\u00e9e avec la m\u00e9thode sp\u00e9cifi\u00e9e.
60
http.416=La plage d''octets demand\u00e9e (byte range) ne peut \u00eatre satisfaite.
61
http.417=L''attente indiqu\u00e9e dans la directive "Expect" de l''ent\u00eate de requ\u00eate ne peut \u00eatre satisfaite.
62
http.422=Le serveur a compris le type de contenu (content type) ainsi que la syntaxe de la requ\u00eate mais a \u00e9t\u00e9 incapable de traiter les instructions contenues.
63
http.423=La ressource source ou destination de la m\u00e9thode est verrouill\u00e9e.
64
http.500=Le serveur a rencontr\u00e9 une erreur interne qui l''a emp\u00each\u00e9 de satisfaire la requ\u00eate.
65
http.501=Le serveur ne supporte pas la fonctionnalit\u00e9 demand\u00e9e pour satisfaire cette requ\u00eate.
66
http.502=Le serveur a re\u00e7u une r\u00e9ponse invalide d''un serveur qu''il consultait en tant que relais ou passerelle.
67
http.503=Le service demand\u00e9 n''est pas disponible actuellement.
68
http.504=Le serveur a re\u00e7u un d\u00e9passement de delai (timeout) d''un serveur amont qu''il consultait en tant que relais ou passerelle.
69
http.505=Le serveur ne supporte pas la version demand\u00e9e du protocole HTTP.
70
http.507=L''espace disponible est insuffisant pour enregistrer l''\u00e9tat de la ressource apr\u00e8s ex\u00e9cution de cette m\u00e9thode.
(-)java/org/apache/catalina/valves/LocalStrings_ja.properties (-2 / +1 lines)
Lines 16-22 Link Here
16
jdbcAccessLogValve.exception=\u30a2\u30af\u30bb\u30b9\u30a8\u30f3\u30c8\u30ea\u306e\u633f\u5165\u3092\u5b9f\u884c\u4e2d\u306e\u4f8b\u5916\u3067\u3059
16
jdbcAccessLogValve.exception=\u30a2\u30af\u30bb\u30b9\u30a8\u30f3\u30c8\u30ea\u306e\u633f\u5165\u3092\u5b9f\u884c\u4e2d\u306e\u4f8b\u5916\u3067\u3059
17
# Error report valve
17
# Error report valve
18
errorReportValve.statusHeader=HTTP\u30b9\u30c6\u30fc\u30bf\u30b9 {0} - {1}
18
errorReportValve.statusHeader=HTTP\u30b9\u30c6\u30fc\u30bf\u30b9 {0} - {1}
19
errorReportValve.exceptionReport=\u4f8b\u5916\u30ec\u30dd\u30fc\u30c8
20
errorReportValve.statusReport=\u30b9\u30c6\u30fc\u30bf\u30b9\u30ec\u30dd\u30fc\u30c8
19
errorReportValve.statusReport=\u30b9\u30c6\u30fc\u30bf\u30b9\u30ec\u30dd\u30fc\u30c8
21
errorReportValve.message=\u30e1\u30c3\u30bb\u30fc\u30b8
20
errorReportValve.message=\u30e1\u30c3\u30bb\u30fc\u30b8
22
errorReportValve.description=\u8aac\u660e
21
errorReportValve.description=\u8aac\u660e
Lines 23-26 Link Here
23
errorReportValve.exception=\u4f8b\u5916
22
errorReportValve.exception=\u4f8b\u5916
24
errorReportValve.rootCause=\u539f\u56e0
23
errorReportValve.rootCause=\u539f\u56e0
25
errorReportValve.note=\u6ce8\u610f
24
errorReportValve.note=\u6ce8\u610f
26
errorReportValve.rootCauseInLogs=\u539f\u56e0\u306e\u3059\u3079\u3066\u306e\u30b9\u30bf\u30c3\u30af\u30c8\u30ec\u30fc\u30b9\u306f\u3001{0}\u306e\u30ed\u30b0\u306b\u8a18\u9332\u3055\u308c\u3066\u3044\u307e\u3059
25
errorReportValve.rootCauseInLogs=\u539f\u56e0\u306e\u3059\u3079\u3066\u306e\u30b9\u30bf\u30c3\u30af\u30c8\u30ec\u30fc\u30b9\u306f\u3001\u306e\u30ed\u30b0\u306b\u8a18\u9332\u3055\u308c\u3066\u3044\u307e\u3059
(-)test/org/apache/catalina/valves/TestErrorReportValve.java (-2 / +2 lines)
Lines 50-57 Link Here
50
50
51
        ByteChunk res = getUrl("http://localhost:" + getPort());
51
        ByteChunk res = getUrl("http://localhost:" + getPort());
52
52
53
        Assert.assertTrue(res.toString().contains("<p><b>message</b> <u>" +
53
        Assert.assertTrue(res.toString().contains("<p><b>Message</b> " +
54
                ErrorServlet.ERROR_TEXT + "</u></p>"));
54
                ErrorServlet.ERROR_TEXT + "</p>"));
55
    }
55
    }
56
56
57
57

Return to bug 60490