diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2015-02-03 19:00:13 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2015-02-03 19:00:13 +0900 |
| commit | feef180e6c7eef8f7345d1a823d62e219e6b35e3 (patch) | |
| tree | 46ade3b3fb224e377c45ac104e257e6e49a5f234 /sapi/phpdbg/phpdbg.c | |
| parent | 30b4a32e09a0bc142ecd7002f0a6eba710a4e997 (diff) | |
| parent | 436ba1c4886024278337a8fe446c05a0629e4215 (diff) | |
| download | php-git-feef180e6c7eef8f7345d1a823d62e219e6b35e3.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed Bug #67988 htmlspecialchars() does not respect default_charset specified by ini_set.
Conflicts:
main/main.c
tests/basic/encoding.phpt
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
0 files changed, 0 insertions, 0 deletions