Francois Gouget : testbot/TestAgent: Prevent _SendEntryHeader() from interfering with _SendFile()'s timeout mechanism.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 2ebf75b9c5dc489974e7119fccd6b403e566cc5f
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=2ebf75b9c5dc489974e7119fc...

Author: Francois Gouget <fgouget(a)free.fr>
Date:   Wed Mar 23 11:48:29 2016 +0100

testbot/TestAgent: Prevent _SendEntryHeader() from interfering with _SendFile()'s timeout mechanism.

Signed-off-by: Francois Gouget <fgouget(a)free.fr>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 testbot/lib/WineTestBot/TestAgent.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm
index 1b2916f..a87b3f2 100644
--- a/testbot/lib/WineTestBot/TestAgent.pm
+++ b/testbot/lib/WineTestBot/TestAgent.pm
@@ -777,6 +777,8 @@ sub _SendFile($$$$)
   debug("  SendFile('$Name', '$Filename')\n");
 
   my $Size = -s $Filename;
+  return undef if (!$self->_SendEntryHeader("$Name/Size", 'd', $Size));
+
   my ($Start, $Sent, $Remaining) = (now(), 0, $Size);
   my $Success;
   eval
@@ -784,7 +786,6 @@ sub _SendFile($$$$)
     local $SIG{ALRM} = sub { die "timeout" };
     $self->_SetAlarm();
 
-    return if (!$self->_SendEntryHeader("$Name/Size", 'd', $Size));
     while ($Remaining)
     {
       my $Buffer;