diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-14 00:02:00 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-14 00:02:00 +0100 |
| commit | a66913d4a30b2ce2dedc58afcf79ad77faead278 (patch) | |
| tree | 55b58e1ce75e67fcfe3a8262f648b9b96e761b83 /libmproxy/proxy | |
| parent | f14eeef6539ac4f104dc37b37fbc74b9ea861965 (diff) | |
| download | mitmproxy-a66913d4a30b2ce2dedc58afcf79ad77faead278.tar.gz mitmproxy-a66913d4a30b2ce2dedc58afcf79ad77faead278.tar.bz2 mitmproxy-a66913d4a30b2ce2dedc58afcf79ad77faead278.zip | |
forward proxy -> upstream proxy
Diffstat (limited to 'libmproxy/proxy')
| -rw-r--r-- | libmproxy/proxy/config.py | 10 | ||||
| -rw-r--r-- | libmproxy/proxy/primitives.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index d3f55f60..067c361d 100644 --- a/libmproxy/proxy/config.py +++ b/libmproxy/proxy/config.py @@ -44,15 +44,15 @@ def process_proxy_options(parser, options): c += 1 get_upstream_server = ConstUpstreamServerResolver(options.reverse_proxy) http_form_in, http_form_out = "relative", "relative" - if options.forward_proxy: + if options.upstream_proxy: c += 1 - get_upstream_server = ConstUpstreamServerResolver(options.forward_proxy) + get_upstream_server = ConstUpstreamServerResolver(options.upstream_proxy) http_form_in, http_form_out = "absolute", "absolute" - if options.manual_upstream_server: + if options.manual_destination_server: c += 1 - get_upstream_server = ConstUpstreamServerResolver(options.manual_upstream_server) + get_upstream_server = ConstUpstreamServerResolver(options.manual_destination_server) if c > 1: - return parser.error("Transparent mode, reverse mode, forward mode and " + return parser.error("Transparent mode, reverse mode, upstream proxy mode and " "specification of an upstream server are mutually exclusive.") if options.http_form_in: http_form_in = options.http_form_in diff --git a/libmproxy/proxy/primitives.py b/libmproxy/proxy/primitives.py index 0fa5273b..691db922 100644 --- a/libmproxy/proxy/primitives.py +++ b/libmproxy/proxy/primitives.py @@ -61,7 +61,7 @@ class AddressPriority(object): MANUALLY_CHANGED = 3 """user changed the target address in the ui""" FROM_SETTINGS = 2 - """upstream server from arguments (reverse proxy, forward proxy or from transparent resolver)""" + """upstream server from arguments (reverse proxy, upstream proxy or from transparent resolver)""" FROM_PROTOCOL = 1 """derived from protocol (e.g. absolute-form http requests)""" |