Fix cache algorithm loophole

[cgit.git] / cgit.c

diff --git a/cgit.c b/cgit.c
index 110facec5867ad0912da6b41c24758a6c3f798cf..7f14016fb70ecb380ffafaa3e7f9f8d92fb362c5 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -465,20 +465,20 @@ static void cgit_fill_cache(struct cacheitem *item)
 
 static void cgit_refresh_cache(struct cacheitem *item)
 {
+       cache_prepare(item);
  top:
-       if (!cache_lookup(item)) {
-               if (cache_lock(item)) {
-                       cgit_fill_cache(item);
-                       cache_unlock(item);
-               } else {
+       if (!cache_exist(item)) {
+               if (!cache_lock(item)) {
                        sched_yield();
                        goto top;
                }
-       } else if (cache_expired(item)) {
-               if (cache_lock(item)) {
+               if (!cache_exist(item))
                        cgit_fill_cache(item);
-                       cache_unlock(item);
-               }
+               cache_unlock(item);
+       } else if (cache_expired(item) && cache_lock(item)) {
+               if (cache_expired(item))
+                       cgit_fill_cache(item);
+               cache_unlock(item);
        }
 }