From 842e408c67d5618b90c688b2ee7a5100ab031535 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 9 Aug 2016 15:33:15 +0200 Subject: Don't copy mime types in CLI server This is both unnecessary and causes leaks in valgrind. --- sapi/cli/php_cli_server.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'sapi/cli/php_cli_server.c') diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index b9c1f342ca..de487b66e4 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -2149,12 +2149,8 @@ static int php_cli_server_mime_type_ctor(php_cli_server *server, const php_cli_s zend_hash_init(&server->extension_mime_types, 0, NULL, NULL, 1); for (pair = mime_type_map; pair->ext; pair++) { - size_t ext_len = 0, mime_type_len = 0; - - ext_len = strlen(pair->ext); - mime_type_len = strlen(pair->mime_type); - - zend_hash_str_add_mem(&server->extension_mime_types, pair->ext, ext_len, (void*)pair->mime_type, mime_type_len + 1); + size_t ext_len = strlen(pair->ext); + zend_hash_str_add_ptr(&server->extension_mime_types, pair->ext, ext_len, (void*)pair->mime_type); } return SUCCESS; -- cgit v1.2.1