A race condition in the lockfile polling could lead to faxgetty looping

and consuming max CPU. This addresses the problem, and promotes HylaFAX
to a 4.1.5 release.

diff --git a/CHANGES b/CHANGES
index a5696dc6b53e2330c19d5449afa83ed13bdc5b8f..785ec9685f37c4dcd332d3c4ad5f9d8caeb8eaf4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,11 @@
 #      $Id$    
 
-Changelog for HylaFAX 4.1.4 - 22 Sep 2002
+Changelog for HylaFAX 4.1.5 - Oct 21, 2002
+
+* fix lockfile polling race condition (21 Oct 2002)
+
+Changelog for HylaFAX 4.1.4 - Oct 20, 2002
 
-CHANGES:
 * fix broken polling in Class 1 (08 Oct 2002)
 * change pollrcvd to behave similarly to faxrcvd (06 Oct 2002)
 * fix faxqclean to not miss certain orphaned files (01 Oct 2002)

diff --git a/README b/README
index a726d6e0e6aaa6749c57f420024a344ec523fdeb..d2df5b028b6d36679af444cf6a66ee56d95ae291 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ $Id$
 
                            *   ANNOUNCE   *
 
-The HylaFAX development team is pleased to announce our 4.1.4
+The HylaFAX development team is pleased to announce our 4.1.5
 patch-level release!  The release represents many hours of work and
 testing by developers and contributors, and our thanks goes to all who
 participate and provide feedback.
@@ -10,7 +10,7 @@ participate and provide feedback.
                                *   *   *
 
 This document is intended to describe the significant differences
-between hylafax-4.1.4 and older releases, point out any known
+between hylafax-4.1.5 and older releases, point out any known
 incompatibilites and issues, and provide the reader with directions to
 further resources regarding HylaFAX.
 
@@ -53,9 +53,13 @@ further resources regarding HylaFAX.
 
                       *   WHO SHOULD UPGRADE?   *
 
+Anyone running the short-lived 4.1.4 release of HylaFAX should consider this
+a mandatory upgrade. A race condition in the lockfile polling code could lead
+to a non-responsive faxgetty in some circumstances.
+
 A large number of security fixes were included in the 4.1.3 release of
 HylaFAX which make it very important to upgrade to 4.1.3 or newer. If you
-are not already running 4.1.3, this 4.1.4 release is a recommended
+are not already running 4.1.3, this 4.1.5 release is a recommended
 upgrade.
 
 Anyone already running 4.1.3 on Solaris should also upgrade, since a number

diff --git a/VERSION b/VERSION
index a95f2884441f750fc59ff84db191aa57f7ba609f..b1cbc1fcd22099f93c0fa579ece055dd4a297980 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.4
+4.1.5

diff --git a/faxd/ModemServer.c++ b/faxd/ModemServer.c++
index 99a49e6a8d0bf31c77343bdc0088a2ba88412834..8db5d12f1f30c48dbd0b93f1335471a40de75b53 100644 (file)
--- a/faxd/ModemServer.c++
+++ b/faxd/ModemServer.c++
@@ -229,9 +229,13 @@ ModemServer::changeState(ModemServerState s, long timeout)
            (const char*) modemDevice, setupAttempts);
        notifyModemWedged();
     }
+    /*
+     * Before we start any timer, make sure we stop the current one
+     */
+    Dispatcher::instance().stopTimer(this);
+
     if (timeout)
        Dispatcher::instance().startTimer(timeout, 0, this);
-
 }
 
 #if HAS_SCHEDCTL