From e664eb74509915c2d7e41f6c799786fc58482e2f Mon Sep 17 00:00:00 2001
From: rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 24 Mar 2009 10:57:38 +0000
Subject: [PATCH] BZ45026: Never return an empty HTTP status response phrase.
 mod_jk and httpd 2.x do not like that.

Addition to r697183.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@757721 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/coyote/ajp/AjpAprProcessor.java | 4 ++++
 java/org/apache/coyote/ajp/AjpProcessor.java    | 4 ++++
 webapps/docs/changelog.xml                      | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/java/org/apache/coyote/ajp/AjpAprProcessor.java b/java/org/apache/coyote/ajp/AjpAprProcessor.java
index c0ea67b78..6ec6ca004 100644
--- a/java/org/apache/coyote/ajp/AjpAprProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpAprProcessor.java
@@ -961,6 +961,10 @@ public class AjpAprProcessor implements ActionHook {
         } 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);
 
diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java
index 3e6119ac8..7b166f3f1 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -966,6 +966,10 @@ public class AjpProcessor implements ActionHook {
         } 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);
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 90a04f46e..12dc923a1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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)
-- 
2.11.0