[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysql/php_mysql.c ext/phar/phar_object.c

[Anatol Belski]

Commit:    077b575d51630641fbd4b664bd18cfc335f76ebe
Author:    Anatol Belski <a...@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:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php