remm 01/07/25 22:31:05
Modified: catalina/src/share/org/apache/catalina/connector/http
HttpProcessor.java
Log:
- Fix an obvious problem with the latest patch, where the value of was overridden,
which caused a loop once the client disconnected.
Revision Changes Path
1.34 +5 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java
Index: HttpProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- HttpProcessor.java 2001/07/26 04:03:23 1.33
+++ HttpProcessor.java 2001/07/26 05:31:05 1.34
@@ -1,6 +1,6 @@
-/* * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
1.33 2001/07/26 04:03:23 remm Exp $
- * $Revision: 1.33 $
- * $Date: 2001/07/26 04:03:23 $
+/* * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
1.34 2001/07/26 05:31:05 remm Exp $
+ * $Revision: 1.34 $
+ * $Date: 2001/07/26 05:31:05 $
*
* ====================================================================
*
@@ -106,7 +106,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.33 $ $Date: 2001/07/26 04:03:23 $
+ * @version $Revision: 1.34 $ $Date: 2001/07/26 05:31:05 $
*/
final class HttpProcessor
@@ -923,7 +923,7 @@
keepAlive = true;
- while (ok && keepAlive) {
+ while (!stopped && ok && keepAlive) {
try {
request.setStream(input);
@@ -1039,8 +1039,6 @@
// Recycling the request and the response objects
request.recycle();
response.recycle();
-
- ok = !stopped;
}