summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2013-08-29 05:40:23 -0700
committerChristopher Jones <sixd@php.net>2013-08-29 05:40:23 -0700
commit5bff1286b626aff4ebadf74dd55e111a580da90e (patch)
tree56dd613af044ab9ef6f39ed02cb464fbb36e3f79 /sapi/cli/php_cli_server.c
parent1fdcc705a4bc3a9d42a32c5f1ee1ce6b5d3ce428 (diff)
parentdfc6feb6e84f27094e6a2e3947caa094f7c35d26 (diff)
downloadphp-git-5bff1286b626aff4ebadf74dd55e111a580da90e.tar.gz
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src: Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien) Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien) Avoid compiler warning Fix bug #65579 (Using traits with get_class_methods causes segfault).
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions