Actually have the variable on the oparray context rather than the CG context

Author: Girgias

Zend/zend_compile.c

@@ -339,7 +339,7 @@ void zend_oparray_context_begin(zend_oparray_context *prev_context, zend_op_arra
 	CG(context).try_catch_offset = -1;
 	CG(context).current_brk_cont = -1;
 	CG(context).last_brk_cont = 0;
-	CG(has_assigned_to_http_response_header) = false;
+	CG(context).has_assigned_to_http_response_header = false;
 	CG(context).brk_cont_array = NULL;
 	CG(context).labels = NULL;
 	CG(context).in_jmp_frameless_branch = false;
@@ -2885,13 +2885,13 @@ static zend_result zend_try_compile_cv(znode *result, zend_ast *ast, uint32_t ty
 			return FAILURE;
 		}
 
-		if (!CG(has_assigned_to_http_response_header) && zend_string_equals_literal(name, "http_response_header")) {
+		if (!CG(context).has_assigned_to_http_response_header && zend_string_equals_literal(name, "http_response_header")) {
 			if (type == BP_VAR_R) {
 				zend_error(E_DEPRECATED,
 					"The predefined locally scoped $http_response_header variable is deprecated,"
 					" call http_get_last_response_headers() instead");
 			} else if (type == BP_VAR_W) {
-				CG(has_assigned_to_http_response_header) = true;
+				CG(context).has_assigned_to_http_response_header = true;
 			}
 		}
 

Zend/zend_compile.h

@@ -208,6 +208,7 @@ typedef struct _zend_oparray_context {
 	zend_string *active_property_info_name;
 	zend_property_hook_kind active_property_hook_kind;
 	bool       in_jmp_frameless_branch;
+	bool has_assigned_to_http_response_header;
 } zend_oparray_context;
 
 /* Class, property and method flags                  class|meth.|prop.|const*/

Zend/zend_globals.h

@@ -106,8 +106,6 @@ struct _zend_compiler_globals {
 
 	bool ini_parser_unbuffered_errors;
 
-	bool has_assigned_to_http_response_header;
-
 	zend_llist open_files;
 
 	struct _zend_ini_parser_param *ini_parser_param;

ext/standard/tests/http/http_response_header_deprecated_multiple_op_arrays.phpt

@@ -1,7 +1,5 @@
 --TEST--
 $http_reponse_header should warn once per oparray
---INI--
-allow_url_fopen=1
 --FILE--
 <?php
 

ext/standard/tests/http/http_response_header_deprecated_nested_op_arrays.phpt

@@ -0,0 +1,16 @@
+--TEST--
+$http_reponse_header should warn once per oparray even if nested
+--FILE--
+<?php
+
+function foo() {
+    $http_response_header = "foo";
+    function nested() {
+        echo $http_response_header;
+    }
+    echo $http_response_header;
+}
+
+?>
+--EXPECTF--
+Deprecated: The predefined locally scoped $http_response_header variable is deprecated, call http_get_last_response_headers() instead in %s on line 6