Merge branch 'true-async' into fiber-support

EdmondDantes · EdmondDantes · commit ce7532657d2c · 2025-12-15T10:33:45.000Z
diff --git a/NEWS b/NEWS
@@ -25,11 +25,16 @@ PHP                                                                        NEWS
 - Mbstring:
   . ini_set() with mbstring.detect_order changes the order of mb_detect_order
     as intended, since mbstring.detect_order is an INI_ALL setting. (tobee94)
+  . Added GB18030-2022 to default encoding list for zh-CN. (HeRaNO)
 
 - Opcache:
   . Fixed bug GH-20051 (apache2 shutdowns when restart is requested during
     preloading). (Arnaud, welcomycozyhom)
 
+- PDO_PGSQL:
+  . Clear session-local state disconnect-equivalent processing.
+    (KentarouTakeda)
+
 - Phar:
   . Support reference values in Phar::mungServer(). (ndossche)
   . Invalid values now throw in Phar::mungServer() instead of being silently
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
@@ -64,6 +64,9 @@ PHP 8.6 INTERNALS UPGRADE NOTES
   . Removed the XML_GetCurrentByteCount() libxml compatibility wrapper,
     as it was unused and could return the wrong result.
 
+- ext/mbstring:
+  . Added GB18030-2022 to default encoding list for zh-CN.
+
 ========================
 4. OpCode changes
 ========================
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -4384,14 +4384,8 @@ ZEND_API void zend_get_callable_zval_from_fcc(const zend_fcall_info_cache *fcc,
 
 ZEND_API const char *zend_get_module_version(const char *module_name) /* {{{ */
 {
-	zend_string *lname;
 	size_t name_len = strlen(module_name);
-	zend_module_entry *module;
-
-	lname = zend_string_alloc(name_len, 0);
-	zend_str_tolower_copy(ZSTR_VAL(lname), module_name, name_len);
-	module = zend_hash_find_ptr(&module_registry, lname);
-	zend_string_efree(lname);
+	zend_module_entry *module = zend_hash_str_find_ptr_lc(&module_registry, module_name, name_len);
 	return module ? module->version : NULL;
 }
 /* }}} */
diff --git a/ext/lexbor/lexbor/url/url.c b/ext/lexbor/lexbor/url/url.c
@@ -1817,7 +1817,6 @@ lxb_url_parse_basic_h(lxb_url_parser_t *parser, lxb_url_t *url,
         if (override_state != LXB_URL_STATE__UNDEF
             && url->scheme.type == LXB_URL_SCHEMEL_TYPE_FILE)
         {
-            p -= 1;
             state = LXB_URL_STATE_FILE_HOST_STATE;
             goto again;
         }
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -116,7 +116,8 @@ static const enum mbfl_no_encoding php_mb_default_identify_list_cn[] = {
 	mbfl_no_encoding_ascii,
 	mbfl_no_encoding_utf8,
 	mbfl_no_encoding_euc_cn,
-	mbfl_no_encoding_cp936
+	mbfl_no_encoding_cp936,
+	mbfl_no_encoding_gb18030_2022
 };
 
 static const enum mbfl_no_encoding php_mb_default_identify_list_tw_hk[] = {
diff --git a/ext/mbstring/tests/zh_CN_default_encodings.phpt b/ext/mbstring/tests/zh_CN_default_encodings.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Default encodings in Simplified Chinese
+--EXTENSIONS--
+mbstring
+--INI--
+mbstring.language=Simplified Chinese
+--FILE--
+<?php
+var_dump(mb_detect_order());
+
+?>
+--EXPECT--
+array(5) {
+  [0]=>
+  string(5) "ASCII"
+  [1]=>
+  string(5) "UTF-8"
+  [2]=>
+  string(6) "EUC-CN"
+  [3]=>
+  string(5) "CP936"
+  [4]=>
+  string(12) "GB18030-2022"
+}
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
@@ -1340,6 +1340,20 @@ static const zend_function_entry *pdo_pgsql_get_driver_methods(pdo_dbh_t *dbh, i
 	}
 }
 
+static void pdo_pgsql_request_shutdown(pdo_dbh_t *dbh)
+{
+	PGresult *res;
+	pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data;
+
+	if(H->server) {
+		res = PQexec(H->server, "DISCARD ALL");
+
+		if(res) {
+			PQclear(res);
+		}
+	}
+}
+
 static bool pdo_pgsql_set_attr(pdo_dbh_t *dbh, zend_long attr, zval *val)
 {
 	bool bval;
@@ -1383,7 +1397,7 @@ static const struct pdo_dbh_methods pgsql_methods = {
 	pdo_pgsql_get_attribute,
 	pdo_pgsql_check_liveness,	/* check_liveness */
 	pdo_pgsql_get_driver_methods,  /* get_driver_methods */
-	NULL,
+	pdo_pgsql_request_shutdown,
 	pgsql_handle_in_transaction,
 	NULL, /* get_gc */
 	pdo_pgsql_scanner
diff --git a/ext/pdo_pgsql/tests/session_state_reset.phpt b/ext/pdo_pgsql/tests/session_state_reset.phpt
@@ -0,0 +1,55 @@
+--TEST--
+Persistent connections: session state reset when performing disconnect-equivalent processing (general case)
+--EXTENSIONS--
+pdo_pgsql
+--SKIPIF--
+<?php
+require __DIR__ . '/config.inc';
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+putenv('PDOTEST_ATTR='.serialize([PDO::ATTR_PERSISTENT => true]));
+
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+
+$pdo1 = PDOTest::test_factory(__DIR__ . '/common.phpt');
+
+$pid1 = (int)$pdo1
+    ->query('select pg_backend_pid()::int;')
+    ->fetchColumn(0);
+
+$defaultValue = (int)$pdo1
+    ->query('show log_min_duration_statement;')
+    ->fetchColumn(0);
+
+$setValue = $defaultValue + 1;
+
+$pdo1->exec("set log_min_duration_statement = {$setValue};");
+
+$pdo1 = null;
+
+$pdo2 = PDOTest::test_factory(__DIR__ . '/common.phpt');
+
+$pid2 = (int)$pdo2
+    ->query('select pg_backend_pid()::int;')
+    ->fetchColumn(0);
+
+assert($pid1 === $pid2);
+
+$expectedValue = (int)$pdo2
+    ->query('show log_min_duration_statement;')
+    ->fetchColumn(0);
+
+echo "defaultValue: {$defaultValue}\n";
+echo "setValue: {$setValue}\n";
+echo "expectedValue: {$expectedValue}\n";
+echo "expected value should be reset to default: " . (($expectedValue === $defaultValue) ? 'success' : 'failure') . "\n";
+
+?>
+--EXPECTF--
+defaultValue: %i
+setValue: %d
+expectedValue: %i
+expected value should be reset to default: success
diff --git a/ext/pdo_pgsql/tests/session_state_reset_advisory_lock.phpt b/ext/pdo_pgsql/tests/session_state_reset_advisory_lock.phpt
@@ -0,0 +1,51 @@
+--TEST--
+Persistent connections: session state reset when performing disconnect-equivalent processing (advisory lock case)
+--EXTENSIONS--
+pdo_pgsql
+--SKIPIF--
+<?php
+require __DIR__ . '/config.inc';
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+putenv('PDOTEST_ATTR='.serialize([PDO::ATTR_PERSISTENT => true]));
+
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+
+$pdo1 = PDOTest::test_factory(__DIR__ . '/common.phpt');
+
+$pid1 = (int)$pdo1
+    ->query('select pg_backend_pid()::int;')
+    ->fetchColumn(0);
+
+$lockResult1 = (bool)$pdo1
+    ->query('select pg_try_advisory_lock(42)::int;')
+    ->fetchColumn(0);
+
+$pdo1 = null;
+
+$dsn = getenv('PDO_PGSQL_TEST_DSN');
+$dsn .= ';';
+putenv('PDO_PGSQL_TEST_DSN='.$dsn);
+
+$pdo2 = PDOTest::test_factory(__DIR__ . '/common.phpt');
+
+$pid2 = (int)$pdo2
+    ->query('select pg_backend_pid()::int;')
+    ->fetchColumn(0);
+
+assert($pid1 !== $pid2);
+
+$lockResult2 = (bool)$pdo2
+    ->query('select pg_try_advisory_lock(42)::int;')
+    ->fetchColumn(0);
+
+echo "lock1: " . ($lockResult1 ? 'success' : 'failure') . "\n";
+echo "lock2: " . ($lockResult2 ? 'success' : 'failure') . "\n";
+
+?>
+--EXPECT--
+lock1: success
+lock2: success
diff --git a/ext/pdo_pgsql/tests/session_state_reset_after_interrupted.phpt b/ext/pdo_pgsql/tests/session_state_reset_after_interrupted.phpt
@@ -0,0 +1,52 @@
+--TEST--
+Persistent connections: session state reset after backend termination (interrupted case)
+--EXTENSIONS--
+pdo_pgsql
+--SKIPIF--
+<?php
+require __DIR__ . '/config.inc';
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+putenv('PDOTEST_ATTR='.serialize([PDO::ATTR_PERSISTENT => true]));
+
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+
+$pdo1 = PDOTest::test_factory(__DIR__ . '/common.phpt');
+
+$pid1 = (int)$pdo1
+    ->query('select pg_backend_pid()::int;')
+    ->fetchColumn(0);
+
+$pid1 = (int)$pdo1
+    ->query('select pg_backend_pid()::int;')
+    ->fetchColumn(0);
+
+$dsn = getenv('PDO_PGSQL_TEST_DSN');
+$dsn .= ';';
+putenv('PDO_PGSQL_TEST_DSN='.$dsn);
+
+$pdo2 = PDOTest::test_factory(__DIR__ . '/common.phpt');
+
+$pid2 = (int)$pdo2
+    ->query('select pg_backend_pid()::int;')
+    ->fetchColumn(0);
+
+assert($pid1 !== $pid2);
+
+$terminateResult = (bool)$pdo2
+    ->query("select pg_terminate_backend({$pid1})::int")
+    ->fetchColumn(0);
+
+// Disconnect after being terminated by another connection
+$pdo1 = null;
+
+echo 'pid of pdo1: ' . $pid1 . "\n";
+echo 'terminate result of pdo1 by pdo2: ' . ($terminateResult ? 'success' : 'failure') . "\n";
+
+?>
+--EXPECTF--
+pid of pdo1: %d
+terminate result of pdo1 by pdo2: success
diff --git a/main/php_network.h b/main/php_network.h
@@ -168,7 +168,8 @@ ZEND_API extern int php_poll2_async(php_pollfd *ufds, unsigned int nfds, const i
 
 static zend_always_inline int _php_poll2_async(php_pollfd *ufds, unsigned int nfds, int timeout)
 {
-	if(UNEXPECTED(ZEND_ASYNC_IS_ACTIVE)) {
+	// Use context switching only if a timeout is specified.
+	if(UNEXPECTED(timeout > 0 && ZEND_ASYNC_IS_ACTIVE)) {
 		return php_poll2_async(ufds, nfds, timeout);
 	} else {
 		return poll(ufds, nfds, timeout);
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
@@ -395,13 +395,7 @@ static void append_essential_headers(smart_str* buffer, php_cli_server_client *c
 
 static const char *get_mime_type(const php_cli_server *server, const char *ext, size_t ext_len) /* {{{ */
 {
-	char *ret;
-	ALLOCA_FLAG(use_heap)
-	char *ext_lower = do_alloca(ext_len + 1, use_heap);
-	zend_str_tolower_copy(ext_lower, ext, ext_len);
-	ret = zend_hash_str_find_ptr(&server->extension_mime_types, ext_lower, ext_len);
-	free_alloca(ext_lower, use_heap);
-	return (const char*)ret;
+	return zend_hash_str_find_ptr_lc(&server->extension_mime_types, ext, ext_len);
 } /* }}} */
 
 PHP_FUNCTION(apache_request_headers) /* {{{ */

Original file line number	Diff line number	Diff line change
`@@ -1817,7 +1817,6 @@ lxb_url_parse_basic_h(lxb_url_parser_t parser, lxb_url_t url,`
`1817`	`1817`	`if (override_state != LXB_URL_STATE__UNDEF`
`1818`	`1818`	`&& url->scheme.type == LXB_URL_SCHEMEL_TYPE_FILE)`
`1819`	`1819`	`{`
`1820`		`- p -= 1;`
`1821`	`1820`	`state = LXB_URL_STATE_FILE_HOST_STATE;`
`1822`	`1821`	`goto again;`
`1823`	`1822`	`}`