Rewritten DownloadHandlerConstants

DownloadHandlerConstants was simplified.  MIME type handling in Accept
header was also reworked.  DownloadContext's metalinkServerContacted_
is replaced with acceptMetalink_ and its boolean value is reverted.
RequestGroup and HttpRequest now do not hold vector of accepting
types.  HttpRequest has the flag acceptMetalink_ which will be set by
the same value of DownloadContext::accpetMetalink_ and if it is true,
Metalink MIME types are added to Accept header field.

1 files changed, 6 insertions, 9 deletions

diff --git a/src/ContentTypeRequestGroupCriteria.h b/src/ContentTypeRequestGroupCriteria.h
index 1c8c7c41..67e6be3a 100644
--- a/src/ContentTypeRequestGroupCriteria.h
+++ b/src/ContentTypeRequestGroupCriteria.h
@@ -44,16 +44,13 @@ namespace aria2 {
 class ContentTypeRequestGroupCriteria:public RequestGroupCriteria
 {
 private:
-  std::vector<std::string> contentTypes_;
-  std::vector<std::string> extensions_;
+  const char** contentTypes_;
+  const char** extensions_;
 public:
-  template<typename InputIterator>
-  ContentTypeRequestGroupCriteria(InputIterator contentTypeFirst,
-                                  InputIterator contentTypeLast,
-                                  InputIterator extensionFirst,
-                                  InputIterator extensionLast):
-    contentTypes_(contentTypeFirst, contentTypeLast),
-    extensions_(extensionFirst, extensionLast) {}
+  ContentTypeRequestGroupCriteria(const char** contentTypes,
+                                  const char** extensions);
+
+  virtual ~ContentTypeRequestGroupCriteria();
 
   virtual bool match(const RequestGroup* requestGroup) const;
 };