From e3b5c496bce23e89b12c4ffa16e2e8faf375cd1c Mon Sep 17 00:00:00 2001
From: Ron Pedde <ron@pedde.com>
Date: Tue, 9 Dec 2003 05:49:00 +0000
Subject: [PATCH] Make 401 persistent.  Not convinced this is right

---
 src/webserver.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/webserver.c b/src/webserver.c
index aac719e3..af154c97 100644
--- a/src/webserver.c
+++ b/src/webserver.c
@@ -734,7 +734,11 @@ void *ws_dispatcher(void *arg) {
 		    pwsc->threadno);
 
 	    can_dispatch=0;
-	    if(auth_handler) {
+	    /* If an auth handler is registered, but it accepts a 
+	     * username and password of NULL, then don't bother 
+	     * authing. 
+	     */
+	    if((auth_handler) && (auth_handler(NULL,NULL)==0)) {
 		/* do the auth thing */
 		auth=ws_getarg(&pwsc->request_headers,"Authorization");
 		if(auth) {
@@ -749,16 +753,19 @@ void *ws_dispatcher(void *arg) {
 		    ws_addarg(&pwsc->response_headers,"Connection","close");
 		    ws_addarg(&pwsc->response_headers,"WWW-Authenticate",
 			      "Basic realm=\"webserver\"");
-		    pwsc->close=1;
 		    ws_returnerror(pwsc,401,"Unauthorized");
-		    ws_close(pwsc);
-		    return NULL;
+		    pwsc->error=0;
 		}
+	    } else {
+		can_dispatch=1;
+	    }
+
+	    if(can_dispatch) {
+		if(req_handler)
+		    req_handler(pwsc);
+		else
+		    ws_defaulthandler(pwsp,pwsc);		
 	    }
-	    if(req_handler)
-		req_handler(pwsc);
-	    else
-		ws_defaulthandler(pwsp,pwsc);		
 	}
 
 	if((pwsc->close) || (pwsc->error) || (pwsp->stop)) {