From cd7e8372f3c83531afe5d5c2460ecb95540f9d0d Mon Sep 17 00:00:00 2001 From: Sfan5 Date: Sun, 19 Jan 2014 14:32:03 +0100 Subject: Include system info in the HTTP user agent on Windows --- src/httpfetch.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/httpfetch.cpp') diff --git a/src/httpfetch.cpp b/src/httpfetch.cpp index 599507562..2eca363d7 100644 --- a/src/httpfetch.cpp +++ b/src/httpfetch.cpp @@ -18,16 +18,13 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include "socket.h" // for select() -#include "porting.h" // for sleep_ms() +#include "porting.h" // for sleep_ms(), get_sysinfo() #include "httpfetch.h" #include #include #include #include #include -#ifndef _WIN32 -#include -#endif #include "jthread/jevent.h" #include "config.h" #include "exceptions.h" @@ -50,15 +47,7 @@ HTTPFetchRequest::HTTPFetchRequest() timeout = g_settings->getS32("curl_timeout"); connect_timeout = timeout * 5; - useragent = std::string("Minetest/") + minetest_version_hash + " "; -#ifdef _WIN32 - useragent += "(Windows)"; -#else - struct utsname osinfo; - uname(&osinfo); - useragent += std::string("(") + osinfo.sysname + "/" - + osinfo.release + " " + osinfo.machine + ")"; -#endif + useragent = std::string("Minetest/") + minetest_version_hash + " (" + porting::get_sysinfo() + ")"; } -- cgit v1.2.3