From 5554fdc59a308c46012f3afa16af60d66a00465e Mon Sep 17 00:00:00 2001 From: Kraant Date: Sun, 10 Aug 2008 10:56:58 +0000 Subject: Set headers for CURL so that proxies won't cache Applied only to resources2.txt and news.txt. (cherry picked from commits 047f598be826dd57dd1124db914e8367256112be, cabf8905526b6601813573d049f6afaf364e1cac and 416e28057f5a6073a2ef44f296ed1c8bc1280bf6) --- NEWS | 2 ++ src/gui/updatewindow.cpp | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/NEWS b/NEWS index ca1286f1..cc6fdff6 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Make sure news and update file list aren't cached (from Aethyra) + 0.0.25 (27 July 2008) - Added support for whispering to other players - Added ability to ignore other players diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index ff1e600c..0d6b00af 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -315,6 +315,17 @@ int UpdaterWindow::downloadThread(void *ptr) curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15); + struct curl_slist *pHeaders = NULL; + if (uw->mDownloadStatus != UPDATE_RESOURCES) + { + // Make sure the resources2.txt and news.txt aren't cached, + // in order to always get the latest version. + pHeaders = curl_slist_append(pHeaders, "pragma: no-cache"); + pHeaders = + curl_slist_append(pHeaders, "Cache-Control: no-cache"); + curl_easy_setopt(curl, CURLOPT_HTTPHEADER, pHeaders); + } + if ((res = curl_easy_perform(curl)) != 0) { uw->mDownloadStatus = UPDATE_ERROR; @@ -339,6 +350,11 @@ int UpdaterWindow::downloadThread(void *ptr) curl_easy_cleanup(curl); + if (uw->mDownloadStatus != UPDATE_RESOURCES) + { + curl_slist_free_all(pHeaders); + } + if (!uw->mStoreInMemory) { // Don't check resources2.txt checksum -- cgit v1.2.3-70-g09d2