diff options
author | Stanislav Malyshev <stas@php.net> | 2017-01-02 21:37:06 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2017-01-02 21:37:06 -0800 |
commit | ca72faa2c50b249715597bbee51fcd01718a0494 (patch) | |
tree | 2a9c96120ea56b07eff9942f96cb3f0bbe980e2a /ext/mysqlnd/mysqlnd_plugin.c | |
parent | 2075fb2b73c2d56c7acfb29773a2dc68b8d2f29d (diff) | |
parent | a6cdefe04353faf96f8a91fd8ef49f486bda7a7c (diff) | |
download | php-git-ca72faa2c50b249715597bbee51fcd01718a0494.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix #73832 - leave the table in a safe state if the size is too big.
Fix bug #73831 - NULL Pointer Dereference while unserialize php object
Diffstat (limited to 'ext/mysqlnd/mysqlnd_plugin.c')
0 files changed, 0 insertions, 0 deletions