--- loncom/lonnet/perl/lonnet.pm	2010/07/29 21:16:49	1.1080
+++ loncom/lonnet/perl/lonnet.pm	2010/08/20 18:17:04	1.1082
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1080 2010/07/29 21:16:49 raeburn Exp $
+# $Id: lonnet.pm,v 1.1082 2010/08/20 18:17:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -222,7 +222,7 @@ sub get_server_loncaparev {
         my @ids=&current_machine_ids();
         if (grep(/^\Q$lonhost\E$/,@ids)) {
             $answer = $perlvar{'lonVersion'};
-            if ($answer =~ /^[\'\"]?([\d.\-]+)[\'\"]?$/) {
+            if ($answer =~ /^[\'\"]?([\w.\-]+)[\'\"]?$/) {
                 $loncaparev = $1;
             }
         } else {
@@ -230,7 +230,7 @@ sub get_server_loncaparev {
             if (($answer eq 'unknown_cmd') || ($answer eq 'con_lost')) {
                 if ($caller eq 'loncron') {
                     my $ua=new LWP::UserAgent;
-                    $ua->timeout(20);
+                    $ua->timeout(4);
                     my $protocol = $protocol{$lonhost};
                     $protocol = 'http' if ($protocol ne 'https');
                     my $url = $protocol.'://'.&hostname($lonhost).'/adm/about.html';
@@ -238,14 +238,14 @@ sub get_server_loncaparev {
                     my $response=$ua->request($request);
                     unless ($response->is_error()) {
                         my $content = $response->content;
-                        if ($content =~ /<p>VERSION\:\s*([\d.\-]+)<\/p>/) {
+                        if ($content =~ /<p>VERSION\:\s*([\w.\-]+)<\/p>/) {
                             $loncaparev = $1;
                         }
                     }
                 } else {
                     $loncaparev = $loncaparevs{$lonhost};
                 }
-            } elsif ($answer =~ /^[\'\"]?([\d.\-]+)[\'\"]?$/) {
+            } elsif ($answer =~ /^[\'\"]?([\w.\-]+)[\'\"]?$/) {
                 $loncaparev = $1;
             }
         }