pierrick Fri, 29 Apr 2011 10:41:44 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=310648
Log: Added support for CURLOPT_MAX_RECV_SPEED_LARGE and CURLOPT_MAX_SEND_SPEED_LARGE. FR #51815 # MFH. This addition was already committed to trunk and is backported as requested in #54622 Bugs: http://bugs.php.net/51815 (Closed) Add support for cURL option CURLOPT_MAX_RECV_SPEED_LARGE http://bugs.php.net/54622 (Assigned) cURL speed limit options not implemented till present day. Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/curl/interface.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-04-29 09:54:24 UTC (rev 310647) +++ php/php-src/branches/PHP_5_3/NEWS 2011-04-29 10:41:44 UTC (rev 310648) @@ -28,6 +28,8 @@ - cURL . Added CURLINFO_REDIRECT_URL support. (Daniel Stenberg, Pierre) + . Added support for CURLOPT_MAX_RECV_SPEED_LARGE and + CURLOPT_MAX_SEND_SPEED_LARGE. FR #51815. (Pierrick) - DateTime extension: . Fixed bug #54340 (DateTime::add() method bug). (Adam) Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/interface.c 2011-04-29 09:54:24 UTC (rev 310647) +++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2011-04-29 10:41:44 UTC (rev 310648) @@ -590,6 +590,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 */ @@ -1692,6 +1697,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)) || PG(safe_mode)) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
