com php-src: Merge branch 'PHP-7.0' into PHP-7.0.10: ext/exif/exif.c ext/standard/ftp_fopen_wrapper.c
| From: | Stanislav Malyshev | Date: | Wed, 17 Aug 2016 06:50:42 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.0.10: ext/exif/exif.c ext/standard/ftp_fopen_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93849@lists.php.net to get a copy of this message | ||
Commit: f8a75d4eee3446fb5c5c493b28b9ee80e34041cc
Author: Stanislav Malyshev <stas@php.net> Tue, 16 Aug 2016 23:50:42 -0700
Parents: e3829b88694460a2e5af10ad5eee9966fa55e589 ae3782a0db8b1e7c2a8665949cc3316227c61643
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f8a75d4eee3446fb5c5c493b28b9ee80e34041cc
Log:
Merge branch 'PHP-7.0' into PHP-7.0.10
* PHP-7.0: (34 commits)
Fix URL rewriter partially
Support "git worktree"
Add NEWS
Fix ASSERT logic
Bugfix 72791: fix memory leak in PDO persistent connections
Don't copy mime types in CLI server
Remove obsolete Id tags
Bump version in OCI8 test
Fixed bug #72788 (Invalid memory access when using persistent PDO connection)
Remove typo'd commit
Fix bug 72788: Invalid memory access when database_object_handle is undefined. Also fix memory
leak in dbh_free when using persistent PDO connections.
Replace dead branch with ZEND_ASSERT()
Add test for bug #69107: finfo no longer detects PHP files
Fix bug #55451
Fix stream_socket_enable_crypto() test
Remove old $Id$ tags
Sync with 7.1 branch changes from Nikita & Dimitri to keep OCI8 code identical
Fix bug #72524 (Binding null values triggers ORA-24816 error)
Fix the fix (Nikita), thanks!
Check the return value of dbconvert() in mssql_guid_string(), as it may return -1 in case the
conversion failed. In that case false is returned.
...
Conflicts:
ext/standard/ftp_fopen_wrapper.c
Bugs:
https://bugs.php.net/72788
https://bugs.php.net/69107
https://bugs.php.net/55451
https://bugs.php.net/72524
Changed paths:
MM ext/exif/exif.c
MM ext/standard/ftp_fopen_wrapper.c
Diff: