diff options
| author | Remi Collet <remi@remirepo.net> | 2025-09-26 15:45:04 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-09-26 15:46:14 +0200 |
| commit | 04e17cf40b94d70781daa48df308d7cd937b6c5c (patch) | |
| tree | 40c842877edc666af75f633ea7a4d4dbb7c7de92 | |
| parent | d546a11f5c5aebb10f839558f2c77709ff722f4a (diff) | |
add patch for PHP 8.5 fromv2.0.27
https://github.com/unbit/uwsgi/pull/2742
(cherry picked from commit e23b806e12be5d02c6746ed73888a9323f952fd0)
| -rw-r--r-- | 0001-STR_EMPTY_ALLOC-removed-in-PHP-8.5.patch | 26 | ||||
| -rw-r--r-- | uwsgi-plugin-php.spec | 10 |
2 files changed, 35 insertions, 1 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 new file mode 100644 index 0000000..e856fb7 --- /dev/null +++ b/0001-STR_EMPTY_ALLOC-removed-in-PHP-8.5.patch @@ -0,0 +1,26 @@ +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 368d370..d4310ec 100644 --- a/uwsgi-plugin-php.spec +++ b/uwsgi-plugin-php.spec @@ -29,13 +29,15 @@ Requires: %{scl_prefix}php-embedded Name: %{?scl_prefix}%{project}-plugin-php Version: 2.0.27 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?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 @@ -68,6 +70,8 @@ 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) @@ -90,6 +94,10 @@ install -Dpm 755 %{?scl}%{!?scl:php}_plugin.so %{buildroot}%{_root_libdir}/%{pro %changelog +* 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 + * Wed Oct 9 2024 Remi Collet <remi@remirepo.net> - 2.0.27-1 - update to 2.0.27 |