Diff for /loncom/lonhttpd between versions 1.10 and 1.11

version 1.10, 2005/02/14 00:18:03 version 1.11, 2007/04/10 20:08:01
Line 51  if ($port_to_use eq '80') { die('Apache Line 51  if ($port_to_use eq '80') { die('Apache
  "mpeg" => "video/mpeg",   "mpeg" => "video/mpeg",
  "mpg" => "video/mpeg",   "mpg" => "video/mpeg",
  "jpeg" => "image/jpeg",   "jpeg" => "image/jpeg",
  "jpg" => "image/jpeg");   "jpg" => "image/jpeg",
            "png" => "image/png");
   
 $logfile = "/home/httpd/perl/logs/lonhttpd.log";  $logfile = "/home/httpd/perl/logs/lonhttpd.log";
   
Line 348  while (<STDIN>) { Line 349  while (<STDIN>) {
  1 while $address =~ s#/\.(/|$)#\1#;   1 while $address =~ s#/\.(/|$)#\1#;
         1 while $address =~ s#/[^/]*/\.\.(/|$)#\1#;          1 while $address =~ s#/[^/]*/\.\.(/|$)#\1#;
  1 while $address =~ s#^/\.\.(/|$)#\1#;   1 while $address =~ s#^/\.\.(/|$)#\1#;
  $fail = 0;   $fail = 1;
 #  #
 # Heavily customized for LON-CAPA  # Heavily customized for LON-CAPA
 #  #
  $address=~s/\/+/\//g;   $address=~s/\/+/\//g;
  unless ($address=~/^\/(status|adm\/|res\/adm\/)/) { $fail=1; }          if ($address=~/^\/(status|adm\/|res\/adm\/)/) {
               $fail = 0;
           } elsif ($address =~ /^\/res\/([^\/]+)\/([^\/]+)\-domainconfig\/(logo|domlogo|img)\/[^\/]+$/) {
   #            FIXME - should check $1 is a real domain here - need a lightweight
   #                    domain checker.
   #            @alldomains = &Apache::lonnet::get_domains();
   #            if (grep(/^\Q$1\E$/,@alldomains)) {
                   $fail = 0;
   #            }
           }
   
 #  #
 # because existing restriction matrix would not do precedence across rules  # because existing restriction matrix would not do precedence across rules
 #  #

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


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