[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 26/153: system_win32: fix version checking
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 26/153: system_win32: fix version checking |
Date: |
Tue, 11 Sep 2018 12:51:37 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit d0d48b42763ec8649196fbf7648ad9de0127dc27
Author: djelinski <address@hidden>
AuthorDate: Wed Jul 25 14:01:55 2018 +0200
system_win32: fix version checking
In the current version, VERSION_GREATER_THAN_EQUAL 6.3 will return false
when run on windows 10.0. This patch addresses that error.
Closes https://github.com/curl/curl/pull/2792
---
lib/system_win32.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/system_win32.c b/lib/system_win32.c
index cfbbf3279..89d648516 100644
--- a/lib/system_win32.c
+++ b/lib/system_win32.c
@@ -134,8 +134,9 @@ bool Curl_verify_windows_version(const unsigned int
majorVersion,
break;
case VERSION_LESS_THAN_EQUAL:
- if(osver.dwMajorVersion <= majorVersion &&
- osver.dwMinorVersion <= minorVersion)
+ if(osver.dwMajorVersion < majorVersion ||
+ (osver.dwMajorVersion == majorVersion &&
+ osver.dwMinorVersion <= minorVersion))
matched = TRUE;
break;
@@ -146,8 +147,9 @@ bool Curl_verify_windows_version(const unsigned int
majorVersion,
break;
case VERSION_GREATER_THAN_EQUAL:
- if(osver.dwMajorVersion >= majorVersion &&
- osver.dwMinorVersion >= minorVersion)
+ if(osver.dwMajorVersion > majorVersion ||
+ (osver.dwMajorVersion == majorVersion &&
+ osver.dwMinorVersion >= minorVersion))
matched = TRUE;
break;
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 59/153: CMake: Respect BUILD_SHARED_LIBS, (continued)
- [GNUnet-SVN] [gnurl] 59/153: CMake: Respect BUILD_SHARED_LIBS, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 33/153: mime: check Curl_rand_hex's return code, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 54/153: lib/Makefile: only do symbol hiding if told to, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 38/153: tests/http_pipe.py: Use /usr/bin/env to find python, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 57/153: cmake: link curl to the OpenSSL targets instead of lib absolute paths, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 48/153: mailmap: Daniel Jelinski, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 42/153: travis: run a 'make checksrc' too, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 46/153: curl: use Content-Disposition before the "URL end" for -OJ, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 29/153: docs/CURLOPT_WRITEFUNCTION: size is always 1, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 58/153: cmake: bumped minimum version to 3.4, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 26/153: system_win32: fix version checking,
gnunet <=
- [GNUnet-SVN] [gnurl] 56/153: travis: build darwinssl on macos 10.12, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 25/153: auth: pick Bearer authentication whenever a token is available, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 45/153: retry: return error if rewind was necessary but didn't happen, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 53/153: hostip: fix unused variable warning, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 47/153: HTTP: Don't attempt to needlessly decompress redirect body, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 23/153: test320: treat curl320.out file as binary, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 44/153: http2: clear the drain counter in Curl_http2_done, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 01/153: examples/crawler.c: move #ifdef to column 0, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 24/153: auth: only ever pick CURLAUTH_BEARER if we *have* a Bearer token, gnunet, 2018/09/11
- [GNUnet-SVN] [gnurl] 37/153: TODO: Support Authority Information Access certificate extension (AIA), gnunet, 2018/09/11