summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2009-06-12 14:20:37 +0000
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2009-06-12 14:20:37 +0000
commit3300aec6ffb395954a9f437740533acd3861d544 (patch)
tree11fbec7e86b1ecd434fbdde31492906b75562183
parent5fe5c378972a80ac6c983a681a04c06e97a9e3e3 (diff)
2009-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed _acceptFeatures and its accessor functions from RequestGroup since they are not used practically. * src/HttpRequestCommand.cc * src/RequestGroup.cc * src/RequestGroup.h
-rw-r--r--ChangeLog8
-rw-r--r--src/HttpRequestCommand.cc7
-rw-r--r--src/RequestGroup.cc15
-rw-r--r--src/RequestGroup.h11
4 files changed, 8 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index 72e878fa..43ec81dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2009-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
+ Removed _acceptFeatures and its accessor functions from
+ RequestGroup since they are not used practically.
+ * src/HttpRequestCommand.cc
+ * src/RequestGroup.cc
+ * src/RequestGroup.h
+
+2009-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
+
Removed member _maxTries from RequestGroup class to avoid
duplicate option value. Those classes who refer this variable
should use option value of PREF_MAX_TRIES directly.
diff --git a/src/HttpRequestCommand.cc b/src/HttpRequestCommand.cc
index bf3bf8f2..7acd3fdf 100644
--- a/src/HttpRequestCommand.cc
+++ b/src/HttpRequestCommand.cc
@@ -91,13 +91,6 @@ createHttpRequest(const SharedHandle<Request>& req,
httpRequest->setCookieStorage(cookieStorage);
httpRequest->setAuthConfigFactory(authConfigFactory);
httpRequest->setProxyRequest(proxyRequest);
- if(!rg->getAcceptFeatures().empty()) {
- const std::deque<std::string>& acceptFeatures = rg->getAcceptFeatures();
- std::string acceptFeaturesHeader = "Accept-Features: ";
- std::for_each(acceptFeatures.begin(), acceptFeatures.end(),
- StringAppend(acceptFeaturesHeader, ","));
- httpRequest->addHeader(Util::trim(acceptFeaturesHeader, ","));
- }
httpRequest->addAcceptType(rg->getAcceptTypes().begin(),
rg->getAcceptTypes().end());
diff --git a/src/RequestGroup.cc b/src/RequestGroup.cc
index 0d34edc7..7a40e6df 100644
--- a/src/RequestGroup.cc
+++ b/src/RequestGroup.cc
@@ -1106,21 +1106,6 @@ void RequestGroup::reportDownloadFinished()
#endif // ENABLE_BITTORRENT
}
-void RequestGroup::addAcceptFeatureHeader(const std::string& feature)
-{
- if(std::find(_acceptFeatures.begin(), _acceptFeatures.end(), feature) == _acceptFeatures.end()) {
- _acceptFeatures.push_back(feature);
- }
-}
-
-void RequestGroup::removeAcceptFeatureHeader(const std::string& feature)
-{
- std::deque<std::string>::iterator i = std::find(_acceptFeatures.begin(), _acceptFeatures.end(), feature);
- if(i != _acceptFeatures.end()) {
- _acceptFeatures.erase(i);
- }
-}
-
void RequestGroup::addAcceptType(const std::string& type)
{
if(std::find(_acceptTypes.begin(), _acceptTypes.end(), type) == _acceptTypes.end()) {
diff --git a/src/RequestGroup.h b/src/RequestGroup.h
index e62ca827..34db9dde 100644
--- a/src/RequestGroup.h
+++ b/src/RequestGroup.h
@@ -134,8 +134,6 @@ private:
std::deque<SharedHandle<PostDownloadHandler> > _postDownloadHandlers;
- std::deque<std::string> _acceptFeatures;
-
std::deque<std::string> _acceptTypes;
SharedHandle<URISelector> _uriSelector;
@@ -438,15 +436,6 @@ public:
void reportDownloadFinished();
- const std::deque<std::string>& getAcceptFeatures() const
- {
- return _acceptFeatures;
- }
-
- void addAcceptFeatureHeader(const std::string& feature);
-
- void removeAcceptFeatureHeader(const std::string& feature);
-
const std::deque<std::string>& getAcceptTypes() const
{
return _acceptTypes;