archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0' into PHP-7.1

Browse source
This commit is contained in:
Nikita Popov 2016-08-09 15:35:04 +02:00
commit 2fbfa7f62e
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sapi/cli/php_cli_server.c
View file

@ -2167,12 +2167,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;