com php-src: Merge branch 'PHP-5.5' into PHP-5.6: main/streams/userspace.c

From: Date: Mon, 09 Mar 2015 06:41:30 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: main/streams/userspace.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85380@lists.php.net to get a copy of this message
Commit: 0f333fa93c63f70d06b5aa8c65b6bf23057b1b58 Author: Stanislav Malyshev <stas@php.net> Sun, 8 Mar 2015 23:41:30 -0700 Parents: 934d6ed900f3d9dbb94e8d428fd60cf2360d80d4 fa72f1ea869e23fd92c50f69a8350e50d57e1c12 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0f333fa93c63f70d06b5aa8c65b6bf23057b1b58 Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: added missing parentheses Fix #67626 Fix #63486 Conflicts: main/streams/userspace.c Bugs: https://bugs.php.net/67626 https://bugs.php.net/63486 Changed paths: MM main/streams/userspace.c Diff:

« previous php.cvs (#85380) next »