From 5795e2a5ea0bddff102a201460cc573c0fd62d8d Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 2 May 2012 12:57:51 +0000 Subject: [PATCH] Fix problem where Client could attempt to coalesce data from server that doesn't cleanly cleave an xcat response git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12470 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/Client.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/Client.pm b/perl-xCAT/xCAT/Client.pm index 240cac341..702ed8aa6 100644 --- a/perl-xCAT/xCAT/Client.pm +++ b/perl-xCAT/xCAT/Client.pm @@ -256,7 +256,7 @@ $request->{clienttype}->[0] = "cli"; # setup clienttype for auditlog } $newdata=1; $response .= $line; - if ($line =~ m/<\/xcatresponse>/) { + if ($line =~ m/<\/xcatresponse>\s*\z/) { if ($line =~ /serverdone/) { $coalescenow=1; } #if serverdone was detected, hint at coalesce code to flush things out now #this means that coalesce can be triggered by stray words in the output prematurely, but that's harmless #replace ESC with xxxxESCxxx because XMLin cannot handle it