patch: rebase

aria2-0001-options-change-default-path-to-current-dir.patch

@@ -1,7 +1,7 @@
-From 1b7fec7ade79f2423ecfef7efd4b2ae7554022fa Mon Sep 17 00:00:00 2001
+From c33446e390e8d4fc79d69031d391eaf12dce1766 Mon Sep 17 00:00:00 2001
 From: myfreeer <[email protected]>
 Date: Tue, 5 Jun 2018 16:49:07 +0800
-Subject: [PATCH] options: change default path to current dir
+Subject: [PATCH 1/4] options: change default path to current dir
 
 and try to load config files in current dir if exists
 ---
@@ -11,7 +11,7 @@ and try to load config files in current dir if exists
  3 files changed, 12 insertions(+), 6 deletions(-)
 
 diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc
-index 4339c91..dbfe29e 100644
+index 3d76d33..cd00881 100644
 --- a/src/OptionHandlerFactory.cc
 +++ b/src/OptionHandlerFactory.cc
 @@ -1276,7 +1276,7 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers()
@@ -37,7 +37,7 @@ index 6214e84..7f89226 100644
        File f(path);
        std::string err;
 diff --git a/src/util.cc b/src/util.cc
-index be73a6e..4d50eaf 100644
+index 2e700de..cc2531d 100644
 --- a/src/util.cc
 +++ b/src/util.cc
 @@ -1805,9 +1805,12 @@ std::string getXDGDir(const std::string& environmentVariable,
@@ -71,5 +71,5 @@ index be73a6e..4d50eaf 100644
    }
    return filename;
 -- 
-2.17.0
+2.17.1
 

aria2-0002-options-unlock-connection-per-server-limit.patch

@@ -1,14 +1,14 @@
-From ac269cf2b9c7e6896439b26ee422d33af30fbcd7 Mon Sep 17 00:00:00 2001
+From 733fa35774821b7c955a9f018d43de570aa98d17 Mon Sep 17 00:00:00 2001
 From: myfreeer <[email protected]>
 Date: Mon, 29 May 2017 22:11:33 +0800
-Subject: [PATCH 2/2] options: unlock connection-per-server limit
+Subject: [PATCH 2/4] options: unlock connection-per-server limit
 
 ---
  src/OptionHandlerFactory.cc | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc
-index 79705aab..6ce0b946 100644
+index cd00881..5768f7b 100644
 --- a/src/OptionHandlerFactory.cc
 +++ b/src/OptionHandlerFactory.cc
 @@ -158,7 +158,7 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers()
@@ -84,5 +84,5 @@ index 79705aab..6ce0b946 100644
      op->addTag(TAG_FTP);
      op->addTag(TAG_HTTP);
 -- 
-2.12.1
+2.17.1
 

aria2-0003-download-retry-on-slow-speed-and-reset.patch

@@ -1,7 +1,7 @@
-From 7e4a9461e83ff802e3e834e72039ed8b0703e24d Mon Sep 17 00:00:00 2001
+From 66524bee738e98742c908d93c993d0a78a2d9891 Mon Sep 17 00:00:00 2001
 From: myfreeer <[email protected]>
 Date: Sat, 18 Nov 2017 11:55:04 +0800
-Subject: [PATCH] download: retry on slow speed and conection close
+Subject: [PATCH 3/4] download: retry on slow speed and conection close
 
 This would provide better speed on bad network conditions
 ---
@@ -11,7 +11,7 @@ This would provide better speed on bad network conditions
  3 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/src/DownloadCommand.cc b/src/DownloadCommand.cc
-index 91042ef..f777dec 100644
+index 2db41e4..f49eb80 100644
 --- a/src/DownloadCommand.cc
 +++ b/src/DownloadCommand.cc
 @@ -306,7 +306,7 @@ void DownloadCommand::checkLowestDownloadSpeed() const
@@ -45,7 +45,7 @@ index 62862ff..1906173 100644
      // A2_LOG_NOTICE(fmt("num=%zu, amount=%d, bufq.size()=%zu, SEND=%d",
      //                   num, amount, bufq_.size(), slen));
 diff --git a/src/SocketCore.cc b/src/SocketCore.cc
-index d0a205f..79a90a3 100644
+index 77dc30c..537375a 100644
 --- a/src/SocketCore.cc
 +++ b/src/SocketCore.cc
 @@ -1009,7 +1009,7 @@ bool SocketCore::tlsHandshake(TLSContext* tlsctx, const std::string& hostname)
@@ -58,5 +58,5 @@ index d0a205f..79a90a3 100644
                                  ? tlsSession_->getLastErrorString().c_str()
                                  : handshakeError.c_str()));
 -- 
-2.14.2
+2.17.1
 

aria2-0004-option_processing-make-use-of-deamon-on-mingw.patch

@@ -1,14 +1,14 @@
-From fc988aa01b850c466d94f047af2b979affc9efaa Mon Sep 17 00:00:00 2001
+From 26816f5deb196c7000244b56edd55b17385381db Mon Sep 17 00:00:00 2001
 From: myfreeer <[email protected]>
 Date: Sat, 9 Jun 2018 15:24:29 +0800
-Subject: [PATCH] option_processing: make use of --deamon on mingw
+Subject: [PATCH 4/4] option_processing: make use of --deamon on mingw
 
 ---
  src/option_processing.cc | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
 diff --git a/src/option_processing.cc b/src/option_processing.cc
-index 652a3bd..f86efd4 100644
+index f9891fe..3952ed6 100644
 --- a/src/option_processing.cc
 +++ b/src/option_processing.cc
 @@ -319,6 +319,22 @@ error_code::Value option_processing(Option& op, bool standalone,