Ticket #1548: actualized_etags.patch

src/base.h

@@ -33 +33 @@
 #include "fdevent.h"
 #include "sys-socket.h"
 #include "http_req.h"
+#include "etag.h"
 
 #if defined HAVE_LIBSSL && defined HAVE_OPENSSL_SSL_H
 # define USE_OPENSSL
@@ -303 +304 @@
         unsigned short use_ipv6;
         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 int max_request_size;
 
@@ -448 +452 @@
         GTimeVal timestamps[TIME_LAST_ELEMENT]; /**< used by timing.h */
 #endif
 
+        /* etag handling */
+        etag_flags_t etag_flags;
+
         int conditional_is_valid[COMP_LAST_ELEMENT];
 } connection;
 

src/configfile.c

@@ -99 +99 @@
                 { "debug.log-timing",            NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER },     /* 51 */
                 { "ssl.cipher-list",             NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER },      /* 52 */
                 { "ssl.use-sslv2",               NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 53 */
+                { "etag.use-inode",              NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER },     /* 54 */
+                { "etag.use-mtime",              NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER },     /* 55 */
+                { "etag.use-size",               NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER },     /* 56 */
 
                 { "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 },
@@ -180 +183 @@
                 s->kbytes_per_second = 0;
                 s->allow_http11  = 1;
                 s->range_requests = 1;
+                s->etag_use_inode = 1;
+                s->etag_use_mtime = 1;
+                s->etag_use_size  = 1;
                 s->force_lowercase_filenames = 0;
                 s->global_kbytes_per_second = 0;
                 s->global_bytes_per_second_cnt = 0;
@@ -225 +231 @@
                 cv[50].destination = &(s->max_connection_idle);
                 cv[52].destination = s->ssl_cipher_list;
                 cv[53].destination = &(s->ssl_use_sslv2);
+                cv[54].destination = &(s->etag_use_inode);
+                cv[55].destination = &(s->etag_use_mtime);
+                cv[56].destination = &(s->etag_use_size);
 
                 srv->config_storage[i] = s;
 
@@ -297 +306 @@
         PATCH(ssl_ca_file);
         PATCH(ssl_cipher_list);
         PATCH(ssl_use_sslv2);
+
+        PATCH(etag_use_inode);
+        PATCH(etag_use_mtime);
+        PATCH(etag_use_size);
         return 0;
 }
 
@@ -342 +355 @@
                                 PATCH(max_connection_idle);
                         } 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);
                         } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.ca-file"))) {
@@ -385 +404 @@
                         }
                 }
         }
+        con->etag_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);
 
         return 0;
 }

src/etag.c

@@ -9 +9 @@
         return 0;
 }
 
-int etag_create(buffer *etag, struct stat *st) {
-        buffer_copy_off_t(etag, st->st_ino);
+int etag_create(buffer *etag, struct stat *st, etag_flags_t flags) {
+
+        if (0 == flags) return 0;
+
+        buffer_reset(etag);
+
+        if (flags & ETAG_USE_INODE) {
+               buffer_append_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;
 }

src/etag.h

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

src/stat_cache.c

@@ -470 +470 @@
                                 break;
                         }
                 }
-                etag_create(sce->etag, &(sce->st));
+                etag_create(sce->etag, &(sce->st), con->etag_flags);
 #ifdef HAVE_XATTR
                 if (con->conf.use_xattr && buffer_is_empty(sce->content_type)) {
                         stat_cache_attr_get(sce->content_type, name->ptr);
                 }
 #endif
         } else if (S_ISDIR(st.st_mode)) {
-                etag_create(sce->etag, &(sce->st));
+                etag_create(sce->etag, &(sce->st), con->etag_flags);
         }
 
         *ret_sce = sce;