diff options
| author | Anatol Belski <ab@php.net> | 2015-06-10 11:26:49 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-06-10 11:26:49 +0200 |
| commit | 23e8956386a539b482653dbe89d1fcb1122a8a9a (patch) | |
| tree | 2d87b7af493ea3aa3b899d4a05d9f722ee9f27c6 | |
| parent | dbef99ba6ec807c6a25cdb4b2c614c7f961dbf19 (diff) | |
| parent | 2c55ae526121bc608ed912ede20d752885082fc8 (diff) | |
| download | php-git-23e8956386a539b482653dbe89d1fcb1122a8a9a.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
| -rw-r--r-- | ext/standard/info.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/ext/standard/info.c b/ext/standard/info.c index c5651b43eb..d8794c4ad6 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -395,10 +395,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"; |