From 72e5fbb1d882aa6ecfc1b9d86117acc7f0199019 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Tue, 16 Aug 2011 15:47:35 -0600
Subject: [PATCH] fix for when if-modified-since not sent

---
 Makefile |  2 +-
 httpd.c  | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 05f1c8e..651ee4a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ CXX=g++
 #LIBOWFAT=../libowfat/
 #DIET=diet -Os
 
-CFLAGS=-Os -fomit-frame-pointer
+CFLAGS += -Os -fomit-frame-pointer
 #CFLAGS=-g
 
 all: fnord fnord-cgi fnord-idx
diff --git a/httpd.c b/httpd.c
index bb6fce4..9a26285 100644
--- a/httpd.c
+++ b/httpd.c
@@ -940,7 +940,6 @@ static struct stat st;
 static int doit(char* buf,int buflen,char* url,int explicit) {
   int fd=-1;
   char* accept;
-  time_t ims;
   while (url[0]=='/') ++url;
   getmimetype(url,explicit);
   {
@@ -967,9 +966,16 @@ ok:
     if (S_ISDIR(st.st_mode)) goto bad;
     /* see if the peer accepts MIME type */
     /* see if the document has been changed */
-    ims=timerfc(header(buf,buflen,"If-Modified-Since"));
-    //fprintf(stderr, "ims: %lu %lu %d\n", ims, st.st_mtime, st.st_mtime - ims);
-    if ((ims!=(time_t)-1) && (st.st_mtime<=ims)) { retcode=304; goto bad; }
+    {
+      char *field = header(buf,buflen,"If-Modified-Since");
+
+      if (field) {
+        time_t ims;
+        
+        ims = timerfc(field);
+        if ((ims!=(time_t)-1) && (st.st_mtime<=ims)) { retcode=304; goto bad; }
+      }
+    }
     rangestart=0; rangeend=st.st_size;
     if ((accept=header(buf,buflen,"Range"))) {
       /* format: "bytes=17-23", "bytes=23-" */