diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-11-27 00:18:54 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-11-27 00:18:54 -0800 |
| commit | 22ad8e1b1a8e12b70b0560cc89c6419f00c86708 (patch) | |
| tree | 9d9b010d6d252d5bc7a5cf472f58ce3c5369d7e1 /ext/pcre/php_pcre.c | |
| parent | 834eaae52d4aba7c7e92c87f424e73bff8bd711e (diff) | |
| parent | 5cd8ff9885e041e8bb31bd86f44183ed2aeecfde (diff) | |
| download | php-git-22ad8e1b1a8e12b70b0560cc89c6419f00c86708.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.4.24-dev now
merge fix
add test
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
Diffstat (limited to 'ext/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions