[BACK]Return to lonhttpd CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom

Diff for /loncom/lonhttpd between versions 1.8 and 1.11

version 1.8, 2003/07/01 19:57:45 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 61  $pidfile="/home/httpd/perl/logs/lonhttpd Line 62  $pidfile="/home/httpd/perl/logs/lonhttpd
   
 if (-e $pidfile) {  if (-e $pidfile) {
    open(LFH,"$pidfile");     open(LFH,"$pidfile");
    my $pide=<$LFH>;     my $pide=<LFH>;
    chomp($pide);     chomp($pide);
    close(LFH);     close(LFH);
    if (kill 0 => $pide) { die "already running"; }     if (kill 0 => $pide) { die "already running"; }
Line 260  EOF Line 261  EOF
  }   }
   
   
 sub bye { unlink($pidfile); exit; }  sub bye { exit; }
   
   sub goodbye { unlink($pidfile); exit; }
   
 sub dead {  sub dead {
  &htsponse(500, "Server Error");   &htsponse(500, "Server Error");
Line 276  EOF Line 279  EOF
 }  }
   
 $SIG{'__DIE__'} = \&dead;  $SIG{'__DIE__'} = \&dead;
 $SIG{'ALRM'} = $SIG{'TERM'} = $SIG{'INT'} = \&bye;  $SIG{'ALRM'} = \&bye;
   $SIG{'TERM'} = $SIG{'INT'} = \&goodbye;
   
 sub master {  sub master {
  $0 = "lonhttpd: (dhttpi) handling request";   $0 = "lonhttpd: (dhttpi) handling request";
Line 345  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.8  
changed lines
  Added in v.1.11

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