diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2014-09-09 10:24:40 -0600 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2014-09-09 10:24:40 -0600 |
| commit | edb27993336545409d73335f3ac96d5895be13de (patch) | |
| tree | eed473462b670c38ecc5812e119e3c5ecbd9bcc4 /ext/ereg/regex/regexec.c | |
| parent | da7c87e2f873b7ef6f9f97b5e2cce8a34589a507 (diff) | |
| parent | bf2f80b22356cd93748dd7551dfa0b54fb53e5b5 (diff) | |
| download | php-git-edb27993336545409d73335f3ac96d5895be13de.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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