Skip to content

Commit 842e408

Browse files
committed
Don't copy mime types in CLI server
This is both unnecessary and causes leaks in valgrind.
1 parent 3c5e6b2 commit 842e408

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

sapi/cli/php_cli_server.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,12 +2149,8 @@ static int php_cli_server_mime_type_ctor(php_cli_server *server, const php_cli_s
21492149
zend_hash_init(&server->extension_mime_types, 0, NULL, NULL, 1);
21502150

21512151
for (pair = mime_type_map; pair->ext; pair++) {
2152-
size_t ext_len = 0, mime_type_len = 0;
2153-
2154-
ext_len = strlen(pair->ext);
2155-
mime_type_len = strlen(pair->mime_type);
2156-
2157-
zend_hash_str_add_mem(&server->extension_mime_types, pair->ext, ext_len, (void*)pair->mime_type, mime_type_len + 1);
2152+
size_t ext_len = strlen(pair->ext);
2153+
zend_hash_str_add_ptr(&server->extension_mime_types, pair->ext, ext_len, (void*)pair->mime_type);
21582154
}
21592155

21602156
return SUCCESS;

0 commit comments

Comments
 (0)