Improve key bindings for ModeLatLon.

[andy/viking.git] / src / curl_download.c

diff --git a/src/curl_download.c b/src/curl_download.c
index 0eb2b45fd55ec96b14d965e240c68f70e94f77b0..9db48ba0d0d276c0a47fd2cc0ce265fda84ecb31 100644 (file)
--- a/src/curl_download.c
+++ b/src/curl_download.c
@@ -1,7 +1,10 @@
 /*
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
- * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
+ * Copyright (C) 2007, Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
+ * Copyright (C) 2007, Quy Tonthat <qtonthat@gmail.com>
+ * Copyright (C) 2009-2010, Jocelyn Jaubert <jocelyn.jaubert@gmail.com>
+ * Copyright (C) 2010, Sven Wegener <sven.wegener@stealer.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,7 +45,7 @@
 #include "globals.h"
 #include "curl_download.h"
 
-gchar *curl_download_user_agent;
+gchar *curl_download_user_agent = NULL;
 
 /*
  * Even if writing to FILE* is supported by libcurl by default,
@@ -57,14 +60,16 @@ static size_t curl_write_func(void *ptr, size_t size, size_t nmemb, FILE *stream
 
 static size_t curl_get_etag_func(void *ptr, size_t size, size_t nmemb, gchar **stream)
 {
+#define ETAG_KEYWORD "ETag: "
+#define ETAG_LEN (sizeof(ETAG_KEYWORD)-1)
   size_t len = size*nmemb;
-  char *str = g_strstr_len(ptr, len, "ETag:");
+  char *str = g_strstr_len(ptr, len, ETAG_KEYWORD);
   if (str) {
-    char *etag_str = str + strlen("ETag: ");
-    char *end_str = g_strstr_len(etag_str, len, "\n");
+    char *etag_str = str + ETAG_LEN;
+    char *end_str = g_strstr_len(etag_str, len - ETAG_LEN, "\r\n");
     if (etag_str && end_str) {
-      end_str = '\0';
-      *stream = g_strndup(etag_str, len);
+      *stream = g_strndup(etag_str, end_str - etag_str);
+      g_debug("%s: ETAG found: %s", __FUNCTION__, *stream);
     }
   }
   return nmemb;
@@ -173,8 +178,8 @@ int curl_download_uri ( const char *uri, FILE *f, DownloadMapOptions *options, D
       if (options->use_etag) {
         if (file_options->etag != NULL) {
           /* add an header on the HTTP request */
-          char str[50];
-          g_snprintf(str, 50, "If-None-Match: %s", file_options->etag);
+          char str[60];
+          g_snprintf(str, 60, "If-None-Match: %s", file_options->etag);
           curl_send_headers = curl_slist_append(curl_send_headers, str);
           curl_easy_setopt ( curl, CURLOPT_HTTPHEADER , curl_send_headers);
         }
@@ -213,8 +218,11 @@ int curl_download_uri ( const char *uri, FILE *f, DownloadMapOptions *options, D
   }
   if (!handle)
      curl_easy_cleanup ( curl );
-  if (curl_send_headers)
+  if (curl_send_headers) {
     curl_slist_free_all(curl_send_headers);
+    curl_send_headers = NULL;
+    curl_easy_setopt ( curl, CURLOPT_HTTPHEADER , NULL);
+  }
   return res;
 }