Author: rleigh Date: Sat Sep 8 10:42:56 2018 New Revision: 1840352 URL: http://svn.apache.org/viewvc?rev=1840352&view=rev Log: CurlURLInputStream: remove fixed timeout
Fixes https://issues.apache.org/jira/browse/XERCESC-2147 using the patch from https://issues.shibboleth.net/jira/browse/CPPXT-132 Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp?rev=1840352&r1=1840351&r2=1840352&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp (original) +++ xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp Sat Sep 8 10:42:56 2018 @@ -333,8 +333,14 @@ bool CurlURLInputStream::readMore(int *r // Wait on the file descriptors timeval tv; - tv.tv_sec = 2; - tv.tv_usec = 0; + + long multi_timeout = 0; + curl_multi_timeout(fMulti, &multi_timeout); + if (multi_timeout < 0) + multi_timeout = 1000; + + tv.tv_sec = multi_timeout / 1000; + tv.tv_usec = (multi_timeout % 1000) * 1000; select(fdcnt+1, &readSet, &writeSet, &exceptSet, &tv); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
