Author: rjung
Date: Mon Apr 6 21:25:09 2009
New Revision: 762510
URL: http://svn.apache.org/viewvc?rev=762510&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45026
Never use empty reason phrase.
Backport of r697183 and r757721.
Modified:
tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/connectors/trunk/jk/java/org/apache/jk/common/JkInputStream.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified:
tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=762510&r1=762509&r2=762510&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Mon Apr 6 21:25:09 2009
@@ -951,6 +951,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/connectors/trunk/jk/java/org/apache/jk/common/JkInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/jk/common/JkInputStream.java?rev=762510&r1=762509&r2=762510&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/java/org/apache/jk/common/JkInputStream.java
(original)
+++ tomcat/connectors/trunk/jk/java/org/apache/jk/common/JkInputStream.java Mon
Apr 6 21:25:09 2009
@@ -288,6 +288,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/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=762510&r1=762509&r2=762510&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Mon Apr 6 21:25:09 2009
@@ -84,6 +84,14 @@
</fix>
</changelog>
</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>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 5.5.27 (fhanik)">
<subsection name="General">
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=762510&r1=762509&r2=762510&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Mon Apr 6 21:25:09 2009
@@ -37,14 +37,6 @@
+1: pero, markt, mturk
-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, markt, mturk
- -1:
- markt: also required for other AJP connectors
- rjung: see below, I added a backport proposal for the other ones.
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45880
More careful use of File /r and and NOTICE file
http://people.apache.org/~markt/patches/2008-09-24-bug45880.patch
@@ -175,14 +167,6 @@
+1: rjung, markt, pero
-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, pero
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41606
Prevent double init() of JSP
Patch provided by Chris Halstead
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
