From 77005c925b6ce0682252511ea7f753ba082e1df8 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 25 Mar 2008 20:00:43 +0000 Subject: [PATCH] Revert change from some work in progress that snuck in as part of an unrelated commit git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@640962 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/InternalNioOutputBuffer.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java index 598c9a229..14b736b70 100644 --- a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java +++ b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java @@ -478,14 +478,11 @@ public class InternalNioOutputBuffer buf[pos++] = Constants.SP; // Write message - String message = null; - if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) { - message = response.getMessage(); - } - if (message == null){ + String message = response.getMessage(); + if (message == null) { write(HttpMessages.getMessage(status)); } else { - write(message.replace('\n', ' ').replace('\r', ' ')); + write(message); } // End the response status line -- 2.11.0