--- thttpd/libhttpd.c	2001/07/08 08:22:33	1.1.4.6
+++ thttpd/libhttpd.c	2001/06/18 21:38:45	1.1.6.1
@@ -822,43 +822,6 @@
 #endif /* ERR_DIR */
     }
 
-void
-httpd_send_err_blocked( httpd_conn* hc )
-    {
-    char *protocol = hc->protocol;
-
-#ifdef ERR_DIR
-    char filename[1000];
-#endif
-
-    hc->protocol = "HTTP/1.0";
-
-#ifdef ERR_DIR
-    /* Try virtual host error page. */
-    if ( hc->hs->vhost && hc->hostdir[0] != '\0' )
-	{
-	(void) my_snprintf( filename, sizeof(filename),
-	    "%s/%s/err403blocked.html", hc->hostdir, ERR_DIR );
-	if ( send_err_file( hc, 403, err403title, "", filename ) )
-	    return;
-	}
-
-    /* Try server-wide error page. */
-    (void) my_snprintf( filename, sizeof(filename),
-	"%s/err403blocked.html", ERR_DIR );
-    if ( send_err_file( hc, 403, err403title, "", filename ) )
-	return;
-
-    /* Fall back on built-in error page. */
-    send_response( hc, 403, err403title, "", err403form, "" );
-
-#else /* ERR_DIR */
-
-    send_response( hc, 403, err403title, "", err403form, "" );
-
-#endif /* ERR_DIR */
-    hc->protocol = protocol;
-    }
 
 #ifdef ERR_DIR
 static int
@@ -1740,6 +1703,7 @@
     hc->keep_alive = 0;
     hc->should_linger = 0;
     hc->file_address = (char*) 0;
+    hc->file_fd = -1;
     return GC_OK;
     }
 
@@ -3686,10 +3650,6 @@
     if ( hc->hs->no_log )
 	return;
 
-    /* don't log UNKNOWN protocol requests (blocks etc..) */
-    if ( hc->method == METHOD_UNKNOWN )
-        return;
-
     /* This is straight CERN Combined Log Format - the only tweak
     ** being that if we're using syslog() we leave out the date, because
     ** syslogd puts it in.  The included syslogtocern script turns the