Merge branch 'v2.6.x'

diff --cc src/php_http_encoding.c
index db364b3858e3273d339696bf89c5fe16ea317388,b5094eea1ac91f16fceeb0cab955641fa9ea790f..83d17947790c106abfc8702f3ac975d8aa5b15ba
--- 1/src/php_http_encoding.c
--- 2/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));