diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2010-10-29 19:41:24 +0200 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2010-11-10 15:48:26 +0100 |
| commit | b9cac605abf029d9f0eb3d83a5f64f5b484d61c1 (patch) | |
| tree | 55acc332c2ca5360f5d531f5f97aee5b5c5b6821 /src/or/directory.c | |
| parent | 13a7e8bea3b9d37b1bfd5e3a3ea14dd650be632e (diff) | |
| download | tor-b9cac605abf029d9f0eb3d83a5f64f5b484d61c1.tar.gz tor-b9cac605abf029d9f0eb3d83a5f64f5b484d61c1.zip | |
Synx manpage and source wrt option capitalization
We had a spelling discrepancy between the manpage and the source code
for some option. Resolve these in favor of the manpage, because it
makes more sense (for example, HTTP should be capitalized).
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index b109cb53a7..fbdd496c12 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -819,7 +819,7 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, /* ensure that we don't make direct connections when a SOCKS server is * configured. */ - if (!anonymized_connection && !use_begindir && !options->HttpProxy && + if (!anonymized_connection && !use_begindir && !options->HTTPProxy && (options->Socks4Proxy || options->Socks5Proxy)) { log_warn(LD_DIR, "Cannot connect to a directory server through a " "SOCKS proxy!"); @@ -850,9 +850,9 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, if (!anonymized_connection && !use_begindir) { /* then we want to connect to dirport directly */ - if (options->HttpProxy) { - tor_addr_copy(&addr, &options->HttpProxyAddr); - dir_port = options->HttpProxyPort; + if (options->HTTPProxy) { + tor_addr_copy(&addr, &options->HTTPProxyAddr); + dir_port = options->HTTPProxyPort; } switch (connection_connect(TO_CONN(conn), conn->_base.address, &addr, @@ -1036,9 +1036,9 @@ directory_send_command(dir_connection_t *conn, } /* come up with some proxy lines, if we're using one. */ - if (direct && get_options()->HttpProxy) { + if (direct && get_options()->HTTPProxy) { char *base64_authenticator=NULL; - const char *authenticator = get_options()->HttpProxyAuthenticator; + const char *authenticator = get_options()->HTTPProxyAuthenticator; tor_snprintf(proxystring, sizeof(proxystring),"http://%s", hoststring); if (authenticator) { |