com php-src: Merge branch 'PHP-5.5': ext/curl/interface.c
| From: | Adam Harvey | Date: | Mon, 19 Aug 2013 19:19:13 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5': ext/curl/interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73001@lists.php.net to get a copy of this message | ||
Commit: 2a46fc0470c0cec055178af8cb962c8d52fb4700
Author: Adam Harvey <aharvey@php.net> Mon, 19 Aug 2013 12:19:13 -0700
Parents: d17ade127b4f0b546c0fd1d11b915c485ceea9ea 69f12ad582c102c1d7b3b2c0ae6cf7cd633dfe1d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2a46fc0470c0cec055178af8cb962c8d52fb4700
Log:
Merge branch 'PHP-5.5'
* PHP-5.5:
Track created curl_slist structs by option so they can be updated in situ.
Conflicts:
ext/curl/interface.c
Changed paths:
MM ext/curl/interface.c
Diff:
diff --cc ext/curl/interface.c
index 8061867,8617954..a1c8a1e
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@@ -1790,9 -1790,11 +1790,11 @@@ static void alloc_curl_handle(php_curl
(*ch)->handlers->read->stream = NULL;
zend_llist_init(&(*ch)->to_free->str, sizeof(char *), (llist_dtor_func_t)
curl_free_string, 0);
- zend_llist_init(&(*ch)->to_free->slist, sizeof(struct curl_slist), (llist_dtor_func_t)
curl_free_slist, 0);
zend_llist_init(&(*ch)->to_free->post, sizeof(struct HttpPost), (llist_dtor_func_t)
curl_free_post, 0);
- (*ch)->safe_upload = 0; /* for now, for BC reason we allow unsafe API */
+ (*ch)->safe_upload = 1; /* for now, for BC reason we allow unsafe API */
+
+ (*ch)->to_free->slist = emalloc(sizeof(HashTable));
+ zend_hash_init((*ch)->to_free->slist, 4, NULL, curl_free_slist, 0);
}
/* }}} */