Merge branch 'stable-5.x' into web

diff --combined yarrg/commod-update-receiver
index 123ca0cd7acc0c3778555ff786aa843881232dd0,0ae5ba8a8560a025b452c596ec9bad9be9458c06..2059ad792416710584c279eb1d2de63032220339
--- 1/yarrg/commod-update-receiver
--- 2/yarrg/commod-update-receiver
+++ b/yarrg/commod-update-receiver
@@@ -93,7 -93,7 +93,7 @@@ addlog("receiving")
  
  $o{'clientname'}= must_param('clientname',$re_any);
  my $clientinfo= $clients{$o{'clientname'}};
 -fail('unknown client') unless defined $clientinfo;
 +fail('unknown client '.errsan($o{'clientname'})) unless defined $clientinfo;
  
  my $clientfixes= must_param('clientfixes', "^([-0-9a-z ]*)\$");
  my @clientfixes= sort grep { m/./ } split /\s+/, $clientfixes;
@@@ -115,7 -115,7 +115,7 @@@ $o{'ocean'}= must_param('ocean', $re_an
  $o{'island'}= must_param('island', $re_any);
  
  my $arches= $oceans{$o{'ocean'}};
 -fail("unknown ocean") unless $arches;
 +fail("unknown ocean ".errsan($o{'ocean'})) unless $arches;
  
  parse_info_serverside_ocean($o{'ocean'});
  
@@@ -126,10 -126,10 +126,10 @@@ foreach my $islands (values %$arches) 
      die if $island_found;
      $island_found= $sources;
  }
 -fail("unknown island") unless $island_found;
 +fail("unknown island ".errsan($o{'island'})) unless $island_found;
  
  $o{'timestamp'}= must_param('timestamp', "^([1-9]\\d{1,20})\$");
- fail("clock skew") if $o{'timestamp'} >= $now;
+ fail("clock skew") if $o{'timestamp'} > $now;
  
  my $indatafh= upload('data');
  defined $indatafh or fail("data is not a file");