Removed util::startsWith(a, b)

1 files changed, 8 insertions, 4 deletions

diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc
index 8f3ef334..ced5090a 100644
--- a/src/HttpConnection.cc
+++ b/src/HttpConnection.cc
@@ -57,6 +57,7 @@
 #include "a2functional.h"
 #include "fmt.h"
 #include "SocketRecvBuffer.h"
+#include "array_fun.h"
 
 namespace aria2 {
 
@@ -86,11 +87,14 @@ std::string HttpConnection::eraseConfidentialInfo(const std::string& request)
   std::string result;
   std::string line;
   while(getline(istr, line)) {
-    static const std::string AUTH_HEADER("Authorization: Basic");
-    static const std::string PROXY_AUTH_HEADER("Proxy-Authorization: Basic");
-    if(util::startsWith(line, AUTH_HEADER)) {
+    const char A2_AUTH_HEADER[] = "Authorization: Basic";
+    const char A2_PROXY_AUTH_HEADER[] = "Proxy-Authorization: Basic";
+    if(util::startsWith(line.begin(), line.end(),
+                        A2_AUTH_HEADER, vend(A2_AUTH_HEADER)-1)) {
       result += "Authorization: Basic ********\n";
-    } else if(util::startsWith(line, PROXY_AUTH_HEADER)) {
+    } else if(util::startsWith(line.begin(), line.end(),
+                               A2_PROXY_AUTH_HEADER,
+                               vend(A2_PROXY_AUTH_HEADER)-1)) {
       result += "Proxy-Authorization: Basic ********\n";
     } else {
       strappend(result, line, "\n");