--- parser3/src/include/pa_sql_driver_manager.h	2001/04/04 11:47:28	1.2
+++ parser3/src/include/pa_sql_driver_manager.h	2001/09/26 10:32:25	1.12
@@ -1,27 +1,32 @@
 /** @file
 	Parser: sql driver manager decl.
+	global sql driver manager, must be thread-safe
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_sql_driver_manager.h,v 1.2 2001/04/04 11:47:28 paf Exp $
-
-
-	global sql driver manager, must be thread-safe
+	$Id: pa_sql_driver_manager.h,v 1.12 2001/09/26 10:32:25 parser Exp $
 */
 
 #ifndef PA_SQL_DRIVER_MANAGER_H
 #define PA_SQL_DRIVER_MANAGER_H
 
+#include "pa_config_includes.h"
 #include "pa_pool.h"
 #include "pa_sql_driver.h"
 #include "pa_hash.h"
 #include "pa_stack.h"
-#include "pa_threads.h"
 #include "pa_table.h"
 #include "pa_string.h"
 
+
+// defines
+
+#define MAIN_SQL_NAME "SQL"
+#define MAIN_SQL_DRIVERS_NAME "drivers"
+
+// forwards
+
 class SQL_Connection;
 
 /// sql driver manager
@@ -31,7 +36,8 @@ public:
 
 	SQL_Driver_manager(Pool& pool) : Pooled(pool),
 		driver_cache(pool),
-		connection_cache(pool) {
+		connection_cache(pool),
+		prev_expiration_pass_time(0) {
 	}
 
 	/** 
@@ -39,7 +45,8 @@ public:
 		using driver dynamic library found in table, if not loaded yet
 		checks driver version
 	*/
-	SQL_Connection& get_connection(const String& url, Table *protocol2library);
+	SQL_Connection& get_connection(const String& url, const String& request_origin,
+		Table *protocol2driver_and_client);
 
 private: // driver cache
 
@@ -50,6 +57,9 @@ private: // connection cache
 
 	SQL_Connection *get_connection_from_cache(const String& url);
 	void put_connection_to_cache(const String& url, SQL_Connection& connection);
+	void maybe_expire_connection_cache();
+private:
+	time_t prev_expiration_pass_time;
 
 private: // for SQL_Connection