loncom/lonhttpd - diff

Return to lonhttpd CVS log

Up to [LON-CAPA] / loncom

version 1.13, 2007/04/11 21:37:24	version 1.16, 2008/05/01 14:36:03
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\|login)\/[^\/]+$/) {
$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");