From 1fc003b3fe76409c9fd7157476a421540eb64e15 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 6 Aug 2011 20:49:52 +0000 Subject: [PATCH] Start to align process method git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154583 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/Http11AprProcessor.java | 5 ++++- java/org/apache/coyote/http11/Http11NioProcessor.java | 3 +++ java/org/apache/coyote/http11/Http11Processor.java | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java index f92bee138..1333bc607 100644 --- a/java/org/apache/coyote/http11/Http11AprProcessor.java +++ b/java/org/apache/coyote/http11/Http11AprProcessor.java @@ -161,6 +161,9 @@ public class Http11AprProcessor extends AbstractHttp11Processor { * Process pipelined HTTP requests using the specified input and output * streams. * + * @param socketWrapper Socket from which the HTTP requests will be read + * and the HTTP responses will be written. + * * @throws IOException error during an I/O operation */ @Override @@ -177,8 +180,8 @@ public class Http11AprProcessor extends AbstractHttp11Processor { // Error flag error = false; - comet = false; keepAlive = true; + comet = false; int keepAliveLeft = maxKeepAliveRequests; long soTimeout = endpoint.getSoTimeout(); diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java index 599776bd2..2eb0f99b1 100644 --- a/java/org/apache/coyote/http11/Http11NioProcessor.java +++ b/java/org/apache/coyote/http11/Http11NioProcessor.java @@ -192,6 +192,9 @@ public class Http11NioProcessor extends AbstractHttp11Processor { * Process pipelined HTTP requests using the specified input and output * streams. * + * @param socketWrapper Socket from which the HTTP requests will be read + * and the HTTP responses will be written. + * * @throws IOException error during an I/O operation */ @Override diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java index 0b87894ad..6ce5daf90 100644 --- a/java/org/apache/coyote/http11/Http11Processor.java +++ b/java/org/apache/coyote/http11/Http11Processor.java @@ -122,7 +122,8 @@ public class Http11Processor extends AbstractHttp11Processor { /** - * Process pipelined HTTP requests on the specified socket. + * Process pipelined HTTP requests using the specified input and output + * streams. * * @param socketWrapper Socket from which the HTTP requests will be read * and the HTTP responses will be written. -- 2.11.0