diff options
author | Christopher Jones <sixd@php.net> | 2013-08-14 20:43:25 -0700 |
---|---|---|
committer | Christopher Jones <sixd@php.net> | 2013-08-14 20:43:25 -0700 |
commit | 39612afc72623e89a2bc595c9be4be497568d1be (patch) | |
tree | ba336742c4b5ad3d4c8933748b91332f7436aa66 /sapi/cli/php_cli_server.c | |
parent | 8c61758dc772345636e436e3f69bef7323f8b339 (diff) | |
parent | 9ad97cd48903ea5454853960f2c14de326e0f624 (diff) | |
download | php-git-39612afc72623e89a2bc595c9be4be497568d1be.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/dba/libinifile/inifile.c
Diffstat (limited to 'sapi/cli/php_cli_server.c')
-rw-r--r-- | sapi/cli/php_cli_server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index a1bae67e74..cbe9c7bd66 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -1335,7 +1335,7 @@ static void php_cli_server_request_translate_vpath(php_cli_server_request *reque static const char *index_files[] = { "index.php", "index.html", NULL }; char *buf = safe_pemalloc(1, request->vpath_len, 1 + document_root_len + 1 + sizeof("index.html"), 1); char *p = buf, *prev_path = NULL, *q, *vpath; - size_t prev_path_len; + size_t prev_path_len = 0; int is_static_file = 0; if (!buf) { |