--- http/processor.c	Fri Sep  6 20:13:37 2002
+++ 3.0/http/processor.c	Mon Oct  7 16:05:29 2002
@@ -73,7 +73,6 @@
 static void destroy_entry(void *);
 static void internal_error(int, int, char *);
 static HttpParameter parse_parameters(char *);
-static int do_timeout(int);
 static void request_timeout(int);
 
 
@@ -122,8 +121,16 @@
   
   RequestWrapper W= wrapper;
 
-  if (do_timeout(W->socket))
-      goto shutdown;
+  set_alarm_handler(request_timeout);
+  alarm(REQUEST_TIMEOUT);
+
+  if(sigsetjmp(timeout, TRUE) ) {
+    
+    internal_error(W->socket, SC_REQUEST_TIMEOUT,
+		   "Time out when handling the Request");
+    goto shutdown;
+    
+  }
     
   do_service(W);
 
@@ -965,30 +972,6 @@
 
 
 /**
- * Activate a timeout alarm clock, set a signal handler to handle the
- * alarm and a jmp_buffer for handling a timeout.
- */
-static int do_timeout(int client) {
-
-  set_alarm_handler(request_timeout);
-  
-  alarm(REQUEST_TIMEOUT);
-  
-  if ( sigsetjmp(timeout, TRUE) ) {
-    
-    internal_error(client, SC_REQUEST_TIMEOUT,
-		   "Time out when handling the Request");
-    
-    return TRUE;
-    
-  }
-  
-  return FALSE;
-  
-}
-
-
-/**
  * Do Basic Authentication if this auth. style is allowed. 
  */
 static int is_authenticated(HttpRequest req, HttpResponse res) {