increase _snd_mixahead to 0.15 to fix crackling sound on Vista

[xonotic/darkplaces.git] / libcurl.c

diff --git a/libcurl.c b/libcurl.c
index 1d261cd68ee8dfa5f7458c842f5ced8d60c653b2..141086ae0bef4da54297b179f01f92034610a7f3 100644 (file)
--- a/libcurl.c
+++ b/libcurl.c
@@ -53,8 +53,13 @@ typedef enum
        CINIT(PRIVATE, OBJECTPOINT, 103),
        CINIT(LOW_SPEED_LIMIT, LONG , 19),
        CINIT(LOW_SPEED_TIME, LONG, 20),
+       CINIT(PROTOCOLS, LONG, 181),
+       CINIT(REDIR_PROTOCOLS, LONG, 182),
 }
 CURLoption;
+#define CURLPROTO_HTTP   (1<<0)
+#define CURLPROTO_HTTPS  (1<<1)
+#define CURLPROTO_FTP    (1<<2)
 typedef enum
 {
        CURLINFO_TEXT = 0,
@@ -169,7 +174,7 @@ static dllhandle_t curl_dll = NULL;
 
 typedef struct downloadinfo_s
 {
-       char filename[MAX_QPATH];
+       char filename[MAX_OSPATH];
        char url[1024];
        char referer[256];
        qfile_t *stream;
@@ -263,7 +268,7 @@ Returns true if a download needed for the current game is running.
 */
 qboolean Curl_Have_forthismap(void)
 {
-       return numdownloads_added;
+       return numdownloads_added != 0;
 }
 
 void Curl_Register_predownload(void)
@@ -585,6 +590,13 @@ static void CheckPendingDownloads(void)
                                qcurl_easy_setopt(di->curle, CURLOPT_LOW_SPEED_TIME, (long) 45);
                                qcurl_easy_setopt(di->curle, CURLOPT_WRITEDATA, (void *) di);
                                qcurl_easy_setopt(di->curle, CURLOPT_PRIVATE, (void *) di);
+                               qcurl_easy_setopt(di->curle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FTP);
+                               if(qcurl_easy_setopt(di->curle, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FTP) != CURLE_OK)
+                               {
+                                       Con_Printf("^1WARNING:^7 for security reasons, please upgrade to libcurl 7.19.4 or above. In a later version of DarkPlaces, HTTP redirect support will be disabled for this libcurl version.\n");
+                                       //qcurl_easy_setopt(di->curle, CURLOPT_FOLLOWLOCATION, 0);
+                               }
+                               
                                qcurl_multi_add_handle(curlm, di->curle);
                                di->started = true;
                                ++numdownloads;
@@ -682,7 +694,7 @@ static qboolean Curl_Begin(const char *URL, const char *name, qboolean ispak, qb
        }
        else
        {
-               char fn[MAX_QPATH];
+               char fn[MAX_OSPATH];
                const char *p, *q;
                size_t length;
                downloadinfo *di;
@@ -1389,7 +1401,7 @@ static const char *Curl_FindPackURL(const char *filename)
 typedef struct requirement_s
 {
        struct requirement_s *next;
-       char filename[MAX_QPATH];
+       char filename[MAX_OSPATH];
 }
 requirement;
 static requirement *requirements = NULL;