diff options
| author | Anatol Belski <ab@php.net> | 2014-08-04 09:58:47 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-04 09:58:47 +0200 |
| commit | d730675be5395899906fad74a7d06c8d75e7d9c9 (patch) | |
| tree | 589bf3c649acf8f4502d1f5ddd707196c35171c6 | |
| parent | 12d76b8cce732564b806e928325c33ab050307bd (diff) | |
| parent | e0c1fa30c46bb384c099f67e79246082d4faef38 (diff) | |
| download | php-git-d730675be5395899906fad74a7d06c8d75e7d9c9.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
backport the fix for bug #67739
| -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); |