[Pkg-privacy-commits] [obfsproxy] 290/353: Don't feed None to parseProxyURI() in external mode.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfsproxy.

commit 2476e260aacaa7696ed2393679d5244971dcca0c
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Apr 15 15:44:51 2014 +0300

    Don't feed None to parseProxyURI() in external mode.
---
 obfsproxy/pyobfsproxy.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/obfsproxy/pyobfsproxy.py b/obfsproxy/pyobfsproxy.py
index 82a4b54..bf3b6c3 100755
--- a/obfsproxy/pyobfsproxy.py
+++ b/obfsproxy/pyobfsproxy.py
@@ -88,8 +88,9 @@ def do_external_mode(args):
     pt_config.setStateLocation(args.data_dir)
     pt_config.setListenerMode(args.mode)
     pt_config.setObfsproxyMode("external")
-    proxy = parseProxyURI(args.proxy)
-    pt_config.setProxy(proxy)
+    if args.proxy: # Set outgoing proxy settings if we have them
+        proxy = parseProxyURI(args.proxy)
+        pt_config.setProxy(proxy)
 
     # Run setup() method.
     run_transport_setup(pt_config)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfsproxy.git