Return-Path: Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 66864 invoked by uid 500); 30 Sep 2003 05:37:54 -0000 Received: (qmail 66860 invoked from network); 30 Sep 2003 05:37:54 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 30 Sep 2003 05:37:54 -0000 Received: (qmail 92964 invoked by uid 1385); 30 Sep 2003 05:38:15 -0000 Date: 30 Sep 2003 05:38:15 -0000 Message-ID: <20030930053815.92963.qmail@minotaur.apache.org> From: billbarker@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 InternalOutputBuffer.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N billbarker 2003/09/29 22:38:15 Modified: http11/src/java/org/apache/coyote/http11 Tag: coyote_10 InternalOutputBuffer.java Log: Port the no-nl patch from the Head branch. Revision Changes Path No revision No revision 1.16.2.2 +4 -2 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java Index: InternalOutputBuffer.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java,v retrieving revision 1.16.2.1 retrieving revision 1.16.2.2 diff -u -r1.16.2.1 -r1.16.2.2 --- InternalOutputBuffer.java 12 Sep 2003 10:28:38 -0000 1.16.2.1 +++ InternalOutputBuffer.java 30 Sep 2003 05:38:15 -0000 1.16.2.2 @@ -425,10 +425,12 @@ write(" "); // Write message - if (response.getMessage() == null) { + String message = response.getMessage(); + if (message == null) { write(HttpMessages.getMessage(status)); } else { - write(response.getMessage()); + message = message.replace('\r', ' ').replace('\n', ' '); + write(message); } // End the response status line