Author: markt
Date: Tue Mar 25 13:00:43 2008
New Revision: 640962
URL: http://svn.apache.org/viewvc?rev=640962&view=rev
Log:
Revert change from some work in progress that snuck in as part of an unrelated
commit
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=640962&r1=640961&r2=640962&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Tue
Mar 25 13:00:43 2008
@@ -478,14 +478,11 @@
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
