Changeset 31488 for main/trunk/greenstone2/perllib/servercontrol.pm

Timestamp:

2017-03-10T18:51:35+13:00 (7 years ago)

Author:

ak19

Message:

Making servercontrol.pm more robust to http and https protocols

File:

• main/trunk/greenstone2/perllib/servercontrol.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -409 +409 @@
         my $host = $uri->host;
         #print STDERR "@@@@@ host: $host\n";
-        if($url =~ m/http:\/\/$host(\/)?$/) {
-            #if($url !~ m/http:\/\/$host:$portnumber(\/)?/ || $url =~ m/http:\/\/$host(\/)?$/) {
+        if($url =~ m/https?:\/\/$host(\/)?$/) {
+            #if($url !~ m/https?:\/\/$host:$portnumber(\/)?/ || $url =~ m/https?:\/\/$host(\/)?$/) {
             # (if the URL does not contain the portnumber, OR if the port is implicitly 80 and)                 
             # If the domain with http:// prefix is completely the same as the URL, assume server.exe
@@ -445 +445 @@
     if (open(PIN, "$perl_command |")) {
         while (defined (my $perl_output_line = <PIN>)) {
-        if($perl_output_line =~ m@http:\/\/(\S*)@) { # grab all the non-whitespace chars
-            $url="http://".$1;
+        if($perl_output_line =~ m@(https?):\/\/(\S*)@) { # grab all the non-whitespace chars
+            $url="$1://".$2; # preserve the http protocol #$url="http://".$1;
         }
         }
@@ -706 +706 @@
     
     #my $host = $url;       
-    #$host =~ s@^http:\/\/(www.)?@@;        
+    #$host =~ s@^https?:\/\/(www.)?@@;      
     #$host =~ s@\/.*@@;
     #print STDERR "**** HOST: $host\n";