User: jules_gosnell
Date: 02/04/10 12:32:32
Modified: jetty/src/main/org/mortbay/http HttpConnection.java
Log:
carry over Brett's fix for "Frequently Hanging On Http Requests"
Revision Changes Path
1.8 +7 -5 contrib/jetty/src/main/org/mortbay/http/HttpConnection.java
Index: HttpConnection.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/HttpConnection.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HttpConnection.java 2 Apr 2002 22:38:53 -0000 1.7
+++ HttpConnection.java 10 Apr 2002 19:32:32 -0000 1.8
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: HttpConnection.java,v 1.7 2002/04/02 22:38:53 olegnitz Exp $
+// $Id: HttpConnection.java,v 1.8 2002/04/10 19:32:32 jules_gosnell Exp $
// ========================================================================
package org.mortbay.http;
@@ -35,7 +35,7 @@
*
* @see HttpListener
* @see HttpServer
- * @version $Id: HttpConnection.java,v 1.7 2002/04/02 22:38:53 olegnitz Exp $
+ * @version $Id: HttpConnection.java,v 1.8 2002/04/10 19:32:32 jules_gosnell Exp $
* @author Greg Wilkins (gregw)
*/
public class HttpConnection
@@ -941,8 +941,9 @@
{
try{
// Read remaining input
- while(_inputStream.skip(4096)>0 ||
- _inputStream.read()>=0);
+ while(_inputStream.available()>0 &&
+ (_inputStream.skip(4096)>0 ||
+ _inputStream.read()>=0));
}
catch(IOException e)
{
@@ -977,7 +978,8 @@
{
// half hearted attempt to eat any remaining input
try{
- while(_inputStream.skip(4096)>0 ||_inputStream.read()>=0);
+ while(_inputStream.available()>0 &&
+ (_inputStream.skip(4096)>0 ||_inputStream.read()>=0));
_inputStream.resetStream();
}
catch(IOException e){Code.ignore(e);}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
