Add http_(get|clear)_last_reponse_headers() functions

This is to provide an alternative to the $http_response_header magic variable

Author: Girgias

ext/standard/basic_functions.c

@@ -419,6 +419,9 @@ PHP_RINIT_FUNCTION(basic) /* {{{ */
 	BASIC_RINIT_SUBMODULE(dir)
 	BASIC_RINIT_SUBMODULE(url_scanner_ex)
 
+	/* Initialize memory for last http headers */
+	ZVAL_UNDEF(&BG(last_http_headers));
+
 	/* Setup default context */
 	FG(default_context) = NULL;
 
@@ -483,6 +486,9 @@ PHP_RSHUTDOWN_FUNCTION(basic) /* {{{ */
 	BASIC_RSHUTDOWN_SUBMODULE(user_filters)
 	BASIC_RSHUTDOWN_SUBMODULE(browscap)
 
+	/* Free last http headers */
+	zval_ptr_dtor(&BG(last_http_headers));
+
 	BG(page_uid) = -1;
 	BG(page_gid) = -1;
 	return SUCCESS;

ext/standard/basic_functions.h

@@ -73,6 +73,9 @@ typedef struct _php_basic_globals {
 
 	zval active_ini_file_section;
 
+	/* http_fopen_wrapper.c */
+	zval last_http_headers;
+
 	/* pageinfo.c */
 	zend_long page_uid;
 	zend_long page_gid;

ext/standard/basic_functions.stub.php

@@ -2991,6 +2991,10 @@ function pfsockopen(string $hostname, int $port = -1, &$error_code = null, &$err
 /** @refcount 1 */
 function http_build_query(array|object $data, string $numeric_prefix = "", ?string $arg_separator = null, int $encoding_type = PHP_QUERY_RFC1738): string {}
 
+function http_get_last_response_headers(): ?array {}
+
+function http_clear_last_response_headers(): void {}
+
 /* image.c */
 
 /**

ext/standard/basic_functions_arginfo.h

@@ -17,6 +17,7 @@
 #include "php_http.h"
 #include "php_ini.h"
 #include "url.h"
+#include "basic_functions.h"
 
 static void php_url_encode_scalar(zval *scalar, smart_str *form_str,
 	int encoding_type, zend_ulong index_int,
@@ -235,3 +236,20 @@ PHP_FUNCTION(http_build_query)
 	RETURN_STR(smart_str_extract(&formstr));
 }
 /* }}} */
+
+PHP_FUNCTION(http_get_last_response_headers)
+{
+	zend_parse_parameters_none();
+
+	if (!Z_ISUNDEF(BG(last_http_headers))) {
+		ZVAL_COPY(return_value, &BG(last_http_headers));
+	}
+}
+
+PHP_FUNCTION(http_clear_last_response_headers)
+{
+	zend_parse_parameters_none();
+
+	zval_ptr_dtor(&BG(last_http_headers));
+	ZVAL_UNDEF(&BG(last_http_headers));
+}

ext/standard/http.c

@@ -982,13 +982,19 @@ php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, const char *pa
 {
 	php_stream *stream;
 	zval headers;
+
 	ZVAL_UNDEF(&headers);
 
+	zval_ptr_dtor(&BG(last_http_headers));
+	ZVAL_UNDEF(&BG(last_http_headers));
+
 	stream = php_stream_url_wrap_http_ex(
 		wrapper, path, mode, options, opened_path, context,
 		PHP_URL_REDIRECT_MAX, HTTP_WRAPPER_HEADER_INIT, &headers STREAMS_CC);
 
 	if (!Z_ISUNDEF(headers)) {
+		ZVAL_COPY(&BG(last_http_headers), &headers);
+
 		if (FAILURE == zend_set_local_var_str(
 				"http_response_header", sizeof("http_response_header")-1, &headers, 0)) {
 			zval_ptr_dtor(&headers);

ext/standard/http_fopen_wrapper.c

@@ -14,17 +14,27 @@ $responses = array(
 
 ['pid' => $pid, 'uri' => $uri] = http_server($responses, $output);
 
+var_dump(http_get_last_response_headers());
+
 var_dump(file_get_contents($uri));
 var_dump($http_response_header);
+var_dump(http_get_last_response_headers());
 
 http_server_kill($pid);
 
 ?>
 --EXPECT--
+NULL
 string(0) ""
 array(2) {
   [0]=>
   string(15) "HTTP/1.0 200 Ok"
   [1]=>
   string(14) "Content-Length"
 }
+array(2) {
+  [0]=>
+  string(15) "HTTP/1.0 200 Ok"
+  [1]=>
+  string(14) "Content-Length"
+}

ext/standard/tests/http/bug75535.phpt

@@ -23,14 +23,26 @@ $options = [
 
 $ctx = stream_context_create($options);
 
+var_dump(http_get_last_response_headers());
+
 $fd = fopen($uri, 'rb', false, $ctx);
 fclose($fd);
 var_dump($http_response_header);
+var_dump(http_get_last_response_headers());
 
 http_server_kill($pid);
 
 ?>
 --EXPECT--
+NULL
+array(3) {
+  [0]=>
+  string(32) "HTTP/1.1 101 Switching Protocols"
+  [1]=>
+  string(15) "Header1: Value1"
+  [2]=>
+  string(15) "Header2: Value2"
+}
 array(3) {
   [0]=>
   string(32) "HTTP/1.1 101 Switching Protocols"

ext/standard/tests/http/bug80838.phpt

@@ -16,21 +16,52 @@ $responses = array(
 ['pid' => $pid, 'uri' => $uri] = http_server($responses, $output);
 
 for ($i = 0; $i < count($responses); ++$i) {
+    echo 'http_get_last_response_headers() before stream layer call:', PHP_EOL;
+    var_dump(http_get_last_response_headers());
+
     $f = @fopen($uri, "r");
+    echo '$http_response_header', PHP_EOL;
     var_dump($http_response_header);
+    echo 'http_get_last_response_headers() after stream layer call:', PHP_EOL;
+    var_dump(http_get_last_response_headers());
     fclose($f);
 }
 
 http_server_kill($pid);
 
 ?>
 --EXPECT--
+http_get_last_response_headers() before stream layer call:
+NULL
+$http_response_header
+array(2) {
+  [0]=>
+  string(126) "HTTP/1.1 200 Some very long reason-phrase to test that this is properly handled by our code without adding a new header like  "
+  [1]=>
+  string(12) "Good: Header"
+}
+http_get_last_response_headers() after stream layer call:
 array(2) {
   [0]=>
   string(126) "HTTP/1.1 200 Some very long reason-phrase to test that this is properly handled by our code without adding a new header like  "
   [1]=>
   string(12) "Good: Header"
 }
+http_get_last_response_headers() before stream layer call:
+array(2) {
+  [0]=>
+  string(126) "HTTP/1.1 200 Some very long reason-phrase to test that this is properly handled by our code without adding a new header like  "
+  [1]=>
+  string(12) "Good: Header"
+}
+$http_response_header
+array(2) {
+  [0]=>
+  string(13) "HTTP/1.1 200 "
+  [1]=>
+  string(12) "Good: Header"
+}
+http_get_last_response_headers() after stream layer call:
 array(2) {
   [0]=>
   string(13) "HTTP/1.1 200 "

ext/standard/tests/http/gh9316.phpt

@@ -0,0 +1,38 @@
+--TEST--
+Verify that http_clear_last_response_headers() clears the headers.
+--SKIPIF--
+<?php require 'server.inc'; http_server_skipif(); ?>
+--INI--
+allow_url_fopen=1
+--FILE--
+<?php
+require 'server.inc';
+
+$responses = array(
+    "data://text/plain,HTTP/1.0 200 Ok\r\nSome: Header\r\nSome: Header\r\n\r\nBody",
+);
+
+['pid' => $pid, 'uri' => $uri] = http_server($responses, $output);
+
+$f = file_get_contents($uri);
+var_dump($f);
+var_dump(http_get_last_response_headers());
+
+// Clear headers
+http_clear_last_response_headers();
+var_dump(http_get_last_response_headers());
+
+http_server_kill($pid);
+
+?>
+--EXPECT--
+string(4) "Body"
+array(3) {
+  [0]=>
+  string(15) "HTTP/1.0 200 Ok"
+  [1]=>
+  string(12) "Some: Header"
+  [2]=>
+  string(12) "Some: Header"
+}
+NULL

ext/standard/tests/http/http_clear_last_response_headers.phpt

@@ -14,14 +14,18 @@ $responses = array(
 
 ['pid' => $pid, 'uri' => $uri] = http_server($responses, $output);
 
+var_dump(http_get_last_response_headers());
+
 $f = file_get_contents($uri);
 var_dump($f);
 var_dump($http_response_header);
+var_dump(http_get_last_response_headers());
 
 http_server_kill($pid);
 
 ?>
 --EXPECT--
+NULL
 string(4) "Body"
 array(3) {
   [0]=>
@@ -31,3 +35,11 @@ array(3) {
   [2]=>
   string(12) "Some: Header"
 }
+array(3) {
+  [0]=>
+  string(15) "HTTP/1.0 200 Ok"
+  [1]=>
+  string(12) "Some: Header"
+  [2]=>
+  string(12) "Some: Header"
+}

ext/standard/tests/http/http_response_header_01.phpt

@@ -16,14 +16,18 @@ $responses = array(
 
 ['pid' => $pid, 'uri' => $uri] = http_server($responses, $output);
 
+var_dump(http_get_last_response_headers());
+
 $f = file_get_contents($uri);
 var_dump($f);
 var_dump($http_response_header);
+var_dump(http_get_last_response_headers());
 
 http_server_kill($pid);
 
 ?>
 --EXPECT--
+NULL
 string(4) "Body"
 array(5) {
   [0]=>
@@ -37,3 +41,15 @@ array(5) {
   [4]=>
   string(12) "Some: Header"
 }
+array(5) {
+  [0]=>
+  string(18) "HTTP/1.0 302 Found"
+  [1]=>
+  string(12) "Some: Header"
+  [2]=>
+  string(20) "Location: /try-again"
+  [3]=>
+  string(15) "HTTP/1.0 200 Ok"
+  [4]=>
+  string(12) "Some: Header"
+}

ext/standard/tests/http/http_response_header_02.phpt

@@ -16,14 +16,19 @@ $responses = array(
 
 ['pid' => $pid, 'uri' => $uri] = http_server($responses, $output);
 
+var_dump(http_get_last_response_headers());
+
 $f = file_get_contents($uri);
 var_dump($f);
 var_dump($http_response_header);
+var_dump(http_get_last_response_headers());
 
 http_server_kill($pid);
 
 ?>
 --EXPECTF--
+NULL
+
 Warning: file_get_contents(http://%s:%d): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found%a
 bool(false)
 array(5) {
@@ -38,3 +43,15 @@ array(5) {
   [4]=>
   string(12) "Some: Header"
 }
+array(5) {
+  [0]=>
+  string(18) "HTTP/1.0 302 Found"
+  [1]=>
+  string(12) "Some: Header"
+  [2]=>
+  string(20) "Location: /try-again"
+  [3]=>
+  string(22) "HTTP/1.0 404 Not Found"
+  [4]=>
+  string(12) "Some: Header"
+}