From 3c05fb3aebe01e29f94c7887187c95f1dae8cf3f Mon Sep 17 00:00:00 2001 From: rjung Date: Fri, 19 Sep 2008 18:51:14 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@697183 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jk/common/JkInputStream.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/org/apache/jk/common/JkInputStream.java b/java/org/apache/jk/common/JkInputStream.java index c23a10336..6186a2ce6 100644 --- a/java/org/apache/jk/common/JkInputStream.java +++ b/java/org/apache/jk/common/JkInputStream.java @@ -281,6 +281,10 @@ public class JkInputStream implements InputBuffer, OutputBuffer { } 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); -- 2.11.0