com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysql/php _mysql.c ext/phar/phar_object.c
| From: | Anatol Belski | Date: | Wed, 15 May 2013 09:17:18 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysql/php _mysql.c ext/phar/phar_object.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72180@lists.php.net to get a copy of this message | ||
Commit: 077b575d51630641fbd4b664bd18cfc335f76ebe
Author: Anatol Belski <ab@php.net> Wed, 15 May 2013 11:17:18 +0200
Parents: 1f97fde89e5e54c4f360b07d348d0f14634808b3 de82e7edf7c91afab236a087ce4900868066b5d7
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=077b575d51630641fbd4b664bd18cfc335f76ebe
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix unitialized vars when sql.safe_mode=1
more check for php_stream_fopen_tmpfile failure
Changed paths:
MM ext/mysql/php_mysql.c
MM ext/phar/phar_object.c
Diff: