com php-src: Merge branch 'PHP-5.4' into PHP-5.5: main/output.c main/streams/streams.c
| From: | Michael Wallner | Date: | Thu, 03 Apr 2014 08:40:20 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: main/output.c main/streams/streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76700@lists.php.net to get a copy of this message | ||
Commit: bbd25ca01f456ceaa33db234978b4ee2063d20b4
Author: Michael Wallner <mike@php.net> Thu, 3 Apr 2014 10:40:20 +0200
Parents: f17fe2cabc1d6875a1eeca4733b793bcbf3e8078 d08b4dbf23febd3f305a2682b03ab9c70f11ac60
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bbd25ca01f456ceaa33db234978b4ee2063d20b4
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix Bug #66736 fpassthru broken
Bugs:
https://bugs.php.net/66736
Changed paths:
MM main/output.c
MM main/streams/streams.c
Diff: