diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2015-03-04 12:50:35 -0700 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2015-03-04 12:50:35 -0700 |
| commit | 5de64a29e6104b2d3e1fcf9e3d8ea3ba6a87f22d (patch) | |
| tree | d211bdda126e16fd1807b79e0631a4f8f59b31aa /ext/mysql/php_mysql.h | |
| parent | 01ccfb7cc91e652a6c93ec8c62817d4ed95bbc19 (diff) | |
| parent | 241f3c34b89ab55432d5af3fd1e4217540e161a3 (diff) | |
| download | php-git-5de64a29e6104b2d3e1fcf9e3d8ea3ba6a87f22d.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68920 (use strict peer_fingerprint input checks)
Conflicts:
ext/openssl/xp_ssl.c
Diffstat (limited to 'ext/mysql/php_mysql.h')
0 files changed, 0 insertions, 0 deletions