com php-src: Revert "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:29 +0000 |
| Subject: | com php-src: Revert "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-87178@lists.php.net to get a copy of this message | ||
Commit: 82e5260104021076402430b1fabc8af99860104c
Author: Christian Wenz <christian@wenz.org> Tue, 9 Jun 2015 10:29:26 +0200
Committer: Anatol Belski <ab@php.net> Wed, 10 Jun 2015 11:22:29 +0200
Parents: 741b949a6f7c3bc3e171622fe289ad2c0871f9cc
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=82e5260104021076402430b1fabc8af99860104c
Log:
Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as
"Business""
This reverts commit 4a05c81b85336b76d05017cc86372fbd04871e3f.
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 d170f8a..82b6bf8 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -404,25 +404,10 @@ char* php_get_windows_name()
sub = "Enterprise Edition";
break;
case PRODUCT_BUSINESS:
- 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";
- }
+ sub = "Business Edition";
break;
case PRODUCT_STARTER:
- if ((osvi.dwMajorVersion > 6) || (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion
> 0)) {
- sub = "Starter N Edition";
- } else {
- sub = "Starter Edition";
- }
+ sub = "Starter Edition";
break;
case PRODUCT_CLUSTER_SERVER:
sub = "Cluster Server Edition";