mirror of
https://github.com/munin-monitoring/contrib.git
synced 2025-07-27 11:24:42 +00:00
Merge pull request #1504 from tofurky/fix_rtorrent_scgi_headers
rtorrent: fix SCGI headers
This commit is contained in:
commit
2f87c7e7e8
8 changed files with 16 additions and 16 deletions
|
@ -70,7 +70,7 @@ sub get_rtorrent_version {
|
|||
my $version;
|
||||
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
|
||||
my $llen = length $line_version;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line_version= "${hlen}:${header},${line_version}";
|
||||
print SOCK $line_version;
|
||||
|
@ -117,7 +117,7 @@ sub construct_line {
|
|||
my $function = rtorrent_version_lower_than($_[0], '0.9.0') ? 'get_memory_usage' : 'pieces.memory.current';
|
||||
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function</methodName></methodCall>";
|
||||
my $llen = length $line;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line = "${hlen}:${header},${line}";
|
||||
return $line;
|
||||
|
|
|
@ -80,7 +80,7 @@ sub get_rtorrent_version {
|
|||
my $version;
|
||||
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
|
||||
my $llen = length $line_version;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line_version= "${hlen}:${header},${line_version}";
|
||||
print SOCK $line_version;
|
||||
|
@ -129,7 +129,7 @@ sub construct_line {
|
|||
my $function_hash = rtorrent_version_lower_than($_[0], '0.9.0') ? 'd.get_hash=' : 'd.hash=';
|
||||
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function_multicall</methodName><params>$function_multicall_arg<param><value><string>main</string></value></param><param><value><string>$function_hash</string></value></param><param><value><string>p.multicall=,p.is_encrypted=,p.is_incoming=</string></value></param></params></methodCall>";
|
||||
my $llen = length $line;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line = "${hlen}:${header},${line}";
|
||||
return $line;
|
||||
|
|
|
@ -94,7 +94,7 @@ sub get_rtorrent_version {
|
|||
my $version;
|
||||
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
|
||||
my $llen = length $line_version;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line_version= "${hlen}:${header},${line_version}";
|
||||
print SOCK $line_version;
|
||||
|
@ -144,7 +144,7 @@ sub construct_line {
|
|||
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.multicall</methodName><params><param><value><array><data><value><struct><member><name>methodName</name><value><string>$function_totalup</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_totaldown</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_rateup</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_ratedown</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value></data></array></value></param></params></methodCall>";
|
||||
|
||||
my $llen = length $line;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line = "${hlen}:${header},${line}";
|
||||
return $line;
|
||||
|
|
|
@ -81,7 +81,7 @@ sub get_rtorrent_version {
|
|||
my $version;
|
||||
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
|
||||
my $llen = length $line_version;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line_version= "${hlen}:${header},${line_version}";
|
||||
print SOCK $line_version;
|
||||
|
@ -130,7 +130,7 @@ sub construct_line {
|
|||
my $function_hash = rtorrent_version_lower_than($_[0], '0.9.0') ? 'd.get_hash=' : 'd.hash=';
|
||||
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function_multicall</methodName><params>$function_multicall_arg<param><value><string>${_}</string></value></param><param><value><string>$function_hash</string></value></param></params></methodCall>";
|
||||
my $llen = length $line;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line = "${hlen}:${header},${line}";
|
||||
return $line;
|
||||
|
|
|
@ -78,7 +78,7 @@ sub rtorrent_version_lower_than {
|
|||
}
|
||||
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
|
||||
my $llen = length $line_version;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line_version= "${hlen}:${header},${line_version}";
|
||||
print SOCK $line_version;
|
||||
|
@ -98,7 +98,7 @@ my $pattern = qr/<value><(int|i4|i8|ex\.i8)>(\d+)<\/(int|i4|i8|ex\.i8)><\/value>
|
|||
my $function = rtorrent_version_lower_than('0.9.0') ? 'get_memory_usage' : 'pieces.memory.current';
|
||||
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function</methodName></methodCall>";
|
||||
my $llen = length $line;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line = "${hlen}:${header},${line}";
|
||||
|
||||
|
|
|
@ -89,7 +89,7 @@ sub rtorrent_version_lower_than {
|
|||
}
|
||||
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
|
||||
my $llen = length $line_version;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line_version= "${hlen}:${header},${line_version}";
|
||||
print SOCK $line_version;
|
||||
|
@ -113,7 +113,7 @@ my $function_multicall_arg = rtorrent_version_lower_than('0.9.0') ? '' : '<
|
|||
my $function_hash = rtorrent_version_lower_than('0.9.0') ? 'd.get_hash=' : 'd.hash=';
|
||||
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function_multicall</methodName><params>$function_multicall_arg<param><value><string>main</string></value></param><param><value><string>$function_hash</string></value></param><param><value><string>p.multicall=,p.is_encrypted=,p.is_incoming=</string></value></param></params></methodCall>";
|
||||
my $llen = length $line;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line = "${hlen}:${header},${line}";
|
||||
|
||||
|
|
|
@ -117,7 +117,7 @@ sub rtorrent_version_lower_than {
|
|||
}
|
||||
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
|
||||
my $llen = length $line_version;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line_version= "${hlen}:${header},${line_version}";
|
||||
print SOCK $line_version;
|
||||
|
@ -141,7 +141,7 @@ my $function_ratedown = rtorrent_version_lower_than('0.9.0') ? 'get_download_rat
|
|||
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.multicall</methodName><params><param><value><array><data><value><struct><member><name>methodName</name><value><string>$function_totalup</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_totaldown</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_rateup</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_ratedown</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value></data></array></value></param></params></methodCall>";
|
||||
|
||||
my $llen = length $line;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line = "${hlen}:${header},${line}";
|
||||
|
||||
|
|
|
@ -90,7 +90,7 @@ sub rtorrent_version_lower_than {
|
|||
}
|
||||
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
|
||||
my $llen = length $line_version;
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
my $hlen = length $header;
|
||||
$line_version= "${hlen}:${header},${line_version}";
|
||||
print SOCK $line_version;
|
||||
|
@ -137,7 +137,7 @@ foreach ( @views ) {
|
|||
$line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function_multicall</methodName><params>$function_multicall_arg<param><value><string>${_}</string></value></param><param><value><string>$function_hash</string></value></param></params></methodCall>";
|
||||
|
||||
$llen = length $line;
|
||||
$header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
|
||||
$header = "CONTENT_LENGTH\000${llen}\000SCGI\0001\000";
|
||||
$hlen = length $header;
|
||||
$line = "${hlen}:${header},${line}";
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue