From: Sara Golemon <pollita@php.net>
Date: Tue, 9 Jan 2007 23:13:05 +0000 (+0000)
Subject: MFH: Add CURLOPT_TCP_NODELAY constant
X-Git-Tag: php-5.2.1RC3~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a8f688af222dcd4c64556da96d43904aa82af79;p=php

MFH: Add CURLOPT_TCP_NODELAY constant
---

diff --git a/NEWS b/NEWS
index 2a7f992e19..d94e3feeb6 100644
--- 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 2c4f746f6a..9acccad7d9 100644
--- 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;