MFH: Add CURLOPT_TCP_NODELAY constant

diff --git a/NEWS b/NEWS
index 2a7f992e19a3742d261420e0d5ca8dd9e4297938..d94e3feeb60df1b9ee7498a134d0e97116359849 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Jan 2007, PHP 5.2.1RC3
+- Added CURLOPT_TCP_NODELAY constant to Curl extension. (Sara)
 - Improved proc_open(). Now on Windows it can run external commands not through
   CMD.EXE. (Dmitry)
 - Fixed bug #40076 (zend_alloc.c: Value of enumeration constant must be in

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 2c4f746f6a00775b50e1f8163f8bb9b366f31a28..9acccad7d94436d5f66b23b8e008896c3f3a93f2 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -452,6 +452,7 @@ PHP_MINIT_FUNCTION(curl)
        REGISTER_CURL_CONSTANT(CURLOPT_PROXYPORT);
        REGISTER_CURL_CONSTANT(CURLOPT_UNRESTRICTED_AUTH);
        REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_EPRT);
+       REGISTER_CURL_CONSTANT(CURLOPT_TCP_NODELAY);
        REGISTER_CURL_CONSTANT(CURLOPT_HTTP200ALIASES);
        REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFMODSINCE);
        REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFUNMODSINCE);
@@ -1263,6 +1264,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
                case CURLOPT_PORT:
                case CURLOPT_AUTOREFERER:
                case CURLOPT_COOKIESESSION:
+               case CURLOPT_TCP_NODELAY:
                        convert_to_long_ex(zvalue);
                        error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
                        break;