Fixed bug #52828 (curl_setopt does not accept persistent streams).

diff --git a/NEWS b/NEWS
index 1e7e094eb0c317bf6f78f73e8219c4c4e2623bd4..c38a1184f689a71af4bc59341ce4b1778932dc13 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,10 @@
     (Ilia)  
   . Fixed #53409 (sleep() returns NULL on Windows). (Pierre)
 
+- Curl extension:
+  . Fixed bug #52828 (curl_setopt does not accept persistent streams).
+    (Gustavo, Ilia)
+
 - Hash extension:
   . Fixed bug #51003 (unaligned memory access in ext/hash/hash_tiger.c).
     (Mike, Ilia)

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index ffb3e65e6d18ebf26263077239421f621b46bbc7..9e89fc34fac44837b030f802021c3464a32fb7ed 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1761,7 +1761,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
                        int type;
                        void * what;
 
-                       what = zend_fetch_resource(zvalue TSRMLS_CC, -1, "File-Handle", &type, 1, php_file_le_stream());
+                       what = zend_fetch_resource(zvalue TSRMLS_CC, -1, "File-Handle", &type, 1, php_file_le_stream(), php_file_le_pstream());
                        if (!what) {
                                RETVAL_FALSE;
                                return 1;