From: Nikita Popov <nikic@php.net>
Date: Sat, 7 Jan 2017 23:02:33 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac469091629e0d5ebc5c1a491122ce50f5729391;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

ac469091629e0d5ebc5c1a491122ce50f5729391
diff --cc ext/standard/http_fopen_wrapper.c
index a9adcc7228,1822566a21..32f06c0750
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@@ -120,7 -120,8 +120,6 @@@ php_stream *php_stream_url_wrap_http_ex
  	zend_string *tmp = NULL;
  	char *ua_str = NULL;
  	zval *ua_zval = NULL, *tmpzval = NULL, ssl_proxy_peer_name;
- 	int body = 0;
 -	size_t scratch_len = 0;
  	char location[HTTP_HEADER_BLOCK_SIZE];
  	zval response_header;
  	int reqok = 0;