com php-src: Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business": ext/standard/info.c

From: Date: Wed, 10 Jun 2015 09:22:30 +0000
Subject: com php-src: Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business": ext/standard/info.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87176@lists.php.net to get a copy of this message
Commit: 0c8136654d59303750fa5dc20907bda0a6307ea7 Author: Christian Wenz <christian@wenz.org> Tue, 9 Jun 2015 10:40:36 +0200 Committer: Anatol Belski <ab@php.net> Wed, 10 Jun 2015 11:22:30 +0200 Parents: 82e5260104021076402430b1fabc8af99860104c Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0c8136654d59303750fa5dc20907bda0a6307ea7 Log: Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business" Bugs: https://bugs.php.net/69781 Changed paths: M ext/standard/info.c Diff: diff --git a/ext/standard/info.c b/ext/standard/info..c index 82b6bf8..d170f8a 100644 --- 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";

« previous php.cvs (#87176) next »