Author: rjung
Date: Mon Apr 6 20:47:04 2009
New Revision: 762499
URL: http://svn.apache.org/viewvc?rev=762499&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45026
Never use empty reason phrase. Backport of
http://svn.apache.org/viewvc?rev=697183&view=rev
http://svn.apache.org/viewvc?rev=757721&view=rev
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=762499&r1=762498&r2=762499&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Apr 6 20:47:04 2009
@@ -38,12 +38,6 @@
0: remm (looks risky, very minor problem), fhanik - minor problem
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45026
- Never use empty reason phrase.
- http://svn.apache.org/viewvc?rev=697183&view=rev
- +1: rjung, mturk, markt, jim
- 0: remm (also affects to the two other AJP connectors)
-
* Allow huge request body packets for AJP13.
This was already applied to connectors, but never
carried forward to trunk and tc6.0.x.
@@ -99,14 +93,6 @@
+1: rjung, markt, remm
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45026
- Never use empty reason phrase.
- Part 2 of the backport proposed and approved above
- (r697183), now also for the other AJP connectors.
- http://svn.apache.org/viewvc?rev=757721&view=rev
- +1: rjung, markt, remm
- -1:
-
* Backport cleanup of semantics of thisAccessedTime and
lastAccessedTime for sessions:
- preparational whitespace changes
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=762499&r1=762498&r2=762499&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Mon
Apr 6 20:47:04 2009
@@ -944,6 +944,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/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=762499&r1=762498&r2=762499&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Mon Apr
6 20:47:04 2009
@@ -950,6 +950,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/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java?rev=762499&r1=762498&r2=762499&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java Mon Apr
6 20:47:04 2009
@@ -281,6 +281,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(res.getStatus());
+ }
tempMB.setString( message );
c2b.convert( tempMB );
outputMsg.appendBytes(tempMB);
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=762499&r1=762498&r2=762499&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Apr 6 20:47:04 2009
@@ -43,6 +43,10 @@
</subsection>
<subsection name="Coyote">
<changelog>
+ <fix>
+ <bug>45026</bug>: Never return an empty HTTP status reason phrase.
+ mod_jk and httpd 2.x do not like that. (rjung)
+ </fix>
<update>
Set remote port for AJP connectors from the optional request
attribute AJP_REMOTE_PORT. (rjung)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
