--- doc/loncapafiles/webserver.piml	2020/09/06 19:29:00	1.43.2.7
+++ doc/loncapafiles/webserver.piml	2020/01/04 18:03:16	1.48
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- webserver.piml -->
 
-<!-- $Id: webserver.piml,v 1.43.2.7 2020/09/06 19:29:00 raeburn Exp $ -->
+<!-- $Id: webserver.piml,v 1.48 2020/01/04 18:03:16 raeburn Exp $ -->
 
 <!--
 
@@ -197,7 +197,7 @@ else {
             'of requests for http:// to https:// '."\n".'or:'."\n".$rewrite_off.
             ' - the file used to disable such rewriting'."\n\n".
             'This may be because '. $curr_rewrite.' has been '. 
-            'previously customized,'."\n".'or it may be because of a change '.  
+            'previously customized,'."\n".' or it may be because of a change '.  
             'to the files in '.$rewrite_dir."\n");
             if (open(my $fh,'&lt;',$curr_rewrite)) {
                 while(&lt;$fh&gt;) {
@@ -219,7 +219,7 @@ else {
                 || '<DIST />' eq 'sles9') {
                 $ssldir = '/etc/apache/vhosts.d';
             } elsif ('<DIST />' =~ /^(suse|sles)/) {
-                $ssldir = '/etc/apache2/vhosts.d';
+                $ssldir = '/etc/apache2/vhosts.d';                  
             } elsif ('<DIST />' =~ /^(debian|ubuntu)/) {
                 $ssldir = '/etc/apache2/sites-available';
             } else {
@@ -227,11 +227,9 @@ else {
             }
             my $hostname = Sys::Hostname::FQDN::fqdn();
             my $hostip = Socket::inet_ntoa(scalar(gethostbyname($hostname)) || 'localhost');
-            my @expected = ('RewriteEngine on',
-                            'RewriteCond %{HTTPS} =on',
-                            'RewriteCond %{REQUEST_URI} ^/adm/wrapper/ext/(?!https:)',
+            my @expected = ('RewriteCond %{REQUEST_URI} ^/adm/wrapper/ext/(?!https:\/\/)',
                             'RewriteCond %{QUERY_STRING} (^|&(|amp;))usehttp=1($|&)',
-                            'RewriteRule ^/adm/wrapper/ext/(?!https:) http://%{HTTP_HOST}%{REQUEST_URI} [R,L,NE]',
+                            'RewriteRule ^/adm/wrapper/ext/(?!https:\/\/) http://%{HTTP_HOST}%{REQUEST_URI} [R,L,NE]',
                             'RewriteCond %{REMOTE_ADDR} 127.0.0.1',
                             'RewriteRule (.*) - [L]');
             if (($hostip ne '') && ($hostip ne '127.0.0.1')) {
@@ -269,7 +267,7 @@ else {
                                         } else {
                                             chomp();
                                             s/^(\s+|\s+)$//g;
-                                            push(@{$rewrites[$num]},$_);
+                                            push(@{$rewrites[$num]},$_);                              
                                         }
                                     } elsif (/^\s*&lt;IfModule\s+mod_rewrite.c&gt;/) {
                                         $rewrite = 1;
@@ -285,28 +283,26 @@ else {
                     foreach my $item (@rewrites) {
                         if (ref($item) eq 'ARRAY') {
                             my $found = 0;
-                            foreach my $line (@{$item}) {
+                            foreach my $item (@rewrites) {
                                 foreach my $match (@expected) {
-                                    if ($match eq $line) {
+                                    if ($match eq $item) {
                                         $found ++;
                                         last;
                                     }
                                 }
                             }
                             if ($found &gt;= @expected) {
-                                $gotrules = 1;
-                                last;
+                                $gotrules = 1;                                
                             }
                         }
                     }
                 }
             }
             unless ($gotrules) {
-                print('**** WARNING **** '."\n".$curr_rewrite.' is currently set so rewrites '.
+                print('**** WARNING **** '.$curr_rewrite.' is currently set so rewrites '.
                       'of http to https are enabled for most URLs.'."\n".
-                      'Unless your Apache configuration includes Strict-Transport-Security '.
-                      '(with max-age > 0), it is recommended to also set rewrites from https to http '.
-                      'for specific URLs in a file in '.$ssldir.' by including the following:'."\n".
+                      'It is recommended to also set rewrites from https to http '.
+                      'in a file in '.$ssldir.' by including the following:'."\n".
                       "&lt;IfModule mod_rewrite.c&gt;\n".'  '.
                       join("\n  ",@expected)."\n".
                       "&lt;/IfModule&gt;\n");