From bd2ead4763282d037f3ce5671cba96177d9ce96c Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Tue, 4 Nov 2008 14:20:12 +0000
Subject: 2008-11-04  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>

	Renamed --http-proxy-method as --proxy-method.
	* src/AbstractCommand.cc
	* src/FtpInitiateConnectionCommand.cc
	* src/HttpInitiateConnectionCommand.cc
	* src/OptionHandlerFactory.cc
	* src/option_processing.cc
	* src/prefs.cc
	* src/prefs.h
	* src/usage_text.h
---
 src/option_processing.cc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/option_processing.cc')

diff --git a/src/option_processing.cc b/src/option_processing.cc
index 19dcc591..9fc1cc01 100644
--- a/src/option_processing.cc
+++ b/src/option_processing.cc
@@ -117,7 +117,7 @@ Option* option_processing(int argc, char* const argv[])
       { PREF_FTP_TYPE.c_str(), required_argument, &lopt, 11 },
       { PREF_FTP_PASV.c_str(), no_argument, NULL, 'p' },
       { "ftp-via-http-proxy", required_argument, &lopt, 12 },
-      { PREF_HTTP_PROXY_METHOD.c_str(), required_argument, &lopt, 14 },
+      { "http-proxy-method", required_argument, &lopt, 14 },
       { PREF_LOWEST_SPEED_LIMIT.c_str(), required_argument, &lopt, 200 },
       { PREF_MAX_DOWNLOAD_LIMIT.c_str(), required_argument, &lopt, 201 },
       { PREF_FILE_ALLOCATION.c_str(), required_argument, 0, 'a' },
@@ -164,6 +164,7 @@ Option* option_processing(int argc, char* const argv[])
       { PREF_HTTPS_PROXY.c_str(), required_argument, &lopt, 227 },
       { PREF_FTP_PROXY.c_str(), required_argument, &lopt, 228 },
       { PREF_ALL_PROXY.c_str(), required_argument, &lopt, 229 },
+      { PREF_PROXY_METHOD.c_str(), required_argument, &lopt, 230 },
 #if defined ENABLE_BITTORRENT || defined ENABLE_METALINK
       { PREF_SHOW_FILES.c_str(), no_argument, NULL, 'S' },
       { PREF_SELECT_FILE.c_str(), required_argument, &lopt, 21 },
@@ -257,8 +258,10 @@ Option* option_processing(int argc, char* const argv[])
 		  << std::endl;
 	exit(EXIT_FAILURE);
       case 14:
-	cmdstream << PREF_HTTP_PROXY_METHOD << "=" << optarg << "\n";
-	break;
+	std::cout << "--http-proxy-method was deprecated."
+		  << " Use --proxy-method option instead."
+		  << std::endl;
+	exit(EXIT_FAILURE);
       case 15:
 	cmdstream << PREF_LISTEN_PORT << "=" << optarg << "\n";
 	break;
@@ -427,6 +430,9 @@ Option* option_processing(int argc, char* const argv[])
       case 229:
 	cmdstream << PREF_ALL_PROXY << "=" << optarg << "\n";
 	break;
+      case 230:
+	cmdstream << PREF_PROXY_METHOD << "=" << optarg << "\n";
+	break;
       }
       break;
     }
-- 
cgit