com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/ftp/ftp.c
| From: | Stanislav Malyshev | Date: | Mon, 01 Jun 2015 00:29:53 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/ftp/ftp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87028@lists.php.net to get a copy of this message | ||
Commit: 8746163153157857fcb95b8ab33b77144d7ee7a8
Author: Stanislav Malyshev <stas@php.net> Sun, 31 May 2015 17:29:53 -0700
Parents: f029a2856b40dfb9093b85414c3e7419c43516f4 0765623d6991b62ffcd93ddb6be8a5203a2fa7e2
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8746163153157857fcb95b8ab33b77144d7ee7a8
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
improve fix for Bug #69545
Bugs:
https://bugs.php.net/69545
Changed paths:
MM ext/ftp/ftp.c
Diff: