[pull] master from php:master

NEWS

@@ -24,6 +24,7 @@ PHP                                                                        NEWS
 - Intl:
   . Fixed grammatical issues in Normalizer invalid form and IntlCalendar time
     zone offset error messages. (Weilin Du)
+  . Removed the dependency on the ICU IO library. (Weilin Du)
 
 - ODBC:
   . Fixed bug GH-22668 (Heap buffer over-read when a column value exceeds the

build/php.m4

@@ -1804,15 +1804,15 @@ dnl
 dnl Common setup macro for ICU.
 dnl
 AC_DEFUN([PHP_SETUP_ICU],[
-  PKG_CHECK_MODULES([ICU], [icu-uc >= 57.1 icu-io icu-i18n])
+  PKG_CHECK_MODULES([ICU], [icu-uc >= 57.1 icu-i18n])
 
   PHP_EVAL_INCLINE([$ICU_CFLAGS])
   PHP_EVAL_LIBLINE([$ICU_LIBS], [$1])
 
   ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
   ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit"
 
-  AS_IF([$PKG_CONFIG icu-io --atleast-version=60],
+  AS_IF([$PKG_CONFIG icu-uc --atleast-version=60],
     [ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"])
 ])
 

ext/intl/config.w32

@@ -5,7 +5,6 @@ ARG_ENABLE("intl", "Enable internationalization support", "no");
 if (PHP_INTL != "no") {
 	if (CHECK_LIB("icudt.lib", "intl", PHP_INTL) &&
 		CHECK_LIB("icuin.lib", "intl", PHP_INTL) &&
-		CHECK_LIB("icuio.lib", "intl", PHP_INTL) &&
 		CHECK_LIB("icuuc.lib", "intl", PHP_INTL) &&
 					CHECK_HEADER("unicode/utf.h", "CFLAGS_INTL")) {
 		// always build as shared - zend_strtod.c/ICU type conflict

ext/intl/msgformat/msgformat_helpers.cpp

@@ -21,7 +21,6 @@
 #include <limits.h>
 #include <unicode/msgfmt.h>
 #include <unicode/chariter.h>
-#include <unicode/ustdio.h>
 #include <unicode/timezone.h>
 #include <unicode/datefmt.h>
 #include <unicode/calendar.h>
@@ -407,9 +406,9 @@ U_CFUNC void umsg_format_helper(MessageFormatter_object *mfo,
 				continue;
 			}
 
-		   UChar temp[16];
-		   const int32_t len = u_sprintf(temp, "%u", (uint32_t)num_index);
-		   key.append(temp, len);
+		   char temp[16];
+		   const int32_t len = slprintf(temp, sizeof(temp), "%u", (uint32_t)num_index);
+		   key.append(UnicodeString(temp, len, US_INV));
 
 		   storedArgType = (Formattable::Type*)zend_hash_index_find_ptr(types, num_index);
 		} else { //string; assumed to be in UTF-8

main/SAPI.c

@@ -111,51 +111,25 @@ PHP_FUNCTION(header_register_callback)
 	zend_fcall_info fci;
 	zend_fcall_info_cache fcc;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "f", &fci, &fcc) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "F", &fci, &fcc) == FAILURE) {
 		RETURN_THROWS();
 	}
 
-	if (Z_TYPE(SG(callback_func)) != IS_UNDEF) {
-		zval_ptr_dtor(&SG(callback_func));
-		SG(fci_cache) = empty_fcall_info_cache;
+	if (ZEND_FCC_INITIALIZED(SG(send_header_fcc))) {
+		zend_fcc_dtor(&SG(send_header_fcc));
 	}
 
 	/* Don't store callback if headers have already been sent:
 	 * It won't get used and we won't have a chance to release it. */
-	if (!SG(headers_sent)) {
-		ZVAL_COPY(&SG(callback_func), &fci.function_name);
+	if (UNEXPECTED(SG(headers_sent))) {
+		zend_release_fcall_info_cache(&fcc);
+	} else {
+		zend_fcc_dup(&SG(send_header_fcc), &fcc);
 	}
-
 	RETURN_TRUE;
 }
 /* }}} */
 
-static void sapi_run_header_callback(zval *callback)
-{
-	int   error;
-	zend_fcall_info fci;
-	char *callback_error = NULL;
-	zval retval;
-
-	if (zend_fcall_info_init(callback, 0, &fci, &SG(fci_cache), NULL, &callback_error) == SUCCESS) {
-		fci.retval = &retval;
-
-		error = zend_call_function(&fci, &SG(fci_cache));
-		if (error == FAILURE) {
-			goto callback_failed;
-		} else {
-			zval_ptr_dtor(&retval);
-		}
-	} else {
-callback_failed:
-		php_error_docref(NULL, E_WARNING, "Could not call the sapi_header_callback");
-	}
-
-	if (callback_error) {
-		efree(callback_error);
-	}
-}
-
 SAPI_API void sapi_handle_post(void *arg)
 {
 	if (SG(request_info).post_entry && SG(request_info).content_type_dup) {
@@ -436,7 +410,6 @@ SAPI_API void sapi_activate(void)
 	SG(sapi_headers).http_status_line = NULL;
 	SG(sapi_headers).mimetype = NULL;
 	SG(headers_sent) = 0;
-	ZVAL_UNDEF(&SG(callback_func));
 	SG(read_post_bytes) = 0;
 	SG(request_info).request_body = NULL;
 	SG(request_info).current_user = NULL;
@@ -446,6 +419,7 @@ SAPI_API void sapi_activate(void)
 	SG(request_info).proto_num = 1000; /* Default to HTTP 1.0 */
 	SG(global_request_time) = 0;
 	SG(post_read) = 0;
+	SG(send_header_fcc) = empty_fcall_info_cache;
 	/* It's possible to override this general case in the activate() callback, if necessary. */
 	if (SG(request_info).request_method && !strcmp(SG(request_info).request_method, "HEAD")) {
 		SG(request_info).headers_only = 1;
@@ -889,12 +863,12 @@ SAPI_API int sapi_send_headers(void)
 		SG(sapi_headers).send_default_content_type = 0;
 	}
 
-	if (Z_TYPE(SG(callback_func)) != IS_UNDEF) {
-		zval cb;
-		ZVAL_COPY_VALUE(&cb, &SG(callback_func));
-		ZVAL_UNDEF(&SG(callback_func));
-		sapi_run_header_callback(&cb);
-		zval_ptr_dtor(&cb);
+	if (ZEND_FCC_INITIALIZED(SG(send_header_fcc))) {
+		zend_fcall_info_cache fcc = SG(send_header_fcc);
+		/* Prevent triggering the callback multiple times */
+		SG(send_header_fcc) = empty_fcall_info_cache;
+		zend_call_known_fcc(&fcc, NULL, 0, NULL, NULL);
+		zend_fcc_dtor(&fcc);
 	}
 
 	SG(headers_sent) = 1;

main/SAPI.h

@@ -143,8 +143,7 @@ typedef struct _sapi_globals_struct {
 	bool sapi_started;
 	double global_request_time;
 	HashTable known_post_content_types;
-	zval callback_func;
-	zend_fcall_info_cache fci_cache;
+	zend_fcall_info_cache send_header_fcc;
 	sapi_request_parse_body_context request_parse_body_context;
 } sapi_globals_struct;
 

tests/basic/header_register_callback_trampoline.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Test header_register_callback
+--FILE--
+<?php
+class TrampolineTest {
+    public function __call(string $name, array $arguments) {
+        echo 'Trampoline for ', $name, PHP_EOL;
+    }
+}
+$o = new TrampolineTest();
+$callback = [$o, 'trampoline'];
+
+header_register_callback($callback);
+?>
+--EXPECT--
+Trampoline for trampoline

tests/basic/header_register_callback_trampoline_after_headers_sent.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Test header_register_callback
+--FILE--
+<?php
+class TrampolineTest {
+    public function __call(string $name, array $arguments) {
+        echo 'Trampoline for ', $name, PHP_EOL;
+    }
+}
+$o = new TrampolineTest();
+$callback = [$o, 'trampoline'];
+
+echo "Send headers.\n";
+header_register_callback($callback);
+?>
+--EXPECT--
+Send headers.