Changeset 2053

Timestamp:

01/18/2008 09:21:07 AM (9 months ago)

Author:

glen

Message:

- generate ETag and Last-Modified headers for mod_ssi based on newest modified include (#1491)

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/mod_ssi.c (modified) (4 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -19 +19 @@
   * open log immediately after daemonizing, fixes SIGPIPEs on startup  (#165)
   * HTTPS env var should be "on" when using mod_extforward and the X-Forwarded-Proto header is set. (#1499)
+  * generate ETag and Last-Modified headers for mod_ssi based on newest modified include (#1491)
 
 - 1.4.18 - 2007-09-09

branches/lighttpd-1.4.x/src/mod_ssi.c

@@ -36 +36 @@
 #include <sys/filio.h>
 #endif
+
+#include "etag.h"
+
+/* The newest modified time of included files for include statement */
+static volatile time_t include_file_last_mtime = 0;
 
 /* init the plugin data */
@@ -576 +581 @@
                         case SSI_INCLUDE:
                                 chunkqueue_append_file(con->write_queue, p->stat_fn, 0, st.st_size);
+
+                                /* Keep the newest mtime of included files */
+                                if (st.st_mtime > include_file_last_mtime)
+                                  include_file_last_mtime = st.st_mtime;
+
                                 break;
                         }
@@ -912 +922 @@
         build_ssi_cgi_vars(srv, con, p);
         p->if_is_false = 0;
+
+        /* Reset the modified time of included files */
+        include_file_last_mtime = 0;
 
         if (-1 == stream_open(&s, con->physical.path)) {
@@ -1011 +1024 @@
         response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_STR_LEN("text/html"));
 
+  {
+        /* Generate "ETag" & "Last-Modified" headers */
+
+                stat_cache_entry *sce = NULL;
+                time_t lm_time = 0;
+                buffer *mtime = NULL;
+
+                stat_cache_get_entry(srv, con, con->physical.path, &sce);
+
+                etag_mutate(con->physical.etag, sce->etag);
+                response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag));
+
+                if (sce->st.st_mtime > include_file_last_mtime)
+                        lm_time = sce->st.st_mtime;
+                else
+                        lm_time = include_file_last_mtime;
+
+                mtime = strftime_cache_get(srv, lm_time);
+                response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"), CONST_BUF_LEN(mtime));
+  }
+
+        /* Reset the modified time of included files */
+        include_file_last_mtime = 0;
+
         /* reset physical.path */
         buffer_reset(con->physical.path);