qmpclient: fix mux_input regex

This commit is contained in:
Dietmar Maurer 2014-11-28 10:42:12 +01:00
parent c8125172c7
commit edb52f14a5

View File

@ -364,10 +364,10 @@ sub mux_input {
my $raw; my $raw;
if ($qga) { if ($qga) {
return if $$input !~ s/^([^\n]+}\n[^\n]+})\n(.*)$/$2/so; return if $$input !~ s/^([^\n]+}\r?\n[^\n]+})\r?\n(.*)$/$2/so;
$raw = $1; $raw = $1;
} else { } else {
return if $$input !~ s/^([^\n]+})\r?\n(.*)$/$2/so; return if $$input !~ s/^(.*})\r?\n(.*)$/$2/so;
$raw = $1; $raw = $1;
} }
@ -464,7 +464,7 @@ sub mux_eof {
if ($qga && $qga_allow_close_cmds->{$curcmd->{execute}}) { if ($qga && $qga_allow_close_cmds->{$curcmd->{execute}}) {
return if $$input !~ s/^([^\n]+})\n(.*)$/$2/so; return if $$input !~ s/^([^\n]+})\r?\n(.*)$/$2/so;
my $raw = $1; my $raw = $1;