From f086eaa7b871bd95612333e616828f0e2f45ed31 Mon Sep 17 00:00:00 2001
From: David Warner <david@warnr.net>
Date: Sun, 17 Nov 2024 22:21:08 +1100
Subject: [PATCH] Add Windows Server 2025 build number

Closes GH-16838.
---
 NEWS                | 1 +
 ext/standard/info.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 88f27025ac8..e2216670399 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ PHP                                                                        NEWS
 
 - Windows:
   . Fixed bug GH-16849 (Error dialog causes process to hang). (cmb)
+  . Windows Server 2025 is now properly reported. (cmb)
 
 21 Nov 2024, PHP 8.4.1
 
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 8a706ef62eb..4ed33f32eab 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -271,7 +271,9 @@ static char* php_get_windows_name()
 						major = "Windows 10";
 					}
 				} else {
-					if (osvi.dwBuildNumber >= 20348) {
+					if (osvi.dwBuildNumber >= 26100) {
+						major = "Windows Server 2025";
+					} else if (osvi.dwBuildNumber >= 20348) {
 						major = "Windows Server 2022";
 					} else if (osvi.dwBuildNumber >= 19042) {
 						major = "Windows Server, version 20H2";