diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2014-07-12 15:09:47 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2014-07-12 15:09:47 +0800 |
| commit | 4e3d9a52ac5f51052e90e5ff5a82f098beddd8ab (patch) | |
| tree | 3e554b340ab1a72fecef5356f238d546f6901a2f /sapi/cli/php_cli_server.c | |
| parent | c3f5e2a1f9d309fdb684ea0e4ac40d881435fde9 (diff) | |
| parent | 7a5323778ddbee3b65a079d5724f5419e7ec47b2 (diff) | |
| download | php-git-4e3d9a52ac5f51052e90e5ff5a82f098beddd8ab.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 9239f6a02c..f333addafd 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -1685,10 +1685,14 @@ static int php_cli_server_client_read_request_on_header_value(php_http_parser *p return 1; } { - char *header_name = zend_str_tolower_dup(client->current_header_name, client->current_header_name_len); - zend_hash_add(&client->request.headers, header_name, client->current_header_name_len + 1, &value, sizeof(char *), NULL); - zend_hash_add(&client->request.headers_original_case, client->current_header_name, client->current_header_name_len + 1, &value, sizeof(char *), NULL); - efree(header_name); + /* strip off the colon */ + char *orig_header_name = estrndup(client->current_header_name, client->current_header_name_len); + char *lc_header_name = zend_str_tolower_dup(client->current_header_name, client->current_header_name_len); + + zend_hash_add(&client->request.headers, lc_header_name, client->current_header_name_len + 1, &value, sizeof(char *), NULL); + zend_hash_add(&client->request.headers_original_case, orig_header_name, client->current_header_name_len + 1, &value, sizeof(char *), NULL); + efree(lc_header_name); + efree(orig_header_name); } if (client->current_header_name_allocated) { |