summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2013-08-30 05:40:24 -0700
committerChristopher Jones <sixd@php.net>2013-08-30 05:40:24 -0700
commitbfb1fe10cbe2a72678809e102231995db1a7b424 (patch)
tree4df373fddc38db8f78db498c11abec25dae1a820 /sapi/cli/php_cli_server.c
parent5bff1286b626aff4ebadf74dd55e111a580da90e (diff)
parentd69513afecf3d82c6bfba35ef1634b3b7c377d87 (diff)
downloadphp-git-bfb1fe10cbe2a72678809e102231995db1a7b424.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 #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions