summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2013-08-30 05:40:30 -0700
committerChristopher Jones <sixd@php.net>2013-08-30 05:40:30 -0700
commitc8b0da6ef74100b476379ba40367c30564da6582 (patch)
treefe980c5613a78b1861e37ce7c71b7cdbcbc33329 /sapi/cli/php_cli_server.c
parenta4ff610e1c140b555d3cb2a7646e8ddfcb6420a7 (diff)
parent6fab1caa4100cf05fcf485ef0917830ae9f57563 (diff)
downloadphp-git-c8b0da6ef74100b476379ba40367c30564da6582.tar.gz
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src: Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer Update NEWS 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