diff options
author | Dmitry Stogov <dmitry@zend.com> | 2016-11-16 16:46:54 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2016-11-16 16:46:54 +0300 |
commit | eb976b89c495fa277176e7918cbf3369e4573400 (patch) | |
tree | fd9ed618912f5a02f38420fb4f62dc48a6c7f8d6 /sapi/apache2handler/php_functions.c | |
parent | a1a5b52f3b9c819fec871601392b438a4ddecf14 (diff) | |
parent | a91f3d475ee9a59c38833c683c0bd355338f1564 (diff) | |
download | php-git-eb976b89c495fa277176e7918cbf3369e4573400.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed ZTS build
Fix #73530: Unsetting result set may reset other result set
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions