diff options
| author | Nikita Popov <nikic@php.net> | 2016-08-09 15:35:04 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-08-09 15:35:04 +0200 |
| commit | 2fbfa7f62ee7d42e25d96b640ec722e9fd4901f3 (patch) | |
| tree | 30cbbdbc7adbce1372c024f866c658ff2644c5aa /sapi/cli/php_cli_server.c | |
| parent | b50a4a485a4ad095e49711d0fb0946f7c0cb7767 (diff) | |
| parent | 842e408c67d5618b90c688b2ee7a5100ab031535 (diff) | |
| download | php-git-2fbfa7f62ee7d42e25d96b640ec722e9fd4901f3.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 21bceaf67e..7ae6c6f1a4 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -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; |