Changeset 1874

Timestamp:

06/15/2007 03:51:16 PM (14 months ago)

Author:

jan

Message:

added static-file.etags, etag.use-inode, etag.use-mtime,
etag.use-size to customize the generation of ETags for
static files. (fixes #1209) (patch by <Yusufg@…>)

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/base.h (modified) (1 diff)
• src/configfile.c (modified) (5 diffs)
• src/etag.c (modified) (1 diff)
• src/etag.h (modified) (1 diff)
• src/mod_staticfile.c (modified) (6 diffs)
• src/stat_cache.c (modified) (2 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -6 +6 @@
 - 1.4.16 - 
 
+  * added static-file.etags, etag.use-inode, etag.use-mtime, etag.use-size
+    to customize the generation of ETags for static files. (#1209) 
+    (patch by <Yusufg@gmail.com>)
   * fixed typecast of NULL on execl() (#1235)
+    (patch by F. Denis)
   * fixed circumventing url.access-deny by trailing slash (#1230)
   * fixed crash on duplicate headers with trailing WS (#1232)

branches/lighttpd-1.4.x/src/base.h

@@ -270 +270 @@
         unsigned short is_ssl;
         unsigned short allow_http11;
+        unsigned short etag_use_inode;
+        unsigned short etag_use_mtime;
+        unsigned short etag_use_size;
         unsigned short force_lowercase_filenames; /* if the FS is case-insensitive, force all files to lower-case */
         unsigned short max_request_size;

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

@@ -90 +90 @@
                 { "ssl.cipher-list",             NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER },      /* 46 */
                 { "ssl.use-sslv2",               NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 47 */
-
+                { "etag.use-inode",             NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 48 */
+                { "etag.use-mtime",             NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 49 */
+                { "etag.use-size",             NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 50 */
                 { "server.host",                 "use server.bind instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET },
                 { "server.docroot",              "use server.document-root instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET },
@@ -163 +165 @@
                 s->kbytes_per_second = 0;
                 s->allow_http11  = 1;
+                s->etag_use_inode = 1;
+                s->etag_use_mtime = 1;
+                s->etag_use_size  = 1;
                 s->range_requests = 1;
                 s->force_lowercase_filenames = 0;
@@ -207 +212 @@
                 cv[46].destination = s->ssl_cipher_list;
                 cv[47].destination = &(s->ssl_use_sslv2);
+                cv[48].destination = &(s->etag_use_inode);
+                cv[49].destination = &(s->etag_use_mtime);
+                cv[50].destination = &(s->etag_use_size);
 
                 srv->config_storage[i] = s;
@@ -281 +289 @@
         PATCH(ssl_cipher_list);
         PATCH(ssl_use_sslv2);
-
-
+        PATCH(etag_use_inode);
+        PATCH(etag_use_mtime);
+        PATCH(etag_use_size);
+ 
         return 0;
 }
@@ -324 +334 @@
                         } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("mimetype.use-xattr"))) {
                                 PATCH(use_xattr);
+                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("etag.use-inode"))) {
+                                PATCH(etag_use_inode);
+                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("etag.use-mtime"))) {
+                                PATCH(etag_use_mtime);
+                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("etag.use-size"))) {
+                                PATCH(etag_use_size);
                         } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.pemfile"))) {
                                 PATCH(ssl_pemfile);

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

@@ -9 +9 @@
 }
 
-int etag_create(buffer *etag, struct stat *st) {
-        buffer_copy_off_t(etag, st->st_ino);
-        buffer_append_string_len(etag, CONST_STR_LEN("-"));
-        buffer_append_off_t(etag, st->st_size);
-        buffer_append_string_len(etag, CONST_STR_LEN("-"));
-        buffer_append_long(etag, st->st_mtime);
+int etag_create(buffer *etag, struct stat *st,etag_flags_t flags) {
+        if (0 == flags) return 0;
+        
+        if (flags & ETAG_USE_INODE) {
+                buffer_copy_off_t(etag, st->st_ino);
+                buffer_append_string_len(etag, CONST_STR_LEN("-"));
+        }
+        
+        if (flags & ETAG_USE_SIZE) {
+                buffer_append_off_t(etag, st->st_size);
+                buffer_append_string_len(etag, CONST_STR_LEN("-"));
+        }
+        
+        if (flags & ETAG_USE_MTIME) {
+                buffer_append_long(etag, st->st_mtime);
+        }
 
         return 0;

branches/lighttpd-1.4.x/src/etag.h

@@ -8 +8 @@
 #include "buffer.h"
 
+typedef enum { ETAG_USE_INODE = 1, ETAG_USE_MTIME = 2, ETAG_USE_SIZE = 4 } etag_flags_t;
+
 int etag_is_equal(buffer *etag, const char *matches);
-int etag_create(buffer *etag, struct stat *st);
+int etag_create(buffer *etag, struct stat *st, etag_flags_t flags);
 int etag_mutate(buffer *mut, buffer *etag);
 

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

@@ -26 +26 @@
 typedef struct {
         array *exclude_ext;
+        unsigned short etags_used;
 } plugin_config;
 
@@ -83 +84 @@
         config_values_t cv[] = {
                 { "static-file.exclude-extensions", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION },       /* 0 */
+                { "static-file.etags",    NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 1 */
                 { NULL,                         NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
         };
@@ -95 +97 @@
                 s = calloc(1, sizeof(plugin_config));
                 s->exclude_ext    = array_init();
+                s->etags_used     = 1;
 
                 cv[0].destination = s->exclude_ext;
+                cv[1].destination = &(s->etags_used);
 
                 p->config_storage[i] = s;
@@ -115 +119 @@
 
         PATCH(exclude_ext);
+        PATCH(etags_used);
 
         /* skip the first, the global context */
@@ -130 +135 @@
                         if (buffer_is_equal_string(du->key, CONST_STR_LEN("static-file.exclude-extensions"))) {
                                 PATCH(exclude_ext);
-                        }
+                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("static-file.etags"))) {
+                                PATCH(etags_used);
+                        } 
                 }
         }
@@ -447 +454 @@
 
         if (allow_caching) {
-                if (NULL == array_get_element(con->response.headers, "ETag")) {
-                        /* generate e-tag */
-                        etag_mutate(con->physical.etag, sce->etag);
-
-                        response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag));
+                etag_flags_t flags;
+
+                flags =   (con->conf.etag_use_mtime ? ETAG_USE_MTIME : 0) | (con->conf.etag_use_inode ? ETAG_USE_INODE : 0) | (con->conf.etag_use_size ? ETAG_USE_SIZE : 0);
+
+                if (p->conf.etags_used && flags != 0 && !buffer_is_empty(sce->etag)) {
+                        if (NULL == array_get_element(con->response.headers, "ETag")) {
+                                /* generate e-tag */
+                                etag_mutate(con->physical.etag, sce->etag);
+
+                                response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag));
+                        }
                 }
 

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

@@ -609 +609 @@
                         }
                 }
-                etag_create(sce->etag, &(sce->st));
+                etag_create(sce->etag, &(sce->st),
+                        (con->conf.etag_use_mtime ? ETAG_USE_MTIME : 0) | (con->conf.etag_use_inode ? ETAG_USE_INODE : 0) | (con->conf.etag_use_size ? ETAG_USE_SIZE : 0));
 #ifdef HAVE_XATTR
                 if (con->conf.use_xattr && buffer_is_empty(sce->content_type)) {
@@ -616 +617 @@
 #endif
         } else if (S_ISDIR(st.st_mode)) {
-                etag_create(sce->etag, &(sce->st));
+                etag_create(sce->etag, &(sce->st),
+                        (con->conf.etag_use_mtime ? ETAG_USE_MTIME : 0) | (con->conf.etag_use_inode ? ETAG_USE_INODE : 0) | (con->conf.etag_use_size ? ETAG_USE_SIZE : 0));
         }