pajoye Tue, 06 Dec 2011 15:57:43 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=320510
Log:
- fix build, CURLOPT_FNMATCH_DATA exists since 7.21.0 only
Changed paths:
U php/php-src/trunk/ext/curl/interface.c
Modified: php/php-src/trunk/ext/curl/interface.c
===================================================================
--- php/php-src/trunk/ext/curl/interface.c 2011-12-06 15:35:07 UTC (rev
320509)
+++ php/php-src/trunk/ext/curl/interface.c 2011-12-06 15:57:43 UTC (rev
320510)
@@ -1975,6 +1975,8 @@
curl_easy_setopt(dupch->cp, CURLOPT_PROGRESSDATA, (void *)
dupch);
}
+/* Available since 7.21.0 */
+#if LIBCURL_VERSION_NUM >= 0x071500
if (ch->handlers->fnmatch) {
dupch->handlers->fnmatch = ecalloc(1, sizeof(php_curl_fnmatch));
if (ch->handlers->fnmatch->func_name) {
@@ -1982,7 +1984,6 @@
dupch->handlers->fnmatch->func_name =
ch->handlers->fnmatch->func_name;
}
dupch->handlers->fnmatch->method =
ch->handlers->fnmatch->method;
-#if LIBCURL_VERSION_NUM >= 0x071500 /* Available since 7.21.0 */
curl_easy_setopt(dupch->cp, CURLOPT_FNMATCH_DATA, (void *)
dupch);
#endif
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
