loncom/lonhttpd - diff

Return to lonhttpd CVS log

Up to [LON-CAPA] / loncom

version 1.11, 2007/04/10 20:08:01	version 1.16, 2008/05/01 14:36:03
Line 356 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 ($address =~ /^\/res\/([^\/]+)\/([^\/]+)\-domainconfig\/(logo\|domlogo\|img)\/[^\/]+$/) {	} elsif ($address =~ /^\/res\/([\w\.\-]+)\/\1\-domainconfig\/(logo\|domlogo\|img\|login)\/[^\/]+$/) {
# 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
#	#
Line 601 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");