Author: fhanik
Date: Mon Jun 9 12:01:32 2008
New Revision: 665830
URL: http://svn.apache.org/viewvc?rev=665830&view=rev
Log:
apply fix for APR sendfile to add connection to poller, not worker
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=665830&r1=665829&r2=665830&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jun 9 12:01:32 2008
@@ -43,29 +43,6 @@
remm Ok with this addition, but I would only vote +0 for inclusion in
this release
(this still sounds like a very minor fix)
-* After being done with an asynchronous sendfile, the socket should go to the
poller (if assigned
- to a worker, it will block).
-Index: java/org/apache/tomcat/util/net/AprEndpoint.java
-===================================================================
---- java/org/apache/tomcat/util/net/AprEndpoint.java (revision 658292)
-+++ java/org/apache/tomcat/util/net/AprEndpoint.java (working copy)
-@@ -1787,11 +1787,9 @@
- // 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
-+ // If all done put the socket back in the
poller for
- // processing of further requests
-- if (!processSocket(state.socket)) {
-- Socket.destroy(state.socket);
-- }
-+ getPoller().add(state.socket);
- } else {
- // Close the socket since this is
- // the end of not keep-alive request.
- +1: remm, jfclere, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45101
Format header dates obtained from DirContextURLConnection as per HTTP spec
Patch provided by Chris Hubick
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=665830&r1=665829&r2=665830&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon
Jun 9 12:01:32 2008
@@ -1787,11 +1787,9 @@
// 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
+ // If all done put the socket back in the
poller for
// processing of further requests
- if (!processSocket(state.socket)) {
- Socket.destroy(state.socket);
- }
+ getPoller().add(state.socket);
} else {
// Close the socket since this is
// the end of not keep-alive request.
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=665830&r1=665829&r2=665830&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jun 9 12:01:32 2008
@@ -35,6 +35,9 @@
<section name="Tomcat 6.0.17 (remm)">
<subsection name="Catalina">
<changelog>
+ <fix>
+ APR connector now adds connection to poller after using send file
(remm)
+ </fix>
<fix><bug>42750</bug>
request line should be tolerant of multiple whitespaces.
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
