@@ -1,5 +1,6 @@

 2007-07-05  Michal Ludvig  <michal@logix.cz>

+	* s3cmd: --configure support for Proxy

 	* S3/S3.py: HTTP proxy support from

 	  John D. Rowell <jdrowell@exerciseyourbrain.com>

@@ -20,7 +20,7 @@ class Config(object):

 	force = False

 	acl_public = False

 	proxy_host = ""

-	proxy_port = 0

+	proxy_port = 8080

 	encrypt = False

 	gpg_passphrase = ""

 	gpg_command = ""

@@ -8,6 +8,8 @@

 import sys

 import logging

 import time

+import os

+import re

 from copy import copy

 from optparse import OptionParser, Option, OptionValueError, IndentedHelpFormatter

@@ -276,10 +278,19 @@ def run_configure(config_file):

 		("secret_key", "Secret Key"),

 		("gpg_passphrase", "Encryption password", "Encryption password is used to protect your files from reading\nby unauthorized persons while in transfer to S3"),

 		("gpg_command", "Path to GPG program"),

+		("proxy_host", "HTTP Proxy server name", "On some networks all internet access must go through a HTTP proxy.\nTry setting it here if you can't conect to S3 directly"),

+		("proxy_port", "HTTP Proxy server port"),

 		]

+	## Option-specfic defaults

 	if getattr(cfg, "gpg_command") == "":

 		setattr(cfg, "gpg_command", find_executable("gpg"))

+	if getattr(cfg, "proxy_host") == "" and os.getenv("http_proxy"):

+		re_match=re.match("(http://)?([^:]+):(\d+)", os.getenv("http_proxy"))

+		if re_match:

+			setattr(cfg, "proxy_host", re_match.groups()[1])

+			setattr(cfg, "proxy_port", re_match.groups()[2])

+

 	try:

 		while 1:

 			output("\nEnter new values or accept defaults in brackets with Enter.")