diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2015-03-09 15:55:33 -0600 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2015-03-09 15:55:33 -0600 |
| commit | 69691cc8cae4ac23aeeac7170458de63c5cf9267 (patch) | |
| tree | deede1a101a7dd6b7750b05cca7575ec3511e607 /ext/pcre/php_pcre.c | |
| parent | 4ca14f681e2eebbbb232b7a3f662ed05038d779f (diff) | |
| parent | bbfd4a5e62cf058cb18d53a0817860edc01c371c (diff) | |
| download | php-git-69691cc8cae4ac23aeeac7170458de63c5cf9267.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix crypto stream timeout regressions
Diffstat (limited to 'ext/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions