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