From: Michael Wallner <mike@php.net>
Date: Wed, 14 Sep 2016 10:56:01 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0_RC1~25
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=b41323e1817c50d062b27da798c7db35fa58212c;p=m6w6%2Fext-http

Merge branch 'v2.6.x'
---

b41323e1817c50d062b27da798c7db35fa58212c
diff --cc src/php_http_encoding.c
index db364b3,b5094ee..83d1794
--- a/src/php_http_encoding.c
+++ b/src/php_http_encoding.c
@@@ -261,11 -262,12 +261,10 @@@ php_http_encoding_stream_t *php_http_en
  
  php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stream_t *from, php_http_encoding_stream_t *to)
  {
 -	TSRMLS_FETCH_FROM_CTX(from->ts);
 -
  	if (from->ops->copy) {
- 		int freeme;
  		php_http_encoding_stream_t *ns;
  
- 		if ((freeme = !to)) {
+ 		if (!to) {
  			to = pemalloc(sizeof(*to), (from->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT));
  		}
  		memset(to, 0, sizeof(*to));