[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/curl/interface.c

2013-02-17 Thread Anatol Belski 
Commit:9a85dca7a566cef6bee9f07dbf9c6059dabb135c
Author:Anatol Belski  Sun, 17 Feb 2013 20:29:58 +0100
Parents:   8be9a974dac0c95eed50e123e5aaeee78e497974 
432d59ab5560202a46b01d05455418e9fc810365
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9a85dca7a566cef6bee9f07dbf9c6059dabb135c

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix free vs. curl_free

Changed paths:
  MM  ext/curl/interface.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/curl/interface.c

2013-04-02 Thread Xinchen Hui 
Commit:bd6a90dac7b759908e8d36fc34f9e8b5a4fd9ce8
Author:Xinchen Hui  Wed, 3 Apr 2013 10:17:49 +0800
Parents:   db037caf18244f1917a553af0b69d9f01082f38d 
bb7017632800feebdb0123781561aafa743d082e
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=bd6a90dac7b759908e8d36fc34f9e8b5a4fd9ce8

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  ext/curl/interface.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/curl/interface.c

2013-04-04 Thread Xinchen Hui 
Commit:2794d455ea988772bed9baff91b21bdc4e00a195
Author:Xinchen Hui  Thu, 4 Apr 2013 19:31:21 +0800
Parents:   4788a961f146500e5d7d4b20521f1c9729771a08 
01ca2bf8c3f694c3637a161a5d68f3c947a22c08
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=2794d455ea988772bed9baff91b21bdc4e00a195

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  ext/curl/interface.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/curl/interface.c

2013-04-23 Thread Pierrick Charron 
Commit:74394733ed36f642fa52e10b73284e3ad2d32325
Author:Pierrick Charron  Tue, 23 Apr 2013 
17:01:50 -0400
Parents:   302de03a5abb5e51345cbc1a4074987e4680cbc0 
b79e65f268d8f368a1088313735eda3ca485fa53
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=74394733ed36f642fa52e10b73284e3ad2d32325

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Remove curl wrappers

Changed paths:
  MM  ext/curl/interface.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/curl/interface.c

2013-06-25 Thread Felipe Pena 
Commit:802a25e0c93c372c8a35ac939892316b1d87c5f1
Author:Felipe Pena  Tue, 25 Jun 2013 21:53:42 
-0300
Parents:   0c7cf5809236f856a5c0b6b4b6fdd0fe904f 
623386d79988d1aeea941bb463ece2c27f9ed5d0
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=802a25e0c93c372c8a35ac939892316b1d87c5f1

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  - Fixed typo on condition

Changed paths:
  MM  ext/curl/interface.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/curl/interface.c

2013-08-19 Thread Adam Harvey 
Commit:2a46fc0470c0cec055178af8cb962c8d52fb4700
Author:Adam Harvey  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);
  }
  /* }}} */


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/curl/interface.c

2013-08-19 Thread Christopher Jones 
Commit:19476f51f2167988909f5524d23444c05630
Author:Christopher Jones  Mon, 19 Aug 2013 17:18:28 
-0700
Parents:   73cd2e0ab14d804c6bf0b689490bdd4fd6e969b1 
d5979c88eaca273479cf244d3e10c2f089c4f080
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=19476f51f2167988909f5524d23444c05630

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Reduce (some more) compile noise of 'unused variable' and 'may be used 
uninitialized' warnings.
  Update NEWS

Changed paths:
  MM  ext/curl/interface.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php