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

Merge pull request #241 from rhansen/get_ip-ssl

Browse source 
Fix detection of `get_ip` caller
This commit is contained in:
Richard Hansen 2020-07-06 23:56:47 -04:00 committed by GitHub
commit 4670955cb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog.md
View file

@ -28,6 +28,7 @@ repository history](https://github.com/ddclient/ddclient/commits/master).
* Fixed a regression introduced in v3.9.0 that caused * Fixed a regression introduced in v3.9.0 that caused
`use=ip,ip=<ipv4-address>` to fail. `use=ip,ip=<ipv4-address>` to fail.
* "true" is now accepted as a boolean value. * "true" is now accepted as a boolean value.
* The `ssl` option now applies to the `web` URL.
### Compatibility and dependency changes ### Compatibility and dependency changes

6
ddclient.in
View file

@ -1986,8 +1986,7 @@ sub geturl {
opt('fw') && debug("opt(fw = %s)", opt('fw')); opt('fw') && debug("opt(fw = %s)", opt('fw'));
$globals{'fw'} && debug("glo fw = %s", $globals{'fw'}); $globals{'fw'} && debug("glo fw = %s", $globals{'fw'});
## always omit SSL for connections to local router if ($force_ssl || ($globals{'ssl'} && !($params->{ignore_ssl_option} // 0))) {
if ($force_ssl || ($globals{'ssl'} && ((caller(1))[3] // '') ne 'main::get_ip')) {
$use_ssl = 1; $use_ssl = 1;
$default_port = '443'; $default_port = '443';
} else { } else {
@ -2188,6 +2187,7 @@ sub get_ip {
url => $url, url => $url,
login => opt('fw-login', $h), login => opt('fw-login', $h),
password => opt('fw-password', $h), password => opt('fw-password', $h),
ignore_ssl_option => 1,
}) || ''; }) || '';
$arg = $url; $arg = $url;
@ -2209,6 +2209,7 @@ sub get_ip {
url => $url, url => $url,
login => opt('fw-login', $h), login => opt('fw-login', $h),
password => opt('fw-password', $h), password => opt('fw-password', $h),
ignore_ssl_option => 1,
}) || ''; }) || '';
$arg = $url; $arg = $url;
@ -2227,6 +2228,7 @@ sub get_ip {
url => $url, url => $url,
login => opt('fw-login', $h), login => opt('fw-login', $h),
password => opt('fw-password', $h), password => opt('fw-password', $h),
ignore_ssl_option => 1,
}) || ''; }) || '';
} }
} }