From 6a5f6adafad6e00406a8c7a407bc07e77cf6446f Mon Sep 17 00:00:00 2001
From: Steveice10 <Steveice10@gmail.com>
Date: Tue, 1 Jan 2019 10:12:07 -0800
Subject: [PATCH] Refine cURL options (thanks @mariohackandglitch for the
 reference)

---
 source/core/http.c  |  8 ++++++++
 source/core/ui/ui.c | 12 ++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/source/core/http.c b/source/core/http.c
index d64ee62..481b45e 100644
--- a/source/core/http.c
+++ b/source/core/http.c
@@ -368,10 +368,13 @@ Result http_download_callback(const char* url, u32 bufferSize, u64* contentLengt
 
                 curl_easy_setopt(curl, CURLOPT_URL, url);
                 curl_easy_setopt(curl, CURLOPT_USERAGENT, HTTP_USER_AGENT);
+                curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "gzip");
                 curl_easy_setopt(curl, CURLOPT_BUFFERSIZE, bufferSize);
                 curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, HTTP_TIMEOUT_SEC);
                 curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+                curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
                 curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
+                curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS);
                 curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, http_curl_write_callback);
                 curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*) &curlData);
                 curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, http_curl_header_callback);
@@ -391,6 +394,11 @@ Result http_download_callback(const char* url, u32 bufferSize, u64* contentLengt
                 if(ret != CURLE_OK) {
                     if(ret == CURLE_WRITE_ERROR) {
                         res = curlData.res;
+                    } else if(ret == CURLE_HTTP_RETURNED_ERROR) {
+                        long responseCode = 0;
+                        curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &responseCode);
+
+                        res = R_APP_HTTP_ERROR_BASE + responseCode;
                     } else {
                         res = R_APP_CURL_ERROR_BASE + ret;
                     }
diff --git a/source/core/ui/ui.c b/source/core/ui/ui.c
index 9f818c1..ef551d2 100644
--- a/source/core/ui/ui.c
+++ b/source/core/ui/ui.c
@@ -383,15 +383,15 @@ const char* ui_get_display_eta(u32 seconds) {
 
 double ui_get_display_size(u64 size) {
     double s = size;
-    if(s > 1024) {
+    if(s >= 1024) {
         s /= 1024;
     }
 
-    if(s > 1024) {
+    if(s >= 1024) {
         s /= 1024;
     }
 
-    if(s > 1024) {
+    if(s >= 1024) {
         s /= 1024;
     }
 
@@ -399,15 +399,15 @@ double ui_get_display_size(u64 size) {
 }
 
 const char* ui_get_display_size_units(u64 size) {
-    if(size > 1024 * 1024 * 1024) {
+    if(size >= 1024 * 1024 * 1024) {
         return "GiB";
     }
 
-    if(size > 1024 * 1024) {
+    if(size >= 1024 * 1024) {
         return "MiB";
     }
 
-    if(size > 1024) {
+    if(size >= 1024) {
         return "KiB";
     }