Author: markt Date: Tue Jun 6 21:31:44 2017 New Revision: 1797828 URL: http://svn.apache.org/viewvc?rev=1797828&view=rev Log: Revert a change introduced in the fix for bug 60718 that changed the status code recorded in the access log when the client dropped the connection from 200 to 500.
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1797828&r1=1797827&r2=1797828&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Tue Jun 6 21:31:44 2017 @@ -80,7 +80,10 @@ public abstract class AbstractProcessor protected void setErrorState(ErrorState errorState, Throwable t) { boolean blockIo = this.errorState.isIoAllowed() && !errorState.isIoAllowed(); this.errorState = this.errorState.getMostSevere(errorState); - if (response.getStatus() < 400) { + // Don't change the status code for IOException since that is almost + // certainly a client disconnect in which case it is preferable to keep + // the original status code http://markmail.org/message/4cxpwmxhtgnrwh7n + if (response.getStatus() < 400 && !(t instanceof IOException)) { response.setStatus(500); } if (t != null) { Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1797828&r1=1797827&r2=1797828&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 6 21:31:44 2017 @@ -93,6 +93,11 @@ <bug>61120</bug>: Do not ignore path parameters when processing HTTP/2 requests. (markt) </fix> + <fix> + Revert a change introduced in the fix for bug <bug>60718</bug> that + changed the status code recorded in the access log when the client + dropped the connection from 200 to 500. (markt) + </fix> </changelog> </subsection> <subsection name="Jasper"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org