From d6a4a040ca66d247bb4c3fc3e67c4ee683c920b2 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Mon, 10 Jan 2011 19:22:37 +0100
Subject: Use md5 of the id in the subscription lockdir. FS#2112

Filenames can't contain ":" on windows and the lock directory contained
the unescaped page id. The lock function tries in an endless loop to
create the lock directory when it fails and the directory doesn't exist.
Just escaping the directory name won't work as then the filename length
limit will be quickly hit when using deep namespace structures with utf8
names. Thus using the md5sum seems to be the best solution. Perhaps the
lock function could also be changed to create a file with that name that
contains the id so the id can be retrieved for debugging purposes.
---
 inc/subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/subscription.php')

diff --git a/inc/subscription.php b/inc/subscription.php
index 08d4cb241..1b5476553 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -46,7 +46,7 @@ function subscription_filename($id) {
  */
 function subscription_lock_filename ($id){
     global $conf;
-    return $conf['lockdir'].'/_subscr_' . $id . '.lock';
+    return $conf['lockdir'].'/_subscr_' . md5($id) . '.lock';
 }
 
 function subscription_lock($id) {
-- 
cgit v1.2.3


From 412b5df14aaa2104af3d82e77380c5321cd94389 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sun, 6 Feb 2011 18:36:24 +0100
Subject: Prevent infinite loop in the subscription lock

There is no reason why the subscription should wait for other calls
because the lock is only for one page so once the other call has
finished the work has already been done. This simplifies the lock
mechanism so there is no more loop.
---
 inc/subscription.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'inc/subscription.php')

diff --git a/inc/subscription.php b/inc/subscription.php
index 1b5476553..8e3a99a8f 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -50,18 +50,19 @@ function subscription_lock_filename ($id){
 }
 
 function subscription_lock($id) {
-    // FIXME merge this with the indexer lock generation, abstract out
     global $conf;
     $lock = subscription_lock_filename($id);
-    while(!@mkdir($lock,$conf['dmode'])){
-        usleep(50);
-        if(time()-@filemtime($lock) > 60*5){
-            // looks like a stale lock - remove it
-            @rmdir($lock);
-        }else{
-            return false;
-        }
+
+    if (is_dir($lock) && time()-@filemtime($lock) > 60*5) {
+        // looks like a stale lock - remove it
+        @rmdir($lock);
     }
+
+    // try creating the lock directory
+    if (!@mkdir($lock,$conf['dmode'])) {
+        return false;
+    }
+
     if($conf['dperm']) chmod($lock, $conf['dperm']);
     return true;
 }
-- 
cgit v1.2.3