pierrick                                 Fri, 14 May 2010 06:29:54 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=299365

Log:
Added support for CURLOPT_MAX_RECV_SPEED_LARGE and CURLOPT_MAX_SEND_SPEED_LARGE.

Changed paths:
    U   php/php-src/trunk/NEWS
    U   php/php-src/trunk/ext/curl/interface.c

Modified: php/php-src/trunk/NEWS
===================================================================
--- php/php-src/trunk/NEWS      2010-05-14 06:25:09 UTC (rev 299364)
+++ php/php-src/trunk/NEWS      2010-05-14 06:29:54 UTC (rev 299365)
@@ -32,6 +32,8 @@
 - Added SplObjectStorage::getHash() hook. (Etienne)
 - Added JsonSerializable interface (Sara)
 - Added support for storing upload progress feedback in session data. (Arnaud)
+- Added support for CURLOPT_MAX_RECV_SPEED_LARGE and 
CURLOPT_MAX_SEND_SPEED_LARGE.
+  FR #51815. (Pierrick)

 - default_charset if not specified is now UTF-8 instead of ISO-8859-1. (Rasmus)


Modified: php/php-src/trunk/ext/curl/interface.c
===================================================================
--- php/php-src/trunk/ext/curl/interface.c      2010-05-14 06:25:09 UTC (rev 
299364)
+++ php/php-src/trunk/ext/curl/interface.c      2010-05-14 06:29:54 UTC (rev 
299365)
@@ -579,6 +579,11 @@
        REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFUNMODSINCE);
        REGISTER_CURL_CONSTANT(CURL_TIMECOND_LASTMOD);

+#if LIBCURL_VERSION_NUM > 0x070f04 /* CURLOPT_MAX_RECV_SPEED_LARGE & 
CURLOPT_MAX_SEND_SPEED_LARGE  are available since curl 7.15.5 */
+       REGISTER_CURL_CONSTANT(CURLOPT_MAX_RECV_SPEED_LARGE);
+       REGISTER_CURL_CONSTANT(CURLOPT_MAX_SEND_SPEED_LARGE);
+#endif
+
 #if LIBCURL_VERSION_NUM > 0x070a05 /* CURLOPT_HTTPAUTH is available since curl 
7.10.6 */
        REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);
        /* http authentication options */
@@ -1672,6 +1677,13 @@
 #endif
                        error = curl_easy_setopt(ch->cp, option, 
Z_LVAL_PP(zvalue));
                        break;
+#if LIBCURL_VERSION_NUM > 0x070f04
+               case CURLOPT_MAX_RECV_SPEED_LARGE:
+               case CURLOPT_MAX_SEND_SPEED_LARGE:
+                       convert_to_long_ex(zvalue);
+                       error = curl_easy_setopt(ch->cp, option, 
(curl_off_t)Z_LVAL_PP(zvalue));
+                       break;
+#endif
                case CURLOPT_FOLLOWLOCATION:
                        convert_to_long_ex(zvalue);
                        if (PG(open_basedir) && *PG(open_basedir)) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to