From a0d7c3f4a82bb3df10625b3d710e5a5512cf41cb Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Fri, 24 Dec 2010 22:37:25 -0800
Subject: [PATCH] Better RPC error detection

---
 web-lib-funcs.pl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index 1ca121b82..7ffb60ccb 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -6215,10 +6215,16 @@ if ($serv->{'fast'} || !$sn) {
 	my $tostr = &serialise_variable($_[1]);
 	print $fh length($tostr)," $fh\n";
 	print $fh $tostr;
-	my $rlen = int(<$fh>);
+	my $rstr = <$fh>;
+	if ($rstr eq '') {
+		return &$main::remote_error_handler(
+			"Error reading response length from fastrpc.cgi : $!")
+		}
+	my $rlen = int($rstr);
 	my ($fromstr, $got);
 	while(length($fromstr) < $rlen) {
-		return &$main::remote_error_handler("Failed to read from fastrpc.cgi")
+		return &$main::remote_error_handler(
+			"Failed to read from fastrpc.cgi : $!")
 			if (read($fh, $got, $rlen - length($fromstr)) <= 0);
 		$fromstr .= $got;
 		}