From edb52f14a52a2ae90e486020dccf3e6dca2df64c Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 28 Nov 2014 10:42:12 +0100
Subject: [PATCH] qmpclient: fix mux_input regex

---
 PVE/QMPClient.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/PVE/QMPClient.pm b/PVE/QMPClient.pm
index 1ed32a62..f3dded3e 100755
--- a/PVE/QMPClient.pm
+++ b/PVE/QMPClient.pm
@@ -364,10 +364,10 @@ sub mux_input {
     my $raw;
 
     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;
     } else {
-	return if $$input !~ s/^([^\n]+})\r?\n(.*)$/$2/so;
+	return if $$input !~ s/^(.*})\r?\n(.*)$/$2/so;
 	$raw = $1;
     }
 
@@ -464,7 +464,7 @@ sub mux_eof {
 
     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;