From 5143a7fed04d37b584983812f86a91dca73a166c Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Wed, 14 May 2008 14:51:31 +0000
Subject: [PATCH] 2008-05-14  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot
 com>

	Defined AUTH_HEADER, PROXY_AUTH_HEADER as static const
std::string
	* src/HttpConnection.cc (eraseConfidentialInfo)
---
 ChangeLog             |  5 +++++
 src/HttpConnection.cc | 17 +++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index afe623d3..9e8f7aa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-14  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Defined AUTH_HEADER, PROXY_AUTH_HEADER as static const std::string
+	* src/HttpConnection.cc (eraseConfidentialInfo)
+
 2008-05-14  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Defined default ftp user and password as static const std::string
diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc
index ca777ae7..88acf0de 100644
--- a/src/HttpConnection.cc
+++ b/src/HttpConnection.cc
@@ -48,7 +48,6 @@
 #include "Logger.h"
 #include "Socket.h"
 #include "Option.h"
-#include <sstream>
 
 namespace aria2 {
 
@@ -77,18 +76,20 @@ HttpConnection::HttpConnection(int32_t cuid,
 std::string HttpConnection::eraseConfidentialInfo(const std::string& request)
 {
   std::istringstream istr(request);
-  std::ostringstream ostr;
+  std::string result;
   std::string line;
   while(getline(istr, line)) {
-    if(Util::startsWith(line, "Authorization: Basic")) {
-      ostr << "Authorization: Basic ********\n";
-    } else if(Util::startsWith(line, "Proxy-Authorization: Basic")) {
-      ostr << "Proxy-Authorization: Basic ********\n";
+    static const std::string AUTH_HEADER("Authorization: Basic");
+    static const std::string PROXY_AUTH_HEADER("Proxy-Authorization: Basic");
+    if(Util::startsWith(line, AUTH_HEADER)) {
+      result += "Authorization: Basic ********\n";
+    } else if(Util::startsWith(line, PROXY_AUTH_HEADER)) {
+      result += "Proxy-Authorization: Basic ********\n";
     } else {
-      ostr << line << "\n";
+      result += line+"\n";
     }
   }
-  return ostr.str();
+  return result;
 }
 
 void HttpConnection::sendRequest(const HttpRequestHandle& httpRequest)