diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-05-28 16:27:12 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-05-28 16:27:12 +0300 |
| commit | 5eb1f92f31cafc48384f9096012f421b37f6d425 (patch) | |
| tree | 4ed67b92229407e7b5cbab37b96428fe80eb3f94 /sapi/cli/php_cli_server.c | |
| parent | 925f05dd1a35eafa71eb29abb69cdfc31a23a75d (diff) | |
| download | php-git-5eb1f92f31cafc48384f9096012f421b37f6d425.tar.gz | |
Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence.
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 6fa1f4d1bb..fef1aa400d 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -360,7 +360,7 @@ static void append_essential_headers(smart_str* buffer, php_cli_server_client *c smart_str_appendl_ex(buffer, "Date: ", 6, persistent); smart_str_appends_ex(buffer, dt->val, persistent); smart_str_appendl_ex(buffer, "\r\n", 2, persistent); - zend_string_release(dt); + zend_string_release_ex(dt, 0); } smart_str_appendl_ex(buffer, "Connection: close\r\n", sizeof("Connection: close\r\n") - 1, persistent); @@ -1580,8 +1580,8 @@ static void php_cli_server_client_save_header(php_cli_server_client *client) GC_MAKE_PERSISTENT_LOCAL(lc_header_name); zend_hash_add_ptr(&client->request.headers, lc_header_name, client->current_header_value); zend_hash_add_ptr(&client->request.headers_original_case, orig_header_name, client->current_header_value); - zend_string_release(lc_header_name); - zend_string_release(orig_header_name); + zend_string_release_ex(lc_header_name, 1); + zend_string_release_ex(orig_header_name, 1); if (client->current_header_name_allocated) { pefree(client->current_header_name, 1); @@ -1835,7 +1835,7 @@ static int php_cli_server_client_ctor(php_cli_server_client *client, php_cli_ser php_network_populate_name_from_sockaddr(addr, addr_len, &addr_str, NULL, 0); client->addr_str = pestrndup(ZSTR_VAL(addr_str), ZSTR_LEN(addr_str), 1); client->addr_str_len = ZSTR_LEN(addr_str); - zend_string_release(addr_str); + zend_string_release_ex(addr_str, 0); } php_http_parser_init(&client->parser, PHP_HTTP_REQUEST); client->request_read = 0; @@ -1951,7 +1951,7 @@ static int php_cli_server_send_error_page(php_cli_server *server, php_cli_server chunk = php_cli_server_chunk_heap_new(buffer.s, ZSTR_VAL(buffer.s), ZSTR_LEN(buffer.s)); if (!chunk) { - smart_str_free(&buffer); + smart_str_free_ex(&buffer, 1); goto fail; } php_cli_server_buffer_prepend(&client->content_sender.buffer, chunk); @@ -2055,7 +2055,7 @@ static int php_cli_server_begin_send_static(php_cli_server *server, php_cli_serv smart_str_appendl_ex(&buffer, "\r\n", 2, 1); chunk = php_cli_server_chunk_heap_new(buffer.s, ZSTR_VAL(buffer.s), ZSTR_LEN(buffer.s)); if (!chunk) { - smart_str_free(&buffer); + smart_str_free_ex(&buffer, 1); php_cli_server_log_response(client, 500, NULL); return FAILURE; } @@ -2291,7 +2291,7 @@ static int php_cli_server_ctor(php_cli_server *server, const char *addr, const c if (server_sock == SOCK_ERR) { php_cli_server_logf("Failed to listen on %s:%d (reason: %s)", host, port, errstr ? ZSTR_VAL(errstr) : "?"); if (errstr) { - zend_string_release(errstr); + zend_string_release_ex(errstr, 0); } retval = FAILURE; goto out; |