You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/10/19 16:40:36 UTC
svn commit: r1709423 -
/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: markt
Date: Mon Oct 19 14:40:35 2015
New Revision: 1709423
URL: http://svn.apache.org/viewvc?rev=1709423&view=rev
Log:
Revert r1701016 since it triggered unit test failures with reads not timing out on Gump that were repeatable on at least OSX.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1709423&r1=1709422&r2=1709423&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Oct 19 14:40:35 2015
@@ -2440,10 +2440,8 @@ public class AprEndpoint extends Abstrac
// Set the current settings for this socket
setBlockingStatus(block);
if (block) {
- Socket.optSet(getSocket().longValue(), Socket.APR_SO_NONBLOCK, 0);
Socket.timeoutSet(getSocket().longValue(), getReadTimeout() * 1000);
} else {
- Socket.optSet(getSocket().longValue(), Socket.APR_SO_NONBLOCK, 1);
Socket.timeoutSet(getSocket().longValue(), 0);
}
// Downgrade the lock
@@ -2561,10 +2559,8 @@ public class AprEndpoint extends Abstrac
// Set the current settings for this socket
setBlockingStatus(block);
if (block) {
- Socket.optSet(getSocket().longValue(), Socket.APR_SO_NONBLOCK, 0);
Socket.timeoutSet(getSocket().longValue(), getWriteTimeout() * 1000);
} else {
- Socket.optSet(getSocket().longValue(), Socket.APR_SO_NONBLOCK, 1);
Socket.timeoutSet(getSocket().longValue(), 0);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1709423 -
/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Posted by Mark Thomas <ma...@apache.org>.
On 19/10/2015 15:57, Rémy Maucherat wrote:
> 2015-10-19 16:40 GMT+02:00 <ma...@apache.org>:
>
>> Author: markt
>> Date: Mon Oct 19 14:40:35 2015
>> New Revision: 1709423
>>
>> URL: http://svn.apache.org/viewvc?rev=1709423&view=rev
>> Log:
>> Revert r1701016 since it triggered unit test failures with reads not
>> timing out on Gump that were repeatable on at least OSX.
>>
> Testing HTTP/2, the blocking call sometimes behaved as a non blocking
> operation (= return 0 bytes without blocking) for me on Linux, I think only
> on write, but I don't recall it 100%. So I'll verify if your next commit
> avoids regressing.
Thanks. The bug I found was with write so hopefully r1709424 will fix
what you were seeing.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1709423 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Posted by Rémy Maucherat <re...@apache.org>.
2015-10-19 16:40 GMT+02:00 <ma...@apache.org>:
> Author: markt
> Date: Mon Oct 19 14:40:35 2015
> New Revision: 1709423
>
> URL: http://svn.apache.org/viewvc?rev=1709423&view=rev
> Log:
> Revert r1701016 since it triggered unit test failures with reads not
> timing out on Gump that were repeatable on at least OSX.
>
> Testing HTTP/2, the blocking call sometimes behaved as a non blocking
operation (= return 0 bytes without blocking) for me on Linux, I think only
on write, but I don't recall it 100%. So I'll verify if your next commit
avoids regressing.
Rémy