diff options
| author | Anatol Belski <ab@php.net> | 2014-08-04 09:47:11 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-04 09:47:11 +0200 |
| commit | 8eeacd33646d9b09192ecee8323f222b5963657b (patch) | |
| tree | 2525a3344a66b7597e8841d883238d6017ab3605 | |
| parent | fa42a513a4cf51837ebc974014d52c0182562b8a (diff) | |
| parent | 513d48f2efb03950b81d76e4cddcc1075868bb0f (diff) | |
| download | php-git-8eeacd33646d9b09192ecee8323f222b5963657b.tar.gz | |
Merge branch 'pull-request/756'
| -rw-r--r-- | ext/standard/info.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/standard/info.c b/ext/standard/info.c index 1b1b8f202b..343244c21c 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -592,6 +592,14 @@ PHPAPI char *php_get_uname(char mode) php_get_windows_cpu(wincpu, sizeof(wincpu)); dwBuild = (DWORD)(HIWORD(dwVersion)); + + /* Windows "version" 6.2 could be Windows 8/Windows Server 2012, but also Windows 8.1/Windows Server 2012 R2 */ + if (dwWindowsMajorVersion == 6 && dwWindowsMinorVersion == 2) { + if (strncmp(winver, "Windows 8.1", 11) == 0 || strncmp(winver, "Windows Server 2012 R2", 22) == 0) { + dwWindowsMinorVersion = 3; + } + } + snprintf(tmp_uname, sizeof(tmp_uname), "%s %s %d.%d build %d (%s) %s", "Windows NT", ComputerName, dwWindowsMajorVersion, dwWindowsMinorVersion, dwBuild, winver?winver:"unknown", wincpu); |