Prettier "Can't connect" message in response

gisle · Feb 13, 2011 · 04810a0 · 04810a0
1 parent 20563d0
commit 04810a0
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/LWP/Protocol/http.pm b/lib/LWP/Protocol/http.pm
@@ -40,8 +40,14 @@ sub _new_socket
 
     unless ($sock) {
 	# IO::Socket::INET leaves additional error messages in $@
-	$@ =~ s/^.*?: //;
-	die "Can't connect to $host:$port ($@)";
+	my $status = "Can't connect to $host:$port";
+	if ($@ =~ /\bconnect: (.*)/ ||
+	    $@ =~ /\b(Bad hostname)\b/ ||
+	    $@ =~ /\b(certificate verify failed)\b/
+	) {
+	    $status .= " ($1)";
+	}
+	die "$status\n\n$@";
     }
 
     # perl 5.005's IO::Socket does not have the blocking method.