tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java
Date Thu, 28 Nov 2002 15:15:02 GMT
remm        2002/11/28 07:15:02

  Modified:    http11/src/java/org/apache/coyote/http11
                        Http11Processor.java
  Log:
  - On the initial blocking call, I think the default socket timeout should be used.
  - Make another call conditional on the disableUploadTimeout flag.
  
  Revision  Changes    Path
  1.47      +5 -4      jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
  
  Index: Http11Processor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- Http11Processor.java	26 Nov 2002 03:32:50 -0000	1.46
  +++ Http11Processor.java	28 Nov 2002 15:15:02 -0000	1.47
  @@ -396,10 +396,9 @@
   
           int keepAliveLeft = maxKeepAliveRequests;
           int soTimeout = socket.getSoTimeout();
  +
           boolean keptAlive = false;
  -        if( !disableUploadTimeout ) {
  -            socket.setSoTimeout(timeout);
  -        }
  +
           while (started && !error && keepAlive) {
               try {
                   if( !disableUploadTimeout && keptAlive && soTimeout >
0 ) {
  @@ -407,7 +406,9 @@
                   }
                   inputBuffer.parseRequestLine();
                   keptAlive = true;
  -                socket.setSoTimeout(timeout);
  +                if (!disableUploadTimeout) {
  +                    socket.setSoTimeout(timeout);
  +                }
                   inputBuffer.parseHeaders();
               } catch (IOException e) {
                   error = true;
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message