diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2014-09-09 09:27:20 -0600 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2014-09-09 09:27:20 -0600 |
| commit | bf2f80b22356cd93748dd7551dfa0b54fb53e5b5 (patch) | |
| tree | 6e92c2abce8ebc686e1081f74d0c7382137f32a0 /ext/ereg/regex/regexec.c | |
| parent | b9ac5e23fb1b347b5eab250832999e291d65807a (diff) | |
| parent | 372844918a318ad712e16f9ec636682424a65403 (diff) | |
| download | php-git-bf2f80b22356cd93748dd7551dfa0b54fb53e5b5.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Bug #41631: Fix regression from first attempt (6569db8)
Bug #67965: Fix blocking behavior in non-blocking crypto streams
Diffstat (limited to 'ext/ereg/regex/regexec.c')
0 files changed, 0 insertions, 0 deletions