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

Remove extra newline in HTTP request

Browse source 
Before, if there were no custom request headers, the request would end
with three newlines instead of two.
This commit is contained in:
Richard Hansen 2020-06-07 13:20:11 -04:00
parent c995698b7e
commit a12004cc4c
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ddclient
View file

@ -2050,7 +2050,8 @@ sub geturl {
$request .= "Content-Length: " . length($data) . "\n"; $request .= "Content-Length: " . length($data) . "\n";
} }
$request .= "Connection: close\n"; $request .= "Connection: close\n";
$request .= "$headers\n"; $headers .= "\n" if $headers ne '' && substr($headers, -1) ne "\n";
$request .= $headers;
$request .= "\n"; $request .= "\n";
$request .= $data; $request .= $data;
@ -3561,6 +3562,7 @@ sub nic_nfsn_gen_auth_header {
my $hash = sha1_hex($hash_string); my $hash = sha1_hex($hash_string);
$auth_header .= $hash; $auth_header .= $hash;
$auth_header .= "\n";
return $auth_header; return $auth_header;
} }
@ -3578,7 +3580,7 @@ sub nic_nfsn_make_request {
my $url = $base_url . $path; my $url = $base_url . $path;
my $header = nic_nfsn_gen_auth_header($h, $path, $body); my $header = nic_nfsn_gen_auth_header($h, $path, $body);
if ($method eq 'POST' && $body ne '') { if ($method eq 'POST' && $body ne '') {
$header .= "\nContent-Type: application/x-www-form-urlencoded"; $header .= "Content-Type: application/x-www-form-urlencoded\n";
} }
return geturl(opt('proxy'), $url, '', '', $header, $method, $body); return geturl(opt('proxy'), $url, '', '', $header, $method, $body);
@ -4282,10 +4284,10 @@ sub nic_cloudflare_update {
my $headers = "Content-Type: application/json\n"; my $headers = "Content-Type: application/json\n";
if ($config{$key}{'login'} eq 'token') { if ($config{$key}{'login'} eq 'token') {
$headers .= "Authorization: Bearer $config{$key}{'password'}"; $headers .= "Authorization: Bearer $config{$key}{'password'}\n";
} else { } else {
$headers .= "X-Auth-Email: $config{$key}{'login'}\n"; $headers .= "X-Auth-Email: $config{$key}{'login'}\n";
$headers .= "X-Auth-Key: $config{$key}{'password'}"; $headers .= "X-Auth-Key: $config{$key}{'password'}\n";
} }
# FQDNs # FQDNs
@ -4428,7 +4430,7 @@ sub nic_yandex_update {
my @hosts = @{$groups{$sig}}; my @hosts = @{$groups{$sig}};
my $key = $hosts[0]; my $key = $hosts[0];
my $ip = $config{$key}{'wantip'}; my $ip = $config{$key}{'wantip'};
my $headers = 'PddToken: ' . $config{$key}{'password'}; my $headers = "PddToken: $config{$key}{'password'}\n";
# FQDNs # FQDNs
for my $host (@hosts) { for my $host (@hosts) {