Don't use SSL for lib downloads

This commit is contained in:
Petr Mrázek 2013-10-06 10:37:39 +02:00
parent 651bed91a0
commit d5e4802ade
2 changed files with 6 additions and 5 deletions

View File

@ -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())
{

View File

@ -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