3 files changed, 16 insertions, 4 deletions

diff --git a/cache.c b/cache.c
index 2e1ef8c..b947a34 100644
--- a/cache.c
+++ b/cache.c
@@ -90,18 +90,23 @@ int cache_lock(struct cacheitem *item)
 	    cache_refill_overdue(lockfile) && !unlink(lockfile))
 			goto top;
 
 	return (item->fd > 0);
 }
 
 int cache_unlock(struct cacheitem *item)
 {
 	close(item->fd);
 	return (rename(fmt("%s.lock", item->name), item->name) == 0);
 }
 
+int cache_cancel_lock(struct cacheitem *item)
+{
+	return (unlink(fmt("%s.lock", item->name)) == 0);
+}
+
 int cache_expired(struct cacheitem *item)
 {
 	if (item->ttl < 0)
 		return 0;
 	return item->st.st_mtime + item->ttl * 60 < time(NULL);
 }
diff --git a/cgit.c b/cgit.c
index d1abaa0..0f72f2d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -52,31 +52,37 @@ static void cgit_check_cache(struct cacheitem *item)
 
 	cache_prepare(item);
  top:
 	if (++i > cgit_max_lock_attempts) {
 		die("cgit_refresh_cache: unable to lock %s: %s",
 		    item->name, strerror(errno));
 	}
 	if (!cache_exist(item)) {
 		if (!cache_lock(item)) {
 			sleep(1);
 			goto top;
 		}
-		if (!cache_exist(item))
+		if (!cache_exist(item)) {
 			cgit_fill_cache(item);
-		cache_unlock(item);
+			cache_unlock(item);
+		} else {
+			cache_cancel_lock(item);
+		}
 	} else if (cache_expired(item) && cache_lock(item)) {
-		if (cache_expired(item))
+		if (cache_expired(item)) {
 			cgit_fill_cache(item);
-		cache_unlock(item);
+			cache_unlock(item);
+		} else {
+			cache_cancel_lock(item);
+		}
 	}
 }
 
 static void cgit_print_cache(struct cacheitem *item)
 {
 	static char buf[4096];
 	ssize_t i;
 
 	int fd = open(item->name, O_RDONLY);
 	if (fd<0)
 		die("Unable to open cached file %s", item->name);
 
diff --git a/cgit.h b/cgit.h
index c1dcc97..c9554a7 100644
--- a/cgit.h
+++ b/cgit.h
@@ -57,24 +57,25 @@ extern void html(const char *txt);
 extern void htmlf(const char *format,...);
 extern void html_txt(char *txt);
 extern void html_attr(char *txt);
 extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 
 extern int cgit_read_config(const char *filename, configfn fn);
 extern int cgit_parse_query(char *txt, configfn fn);
 
 extern void cache_prepare(struct cacheitem *item);
 extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
+extern int cache_cancel_lock(struct cacheitem *item);
 extern int cache_exist(struct cacheitem *item);
 extern int cache_expired(struct cacheitem *item);
 
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_pageurl(const char *reponame, const char *pagename, 
 			  const char *query);
 
 extern void cgit_print_error(char *msg);
 extern void cgit_print_docstart(char *title, struct cacheitem *item);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title);