Changeset 10582 for branches

Timestamp:

May 1, 2010, 4:36:01 AM (12 years ago)

Author:

charles

Message:

(1.9x daemon) backport r10431 for #3070 "--blocklist-update timeout"

File:

• branches/1.9x/daemon/remote.c (modified) (3 diffs)

branches/1.9x/daemon/remote.c

@@ -1841 +1841 @@
     curl_easy_setopt( curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL );
     curl_easy_setopt( curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY );
-    curl_easy_setopt( curl, CURLOPT_TIMEOUT, 60L );
     curl_easy_setopt( curl, CURLOPT_VERBOSE, debug );
     curl_easy_setopt( curl, CURLOPT_ENCODING, "" ); /* "" tells curl to fill in the blanks with what it was compiled to support */
@@ -1857 +1856 @@
 }
 
+static long
+getTimeoutSecs( const char * req )
+{
+    if( strstr( req, "\"method\":\"blocklist-update\"" ) != NULL ) 
+        return 300L; 
+
+    return 60L; /* default value */ 
+} 
 
 static int
@@ -1882 +1889 @@
 
         curl_easy_setopt( curl, CURLOPT_POSTFIELDS, reqs[i] );
+        curl_easy_setopt( curl, CURLOPT_TIMEOUT, getTimeoutSecs( reqs[i] ) );
 
         if( debug )