From e45a0e7e5fa64069b69775d9ed5b11c0729d074e Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Fri, 3 Jul 2009 15:38:29 +0000
Subject: [PATCH] 2009-07-04  Tatsuhiro Tsujikawa 
 <t-tujikawa@users.sourceforge.net>

	Removed calls to Request::resetUrl() in AbstractCommand.cc.
	Removed hidden option PREF_RESET_URI.
	* src/AbstractCommand.cc
	* src/OptionHandlerFactory.cc
	* src/prefs.cc
	* src/prefs.h
---
 ChangeLog                   | 9 +++++++++
 src/AbstractCommand.cc      | 9 ---------
 src/OptionHandlerFactory.cc | 9 ---------
 src/prefs.cc                | 2 --
 src/prefs.h                 | 2 --
 5 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44af6dab..ff3081d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-04  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Removed calls to Request::resetUrl() in AbstractCommand.cc.
+	Removed hidden option PREF_RESET_URI.
+	* src/AbstractCommand.cc
+	* src/OptionHandlerFactory.cc
+	* src/prefs.cc
+	* src/prefs.h
+
 2009-07-03  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Removed unused variable/function.
diff --git a/src/AbstractCommand.cc b/src/AbstractCommand.cc
index c8b54f98..8b6f79b3 100644
--- a/src/AbstractCommand.cc
+++ b/src/AbstractCommand.cc
@@ -193,8 +193,6 @@ bool AbstractCommand::execute() {
       _requestGroup->setLastUriResult(req->getUrl(), err.getCode());
     }
     onAbort();
-    // TODO Do we need this?
-    //req->resetUrl();
     tryReserved();
     return true;
   } catch(DlRetryEx& err) {
@@ -209,13 +207,6 @@ bool AbstractCommand::execute() {
     bool isAbort = maxTries != 0 && req->getTryCount() >= maxTries;
     if(isAbort) {
       onAbort();
-      req->resetUrl();
-    } else {
-      if(getOption()->getAsBool(PREF_RESET_URI)) {
-	req->resetUrl();
-      }
-    }
-    if(isAbort) {
       logger->info(MSG_MAX_TRY, cuid, req->getTryCount());
       logger->error(MSG_DOWNLOAD_ABORTED, err, cuid, req->getUrl().c_str());
       _fileEntry->addURIResult(req->getUrl(), err.getCode());
diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc
index fcbee87c..21e6acbd 100644
--- a/src/OptionHandlerFactory.cc
+++ b/src/OptionHandlerFactory.cc
@@ -512,15 +512,6 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
     op->addTag(TAG_HTTP);
     handlers.push_back(op);
   }
-  {
-    SharedHandle<OptionHandler> op(new BooleanOptionHandler
-				   (PREF_RESET_URI,
-				    NO_DESCRIPTION,
-				    V_FALSE,
-				    OptionHandler::OPT_ARG));
-    op->hide();
-    handlers.push_back(op);
-  }
   {
     SharedHandle<OptionHandler> op(new NumberOptionHandler
 				   (PREF_RETRY_WAIT,
diff --git a/src/prefs.cc b/src/prefs.cc
index 4efc20d5..08a985c0 100644
--- a/src/prefs.cc
+++ b/src/prefs.cc
@@ -158,8 +158,6 @@ const std::string PREF_XML_RPC_LISTEN_PORT("xml-rpc-listen-port");
 // value: true | false
 const std::string PREF_ENABLE_XML_RPC("enable-xml-rpc");
 // value: true | false
-const std::string PREF_RESET_URI("reset-uri");
-// value: true | false
 const std::string PREF_DRY_RUN("dry-run");
 // value: true | false
 const std::string PREF_REUSE_URI("reuse-uri");
diff --git a/src/prefs.h b/src/prefs.h
index 59da1620..73f0846a 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -162,8 +162,6 @@ extern const std::string PREF_XML_RPC_LISTEN_PORT;
 // value: true | false
 extern const std::string PREF_ENABLE_XML_RPC;
 // value: true | false
-extern const std::string PREF_RESET_URI;
-// value: true | false
 extern const std::string PREF_DRY_RUN;
 // value: true | false
 extern const std::string PREF_REUSE_URI;