Fabio/ddclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reverting non-Google domain cleanups.

Browse source
This commit is contained in:
Nelson Araujo 2015-01-18 10:54:08 -08:00
parent 8409f45ab8
commit e1070de9e5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ddclient
View file

@ -1881,21 +1881,21 @@ sub geturl {
$server =~ s%/.*%%; $server =~ s%/.*%%;
$url = "/" unless $url =~ m%/%; $url = "/" unless $url =~ m%/%;
$url =~ s%^[^/]*/%%; $url =~ s%^[^/]*/%%;
debug("server = $server"); debug("server = $server");
opt('fw') && debug("opt(fw = ",opt('fw'),")"); opt('fw') && debug("opt(fw = ",opt('fw'),")");
$globals{'fw'} && debug("glo fw = $globals{'fw'}"); $globals{'fw'} && debug("glo fw = $globals{'fw'}");
#if ( $globals{'ssl'} and $server ne $globals{'fw'} ) { #if ( $globals{'ssl'} and $server ne $globals{'fw'} ) {
## always omit SSL for connections to local router ## always omit SSL for connections to local router
if ( $force_ssl || ($globals{'ssl'} and (caller(1))[3] ne 'main::get_ip') ) { if ( $force_ssl || ($globals{'ssl'} and (caller(1))[3] ne 'main::get_ip') ) {
$use_ssl = 1; $use_ssl = 1;
$default_port = 443; $default_port = 443;
load_ssl_support; load_ssl_support;
} else { } else {
$use_ssl = 0; $use_ssl = 0;
$default_port = 80; $default_port = 80;
} }
## determine peer and port to use. ## determine peer and port to use.
$peer = $proxy || $server; $peer = $proxy || $server;
$peer =~ s%/.*%%; $peer =~ s%/.*%%;
@ -1903,7 +1903,7 @@ sub geturl {
$port =~ s%^.*:%%; $port =~ s%^.*:%%;
$port = $default_port unless $port =~ /^\d+$/; $port = $default_port unless $port =~ /^\d+$/;
$peer =~ s%:.*$%%; $peer =~ s%:.*$%%;
my $to = sprintf "%s%s", $server, $proxy ? " via proxy $peer:$port" : ""; my $to = sprintf "%s%s", $server, $proxy ? " via proxy $peer:$port" : "";
verbose("CONNECT:", "%s", $to); verbose("CONNECT:", "%s", $to);