diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-10-12 23:26:15 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-10-12 23:26:15 -0700 |
| commit | ff75665663045a96d6f182e24283e6bebb8537fa (patch) | |
| tree | f6ae4861581e041a5e618da5f70079630077edf3 /sapi/phpdbg/phpdbg_prompt.c | |
| parent | 47e21eb5177dae5a02fa397a79bd4bf0b778cd6e (diff) | |
| parent | cd8c9b06149dc7dc0415524f1d74880fd6f2d25c (diff) | |
| download | php-git-ff75665663045a96d6f182e24283e6bebb8537fa.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
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
0 files changed, 0 insertions, 0 deletions