com php-src: Fixed bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_multi_exec) : NEWS ext/curl/interface.c
ext/curl/tests/bug71 523.phpt
| From: | Xinchen Hui | Date: | Fri, 05 Feb 2016 11:49:26 +0000 |
| Subject: | com php-src: Fixed bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_multi_exec) : NEWS ext/curl/interface.c ext/curl/tests/bug71 523.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90956@lists.php.net to get a copy of this message | ||
Commit: 5fdfab743d964bb13602effc9efcd6f747e2f58c
Author: Xinchen Hui <laruence@gmail.com> Fri, 5 Feb 2016 19:49:26 +0800
Parents: 8442a1cc4ee79b09b5bb21d64aa87edcea453c21
Branches: PHP-5.6 PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5fdfab743d964bb13602effc9efcd6f747e2f58c
Log:
Fixed bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_multi_exec)
Bugs:
https://bugs.php.net/71523
Changed paths:
M NEWS
M ext/curl/interface.c
A ext/curl/tests/bug71523.phpt
Diff:
diff --git a/NEWS b/NEWS
index f3ebeba..0fc0565 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2016, PHP 5.6.19
+- CURL:
+ . Fixed bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes
+ while curl_multi_exec). (Laruence)
+
- Date:
. Fixed bug #68078 (Datetime comparisons ignore microseconds). (Willem-Jan
Zijderveld)
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 267afec..d9aab75 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -2543,7 +2543,12 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue
TSRMLS_DC)
return 1;
}
}
- zend_hash_index_update(ch->to_free->slist, (ulong) option, &slist, sizeof(struct
curl_slist *), NULL);
+
+ if (Z_REFCOUNT_P(ch->clone) <= 1) {
+ zend_hash_index_update(ch->to_free->slist, (ulong) option, &slist, sizeof(struct
curl_slist *), NULL);
+ } else {
+ zend_hash_next_index_insert(ch->to_free->slist, &slist, sizeof(struct curl_slist *),
NULL);
+ }
error = curl_easy_setopt(ch->cp, option, slist);
diff --git a/ext/curl/tests/bug71523.phpt b/ext/curl/tests/bug71523.phpt
new file mode 100644
index 0000000..06647de
--- /dev/null
+++ b/ext/curl/tests/bug71523.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_multi_exec)
+--SKIPIF--
+<?php
+if (!extension_loaded("curl")) {
+ exit("skip curl extension not loaded");
+}
+?>
+--FILE--
+<?php
+
+$base = curl_init('http://www.google.com/');
+curl_setopt($base, CURLOPT_RETURNTRANSFER, true);
+$mh = curl_multi_init();
+
+for ($i = 0; $i < 2; ++$i) {
+ $ch = curl_copy_handle($base);
+ curl_setopt($ch, CURLOPT_HTTPHEADER, ['Foo: Bar']);
+ curl_multi_add_handle($mh, $ch);
+}
+
+do {
+ curl_multi_exec($mh, $active);
+} while ($active);
+?>
+okey
+--EXPECTF--
+okey