Changeset 14920 in josm

Timestamp:

2019-03-23T16:38:45+01:00 (5 years ago)

Author:

stoecker

Message:

see #16123 - use port 443 for tests always, not a specified non-standard port - last variant failed with {switch:...} statements

File:

• trunk/scripts/TestHTTPS.pl (modified) (4 diffs)

trunk/scripts/TestHTTPS.pl

@@ -33 +33 @@
     for my $e ($xpc->findnodes(".//j:*", $entry))
     {
-      if($e->textContent =~ /^http:\/\/(.*?)[\/:]/)
+      if($e->textContent =~ /^http:\/\/(.*?)(:\d+)?[\/]/)
       {
         my $u = $1;
@@ -72 +72 @@
       }
     }
-    if($line =~ /http:\/\/(.*?)[\/:]/)
+    if($line =~ /http:\/\/(.*?)(:\d+)?[\/]/)
     {
       $urls{$1}{$name}++;
@@ -93 +93 @@
 
 open OUTFILE,">","josm_https.txt" or die "Could not open output file";
+open OUTFILENH,">","josm_no_https.txt" or die "Could not open no-https output file";
 
 sub doprint($)
@@ -150 +151 @@
     doprint "* $url [$code $mess]: $i\n";
   };
-  if($@ && $@ !~ "(--Alarm--|Connection refused)")
+  if($@)
   {
-    my $e = $@;
+    my $e = $@||"";
     $e =~ s/[\r\n]//g;
     $e =~ s/ at scripts\/TestHTTPS.pl .*//;
-    doprint "* $url [Error $e] :$i\n";
+    if($@ !~ "(--Alarm--|Connection refused)")
+    {
+      doprint "* $url [Error $e] :$i\n";
+    }
+    elsif($@)
+    {
+      print OUTFILENH "* $url [$e] :$i\n";
+    }
   }
 }