Author: rjung Date: Tue Mar 24 10:57:38 2009 New Revision: 757721 URL: http://svn.apache.org/viewvc?rev=757721&view=rev Log: BZ45026: Never return an empty HTTP status response phrase. mod_jk and httpd 2.x do not like that.
Addition to r697183. Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=757721&r1=757720&r2=757721&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Tue Mar 24 10:57:38 2009 @@ -961,6 +961,10 @@ } else { message = message.replace('\n', ' ').replace('\r', ' '); } + if (message == null) { + // mod_jk + httpd 2.x fails with a null status message - bug 45026 + message = Integer.toString(response.getStatus()); + } tmpMB.setString(message); responseHeaderMessage.appendBytes(tmpMB); Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=757721&r1=757720&r2=757721&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Mar 24 10:57:38 2009 @@ -966,6 +966,10 @@ } else { message = message.replace('\n', ' ').replace('\r', ' '); } + if (message == null) { + // mod_jk + httpd 2.x fails with a null status message - bug 45026 + message = Integer.toString(response.getStatus()); + } tmpMB.setString(message); responseHeaderMessage.appendBytes(tmpMB); Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=757721&r1=757720&r2=757721&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 24 10:57:38 2009 @@ -102,6 +102,10 @@ </subsection> <subsection name="Coyote"> <changelog> + <fix> + <bug>45026</bug>: Never return an empty HTTP status response phrase. + mod_jk and httpd 2.x do not like that. (rjung) + </fix> <update> Allow bigger AJP packets also for request bodies and responses using the packetSize attribute of the Connector. (rjung) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org