remove recognition for no more supported OSes

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 943843508f7310806420806604e61e6d4b05b798..093bc21ea0fcf72ea95efcc8a9f81f3a530324c2 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -317,7 +317,7 @@ char* php_get_windows_name()
                GetSystemInfo(&si);
        }
 
-       if (VER_PLATFORM_WIN32_NT==osvi.dwPlatformId && osvi.dwMajorVersion > 4 ) {
+       if (VER_PLATFORM_WIN32_NT==osvi.dwPlatformId && osvi.dwMajorVersion >= 6 ) {
                if (osvi.dwMajorVersion == 6) {
                        if( osvi.dwMinorVersion == 0 ) {
                                if( osvi.wProductType == VER_NT_WORKSTATION ) {
@@ -325,8 +325,7 @@ char* php_get_windows_name()
                                } else {
                                        major = "Windows Server 2008";
                                }
-                       } else
-                       if ( osvi.dwMinorVersion == 1 ) {
+                       } else if ( osvi.dwMinorVersion == 1 ) {
                                if( osvi.wProductType == VER_NT_WORKSTATION )  {
                                        major = "Windows 7";
                                } else {
@@ -425,78 +424,6 @@ char* php_get_windows_name()
                                        break;
                        }
                }
-
-               if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2 ) {
-                       if (GetSystemMetrics(SM_SERVERR2))
-                               major = "Windows Server 2003 R2";
-                       else if (osvi.wSuiteMask==VER_SUITE_STORAGE_SERVER)
-                               major = "Windows Storage Server 2003";
-                       else if (osvi.wSuiteMask==VER_SUITE_WH_SERVER)
-                               major = "Windows Home Server";
-                       else if (osvi.wProductType == VER_NT_WORKSTATION &&
-                               si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64) {
-                               major = "Windows XP Professional x64 Edition";
-                       } else {
-                               major = "Windows Server 2003";
-                       }
-
-                       /* Test for the server type. */
-                       if ( osvi.wProductType != VER_NT_WORKSTATION ) {
-                               if ( si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_IA64 ) {
-                                       if( osvi.wSuiteMask & VER_SUITE_DATACENTER )
-                                               sub = "Datacenter Edition for Itanium-based Systems";
-                                       else if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )
-                                               sub = "Enterprise Edition for Itanium-based Systems";
-                               }
-
-                               else if ( si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64 ) {
-                                       if( osvi.wSuiteMask & VER_SUITE_DATACENTER )
-                                               sub = "Datacenter x64 Edition";
-                                       else if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )
-                                               sub = "Enterprise x64 Edition";
-                                       else sub = "Standard x64 Edition";
-                               } else {
-                                       if ( osvi.wSuiteMask & VER_SUITE_COMPUTE_SERVER )
-                                               sub = "Compute Cluster Edition";
-                                       else if( osvi.wSuiteMask & VER_SUITE_DATACENTER )
-                                               sub = "Datacenter Edition";
-                                       else if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )
-                                               sub = "Enterprise Edition";
-                                       else if ( osvi.wSuiteMask & VER_SUITE_BLADE )
-                                               sub = "Web Edition";
-                                       else sub = "Standard Edition";
-                               }
-                       }
-               }
-
-               if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1 )     {
-                       major = "Windows XP";
-                       if( osvi.wSuiteMask & VER_SUITE_PERSONAL ) {
-                               sub = "Home Edition";
-                       } else if (GetSystemMetrics(SM_MEDIACENTER)) {
-                               sub = "Media Center Edition";
-                       } else if (GetSystemMetrics(SM_STARTER)) {
-                               sub = "Starter Edition";
-                       } else if (GetSystemMetrics(SM_TABLETPC)) {
-                               sub = "Tablet PC Edition";
-                       } else {
-                               sub = "Professional";
-                       }
-               }
-
-               if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0 ) {
-                       major = "Windows 2000";
-
-                       if (osvi.wProductType == VER_NT_WORKSTATION ) {
-                               sub = "Professional";
-                       } else {
-                               if( osvi.wSuiteMask & VER_SUITE_DATACENTER )
-                                       sub = "Datacenter Server";
-                               else if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )
-                                       sub = "Advanced Server";
-                               else sub = "Server";
-                       }
-               }
        } else {
                return NULL;
        }