diff options
| author | Remi Collet <remi@remirepo.net> | 2026-02-13 15:28:57 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2026-02-13 15:28:57 +0100 |
| commit | 1f04aa3947c9fa705ad8edded02182179dc48feb (patch) | |
| tree | 786162fbd0a936793ab1481c98795bdee3685e64 | |
| parent | e23b806e12be5d02c6746ed73888a9323f952fd0 (diff) | |
| -rw-r--r-- | 0001-STR_EMPTY_ALLOC-removed-in-PHP-8.5.patch | 26 | ||||
| -rw-r--r-- | uwsgi-plugin-php.spec | 13 |
2 files changed, 6 insertions, 33 deletions
diff --git a/0001-STR_EMPTY_ALLOC-removed-in-PHP-8.5.patch b/0001-STR_EMPTY_ALLOC-removed-in-PHP-8.5.patch deleted file mode 100644 index e856fb7..0000000 --- a/0001-STR_EMPTY_ALLOC-removed-in-PHP-8.5.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1ff03c2e45440327015a7bcbf55df4833c9778db Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 26 Sep 2025 15:38:52 +0200 -Subject: [PATCH] STR_EMPTY_ALLOC removed in PHP 8.5 - -ZSTR_EMPTY_ALLOC exists since 7.0 ---- - plugins/php/session.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/php/session.c b/plugins/php/session.c -index cce06985..1e19f8be 100644 ---- a/plugins/php/session.c -+++ b/plugins/php/session.c -@@ -14,7 +14,7 @@ PS_READ_FUNC(uwsgi) { - uint64_t valsize = 0; - char *value = uwsgi_cache_magic_get(key->val, key->len , &valsize, NULL, cache); - if (!value) { -- *val = STR_EMPTY_ALLOC(); -+ *val = ZSTR_EMPTY_ALLOC(); - return SUCCESS; - } - *val = zend_string_init(value, valsize, 0); --- -2.51.0 - diff --git a/uwsgi-plugin-php.spec b/uwsgi-plugin-php.spec index 82436b0..ae23d26 100644 --- a/uwsgi-plugin-php.spec +++ b/uwsgi-plugin-php.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for uwsgi-plugin-php # -# SPDX-FileCopyrightText: Copyright 2017-2025 Remi Collet +# SPDX-FileCopyrightText: Copyright 2017-2026 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # @@ -28,16 +28,14 @@ Requires: %{scl_prefix}php-embedded %endif Name: %{?scl_prefix}%{project}-plugin-php -Version: 2.0.30 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 2.0.31 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: uWSGI - Plugin for PHP support License: GPL-2.0-only with exceptions URL: http://projects.unbit.it/uwsgi Source0: https://github.com/unbit/uwsgi/archive/refs/tags/%{version}.tar.gz -Patch0: 0001-STR_EMPTY_ALLOC-removed-in-PHP-8.5.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-embedded @@ -69,8 +67,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO # Fix makefile sed -e 's:/lib:/%{_lib}:' -i plugins/php/uwsgiplugin.py -%patch -P0 -p1 - %build # for php-config PATH (mandatory for SCL) @@ -92,6 +88,9 @@ install -Dpm 755 %{?scl}%{!?scl:php}_plugin.so %{buildroot}%{_root_libdir}/%{pro %changelog +* Fri Feb 13 2026 Remi Collet <remi@remirepo.net> - 2.0.31-1 +- update to 2.0.31 + * Fri Sep 26 2025 Remi Collet <remi@remirepo.net> - 2.0.30-2 - add patch for PHP 8.5 from https://github.com/unbit/uwsgi/pull/2742 |