You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/03/24 21:09:23 UTC
svn commit: r640551 -
/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Author: markt
Date: Mon Mar 24 13:09:15 2008
New Revision: 640551
URL: http://svn.apache.org/viewvc?rev=640551&view=rev
Log:
Clean-up unused import
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=640551&r1=640550&r2=640551&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Mon Mar 24 13:09:15 2008
@@ -34,7 +34,6 @@
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 @@
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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r640551 - /tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Posted by Mark Thomas <ma...@apache.org>.
jean-frederic clere wrote:
> markt@apache.org wrote:
>> Author: markt
>> Date: Mon Mar 24 13:09:15 2008
>> New Revision: 640551
>>
>> URL: http://svn.apache.org/viewvc?rev=640551&view=rev
>
> That breaks the builds.
Sorry. My bad. Should be fixed now.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r640551 - /tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Posted by jean-frederic clere <jf...@gmail.com>.
markt@apache.org wrote:
> Author: markt
> Date: Mon Mar 24 13:09:15 2008
> New Revision: 640551
>
> URL: http://svn.apache.org/viewvc?rev=640551&view=rev
> Log:
> Clean-up unused import
>
> 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=640551&r1=640550&r2=640551&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java (original)
> +++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Mon Mar 24 13:09:15 2008
> @@ -34,7 +34,6 @@
> 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 @@
> 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) {
That breaks the builds.
Cheers
Jean-Frederic
> + message = response.getMessage();
> + }
> + if (message == null){
> write(HttpMessages.getMessage(status));
> } else {
> - write(message);
> + write(message.replace('\n', ' ').replace('\r', ' '));
> }
>
> // End the response status line
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org