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 Sat, 02 Jul 2005 17:36:35 GMT
remm        2005/07/02 10:36:35

  Modified:    util/java/org/apache/tomcat/util/net AprEndpoint.java
               http11/src/java/org/apache/coyote/http11
                        Http11AprProcessor.java
  Log:
  - No change. Remove some tabs.
  
  Revision  Changes    Path
  1.55      +10 -11    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.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- AprEndpoint.java	2 Jul 2005 17:18:46 -0000	1.54
  +++ AprEndpoint.java	2 Jul 2005 17:36:34 -0000	1.55
  @@ -1283,17 +1283,16 @@
                               if (state.pos >= state.end) {
                                   remove(state);
                                   if (state.keepAlive) {
  -                                	// Destroy file descriptor pool, which should close the
file
  -                                	Pool.destroy(state.fdpool);
  -                                	Socket.timeoutSet(state.socket, soTimeout * 1000);
  -                                	// If all done hand this socket off to a worker for
  -                                	// processing of further requests
  -                                	getWorkerThread().assign(state.socket);
  -                                }
  -                                else {
  -                                	// Close the socket since this is
  -                                	// the end of not keep-alive request.
  -                                	Socket.destroy(state.socket);	
  +                                    // Destroy file descriptor pool, which should close
the file
  +                                    Pool.destroy(state.fdpool);
  +                                    Socket.timeoutSet(state.socket, soTimeout * 1000);
  +                                    // If all done hand this socket off to a worker for
  +                                    // processing of further requests
  +                                    getWorkerThread().assign(state.socket);
  +                                } else {
  +                                    // Close the socket since this is
  +                                    // the end of not keep-alive request.
  +                                    Socket.destroy(state.socket);	
                                   }
                               }
                           }
  
  
  
  1.19      +3 -4      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Http11AprProcessor.java	2 Jul 2005 17:18:46 -0000	1.18
  +++ Http11AprProcessor.java	2 Jul 2005 17:36:35 -0000	1.19
  @@ -884,13 +884,12 @@
               // Do sendfile as needed: add socket to sendfile and end
               if (sendfileData != null) {
                   sendfileData.socket = socket;
  -             	sendfileData.keepAlive = keepAlive;
  +                sendfileData.keepAlive = keepAlive;
                   if (!endpoint.getSendfile().add(sendfileData)) {
                       keepAlive = false;
                       openSocket = false;
  -                }
  -                else {
  -                	openSocket = true;
  +                } else {
  +                    openSocket = true;
                   }
                   break;
               }
  
  
  

---------------------------------------------------------------------
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