summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2011-07-21 14:49:55 +0000
committerPierre Joye <pajoye@php.net>2011-07-21 14:49:55 +0000
commit83b69f4034472196234eb17cc147e652b4233675 (patch)
treef8de9e54b7e4ca4f6f0dcf92a96e92f2190a2daf
parent5dc5c26a5f6b149236ce0ca9031c37db5d9dcdab (diff)
downloadphp-git-83b69f4034472196234eb17cc147e652b4233675.tar.gz
- Fixed bug #55258 (Windows Version Detecting Error) (already fixed in trunk/5.4)
-rw-r--r--NEWS2
-rw-r--r--ext/standard/info.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index df5f277fff..fdcbf0f685 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,8 @@ PHP NEWS
- Core
. Removed warning when argument of is_a() or is_subclass_of() is not
a known class. (Stas)
+ . Fixed bug #55258 (Windows Version Detecting Error).
+ ( xiaomao5 at live dot com, Pierre)
. Fixed bug #55187 (readlink returns weird characters when false result).
(Pierre)
. Fixed bug #55014 (Compile failure due to improper use of ctime_r()). (Ilia)
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 09fc2346e3..90ae34f0bc 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -289,7 +289,7 @@ char* php_get_windows_name()
major = "Windows Server 2008";
}
} else
- if ( osvi.dwMinorVersion == 2 ) {
+ if ( osvi.dwMinorVersion == 1 ) {
if( osvi.wProductType == VER_NT_WORKSTATION ) {
major = "Windows 7";
} else {