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

diff --cc ext/curl/interface.c
index 80618674a39a5df8db5ef824ea30a46f4b1fd543,861795485d1c02163ec2276c566ac60c56227695..a1c8a1e520c51c9d7c06502a6defe38f89521706
--- 1/ext/curl/interface.c
--- 2/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);
  }
  /* }}} */