Fix cache algorithm loophole

[ps-cgit] / cgit.c
diff --git a/cgit.c b/cgit.c

index 808ffe98199ec38bdc5d705b559cab615b8e47a0..7f14016fb70ecb380ffafaa3e7f9f8d92fb362c5 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -8,14 +8,16 @@
  
  #include "cgit.h"
  
-static const char cgit_doctype[] =
+const char cgit_version[] = CGIT_VERSION;
+
+const char cgit_doctype[] =
  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
  "  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
  
-static const char cgit_error[] =
+const char cgit_error[] =
  "<div class='error'>%s</div>";
  
-static const char cgit_lib_error[] =
+const char cgit_lib_error[] =
  "<div class='error'>%s: %s</div>";
  
  int htmlfd = 0;
@@ -200,6 +202,7 @@ static void cgit_print_docstart(char *title)
         html("<title>");
         html_txt(title);
         html("</title>\n");
+       htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
         html("<link rel='stylesheet' type='text/css' href='");
         html_attr(cgit_css);
         html("'/>\n");
@@ -462,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);
         }
  }