]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 30b4a32 436ba1c)
Merge branch 'PHP-5.6'
authorYasuo Ohgaki <yohgaki@php.net>
Tue, 3 Feb 2015 10:00:13 +0000 (19:00 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Tue, 3 Feb 2015 10:00:13 +0000 (19:00 +0900)
commitfeef180e6c7eef8f7345d1a823d62e219e6b35e3
tree46ade3b3fb224e377c45ac104e257e6e49a5f234tree | snapshot
parent30b4a32e09a0bc142ecd7002f0a6eba710a4e997commit | diff
parent436ba1c4886024278337a8fe446c05a0629e4215commit | diff
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
main/main.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.