diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-10-06 10:37:39 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-10-06 10:37:39 +0200 |
| commit | d5e4802adef575d1d2d20a3e6e5addd4b5f4d2ca (patch) | |
| tree | c137de6993a50025fb561aac4d73f8557c86d5c6 | |
| parent | 651bed91a0d6aff551fd6880a7cdbca403064c4f (diff) | |
| download | MultiMC-d5e4802adef575d1d2d20a3e6e5addd4b5f4d2ca.tar MultiMC-d5e4802adef575d1d2d20a3e6e5addd4b5f4d2ca.tar.gz MultiMC-d5e4802adef575d1d2d20a3e6e5addd4b5f4d2ca.tar.lz MultiMC-d5e4802adef575d1d2d20a3e6e5addd4b5f4d2ca.tar.xz MultiMC-d5e4802adef575d1d2d20a3e6e5addd4b5f4d2ca.zip | |
Don't use SSL for lib downloads
| -rw-r--r-- | logic/OneSixLibrary.cpp | 9 | ||||
| -rw-r--r-- | logic/OneSixLibrary.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/logic/OneSixLibrary.cpp b/logic/OneSixLibrary.cpp index 0643abe3..9c1caaa7 100644 --- a/logic/OneSixLibrary.cpp +++ b/logic/OneSixLibrary.cpp @@ -86,7 +86,7 @@ bool OneSixLibrary::isNative() } QString OneSixLibrary::downloadUrl() { - if(m_absolute_url.size()) + if (m_absolute_url.size()) return m_absolute_url; return m_download_url; } @@ -119,11 +119,12 @@ QJsonObject OneSixLibrary::toJson() { QJsonObject libRoot; libRoot.insert("name", m_name); - if(m_absolute_url.size()) + if (m_absolute_url.size()) libRoot.insert("MMC-absoluteUrl", m_absolute_url); - if(m_hint.size()) + if (m_hint.size()) libRoot.insert("MMC-hint", m_hint); - if(m_base_url != "https://s3.amazonaws.com/Minecraft.Download/libraries/") + if (m_base_url != "http://s3.amazonaws.com/Minecraft.Download/libraries/" && + m_base_url != "https://s3.amazonaws.com/Minecraft.Download/libraries/") libRoot.insert("url", m_base_url); if (isNative() && m_native_suffixes.size()) { diff --git a/logic/OneSixLibrary.h b/logic/OneSixLibrary.h index a8bcc364..5e58ef89 100644 --- a/logic/OneSixLibrary.h +++ b/logic/OneSixLibrary.h @@ -13,7 +13,7 @@ class OneSixLibrary private: // basic values used internally (so far) QString m_name; - QString m_base_url = "https://s3.amazonaws.com/Minecraft.Download/libraries/"; + QString m_base_url = "http://s3.amazonaws.com/Minecraft.Download/libraries/"; QList<std::shared_ptr<Rule> > m_rules; // custom values |