[Slim-Checkins] r12723 - in /trunk/server/Slim/Networking: SimpleAsyncHTTP.pm SqueezeNetwork.pm

[andy at svn.slimdevices.com]

Author: andy
Date: Fri Aug 24 08:37:42 2007
New Revision: 12723

URL: http://svn.slimdevices.com?rev=12723&view=rev
Log:
Fix timeouts through SN module

Modified:
    trunk/server/Slim/Networking/SimpleAsyncHTTP.pm
    trunk/server/Slim/Networking/SqueezeNetwork.pm

Modified: trunk/server/Slim/Networking/SimpleAsyncHTTP.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Networking/SimpleAsyncHTTP.pm?rev=12723&r1=12722&r2=12723&view=diff
==============================================================================
--- trunk/server/Slim/Networking/SimpleAsyncHTTP.pm (original)
+++ trunk/server/Slim/Networking/SimpleAsyncHTTP.pm Fri Aug 24 08:37:42 2007
@@ -125,7 +125,8 @@
 	}
 	
 	my $timeout 
-		=  $self->{params}->{Timeout} 
+		=  $self->{params}->{Timeout}
+		|| $self->{params}->{timeout}
 		|| preferences('server')->get('remotestreamtimeout')
 		|| 10;
 		

Modified: trunk/server/Slim/Networking/SqueezeNetwork.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Networking/SqueezeNetwork.pm?rev=12723&r1=12722&r2=12723&view=diff
==============================================================================
--- trunk/server/Slim/Networking/SqueezeNetwork.pm (original)
+++ trunk/server/Slim/Networking/SqueezeNetwork.pm Fri Aug 24 08:37:42 2007
@@ -31,6 +31,9 @@
 	my $http = $class->new(
 		\&_init_done,
 		\&_init_error,
+		{
+			Timeout => 30,
+		},
 	);
 	
 	$http->get( $timeURL );
@@ -167,7 +170,8 @@
 		\&_login_done,
 		\&_error,
 		{
-			params => \%params,
+			params  => \%params,
+			Timeout => 30,
 		},
 	);