com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/pdo _odbc/odbc_stmt.c ext/phar/phar_path_check.c
ex t/standard/file.c ext/standard/php_rand.h ext/standar d/rand.c main/php_streams.h main/streams/streams.c
| From: | Anatol Belski | Date: | Mon, 21 Apr 2014 06:57:18 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/pdo _odbc/odbc_stmt.c ext/phar/phar_path_check.c ex t/standard/file.c ext/standard/php_rand.h ext/standar d/rand.c main/php_streams.h main/streams/streams.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77156@lists.php.net to get a copy of this message | ||
Commit: 70707a58c9297b18ba6f6e1cbbfd0d241a732a74
Author: Anatol Belski <ab@php.net> Mon, 21 Apr 2014 08:57:18 +0200
Parents: 3eaf40c3fcc264e751440c3d3d2374e3e33874c4 32d5f269a03b554a0d3ebc96fcacc842e3344e4e
Branches: str_size_and_int64_56_backport
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=70707a58c9297b18ba6f6e1cbbfd0d241a732a74
Log:
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
Fix #50444: PDO-ODBC changes for 64-bit
Fix a compiler warning in php_rand.h
Fix #66908: php-fpm reload leaks epoll_create() file descriptor
Fix bug #65701: Do not use cache for file file copy
Bugs:
https://bugs..php.net/50444
https://bugs.php.net/66908
https://bugs.php.net/65701
Changed paths:
MM ext/pdo_odbc/odbc_stmt.c
MM ext/phar/phar_path_check.c
MM ext/standard/file.c
MM ext/standard/php_rand.h
MM ext/standard/rand.c
MM main/php_streams.h
MM main/streams/streams.c
Diff: