1 files changed, 9 insertions, 5 deletions
diff --git a/mitmdump b/mitmdump
index 461abf4b..b54d051f 100755
--- a/mitmdump
+++ b/mitmdump
@@ -39,11 +39,15 @@ if __name__ == '__main__':
         options.verbose = 0
 
     config = proxy.process_certificate_option_group(parser, options)
-    try:
-        server = proxy.ProxyServer(config, options.port, options.addr)
-    except proxy.ProxyServerError, v:
-        print >> sys.stderr, "mitmdump:", v.args[0]
-        sys.exit(1)
+    if options.no_server:
+        server = None
+    else:
+        try:
+            server = proxy.ProxyServer(config, options.port, options.addr)
+        except proxy.ProxyServerError, v:
+            print >> sys.stderr, "mitmdump:", v.args[0]
+            sys.exit(1)
+
 
     dumpopts = dump.Options(**cmdline.get_common_options(options))
     dumpopts.keepserving = options.keepserving