[Slim-Checkins] r10203 - /branches/6.5/server/Slim/Utils/Scanner.pm

[andy at svn.slimdevices.com]

Author: andy
Date: Wed Oct  4 19:25:39 2006
New Revision: 10203

URL: http://svn.slimdevices.com?rev=10203&view=rev
Log:
Fix bug in scanWMA, invalid check should come after we convert mms to http

Modified:
    branches/6.5/server/Slim/Utils/Scanner.pm

Modified: branches/6.5/server/Slim/Utils/Scanner.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Utils/Scanner.pm?rev=10203&r1=10202&r2=10203&view=diff
==============================================================================
--- branches/6.5/server/Slim/Utils/Scanner.pm (original)
+++ branches/6.5/server/Slim/Utils/Scanner.pm Wed Oct  4 19:25:39 2006
@@ -920,16 +920,16 @@
 sub scanWMAStream {
 	my $args = shift;
 	
+	my $request = HTTP::Request->new( GET => $args->{'url'} );
+	
+	addWMAHeaders( $request );
+	
 	# Make sure we don't send any bad URLs through
-	if ( $args->{'url'} !~ /^http:/ ) {
+	if ( $request->uri->as_string !~ /^http:/ ) {
 		my $error = 'Invalid URL: ' . $args->{'url'};
 		scanWMAStreamError( undef, $error, $args );
 		return;
 	}
-	
-	my $request = HTTP::Request->new( GET => $args->{'url'} );
-	
-	addWMAHeaders( $request );
 	
 	my $http = Slim::Networking::Async::HTTP->new();
 	$http->send_request( {