--- loncom/lonhttpd 2007/04/11 19:52:44 1.12 +++ loncom/lonhttpd 2007/04/13 15:43:42 1.14 @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: lonhttpd,v 1.12 2007/04/11 19:52:44 raeburn Exp $ +# $Id: lonhttpd,v 1.14 2007/04/13 15:43:42 raeburn Exp $ $VERSION = "1.3.2 (Demonic/Linux/LON-CAPA Derivative $Revison$)"; @@ -12,7 +12,6 @@ $VERSION = "1.3.2 (Demonic/Linux/LON-CAP use lib '/home/httpd/lib/perl/'; use LONCAPA::Configuration(); -use Apache::lonnet; %loncapavar=%{&LONCAPA::Configuration::read_conf('loncapa.conf')}; $port_to_use=$loncapavar{'lonhttpdPort'}; if (!defined($port_to_use)) { @@ -357,12 +356,9 @@ while () { $address=~s/\/+/\//g; if ($address=~/^\/(status|adm\/|res\/adm\/)/) { $fail = 0; - } elsif ($address =~ /^\/res\/([^\/]+)\/\1\-domainconfig\/(logo|domlogo|img)\/[^\/]+$/) { - if (&Apache::lonnet::domain($1) ne '') { - $fail = 0; - } + } elsif ($address =~ /^\/res\/([\w\.\-]+)\/\1\-domainconfig\/(logo|domlogo|img)\/[^\/]+$/) { + $fail = 0; } - # # because existing restriction matrix would not do precedence across rules #