com php-src: Fixed bug #71144 (Sementation fault when using cURL with ZTS): NEWS ext/curl/interface.c ext/curl/tests/bug71144.phpt
| From: | Xinchen Hui | Date: | Fri, 18 Dec 2015 16:29:19 +0000 |
| Subject: | com php-src: Fixed bug #71144 (Sementation fault when using cURL with ZTS): NEWS ext/curl/interface.c ext/curl/tests/bug71144.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90339@lists.php.net to get a copy of this message | ||
Commit: 8f9af36da35eef78728a46890ba5f1f114d7a0b0
Author: Xinchen Hui <laruence@gmail.com> Sat, 19 Dec 2015 00:29:19 +0800
Parents: 916f10ac315bcca24d546404771792cc54b2168e
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8f9af36da35eef78728a46890ba5f1f114d7a0b0
Log:
Fixed bug #71144 (Sementation fault when using cURL with ZTS)
Bugs:
https://bugs.php.net/71144
Changed paths:
M NEWS
M ext/curl/interface.c
A ext/curl/tests/bug71144.phpt
Diff:
diff --git a/NEWS b/NEWS
index a82de3b...1317770 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,10 @@ PHP NEWS
(Nikita)
. Fixed bug #52355 (Negating zero does not produce negative zero). (Andrea)
+. CURL:
+ . Fixed bug #71144 (Sementation fault when using cURL with ZTS).
+ (Michael Maroszek, Laruence)
+
- DBA:
. Fixed key leak with invalid resource. (Laruence)
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index f12a9e24..7dd04a6 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1851,7 +1851,9 @@ static void _php_curl_set_default_options(php_curl *ch)
curl_easy_setopt(ch->cp, CURLOPT_INFILE, (void *) ch);
curl_easy_setopt(ch->cp, CURLOPT_HEADERFUNCTION, curl_write_header);
curl_easy_setopt(ch->cp, CURLOPT_WRITEHEADER, (void *) ch);
+#if !defined(ZTS)
curl_easy_setopt(ch->cp, CURLOPT_DNS_USE_GLOBAL_CACHE, 1);
+#endif
curl_easy_setopt(ch->cp, CURLOPT_DNS_CACHE_TIMEOUT, 120);
curl_easy_setopt(ch->cp, CURLOPT_MAXREDIRS, 20); /* prevent infinite redirects */
@@ -2183,6 +2185,12 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /*
{{{
return 1;
}
#endif
+# if defined(ZTS)
+ if (option == CURLOPT_DNS_USE_GLOBAL_CACHE) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_DNS_USE_GLOBAL_CACHE cannot be
activated when thread safety is enabled");
+ return 1;
+ }
+# endif
error = curl_easy_setopt(ch->cp, option, lval);
break;
case CURLOPT_SAFE_UPLOAD:
diff --git a/ext/curl/tests/bug71144.phpt b/ext/curl/tests/bug71144.phpt
new file mode 100644
index 0000000..059cd63
--- /dev/null
+++ b/ext/curl/tests/bug71144.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Bug #71144 (Sementation fault when using cURL with ZTS)
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+<?php if (!PHP_ZTS) { print "skip only for zts build"; } ?>
+--FILE--
+<?php
+$ch = curl_init();
+var_dump(curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, 1));
+?>
+--EXPECTF--
+Warning: curl_setopt(): CURLOPT_DNS_USE_GLOBAL_CACHE cannot be activated when thread safety is
enabled in %sbug71144.php on line %d
+bool(false)