From 11d8713ca5bc566fa4c5eae43f9c1c6d97fb3ca8 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 24 Mar 2008 20:09:15 +0000 Subject: [PATCH] Clean-up unused import git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@640551 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/InternalNioOutputBuffer.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java index 8cf452950..8539213bb 100644 --- a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java +++ b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java @@ -34,7 +34,6 @@ import org.apache.tomcat.util.net.NioChannel; import org.apache.tomcat.util.net.NioEndpoint; import org.apache.tomcat.util.net.NioSelectorPool; import org.apache.tomcat.util.res.StringManager; -import java.io.EOFException; import org.apache.tomcat.util.MutableInteger; /** @@ -479,11 +478,14 @@ public class InternalNioOutputBuffer buf[pos++] = Constants.SP; // Write message - String message = response.getMessage(); - if (message == null) { + String message = null; + if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) { + message = response.getMessage(); + } + if (message == null){ write(HttpMessages.getMessage(status)); } else { - write(message); + write(message.replace('\n', ' ').replace('\r', ' ')); } // End the response status line -- 2.11.0