From f60942fed0ff266aa2456ba4e5ecc2ba3e64bc3d Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 31 Jul 2011 23:34:22 -0400
Subject: - Patch #1216886 by pounard: _lock_id() shouldn't use
 drupal_static(), any cache clear would potentially make locks stall.

---
 includes/lock.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'includes/lock.inc')

diff --git a/includes/lock.inc b/includes/lock.inc
index 42f1906f2..7dd8db30a 100644
--- a/includes/lock.inc
+++ b/includes/lock.inc
@@ -74,7 +74,10 @@ function lock_initialize() {
  * Helper function to get this request's unique id.
  */
 function _lock_id() {
-  $lock_id = &drupal_static(__FUNCTION__);
+  // Do not use drupal_static(). This identifier refers to the current
+  // client request, and must not be changed under any circumstances
+  // else the shutdown handler may fail to release our locks.
+  static $lock_id;
 
   if (!isset($lock_id)) {
     // Assign a unique id.
-- 
cgit v1.2.3