1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.5'

* PHP-8.5:
  ext/pgsql: Fix preprocessor guard typo that silently disabled a feature
This commit is contained in:
David Carlier
2026-03-09 07:45:20 +00:00
2 changed files with 3 additions and 3 deletions

View File

@@ -414,7 +414,7 @@ namespace {
* @cvalue PGSQL_DML_STRING
*/
const PGSQL_DML_STRING = UNKNOWN;
#ifdef PQTRACE_SUPPPRESS_TIMESTAMPS
#ifdef PQTRACE_SUPPRESS_TIMESTAMPS
/**
* @var int
* @cvalue PQTRACE_SUPPRESS_TIMESTAMPS

View File

@@ -1,5 +1,5 @@
/* This is a generated file, edit pgsql.stub.php instead.
* Stub hash: 26124c3620c00107a0a72f087ee0580fa895b659 */
* Stub hash: f25b5a574c96d4bc2f08b8cacab16f499a164a6b */
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_pg_connect, 0, 1, PgSql\\Connection, MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO(0, connection_string, IS_STRING, 0)
@@ -835,7 +835,7 @@ static void register_pgsql_symbols(int module_number)
REGISTER_LONG_CONSTANT("PGSQL_DML_EXEC", PGSQL_DML_EXEC, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PGSQL_DML_ASYNC", PGSQL_DML_ASYNC, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PGSQL_DML_STRING", PGSQL_DML_STRING, CONST_PERSISTENT);
#if defined(PQTRACE_SUPPPRESS_TIMESTAMPS)
#if defined(PQTRACE_SUPPRESS_TIMESTAMPS)
REGISTER_LONG_CONSTANT("PGSQL_TRACE_SUPPRESS_TIMESTAMPS", PQTRACE_SUPPRESS_TIMESTAMPS, CONST_PERSISTENT);
#endif
#if defined(PQTRACE_REGRESS_MODE)