You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2018/09/24 09:36:02 UTC
svn commit: r1841817 - in /tomcat/jk/trunk: native/common/jk_connect.c
xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Mon Sep 24 09:36:01 2018
New Revision: 1841817
URL: http://svn.apache.org/viewvc?rev=1841817&view=rev
Log:
Fix 62751: Regression in mod_jk 1.2.44 which
resulted in socket_connect_timeout to be
interpreted in units of seconds instead of
milliseconds on platforms that provide poll().
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1841817&r1=1841816&r2=1841817&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Mon Sep 24 09:36:01 2018
@@ -274,7 +274,7 @@ static int nb_connect(jk_sock_t sd, jk_s
socklen_t rclen = (socklen_t)sizeof(rc);
pfd.fd = sd;
pfd.events = POLLOUT;
- rc = poll(&pfd, 1, timeout * 1000);
+ rc = poll(&pfd, 1, timeout);
if (rc <= 0) {
/* Save errno */
int err = errno;
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1841817&r1=1841816&r2=1841817&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Sep 24 09:36:01 2018
@@ -44,6 +44,11 @@
<br />
<subsection name="Native">
<changelog>
+ <fix>
+ <bug>62751</bug>: Apache: Fix regression in 1.2.44 which resulted in
+ socket_connect_timeout to be interpreted in units of seconds
+ instead of milliseconds on platforms that provide poll(). (rjung)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org