]> granicus.if.org Git - php/commitdiff
Don't copy mime types in CLI server
authorNikita Popov <nikic@php.net>
Tue, 9 Aug 2016 13:33:15 +0000 (15:33 +0200)
committerNikita Popov <nikic@php.net>
Tue, 9 Aug 2016 13:34:03 +0000 (15:34 +0200)
This is both unnecessary and causes leaks in valgrind.

sapi/cli/php_cli_server.c

index b9c1f342ca56ae673ec37d9790357a162c30f693..de487b66e43328c66a8e4ec53235294ba9ce4d8d 100644 (file)
@@ -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;