Author: markt
Date: Wed Nov 5 07:58:37 2008
New Revision: 711594
URL: http://svn.apache.org/viewvc?rev=711594&view=rev
Log:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46077
Expose deferAccept
Patch provided by Michael Leinartas
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=711594&r1=711593&r2=711594&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 5 07:58:37 2008
@@ -187,13 +187,6 @@
+1: fhanik, pero
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46077
- Expose deferAccept
- Patch provided by Michael Leinartas
- http://svn.apache.org/viewvc?rev=708344&view=rev
- +1: markt, remm, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46075
Don't create ByteArrayOutputStream at maxmimum possible size
http://svn.apache.org/viewvc?rev=708361&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=711594&r1=711593&r2=711594&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Wed Nov 5 07:58:37 2008
@@ -245,6 +245,9 @@
public int getSendfileSize() { return endpoint.getSendfileSize(); }
public void setSendfileSize(int sendfileSize) {
endpoint.setSendfileSize(sendfileSize); }
+ public boolean getDeferAccept() { return endpoint.getDeferAccept(); }
+ public void setDeferAccept(boolean deferAccept) {
endpoint.setDeferAccept(deferAccept); }
+
protected int socketBuffer = 9000;
public int getSocketBuffer() { return socketBuffer; }
public void setSocketBuffer(int socketBuffer) { this.socketBuffer =
socketBuffer; }
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=711594&r1=711593&r2=711594&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 Wed
Nov 5 07:58:37 2008
@@ -156,15 +156,17 @@
protected long sslContext = 0;
+ // ------------------------------------------------------------- Properties
+
+
/**
* Defer accept.
*/
protected boolean deferAccept = true;
+ public void setDeferAccept(boolean deferAccept) { this.deferAccept =
deferAccept; }
+ public boolean getDeferAccept() { return deferAccept; }
- // ------------------------------------------------------------- Properties
-
-
/**
* External Executor based thread pool.
*/
@@ -659,8 +661,10 @@
// Delay accepting of new connections until data is available
// Only Linux kernels 2.4 + have that implemented
// on other platforms this call is noop and will return APR_ENOTIMPL.
- if (Socket.optSet(serverSock, Socket.APR_TCP_DEFER_ACCEPT, 1) ==
Status.APR_ENOTIMPL) {
- deferAccept = false;
+ if (deferAccept) {
+ if (Socket.optSet(serverSock, Socket.APR_TCP_DEFER_ACCEPT, 1) ==
Status.APR_ENOTIMPL) {
+ deferAccept = false;
+ }
}
// Initialize SSL if needed
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=711594&r1=711593&r2=711594&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Nov 5 07:58:37 2008
@@ -168,6 +168,10 @@
<bug>45591</bug>: NPE on start-up failure in some cases. Based on a
patch by Matt Passell. (markt)
</fix>
+ <fix>
+ <bug>46077</bug>: Expose deferAccept for configuration. Patch provided
+ by Michael Leinartas. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml?rev=711594&r1=711593&r2=711594&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml Wed Nov 5 07:58:37 2008
@@ -236,6 +236,13 @@
presented. The default value is infinite (i.e. no timeout).</p>
</attribute>
+ <attribute name="deferAccept" required="false">
+ <p>Sets the <code>TCP_DEFER_ACCEPT</code> flag on the listening socket
for
+ this connector. The default value is <code>true</code> where
+ <code>TCP_DEFER_ACCEPT</code> is supported by the operating system,
+ otherwise it is <code>false</code>.</p>
+ </attribute>
+
<attribute name="executor" required="false">
<p>A reference to the name in an <a href="executor.html">Executor</a>
element.
If this attribute is enabled, and the named executor exists, the
connector will
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
