2008-11-04 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Deprecated --http-proxy-user and --http-proxy-passwd options.
	Added --https-proxy, --ftp-proxy and --all-proxy options.
	Above 3 options and --http-proxy option can handle proxy in URL
	format like: http://user:passwd@host:port.
	If a proxy requires user/password, they must be specified in a
	URL.
	Deprecated --ftp-via-http-proxy option. Use --http-proxy-method
	option instead.
	* src/AbstractCommand.cc
	* src/AbstractCommand.h
	* src/AbstractProxyRequestCommand.cc
	* src/AbstractProxyRequestCommand.h
	* src/AuthConfigFactory.cc
	* src/AuthConfigFactory.h
	* src/FtpFinishDownloadCommand.cc
	* src/FtpInitiateConnectionCommand.cc
	* src/FtpInitiateConnectionCommand.h
	* src/FtpNegotiationCommand.cc
	* src/FtpTunnelRequestCommand.cc
	* src/FtpTunnelRequestCommand.h
	* src/HttpDownloadCommand.cc
	* src/HttpInitiateConnectionCommand.cc
	* src/HttpInitiateConnectionCommand.h
	* src/HttpProxyRequestCommand.cc
	* src/HttpProxyRequestCommand.h
	* src/HttpRequest.cc
	* src/HttpRequest.h
	* src/HttpRequestCommand.cc
	* src/HttpRequestCommand.h
	* src/HttpSkipResponseCommand.cc
	* src/InitiateConnectionCommand.cc
	* src/InitiateConnectionCommand.h
	* src/OptionHandlerFactory.cc
	* src/OptionHandlerImpl.h
	* src/Request.cc
	* src/option_processing.cc
	* src/prefs.cc
	* src/prefs.h
	* src/usage_text.h
	* test/AuthConfigFactoryTest.cc
	* test/HttpRequestTest.cc
	* test/OptionHandlerTest.cc

1 files changed, 8 insertions, 23 deletions

diff --git a/src/HttpRequest.h b/src/HttpRequest.h
index 8069851c..b80089bb 100644
--- a/src/HttpRequest.h
+++ b/src/HttpRequest.h
@@ -62,10 +62,6 @@ private:
 
   uint64_t entityLength;
 
-  bool proxyEnabled;
-
-  bool proxyAuthEnabled;
-
   bool _contentEncodingEnabled;
 
   std::string userAgent;
@@ -78,6 +74,8 @@ private:
 
   SharedHandle<AuthConfigFactory> _authConfigFactory;
 
+  SharedHandle<Request> _proxyRequest;
+
   std::string getHostText(const std::string& host, uint16_t port) const;
 
   std::string getProxyAuthString() const;
@@ -147,25 +145,6 @@ public:
    */
   std::string createProxyRequest() const;
 
-  /**
-   * Configures this object with option.
-   * Following values are evaluated:
-   * PREF_HTTP_PROXY_ENABLED,
-   * PREF_HTTP_PROXY_METHOD, PREF_HTTP_PROXY_AUTH_ENABLED,
-   * The evaluation results are stored in instance variables.
-   */
-  void configure(const Option* option);
-
-  void setProxyEnabled(bool proxyEnabled)
-  {
-    this->proxyEnabled = proxyEnabled;
-  }
-
-  void setProxyAuthEnabled(bool proxyAuthEnabled)
-  {
-    this->proxyAuthEnabled = proxyAuthEnabled;
-  }
-
   void enableContentEncoding();
 
   void disableContentEncoding();
@@ -191,6 +170,12 @@ public:
   SharedHandle<CookieStorage> getCookieStorage() const;
 
   void setAuthConfigFactory(const SharedHandle<AuthConfigFactory>& factory);
+
+  /*
+   * To use proxy, pass proxy string to Request::setUrl() and set it this
+   * object.
+   */
+  void setProxyRequest(const SharedHandle<Request>& proxyRequest);
 };
 
 typedef SharedHandle<HttpRequest> HttpRequestHandle;