Diff for /loncom/lonhttpd between versions 1.11 and 1.12

version 1.11, 2007/04/10 20:08:01 version 1.12, 2007/04/11 19:52:44
Line 12  $VERSION = "1.3.2 (Demonic/Linux/LON-CAP Line 12  $VERSION = "1.3.2 (Demonic/Linux/LON-CAP
   
 use lib '/home/httpd/lib/perl/';  use lib '/home/httpd/lib/perl/';
 use LONCAPA::Configuration();  use LONCAPA::Configuration();
   use Apache::lonnet;
 %loncapavar=%{&LONCAPA::Configuration::read_conf('loncapa.conf')};  %loncapavar=%{&LONCAPA::Configuration::read_conf('loncapa.conf')};
 $port_to_use=$loncapavar{'lonhttpdPort'};  $port_to_use=$loncapavar{'lonhttpdPort'};
 if (!defined($port_to_use)) {  if (!defined($port_to_use)) {
Line 356  while (<STDIN>) { Line 357  while (<STDIN>) {
  $address=~s/\/+/\//g;   $address=~s/\/+/\//g;
         if ($address=~/^\/(status|adm\/|res\/adm\/)/) {          if ($address=~/^\/(status|adm\/|res\/adm\/)/) {
             $fail = 0;              $fail = 0;
         } elsif ($address =~ /^\/res\/([^\/]+)\/([^\/]+)\-domainconfig\/(logo|domlogo|img)\/[^\/]+$/) {          } elsif ($address =~ /^\/res\/([^\/]+)\/\1\-domainconfig\/(logo|domlogo|img)\/[^\/]+$/) {
 #            FIXME - should check $1 is a real domain here - need a lightweight              if (&Apache::lonnet::domain($1) ne '') {
 #                    domain checker.  
 #            @alldomains = &Apache::lonnet::get_domains();  
 #            if (grep(/^\Q$1\E$/,@alldomains)) {  
                 $fail = 0;                  $fail = 0;
 #            }              }
         }          }
   
 #  #

Removed from v.1.11  
changed lines
  Added in v.1.12


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>