com php-src: Don't copy mime types in CLI server: sapi/cli/php _cli_server.c
| From: | Nikita Popov | Date: | Tue, 09 Aug 2016 13:34:03 +0000 |
| Subject: | com php-src: Don't copy mime types in CLI server: sapi/cli/php _cli_server.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93689@lists.php.net to get a copy of this message | ||
Commit: 842e408c67d5618b90c688b2ee7a5100ab031535
Author: Nikita Popov <nikic@php.net> Tue, 9 Aug 2016 15:33:15 +0200
Parents: 3c5e6b29ce0e0f495a96c7878b23ca00a34c44d7
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=842e408c67d5618b90c688b2ee7a5100ab031535
Log:
Don't copy mime types in CLI server
This is both unnecessary and causes leaks in valgrind.
Changed paths:
M sapi/cli/php_cli_server.c
Diff:
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index b9c1f34..de487b6 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;