]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/httpfetch.cpp
make formspec textarea wordwrap
[dragonfireclient.git] / src / httpfetch.cpp
index 176a3b22a057792d335da6e374f4d0ee0f201926..751a4471a811cab1faeb94ed9d98bcbac9f16b1c 100644 (file)
@@ -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 <iostream>
 #include <sstream>
 #include <list>
 #include <map>
 #include <errno.h>
-#ifndef _MSC_VER
-#include <sys/utsname.h>
-#endif
 #include "jthread/jevent.h"
 #include "config.h"
 #include "exceptions.h"
@@ -42,23 +39,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 JMutex g_httpfetch_mutex;
 std::map<unsigned long, std::list<HTTPFetchResult> > g_httpfetch_results;
 
-       HTTPFetchRequest::HTTPFetchRequest()
-       {
-               url = "";
-               caller = HTTPFETCH_DISCARD;
-               request_id = 0;
-               timeout = g_settings->getS32("curl_timeout");
-               connect_timeout = timeout * 5;
-               
-               useragent = std::string("Minetest ") + minetest_version_hash;
-#ifdef _MSC_VER
-               useragent += "Windows";
-#else
-               struct utsname osinfo;
-               uname(&osinfo);
-               useragent += std::string(" (") + osinfo.sysname + "; " + osinfo.release + "; " + osinfo.machine + ")";
-#endif
-       }
+HTTPFetchRequest::HTTPFetchRequest()
+{
+       url = "";
+       caller = HTTPFETCH_DISCARD;
+       request_id = 0;
+       timeout = g_settings->getS32("curl_timeout");
+       connect_timeout = timeout * 5;
+       
+       useragent = std::string("Minetest/") + minetest_version_hash + " (" + porting::get_sysinfo() + ")";
+}
 
 
 static void httpfetch_deliver_result(const HTTPFetchResult &fetchresult)
@@ -548,7 +538,7 @@ class CurlFetchThread : public JThread
                if (select_timeout > 0) {
                        // in Winsock it is forbidden to pass three empty
                        // fd_sets to select(), so in that case use sleep_ms
-                       if (max_fd == -1) {
+                       if (max_fd != -1) {
                                select_tv.tv_sec = select_timeout / 1000;
                                select_tv.tv_usec = (select_timeout % 1000) * 1000;
                                int retval = select(max_fd + 1, &read_fd_set,
@@ -576,6 +566,8 @@ class CurlFetchThread : public JThread
                log_register_thread("CurlFetchThread");
                DSTACK(__FUNCTION_NAME);
 
+               porting::setThreadName("CurlFetchThread");
+
                CurlHandlePool pool;
 
                m_multi = curl_multi_init();