2008-05-05 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Reimplemented transparent metalink using Accept request header.
	* src/HttpRequest.cc
	* src/HttpRequest.h
	* src/HttpRequestCommand.cc
	* src/Metalink2RequestGroup.cc
	* src/RequestGroup.cc
	* src/RequestGroup.h
	* test/HttpRequestTest.cc

1 files changed, 14 insertions, 2 deletions

diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index 70e281da..ab260a46 100644
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -44,6 +44,7 @@
 #include "prefs.h"
 #include "AuthConfigFactory.h"
 #include "AuthConfig.h"
+#include "a2functional.h"
 #include <numeric>
 
 namespace aria2 {
@@ -145,11 +146,17 @@ std::string HttpRequest::createRequest() const
   }
   requestLine +=
     std::string(" HTTP/1.1\r\n")+
-    "User-Agent: "+userAgent+"\r\n"+
-    "Accept: */*\r\n"+        /* */
+    "User-Agent: "+userAgent+"\r\n";
+  
+  requestLine +=
+    std::accumulate(_acceptTypes.begin(), _acceptTypes.end(),
+		    std::string("Accept: */*"), Concat(","))+"\r\n"; /* */
+
+  requestLine +=
     "Host: "+getHostText(getHost(), getPort())+"\r\n"+
     "Pragma: no-cache\r\n"+
     "Cache-Control: no-cache\r\n";
+
   if(!request->isKeepAliveEnabled() && !request->isPipeliningEnabled()) {
     requestLine += "Connection: close\r\n";
   }
@@ -232,6 +239,11 @@ void HttpRequest::addHeader(const std::string& headersString)
   _headers.insert(_headers.end(), headers.begin(), headers.end());
 }
 
+void HttpRequest::addAcceptType(const std::string& type)
+{
+  _acceptTypes.push_back(type);
+}
+
 void HttpRequest::configure(const Option* option)
 {
   authEnabled = option->get(PREF_HTTP_AUTH_ENABLED) == V_TRUE;