com php-src: Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business": ext/standard/info.c
| From: | Anatol Belski | Date: | Wed, 10 Jun 2015 09:22:28 +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-87175@lists.php.net to get a copy of this message | ||
Commit: 741b949a6f7c3bc3e171622fe289ad2c0871f9cc
Author: Christian Wenz <christian@wenz.org> Tue, 9 Jun 2015 10:05:27 +0200
Committer: Anatol Belski <ab@php.net> Wed, 10 Jun 2015 11:22:28 +0200
Parents: aef5a02ebb87212f9bd5afd44f70a03d23cb62dc
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=741b949a6f7c3bc3e171622fe289ad2c0871f9cc
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";