summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-08-04 16:33:07 -0700
committerStanislav Malyshev <stas@php.net>2015-08-04 16:33:07 -0700
commit7b6dd533ba285740671642cfbb7872e6ec46b6cb (patch)
tree1cc823f7188a7f74540dabfe70a24c8c6d1f6587 /sapi/cli/php_cli_server.c
parent54daa5317f8af16ca7a14ae7a66c00ddd87a6e70 (diff)
parenteb7ba73079b73ca4ef91307ae1ef30b43468717b (diff)
downloadphp-git-7b6dd533ba285740671642cfbb7872e6ec46b6cb.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: virtual_file_ex uses emalloc in 5.6+
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions