[Slim-Checkins] r10200 - in /branches/6.5: makerelease.pl platforms/win32/SlimTray.pl

[dsully at svn.slimdevices.com]

Author: dsully
Date: Wed Oct  4 17:42:30 2006
New Revision: 10200

URL: http://svn.slimdevices.com?rev=10200&view=rev
Log:
Bug: N/A
Description: Merge from trunk -r 10198:10199

Modified:
    branches/6.5/makerelease.pl
    branches/6.5/platforms/win32/SlimTray.pl

Modified: branches/6.5/makerelease.pl
URL: http://svn.slimdevices.com/branches/6.5/makerelease.pl?rev=10200&r1=10199&r2=10200&view=diff
==============================================================================
--- branches/6.5/makerelease.pl (original)
+++ branches/6.5/makerelease.pl Wed Oct  4 17:42:30 2006
@@ -326,7 +326,7 @@
 		../../server/CPAN/arch/5.8/MSWin32-x86-multi-thread/auto
 	));
 
-	print `cd $source/platforms/win32; perltray --force --singleton --lib "$libpaths" --verbose --icon "res/SlimServer.ICO;res/SlimServerOff.ICO" SlimTray.pl; cd ../..`;
+	print `cd $source/platforms/win32; perltray --trim unicore:: --force --singleton --lib "$libpaths" --verbose --icon "res/SlimServer.ICO;res/SlimServerOff.ICO" SlimTray.pl; cd ../..`;
 	move("$source/platforms/win32/SlimTray.exe", "$winserverdir/SlimTray.exe");
 
 	rmsvn($winserverdir);

Modified: branches/6.5/platforms/win32/SlimTray.pl
URL: http://svn.slimdevices.com/branches/6.5/platforms/win32/SlimTray.pl?rev=10200&r1=10199&r2=10200&view=diff
==============================================================================
--- branches/6.5/platforms/win32/SlimTray.pl (original)
+++ branches/6.5/platforms/win32/SlimTray.pl Wed Oct  4 17:42:30 2006
@@ -22,7 +22,8 @@
 use Cwd qw(cwd);
 use File::Spec;
 use Getopt::Long;
-use LWP::Simple;
+use Socket;
+use Symbol;
 use Win32;
 use Win32::Daemon;
 use Win32::Process qw(DETACHED_PROCESS CREATE_NO_WINDOW NORMAL_PRIORITY_CLASS);
@@ -465,9 +466,23 @@
 		}
 	}
 
-	my $content = get("http://localhost:$httpPort/EN/html/ping.html");
-
-	if ($content && $content =~ /alive/) {
+	# Use low-level socket code. IO::Socket returns a 'Invalid Descriptor'
+	# erorr. It also sucks more memory than it should.
+	my $raddr = '127.0.0.1';
+	my $rport = 9000;
+
+	my $proto = (getprotobyname('tcp'))[2];
+	my $pname = (getprotobynumber($proto))[0];
+	my $sock  = Symbol::gensym();
+
+	my $iaddr = inet_aton($raddr);
+	my $paddr = sockaddr_in($rport, $iaddr);
+	socket($sock, PF_INET, SOCK_STREAM, $proto);
+	connect($sock, $paddr);
+
+	if (defined $sock && fileno($sock)) {
+
+		close($sock);
 
 		return $httpPort;
 	}