<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.4
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/178617f0640c0f42f5dfe211e2eeb5a9e3f9111c">https://github.com/macports/macports-base/commit/178617f0640c0f42f5dfe211e2eeb5a9e3f9111c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 178617f0640c0f42f5dfe211e2eeb5a9e3f9111c
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Feb 21 08:33:05 2017 +1100

<span style='display:block; white-space:pre;color:#404040;'>    Only use curl_multi_timeout when available
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/53607
</span><span style='display:block; white-space:pre;color:#404040;'>    (cherry picked from commit 3afeab53d003f02794dca5f9851ea693ed3a26fe)
</span>---
 src/pextlib1.0/curl.c | 3 +++
 1 file changed, 3 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/curl.c b/src/pextlib1.0/curl.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 1fa3651..753d03b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/curl.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/curl.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -500,12 +500,15 @@ CurlFetchCmd(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[])
</span> 
                        long curl_timeout = -1;
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        /* curl_multi_timeout introduced in libcurl 7.15.4 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if LIBCURL_VERSION_NUM >= 0x070f04
</span>                   /* get the next timeout */
                        theCurlMCode = curl_multi_timeout(theMHandle, &curl_timeout);
                        if (theCurlMCode != CURLM_OK) {
                                theResult = SetResultFromCurlMErrorCode(interp, theCurlMCode);
                                break;
                        }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span> 
                        timeout.tv_sec = 1;
                        timeout.tv_usec = 0;
</pre><pre style='margin:0'>

</pre>