From: Anatol Belski <ab@php.net>
Date: Fri, 28 Feb 2014 18:38:32 +0000 (+0100)
Subject: don't compare constants on run time
X-Git-Tag: php-5.5.11RC1~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36c445970eb9976119e6668dae6dbb9c7f79d5ce;p=php

don't compare constants on run time
---

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 0d96d1f026..09e20d3a67 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -169,16 +169,20 @@ static int php_curl_option_str(php_curl *ch, long option, const char *str, const
 {
 	CURLcode error = CURLE_OK;
 
-	if (make_copy || LIBCURL_VERSION_NUM < 0x071100) {
+#if LIBCURL_VERSION_NUM >= 0x071100
+	if (make_copy) {
+#endif
 		char *copystr;
 
 		/* Strings passed to libcurl as 'char *' arguments, are copied by the library since 7.17.0 */
 		copystr = estrndup(str, len);
 		error = curl_easy_setopt(ch->cp, option, copystr);
 		zend_llist_add_element(&ch->to_free->str, &copystr);
+#if LIBCURL_VERSION_NUM >= 0x071100
 	} else {
 		error = curl_easy_setopt(ch->cp, option, str);
 	}
+#endif
 
 	SAVE_CURL_ERROR(ch, error)