diff options
| author | Anatol Belski <ab@php.net> | 2015-06-10 11:25:21 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-06-10 11:25:21 +0200 |
| commit | 64df05d5b1908314fae212fcaf8632a68bd9996d (patch) | |
| tree | dea0183a8c335b837a83dea84ce9a698ee810843 | |
| parent | f4707ed2560abf1dcdad2796ba4648ee4b17ecda (diff) | |
| parent | 60e181c20ac801292b3e21afc845b700b04cf586 (diff) | |
| download | php-git-64df05d5b1908314fae212fcaf8632a68bd9996d.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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 429c593c7d..83bea1ac16 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"; |