tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r697183 - /tomcat/trunk/java/org/apache/jk/common/JkInputStream.java
Date Fri, 19 Sep 2008 18:51:14 GMT
Author: rjung
Date: Fri Sep 19 11:51:14 2008
New Revision: 697183

URL: http://svn.apache.org/viewvc?rev=697183&view=rev
Log:
Add Mark's proposed fix for BZ 45026:
mod_jk + httpd 2.x fails with a null status message.

Although the problem has been fixed in future httpd and mod_jk
versions, we should also stay safe on the backend side.

Modified:
    tomcat/trunk/java/org/apache/jk/common/JkInputStream.java

Modified: tomcat/trunk/java/org/apache/jk/common/JkInputStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/common/JkInputStream.java?rev=697183&r1=697182&r2=697183&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/common/JkInputStream.java (original)
+++ tomcat/trunk/java/org/apache/jk/common/JkInputStream.java Fri Sep 19 11:51:14 2008
@@ -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);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message