projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
f6a612b
)
followup on #44
author
Michael Wallner
<mike@php.net>
Sat, 11 Jun 2016 06:58:40 +0000
(08:58 +0200)
committer
Michael Wallner
<mike@php.net>
Sat, 11 Jun 2016 06:58:40 +0000
(08:58 +0200)
src/php_http_client_curl.c
patch
|
blob
|
history
diff --git
a/src/php_http_client_curl.c
b/src/php_http_client_curl.c
index 18eb944708b7d74b562966a9f4fed1b0e6552aac..423e12e3c6214c3e5f034e8b5e4c5e375f7dbc4a 100644
(file)
--- a/
src/php_http_client_curl.c
+++ b/
src/php_http_client_curl.c
@@
-625,7
+625,7
@@
static php_http_message_t *php_http_curlm_responseparser(php_http_client_curl_ha
{
php_http_message_t *response;
php_http_header_parser_t parser;
{
php_http_message_t *response;
php_http_header_parser_t parser;
- zval *zh;
+ zval *zh
, tmp
;
response = php_http_message_init(NULL, 0, h->response.body);
php_http_header_parser_init(&parser);
response = php_http_message_init(NULL, 0, h->response.body);
php_http_header_parser_init(&parser);
@@
-654,23
+654,23
@@
static php_http_message_t *php_http_curlm_responseparser(php_http_client_curl_ha
/* let's update the response headers */
if ((zh = php_http_message_header(response, ZEND_STRL("Content-Length")))) {
/* let's update the response headers */
if ((zh = php_http_message_header(response, ZEND_STRL("Content-Length")))) {
- Z
_TRY_ADDREF_P(
zh);
- zend_hash_str_update(&response->hdrs, "X-Original-Content-Length", lenof("X-Original-Content-Length"),
zh
);
+ Z
VAL_COPY(&tmp,
zh);
+ zend_hash_str_update(&response->hdrs, "X-Original-Content-Length", lenof("X-Original-Content-Length"),
&tmp
);
}
if ((zh = php_http_message_header(response, ZEND_STRL("Transfer-Encoding")))) {
}
if ((zh = php_http_message_header(response, ZEND_STRL("Transfer-Encoding")))) {
- Z_TRY_ADDREF_P(zh);
- zend_hash_str_update(&response->hdrs, "X-Original-Transfer-Encoding", lenof("X-Original-Transfer-Encoding"), zh);
+ ZVAL_COPY(&tmp, zh);
zend_hash_str_del(&response->hdrs, "Transfer-Encoding", lenof("Transfer-Encoding"));
zend_hash_str_del(&response->hdrs, "Transfer-Encoding", lenof("Transfer-Encoding"));
+ zend_hash_str_update(&response->hdrs, "X-Original-Transfer-Encoding", lenof("X-Original-Transfer-Encoding"), &tmp);
}
if ((zh = php_http_message_header(response, ZEND_STRL("Content-Range")))) {
}
if ((zh = php_http_message_header(response, ZEND_STRL("Content-Range")))) {
- Z_TRY_ADDREF_P(zh);
- zend_hash_str_update(&response->hdrs, "X-Original-Content-Range", lenof("X-Original-Content-Range"), zh);
+ ZVAL_COPY(&tmp, zh);
zend_hash_str_del(&response->hdrs, "Content-Range", lenof("Content-Range"));
zend_hash_str_del(&response->hdrs, "Content-Range", lenof("Content-Range"));
+ zend_hash_str_update(&response->hdrs, "X-Original-Content-Range", lenof("X-Original-Content-Range"), &tmp);
}
if ((zh = php_http_message_header(response, ZEND_STRL("Content-Encoding")))) {
}
if ((zh = php_http_message_header(response, ZEND_STRL("Content-Encoding")))) {
- Z_TRY_ADDREF_P(zh);
- zend_hash_str_update(&response->hdrs, "X-Original-Content-Encoding", lenof("X-Original-Content-Encoding"), zh);
+ ZVAL_COPY(&tmp, zh);
zend_hash_str_del(&response->hdrs, "Content-Encoding", lenof("Content-Encoding"));
zend_hash_str_del(&response->hdrs, "Content-Encoding", lenof("Content-Encoding"));
+ zend_hash_str_update(&response->hdrs, "X-Original-Content-Encoding", lenof("X-Original-Content-Encoding"), &tmp);
}
php_http_message_update_headers(response);
}
php_http_message_update_headers(response);