Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 82b6bf8b48d40b9f3639d93979591412e6a8de7d..d170f8a34559e87bfb3e8103af3093d3b6f93040 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -404,10 +404,25 @@ char* php_get_windows_name()
                                        sub = "Enterprise Edition";
                                        break;
                                case PRODUCT_BUSINESS:
-                                       sub = "Business Edition";
+                                       if ((osvi.dwMajorVersion > 6) || (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion > 0)) {
+                                               sub = "Professional Edition";
+                                       } else {
+                                               sub = "Business Edition";
+                                       }
+                                       break;
+                               case PRODUCT_BUSINESS_N:
+                                       if ((osvi.dwMajorVersion > 6) || (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion > 0)) {
+                                               sub = "Professional N Edition";
+                                       } else {
+                                               sub = "Business N Edition";
+                                       }
                                        break;
                                case PRODUCT_STARTER:
-                                       sub = "Starter Edition";
+                                       if ((osvi.dwMajorVersion > 6) || (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion > 0)) {
+                                               sub = "Starter N Edition";
+                                       } else {
+                                           sub = "Starter Edition";
+                                       }
                                        break;
                                case PRODUCT_CLUSTER_SERVER:
                                        sub = "Cluster Server Edition";