diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-08-13 14:28:16 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-08-13 14:28:16 +0200 |
| commit | 1ec40e84d4ca1c36459012c1dee70da9753179c6 (patch) | |
| tree | b4f1b027de72b7f4ca527883b78c87f181e38b1e /ext/zip/php_zip.c | |
| parent | 715d5d2855a0c6946ac99f1631a4dd9168b0cbfe (diff) | |
| parent | cd18ba117cd3d32b760aa7e16a78947aa91e254a (diff) | |
| download | php-git-1ec40e84d4ca1c36459012c1dee70da9753179c6.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #70232: Incorrect bump-along behavior with \K and empty string match
Resolved conflicts:
ext/pcre/php_pcre.c
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions