loncom/lonhttpd - diff

Return to lonhttpd CVS log

Up to [LON-CAPA] / loncom

version 1.11, 2007/04/10 20:08:01	version 1.13, 2007/04/11 21:37:24
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 (&Apache::lonnet::is_domainimage($address)) {
# FIXME - should check $1 is a real domain here - need a lightweight	$fail = 0;
# 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
#	#