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 Http11AprProcessor.java
Date Sun, 03 Jul 2005 10:12:51 GMT
remm        2005/07/03 03:12:51

  Modified:    util/java/org/apache/tomcat/util/net AprEndpoint.java
               http11/src/java/org/apache/coyote/http11
                        Http11AprProcessor.java
  Log:
  - Small tweaks.
  
  Revision  Changes    Path
  1.57      +1 -3      jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- AprEndpoint.java	3 Jul 2005 00:20:27 -0000	1.56
  +++ AprEndpoint.java	3 Jul 2005 10:12:51 -0000	1.57
  @@ -1165,7 +1165,7 @@
                       } else {
                           data.pos = data.pos + nw;
                           if (data.pos >= data.end) {
  -                            // Entire file has been send
  +                            // Entire file has been sent
                               Pool.destroy(data.fdpool);
                               // Set back socket to blocking mode
                               Socket.timeoutSet(data.socket, soTimeout * 1000);
  @@ -1196,8 +1196,6 @@
               if (rv == Status.APR_SUCCESS) {
                   sendfileCount--;
               }
  -            // Set the socket to blocking mode again
  -            Socket.optSet(data.socket, Socket.APR_SO_NONBLOCK, 0);
               sendfileData.remove(data);
           }
   
  
  
  
  1.21      +0 -1      jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
  
  Index: Http11AprProcessor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Http11AprProcessor.java	3 Jul 2005 00:20:27 -0000	1.20
  +++ Http11AprProcessor.java	3 Jul 2005 10:12:51 -0000	1.21
  @@ -776,7 +776,6 @@
                       // This means that no data is available right now
                       // (long keepalive), so that the processor should be recycled
                       // and the method should return true
  -                    rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
                       openSocket = true;
                       // Add the socket to the poller
                       endpoint.getPoller().add(socket);
  
  
  

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


Mime
View raw message