From a0d52df81ee64d3dfd2a719f1190bb463ef28685 Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Wed, 19 Nov 2008 14:18:08 +0100
Subject: [PATCH 1/2] Fixed a performance issue in the logstream db and pdo
 drivers when using filters.

---
 src/classes/logstreamdb.class.php  | 5 +++++
 src/classes/logstreampdo.class.php | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/classes/logstreamdb.class.php b/src/classes/logstreamdb.class.php
index 59a4e85..e8bb4be 100644
--- a/src/classes/logstreamdb.class.php
+++ b/src/classes/logstreamdb.class.php
@@ -1035,6 +1035,11 @@ class LogStreamDB extends LogStream {
 			$iBegin++;
 		}
 
+		// --- Check if results were found
+		if ( $iBegin == $this->_currentRecordNum )
+			return ERROR_NOMORERECORDS;
+		// --- 
+
 		// Free Query ressources
 		mysql_free_result ($myquery); 
 
diff --git a/src/classes/logstreampdo.class.php b/src/classes/logstreampdo.class.php
index 8c54411..5ad98f5 100644
--- a/src/classes/logstreampdo.class.php
+++ b/src/classes/logstreampdo.class.php
@@ -1065,6 +1065,11 @@ class LogStreamPDO extends LogStream {
 			$iCount++;
 		}
 
+		// --- Check if results were found
+		if ( $iBegin == $this->_currentRecordNum )
+			return ERROR_NOMORERECORDS;
+		// --- 
+
 		// return success state if reached this point!
 		return SUCCESS;
 	}

From 2ca29f1f6cbbea0f7f48d9a82bc5c11fd66f8bfe Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Wed, 19 Nov 2008 14:23:39 +0100
Subject: [PATCH 2/2] Added changelog entry

---
 ChangeLog                        | 5 +++++
 src/include/functions_common.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5ddd263..64255ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------
+Version 2.5.20 (beta), 2008-11-19
+- Fixed a performance issue in the logstream db and pdo drivers when 
+  using filters. This bug could cause script timeouts when using complex
+  filters. 
+---------------------------------------------------------------------------
 Version 2.5.19 (beta), 2008-11-18
 - Added a new "cron" folder which contains a maintenance.php script. 
   This script can be used on command line level for database maintenance. 
diff --git a/src/include/functions_common.php b/src/include/functions_common.php
index d04806e..78ab106 100644
--- a/src/include/functions_common.php
+++ b/src/include/functions_common.php
@@ -66,7 +66,7 @@ $LANG_EN = "en";	// Used for fallback
 $LANG = "en";		// Default language
 
 // Default Template vars
-$content['BUILDNUMBER'] = "2.5.19";
+$content['BUILDNUMBER'] = "2.5.20";
 $content['TITLE'] = "phpLogCon :: Release " . $content['BUILDNUMBER'];	// Default page title 
 $content['BASEPATH'] = $gl_root_path;
 $content['SHOW_DONATEBUTTON'] = true; // Default = true!