diff options
| author | Christian Wenz <christian@wenz.org> | 2015-06-09 10:05:27 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-06-10 11:22:28 +0200 |
| commit | 741b949a6f7c3bc3e171622fe289ad2c0871f9cc (patch) | |
| tree | cdadc13aa80c5c66106e93c1362b266ef64bb64e /ext/standard/info.c | |
| parent | aef5a02ebb87212f9bd5afd44f70a03d23cb62dc (diff) | |
| download | php-git-741b949a6f7c3bc3e171622fe289ad2c0871f9cc.tar.gz | |
Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
Diffstat (limited to 'ext/standard/info.c')
| -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 82b6bf8b48..d170f8a345 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"; |