[Tools 1/2] testbot/TestAgent: Prevent _SendEntryHeader() from interfering with _SendFile()'s timeout mechanism.
Francois Gouget
fgouget at free.fr
Wed Mar 23 05:48:29 CDT 2016
Signed-off-by: Francois Gouget <fgouget at free.fr>
---
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;
--
2.7.0
More information about the wine-patches
mailing list