diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2015-03-09 16:02:04 -0600 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2015-03-09 16:02:04 -0600 |
| commit | 748433e7bcedba58fa7057a048b8b257279a2569 (patch) | |
| tree | 64d99b240040edbb828ed9b7ea5cd6c3afb37740 /ext/pcre/php_pcre.c | |
| parent | f174859acdb9d99176440a30b6608388a383de3f (diff) | |
| parent | 69691cc8cae4ac23aeeac7170458de63c5cf9267 (diff) | |
| download | php-git-748433e7bcedba58fa7057a048b8b257279a2569.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix crypto stream timeout regressions
Conflicts:
ext/openssl/xp_ssl.c
Diffstat (limited to 'ext/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions