diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-10-12 23:26:15 -0700 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-10-14 01:58:48 +0200 |
| commit | 177e6adca7349bf97c3c543fd0aea577583129cb (patch) | |
| tree | 7c46a5dfa3ea1e2f626d7d607d94f8147e29bde7 /sapi/phpdbg/phpdbg_prompt.c | |
| parent | 94b7ab185c589c61b16a172376c386ad82ae7be7 (diff) | |
| download | php-git-177e6adca7349bf97c3c543fd0aea577583129cb.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix outlen for openssl function
Syncronize with 5.6 - __toString should return ""
Fix potential overflows in php_pcre_replace_impl
(cherry picked from commit ff75665663045a96d6f182e24283e6bebb8537fa)
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
0 files changed, 0 insertions, 0 deletions