mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: ext/pgsql: Fix preprocessor guard typo that silently disabled a feature
This commit is contained in:
@@ -432,7 +432,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
|
||||
|
||||
4
ext/pgsql/pgsql_arginfo.h
generated
4
ext/pgsql/pgsql_arginfo.h
generated
@@ -1,5 +1,5 @@
|
||||
/* This is a generated file, edit the .stub.php file instead.
|
||||
* Stub hash: 7c5c32d94c0ac05313d8b19915c6318b0678b75b */
|
||||
* Stub hash: 778fedc7b65675b54f3c1b42205920478bf49fbf */
|
||||
|
||||
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)
|
||||
@@ -853,7 +853,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)
|
||||
|
||||
Reference in New Issue
Block a user