summaryrefslogtreecommitdiff
path: root/ext/standard/http_fopen_wrapper.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-04-12 23:49:16 -0700
committerStanislav Malyshev <stas@php.net>2015-04-12 23:49:16 -0700
commitba15e8dfd0bbe65fd7022f55cf5bdaca413d96e4 (patch)
treeb2dd8e35ab20929e2bbab13c119f5d3d208b80b3 /ext/standard/http_fopen_wrapper.c
parented7d4977bb0e99153c67d2873488b8f572627c8a (diff)
parent45facd15fb1be704ee1ae374fa306dad8450edbd (diff)
downloadphp-git-ba15e8dfd0bbe65fd7022f55cf5bdaca413d96e4.tar.gz
Merge branch 'PHP-5.4.40' into PHP-5.5.24
* PHP-5.4.40: fix memory leak & add test Fix tests
Diffstat (limited to 'ext/standard/http_fopen_wrapper.c')
-rw-r--r--ext/standard/http_fopen_wrapper.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index 3a53ae462e..95f9cb5c84 100644
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -922,8 +922,13 @@ out:
if (transfer_encoding) {
php_stream_filter_append(&stream->readfilters, transfer_encoding);
}
- } else if (transfer_encoding) {
- php_stream_filter_free(transfer_encoding TSRMLS_CC);
+ } else {
+ if(response_header) {
+ Z_DELREF_P(response_header);
+ }
+ if (transfer_encoding) {
+ php_stream_filter_free(transfer_encoding TSRMLS_CC);
+ }
}
return stream;