diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-12-06 19:50:57 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-12-06 19:50:57 -0700 |
| commit | 483941ef2a4faef54865b3ce2e316cb32ed8cf64 (patch) | |
| tree | a542f040a80497eca957c36adbfb490ed419b02b /src/gui/updatewindow.cpp | |
| parent | 617fb41e21710856c1451058481e5df3756fb355 (diff) | |
| parent | 416e28057f5a6073a2ef44f296ed1c8bc1280bf6 (diff) | |
| download | mana-client-483941ef2a4faef54865b3ce2e316cb32ed8cf64.tar.gz mana-client-483941ef2a4faef54865b3ce2e316cb32ed8cf64.tar.bz2 mana-client-483941ef2a4faef54865b3ce2e316cb32ed8cf64.tar.xz mana-client-483941ef2a4faef54865b3ce2e316cb32ed8cf64.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/gui/updatewindow.cpp')
| -rw-r--r-- | src/gui/updatewindow.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index c0344b72..7f7d45fc 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -310,6 +310,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; @@ -334,6 +345,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 |