com php-src: Merge branch 'PHP-5.6': ext/curl/interface.c
| From: | Stanislav Malyshev | Date: | Tue, 14 Oct 2014 18:45:01 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/curl/interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82311@lists.php.net to get a copy of this message | ||
Commit: 01d17228dc62ea30b7ad25835f049ccd1998b5f2
Author: Stanislav Malyshev <stas@php.net> Tue, 14 Oct 2014 11:45:01 -0700
Parents: d9559d0ecd81ea09575cdbb20e908d5516cad4ad 47a1447cc8b5be0b19843a21d533984803993755
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=01d17228dc62ea30b7ad25835f049ccd1998b5f2
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix return code (merges are hard :( )
Changed paths:
MM ext/curl/interface.c
Diff: