Commit 931d8ea4e19 for php
commit 931d8ea4e199d3bcb62acdf685bdcc4586bf58a2
Merge: 4aa77a1b05b 43c60146708
Author: David Carlier <devnexen@gmail.com>
Date: Thu Sep 24 04:48:20 2026 +0100
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
ext/pgsql: Removed `pg_service()`, unavailable with any released libpq
# Conflicts:
# ext/pgsql/pgsql.c
# ext/pgsql/pgsql_arginfo.h
diff --cc ext/pgsql/pgsql.c
index de50c6929c5,fdf194969d2..38ac6cd09ff
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@@ -993,13 -1006,7 +992,7 @@@ static void php_pgsql_get_link_info(INT
PQclear(res);
return;
}
- #if defined(HAVE_PG_SERVICE)
- case PHP_PG_SERVICE: {
- result = PQservice(pgsql);
- break;
- }
- #endif
- EMPTY_SWITCH_DEFAULT_CASE()
+ default: ZEND_UNREACHABLE();
}
if (result) {
RETURN_STRING(result);
diff --cc ext/pgsql/pgsql_arginfo.h
index ccaab3ddc86,c9b0c85880d..d63b98bfe1b
Binary files differ