Changeset 31488 for main/trunk
- Timestamp:
- 2017-03-10T18:51:35+13:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/servercontrol.pm
r30596 r31488 409 409 my $host = $uri->host; 410 410 #print STDERR "@@@@@ host: $host\n"; 411 if($url =~ m/http :\/\/$host(\/)?$/) {412 #if($url !~ m/http :\/\/$host:$portnumber(\/)?/ || $url =~ m/http:\/\/$host(\/)?$/) {411 if($url =~ m/https?:\/\/$host(\/)?$/) { 412 #if($url !~ m/https?:\/\/$host:$portnumber(\/)?/ || $url =~ m/https?:\/\/$host(\/)?$/) { 413 413 # (if the URL does not contain the portnumber, OR if the port is implicitly 80 and) 414 414 # If the domain with http:// prefix is completely the same as the URL, assume server.exe … … 445 445 if (open(PIN, "$perl_command |")) { 446 446 while (defined (my $perl_output_line = <PIN>)) { 447 if($perl_output_line =~ m@ http:\/\/(\S*)@) { # grab all the non-whitespace chars448 $url=" http://".$1;447 if($perl_output_line =~ m@(https?):\/\/(\S*)@) { # grab all the non-whitespace chars 448 $url="$1://".$2; # preserve the http protocol #$url="http://".$1; 449 449 } 450 450 } … … 706 706 707 707 #my $host = $url; 708 #$host =~ s@^http :\/\/(www.)?@@;708 #$host =~ s@^https?:\/\/(www.)?@@; 709 709 #$host =~ s@\/.*@@; 710 710 #print STDERR "**** HOST: $host\n";
Note:
See TracChangeset
for help on using the changeset viewer.