Diff for /loncom/lonhttpd between versions 1.13 and 1.15

version 1.13, 2007/04/11 21:37:24 version 1.15, 2007/07/11 18:48:20
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 357  while (<STDIN>) { Line 356  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 (&Apache::lonnet::is_domainimage($address)) {          } elsif ($address =~ /^\/res\/([\w\.\-]+)\/\1\-domainconfig\/(logo|domlogo|img)\/[^\/]+$/) {
             $fail = 0;              $fail = 0;
         }          }
 #  #
Line 596  for (;;) { Line 595  for (;;) {
  waitpid($pid, 0);   waitpid($pid, 0);
  $0 = "lonhttpd: (dhttpi) on ANY:$port_to_use, last request " .   $0 = "lonhttpd: (dhttpi) on ANY:$port_to_use, last request " .
  scalar localtime;   scalar localtime;
    close(NS);
  } else {   } else {
  $0 = "lonhttpd: (dhttpi) child switching to socket";   $0 = "lonhttpd: (dhttpi) child switching to socket";
  open(STDIN, "<&NS");   open(STDIN, "<&NS");

Removed from v.1.13  
changed lines
  Added in v.1.15


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.