diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-sqlsrv.spec | 17 | ||||
| -rw-r--r-- | php85.patch | 57 |
4 files changed, 10 insertions, 68 deletions
@@ -2,7 +2,7 @@ sqlsrv sqlsrv support => enabled -ExtensionVer => 5.13.0-beta1 +ExtensionVer => 5.13.0 Directive => Local Value => Master Value sqlsrv.WarningsReturnAsErrors => On => On @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #117 sqlsrv version 5.13.0-beta1 ] { +Extension [ <persistent> extension #117 sqlsrv version 5.13.0 ] { - INI { Entry [ sqlsrv.WarningsReturnAsErrors <ALL> ] diff --git a/php-sqlsrv.spec b/php-sqlsrv.spec index 33da0c7..78dcfc1 100644 --- a/php-sqlsrv.spec +++ b/php-sqlsrv.spec @@ -23,8 +23,8 @@ Name: %{?scl_prefix}php-sqlsrv Summary: Microsoft Drivers for PHP for SQL Server -%global tarversion 5.13.0beta1 -Version: 5.13.0~beta1 +%global tarversion 5.13.0 +Version: 5.13.0 Release: 1%{?dist} License: MIT @@ -36,14 +36,11 @@ Source1: http://pecl.php.net/get/pdo_%{extname}-%{tarversion}.tgz Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz %endif -# See https://github.com/microsoft/msphpsql/pull/1543 -Patch0: php85.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ BuildRequires: libtool-ltdl-devel -BuildRequires: %{?scl_prefix}php-devel >= 8.2 +BuildRequires: %{?scl_prefix}php-devel >= 8.3 BuildRequires: %{?scl_prefix}php-pdo BuildRequires: %{?scl_prefix}php-pear BuildRequires: unixODBC-devel >= 2.3.1 @@ -108,7 +105,7 @@ cd NTS cd %{extname} : no patch cd ../pdo_%{extname} -%patch -P0 -p3 +: no patch cd .. # Sanity check, really often broken @@ -125,12 +122,11 @@ fi cd .. cat << 'EOF' | tee %{ininame} -; Enable '%{summary}' extension module +; Enable '%{summary}' extensions extension = %{extname}.so extension = pdo_%{extname}.so ; Configuration - ;sqlsrv.WarningsReturnAsErrors = On ;sqlsrv.LogSeverity = 0 ;sqlsrv.LogSubsystems = 0 @@ -245,6 +241,9 @@ install -D -m 644 %{ininame} %{buildroot}%{php_ztsinidir}/%{ininame} %changelog +* Sat Feb 28 2026 Remi Collet <remi@remirepo.net> - 5.12.0-1 +- update to 5.13.0 + * Sat Jan 31 2026 Remi Collet <remi@remirepo.net> - 5.12.0~beta1-1 - update to 5.13.0beta1 diff --git a/php85.patch b/php85.patch deleted file mode 100644 index 1f58929..0000000 --- a/php85.patch +++ /dev/null @@ -1,57 +0,0 @@ -From bad3c5e0058aa519d9e389739997dd94a8e697ed Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel@archte.ch> -Date: Sun, 19 Oct 2025 23:11:41 +0200 -Subject: [PATCH] PHP 8.5 (compilation) support - -Since https://github.com/php/php-src/pull/17741, dbh->error_mode is -stored as uint8_t. We cast the value to pdo_error_mode for the -assignment to work. - -Since https://github.com/php/php-src/pull/17742, query_stmt_zval has -been replaced by query_stmt_obj. The diff in the linked PR shows -the new destructor usage. We follow that same usage in this commit. ---- - source/pdo_sqlsrv/pdo_dbh.cpp | 4 ++-- - source/pdo_sqlsrv/php_pdo_sqlsrv_int.h | 7 ++++++- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/source/pdo_sqlsrv/pdo_dbh.cpp b/source/pdo_sqlsrv/pdo_dbh.cpp -index 8f39e72fd..075134e05 100644 ---- a/source/pdo_sqlsrv/pdo_dbh.cpp -+++ b/source/pdo_sqlsrv/pdo_dbh.cpp -@@ -625,7 +625,7 @@ int pdo_sqlsrv_db_handle_factory( _Inout_ pdo_dbh_t *dbh, _In_opt_ zval *driver_ - PDO_LOG_DBH_ENTRY; - - hash_auto_ptr pdo_conn_options_ht; -- pdo_error_mode prev_err_mode = dbh->error_mode; -+ pdo_error_mode prev_err_mode = static_cast<pdo_error_mode>( dbh->error_mode ); - - // must be done in all cases so that even a failed connection can query the - // object for errors. -@@ -1604,7 +1604,7 @@ zend_string * pdo_sqlsrv_dbh_last_id(_Inout_ pdo_dbh_t *dbh, _In_ const zend_str - PDO_LOG_DBH_ENTRY; - - // turn off any error handling for last_id -- pdo_error_mode prev_err_mode = dbh->error_mode; -+ pdo_error_mode prev_err_mode = static_cast<pdo_error_mode>( dbh->error_mode ); - dbh->error_mode = PDO_ERRMODE_SILENT; - - sqlsrv_malloc_auto_ptr<sqlsrv_stmt> driver_stmt; -diff --git a/source/pdo_sqlsrv/php_pdo_sqlsrv_int.h b/source/pdo_sqlsrv/php_pdo_sqlsrv_int.h -index a0a6dd89b..4ce153261 100644 ---- a/source/pdo_sqlsrv/php_pdo_sqlsrv_int.h -+++ b/source/pdo_sqlsrv/php_pdo_sqlsrv_int.h -@@ -301,7 +301,12 @@ inline void pdo_reset_dbh_error( _Inout_ pdo_dbh_t* dbh ) - // release the last statement from the dbh so that error handling won't have a statement passed to it - if( dbh->query_stmt ) { - dbh->query_stmt = NULL; -- zval_ptr_dtor( &dbh->query_stmt_zval ); -+ #if PHP_VERSION_ID < 80500 -+ zval_ptr_dtor( &dbh->query_stmt_zval ); -+ #else -+ OBJ_RELEASE( dbh->query_stmt_obj ); -+ dbh->query_stmt_obj = NULL; -+ #endif - } - - // if the driver isn't valid, just return (PDO calls close sometimes more than once?) |