--- loncom/lonhttpd	2007/04/11 21:37:24	1.13
+++ loncom/lonhttpd	2008/05/01 14:36:03	1.16
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: lonhttpd,v 1.13 2007/04/11 21:37:24 raeburn Exp $
+# $Id: lonhttpd,v 1.16 2008/05/01 14:36:03 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,7 +356,7 @@ while (<STDIN>) {
 	$address=~s/\/+/\//g;
         if ($address=~/^\/(status|adm\/|res\/adm\/)/) {
             $fail = 0;
-        } elsif (&Apache::lonnet::is_domainimage($address)) {
+        } elsif ($address =~ /^\/res\/([\w\.\-]+)\/\1\-domainconfig\/(logo|domlogo|img|login)\/[^\/]+$/) {
             $fail = 0;
         }
 #
@@ -596,6 +595,7 @@ for (;;) {
 		waitpid($pid, 0);
 		$0 = "lonhttpd: (dhttpi) on ANY:$port_to_use, last request " .
 			scalar localtime;
+		close(NS);
 	} else {
 		$0 = "lonhttpd: (dhttpi) child switching to socket";
 		open(STDIN, "<&NS");