From: Andrew Dolgov <fox@bah.spb.su>
Date: Thu, 24 Jan 2008 17:37:56 +0000 (+0100)
Subject: merge stuff
X-Git-Tag: 1.2.20~61
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=abfa57fdf00894a07f8c268c799ce9b225e5bc5b;p=tt-rss.git

merge stuff
---

abfa57fdf00894a07f8c268c799ce9b225e5bc5b
diff --cc update_daemon2.php
index 4d2eed5d,e7b5aeb2..cf25eeac
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@@ -85,11 -85,11 +85,6 @@@
  			"Maybe another daemon is already running.\n");
  	}
  
--	if (file_is_locked("update_daemon.lock")) {
--		die("error: Can't create lockfile. ".
--			"Maybe another daemon is already running.\n");
--	}
--
  	if (!pcntl_fork()) {
  		pcntl_signal(SIGINT, 'sigint_handler');
  
@@@ -277,7 -284,7 +272,7 @@@
  					if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
  
  					_debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");
--
++ 
  					db_close($link);
  
  					// We are in a fork.