@@ -1,3 +1,7 @@

+Wed Jan 26 18:20:40 GMT 2005 (trog)

+-----------------------------------

+  * clamd/server-th.c: always check if we need to end the SESSION.

+

 Wed Jan 26 19:01:27 CET 2005 (tk)

 ---------------------------------

   * libclamav/others: increase flevel

@@ -109,22 +109,19 @@ void scanner_thread(void *arg)

 	    case COMMAND_END:

 		session = FALSE;

 		break;

-

-	    case COMMAND_TIMEOUT:

-		if (session) {

-		    pthread_mutex_lock(&exit_mutex);

-		    if(progexit) {

-			session = FALSE;

-		    }

-		    pthread_mutex_unlock(&exit_mutex);

-                    pthread_mutex_lock(&reload_mutex);

-                    if(reload) {

-			session = FALSE;

-		    }

-                    pthread_mutex_unlock(&reload_mutex);

-		}

-		break;

-        }

+	}

+	if (session) {

+	    pthread_mutex_lock(&exit_mutex);

+	    if(progexit) {

+		session = FALSE;

+	    }

+	    pthread_mutex_unlock(&exit_mutex);

+	    pthread_mutex_lock(&reload_mutex);

+	    if(reload) {

+		session = FALSE;

+	    }

+	    pthread_mutex_unlock(&reload_mutex);

+	}

     } while (session);

     close(conn->sd);