Author: markt
Date: Sat Jan 30 00:47:32 2016
New Revision: 1727675
URL: http://svn.apache.org/viewvc?rev=1727675&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58768
Log a warning if a redirect fails because of an invalid location.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/webapps/docs/changelog.xml
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=1727675&r1=1727674&r2=1727675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Sat
Jan 30 00:47:32 2016
@@ -73,4 +73,6 @@ request.asyncNotSupported=A filter or se
requestFacade.nullRequest=The request object has been recycled and is no
longer associated with this facade
+response.sendRedirectFail=Failed to redirect to [{0}]
+
responseFacade.nullResponse=The response object has been recycled and is no
longer associated with this facade
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1727675&r1=1727674&r2=1727675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Sat Jan 30
00:47:32 2016
@@ -51,6 +51,8 @@ import org.apache.catalina.util.RequestU
import org.apache.catalina.util.SessionConfig;
import org.apache.catalina.util.UriUtil;
import org.apache.coyote.ActionCode;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.UEncoder;
import org.apache.tomcat.util.buf.UEncoder.SafeCharsSet;
@@ -65,14 +67,12 @@ import org.apache.tomcat.util.res.String
* @author Remy Maucherat
* @author Craig R. McClanahan
*/
-public class Response
- implements HttpServletResponse {
+public class Response implements HttpServletResponse {
+ private static final Log log = LogFactory.getLog(Response.class);
+ protected static final StringManager sm =
StringManager.getManager(Response.class);
- // ----------------------------------------------------------- Constructors
-
- private static final MediaTypeCache MEDIA_TYPE_CACHE =
- new MediaTypeCache(100);
+ private static final MediaTypeCache MEDIA_TYPE_CACHE = new
MediaTypeCache(100);
/**
* Compliance with SRV.15.2.22.1. A call to Response.getWriter() if no
@@ -88,17 +88,6 @@ public class Response
"true"));
}
- public Response() {
- }
-
-
- // ----------------------------------------------------- Class Variables
-
- /**
- * The string manager for this package.
- */
- protected static final StringManager sm =
StringManager.getManager(Response.class);
-
// ----------------------------------------------------- Instance Variables
@@ -1328,6 +1317,7 @@ public class Response
flushBuffer();
}
} catch (IllegalArgumentException e) {
+ log.warn(sm.getString("response.sendRedirectFail", location), e);
setStatus(SC_NOT_FOUND);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1727675&r1=1727674&r2=1727675&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Jan 30 00:47:32 2016
@@ -52,6 +52,10 @@
property <code>test.name</code> and document the property in
BUILDING.txt. (rjung)
</add>
+ <fix>
+ <bug>58768</bug>: Log a warning if a redirect fails because of an
+ invalid location. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
