From 1b15e5932611ca10fe1d4384a569f04358e414ad Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 26 Sep 2025 15:32:00 +0200
Subject: add upstream patch for PHP 8.5

---
 unit-php.spec    | 15 ++++++++++++---
 unit-php85.patch | 28 ++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 unit-php85.patch

diff --git a/unit-php.spec b/unit-php.spec
index f852fb3..caa4b59 100644
--- a/unit-php.spec
+++ b/unit-php.spec
@@ -9,7 +9,7 @@
 
 %global gh_owner     nginx
 %global project      unit
-%global gh_commit    8ab74a8cc929272eb8683d3f6ab4cb406465fd34
+%global gh_commit    28404105810f53c570523c3e70006ad0ca210e58
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 
 %undefine _debugsource_packages
@@ -34,14 +34,16 @@ Requires: %{scl_prefix}php-embedded
 %endif
 
 Name:          %{?scl_prefix}%{project}-php
-Version:       1.34.2
-Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:       1.35.0
+Release:       2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Summary:       PHP module for NGINX Unit
 License:       Apache-2.0
 URL:           https://unit.nginx.org/
 
 Source0:       https://github.com/%{gh_owner}/%{project}/archive/%{gh_commit}/%{project}-%{version}-%{gh_short}.tar.gz
 
+Patch0:        unit-php85.patch
+
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel
@@ -62,6 +64,7 @@ and NGINX unit %{version}.
 
 %prep
 %setup -qn %{project}-%{gh_commit}
+%patch -P0 -p1
 
 
 %build
@@ -121,6 +124,12 @@ make %{modname}-install DESTDIR=%{buildroot}
 
 
 %changelog
+* Fri Sep 26 2025 Remi Collet <remi@remirepo.net> - 1.35.0-2
+- add upstream patch for PHP 8.5
+
+* Fri Sep 12 2025 Remi Collet <remi@remirepo.net> - 1.35.0-1
+- update to 1.35.0
+
 * Tue Mar  4 2025 Remi Collet <remi@remirepo.net> - 1.34.2-1
 - update to 1.34.2
 
diff --git a/unit-php85.patch b/unit-php85.patch
new file mode 100644
index 0000000..1f56f89
--- /dev/null
+++ b/unit-php85.patch
@@ -0,0 +1,28 @@
+From ad736f9f4fddd844aed1eb6ee8a9dc88df5533fb Mon Sep 17 00:00:00 2001
+From: Andy Postnikov <apostnikov@gmail.com>
+Date: Thu, 25 Sep 2025 01:36:53 +0200
+Subject: [PATCH] php: Add a new to 8.5 SAPI callback, pre_request_init
+
+Closes: https://github.com/nginx/unit/issues/1660
+[ Commit message tweak - Andrew ]
+Signed-off-by: Andrew Clayton <ac@sigsegv.uk>
+---
+ src/nxt_php_sapi.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c
+index 926ebe99d..57ba87ae5 100644
+--- a/src/nxt_php_sapi.c
++++ b/src/nxt_php_sapi.c
+@@ -340,7 +340,10 @@ static sapi_module_struct  nxt_php_sapi_module =
+ 
+     NULL,                        /* ini_entries */
+     NULL,                        /* additional_functions */
+-    NULL                         /* input_filter_init */
++    NULL,                        /* input_filter_init */
++#if (PHP_VERSION_ID >= 80500)
++    NULL,                        /* pre_request_init */
++#endif
+ };
+ 
+ 
-- 
cgit