tony2001 Fri Jan 19 15:38:51 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/curl interface.c
Log:
MFH: fix #40169 (CURLOPT_TCP_NODELAY only available in curl >= 7.11.2)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.503&r2=1.2027.2.547.2.504&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.503 php-src/NEWS:1.2027.2.547.2.504
--- php-src/NEWS:1.2027.2.547.2.503 Fri Jan 19 00:13:49 2007
+++ php-src/NEWS Fri Jan 19 15:38:50 2007
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Jan 2007, PHP 5.2.1RC4
+- Fixed bug #40169 (CURLOPT_TCP_NODELAY only available in curl >= 7.11.2).
+ (Tony)
18 Jan 2007, PHP 5.2.1RC3
- Added read-timeout context option "timeout" for HTTP streams. (Hannes,
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.20&r2=1.62.2.14.2.21&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.20
php-src/ext/curl/interface.c:1.62.2.14.2.21
--- php-src/ext/curl/interface.c:1.62.2.14.2.20 Tue Jan 9 23:13:05 2007
+++ php-src/ext/curl/interface.c Fri Jan 19 15:38:51 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.20 2007/01/09 23:13:05 pollita Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.21 2007/01/19 15:38:51 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -452,7 +452,9 @@
REGISTER_CURL_CONSTANT(CURLOPT_PROXYPORT);
REGISTER_CURL_CONSTANT(CURLOPT_UNRESTRICTED_AUTH);
REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_EPRT);
+#if LIBCURL_VERSION_NUM > 0x070b01 /* CURLOPT_TCP_NODELAY is available since
curl 7.11.2 */
REGISTER_CURL_CONSTANT(CURLOPT_TCP_NODELAY);
+#endif
REGISTER_CURL_CONSTANT(CURLOPT_HTTP200ALIASES);
REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFMODSINCE);
REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFUNMODSINCE);
@@ -1264,10 +1266,12 @@
case CURLOPT_PORT:
case CURLOPT_AUTOREFERER:
case CURLOPT_COOKIESESSION:
+#if LIBCURL_VERSION_NUM > 0x070b01 /* CURLOPT_TCP_NODELAY is available since
curl 7.11.2 */
case CURLOPT_TCP_NODELAY:
convert_to_long_ex(zvalue);
error = curl_easy_setopt(ch->cp, option,
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
