Merge branch 'v2.6.x'
authorMichael Wallner <mike@php.net>
Wed, 14 Sep 2016 10:56:01 +0000 (12:56 +0200)
committerMichael Wallner <mike@php.net>
Wed, 14 Sep 2016 10:56:01 +0000 (12:56 +0200)
1  2 
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));