From: Pierre Joye <pajoye@php.net>
Date: Mon, 4 May 2009 12:12:57 +0000 (+0000)
Subject: - MFH: [DOC] #47739. add option CURLOPT_IPRESOLVE which accepts CURL_IPRESOLVE_WHATEV... 
X-Git-Tag: php-5.3.0RC2~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b3fa5afdd1612c5a1fec0008a7a57236e18b79b;p=php

- MFH: [DOC] #47739. add option CURLOPT_IPRESOLVE which accepts CURL_IPRESOLVE_WHATEVER, CURL_IPRESOLVE_V4 or CURL_IPRESOLVE_V6
---

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 5b4112030e..97b5586812 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -444,6 +444,10 @@ PHP_MINIT_FUNCTION(curl)
 	le_curl_multi_handle = zend_register_list_destructors_ex(_php_curl_multi_close, NULL, "curl", module_number);
 
 	/* Constants for curl_setopt() */
+	REGISTER_CURL_CONSTANT(CURLOPT_IPRESOLVE);
+	REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_WHATEVER);
+	REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V4);
+	REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V6);
 	REGISTER_CURL_CONSTANT(CURLOPT_DNS_USE_GLOBAL_CACHE);
 	REGISTER_CURL_CONSTANT(CURLOPT_DNS_CACHE_TIMEOUT);
 	REGISTER_CURL_CONSTANT(CURLOPT_PORT);
@@ -1512,6 +1516,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
 		case CURLOPT_REDIR_PROTOCOLS:
 		case CURLOPT_PROTOCOLS:
 #endif
+		case CURLOPT_IPRESOLVE:
 			convert_to_long_ex(zvalue);
 			error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
 			break;