diff options
| -rwxr-xr-x | utils/NewNightlyTest.pl | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/utils/NewNightlyTest.pl b/utils/NewNightlyTest.pl index dc6cf6d17f..6837dc0e72 100755 --- a/utils/NewNightlyTest.pl +++ b/utils/NewNightlyTest.pl @@ -445,14 +445,21 @@ sub SendData{ $file = $_[1]; $variables=$_[2]; - $port=80; - $socketaddr= sockaddr_in $port, inet_aton $host or die "Bad hostname\n"; - socket SOCK, PF_INET, SOCK_STREAM, getprotobyname('tcp') or - die "Bad socket\n"; - connect SOCK, $socketaddr or die "Bad connection\n"; - select((select(SOCK), $| = 1)[0]); + # Write out the "...-sentdata.txt" file. + + my $sentdata=""; + foreach $x (keys (%$variables)){ + $value = $variables->{$x}; + $sentdata.= "$x => $value\n"; + } + WriteFile "$Prefix-sentdata.txt", $sentdata; + + if (!($SUBMITAUX eq "")) { + system "$SUBMITAUX \"$Prefix-sentdata.txt\""; + } + + # Create the content to send to the server. - #creating content here my $content; foreach $key (keys (%$variables)){ $value = $variables->{$key}; @@ -460,6 +467,17 @@ sub SendData{ $content .= "$key=$value&"; } + # Send the data to the server. + # + # FIXME: This code should be more robust? + + $port=80; + $socketaddr= sockaddr_in $port, inet_aton $host or die "Bad hostname\n"; + socket SOCK, PF_INET, SOCK_STREAM, getprotobyname('tcp') or + die "Bad socket\n"; + connect SOCK, $socketaddr or die "Bad connection\n"; + select((select(SOCK), $| = 1)[0]); + $length = length($content); my $send= "POST $file HTTP/1.0\n"; @@ -475,17 +493,6 @@ sub SendData{ } close(SOCK); - my $sentdata=""; - foreach $x (keys (%$variables)){ - $value = $variables->{$x}; - $sentdata.= "$x => $value\n"; - } - WriteFile "$Prefix-sentdata.txt", $sentdata; - - if (!($SUBMITAUX eq "")) { - system "$SUBMITAUX \"$Prefix-sentdata.txt\""; - } - return $result; } |