lighttpd
/
lighttpd1.4
2
0
Fork 0
Code Issues Releases Wiki Activity
lighttpd 1.4.x https://www.lighttpd.net/
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
4173 Commits
8 Branches
79 Tags
48 MiB
Tree: d59d5e59b9
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'd59d5e59b9'
${ noResults }
lighttpd1.4/src/http_etag.c

93 lines
2.5 KiB
Raw Normal View History Unescape

[multiple] etag.[ch] -> http_etag.[ch]; better imp more efficient implementation of HTTP ETag generation and comparison modify dekhash() to take hash value to allow for incremental hashing
2 years ago
/*
* http_etag - HTTP ETag manipulation
*
* Copyright(c) 2015,2020 Glenn Strauss gstrauss()gluelogic.com All rights reserved
* License: BSD 3-clause (same as lighttpd)
*/
#include "first.h"
#include "http_etag.h"
#include <sys/stat.h>
#include <string.h>
#include "algo_md.h"
#include "buffer.h"
int
http_etag_matches (const buffer * const etag, const char *s, const int weak_ok)
{
if ('*' == s[0] && '\0' == s[1]) return 1;
[multiple] reduce redundant NULL buffer checks This commit is a large set of code changes and results in removal of hundreds, perhaps thousands, of CPU instructions, a portion of which are on hot code paths. Most (buffer *) used by lighttpd are not NULL, especially since buffers were inlined into numerous larger structs such as request_st and chunk. In the small number of instances where that is not the case, a NULL check is often performed earlier in a function where that buffer is later used with a buffer_* func. In the handful of cases that remained, a NULL check was added, e.g. with r->http_host and r->conf.server_tag. - check for empty strings at config time and set value to NULL if blank string will be ignored at runtime; at runtime, simple pointer check for NULL can be used to check for a value that has been set and is not blank ("") - use buffer_is_blank() instead of buffer_string_is_empty(), and use buffer_is_unset() instead of buffer_is_empty(), where buffer is known not to be NULL so that NULL check can be skipped - use buffer_clen() instead of buffer_string_length() when buffer is known not to be NULL (to avoid NULL check at runtime) - use buffer_truncate() instead of buffer_string_set_length() to truncate string, and use buffer_extend() to extend Examples where buffer known not to be NULL: - cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL (though we might set it to NULL if buffer_is_blank(cpv->v.b)) - address of buffer is arg (&foo) (compiler optimizer detects this in most, but not all, cases) - buffer is checked for NULL earlier in func - buffer is accessed in same scope without a NULL check (e.g. b->ptr) internal behavior change: callers must not pass a NULL buffer to some funcs. - buffer_init_buffer() requires non-null args - buffer_copy_buffer() requires non-null args - buffer_append_string_buffer() requires non-null args - buffer_string_space() requires non-null arg
1 year ago
if (buffer_is_blank(etag)) return 0;
[multiple] etag.[ch] -> http_etag.[ch]; better imp more efficient implementation of HTTP ETag generation and comparison modify dekhash() to take hash value to allow for incremental hashing
2 years ago
[multiple] reduce redundant NULL buffer checks This commit is a large set of code changes and results in removal of hundreds, perhaps thousands, of CPU instructions, a portion of which are on hot code paths. Most (buffer *) used by lighttpd are not NULL, especially since buffers were inlined into numerous larger structs such as request_st and chunk. In the small number of instances where that is not the case, a NULL check is often performed earlier in a function where that buffer is later used with a buffer_* func. In the handful of cases that remained, a NULL check was added, e.g. with r->http_host and r->conf.server_tag. - check for empty strings at config time and set value to NULL if blank string will be ignored at runtime; at runtime, simple pointer check for NULL can be used to check for a value that has been set and is not blank ("") - use buffer_is_blank() instead of buffer_string_is_empty(), and use buffer_is_unset() instead of buffer_is_empty(), where buffer is known not to be NULL so that NULL check can be skipped - use buffer_clen() instead of buffer_string_length() when buffer is known not to be NULL (to avoid NULL check at runtime) - use buffer_truncate() instead of buffer_string_set_length() to truncate string, and use buffer_extend() to extend Examples where buffer known not to be NULL: - cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL (though we might set it to NULL if buffer_is_blank(cpv->v.b)) - address of buffer is arg (&foo) (compiler optimizer detects this in most, but not all, cases) - buffer is checked for NULL earlier in func - buffer is accessed in same scope without a NULL check (e.g. b->ptr) internal behavior change: callers must not pass a NULL buffer to some funcs. - buffer_init_buffer() requires non-null args - buffer_copy_buffer() requires non-null args - buffer_append_string_buffer() requires non-null args - buffer_string_space() requires non-null arg
1 year ago
uint32_t etag_sz = buffer_clen(etag);
[multiple] etag.[ch] -> http_etag.[ch]; better imp more efficient implementation of HTTP ETag generation and comparison modify dekhash() to take hash value to allow for incremental hashing
2 years ago
const char *etag_ptr = etag->ptr;
if (etag_ptr[0] == 'W' && etag_ptr[1] == '/') {
if (!weak_ok) return 0;
etag_ptr += 2;
etag_sz -= 2;
}
while (*s) {
while (*s == ' ' || *s == '\t' || *s == ',') ++s;
if (s[0] == 'W' && s[1] == '/' ? (s+=2, weak_ok) : 1) {
if (0 == strncmp(s, etag_ptr, etag_sz) || *s == '*') {
s += (*s != '*' ? etag_sz : 1);
if (*s == '\0' || *s == ' ' || *s == '\t' || *s == ',')
return 1;
}
}
while (*s != '\0' && *s != ',') ++s;
}
return 0;
}
static void
http_etag_remix (buffer * const etag, const char * const str, const uint32_t len)
{
uint32_t h = dekhash(str, len, len); /*(pass len as initial hash value)*/
[core] comment out unused part of http_etag_remix note: etag buffer etag->ptr might be NULL (etag->used = etag->sze = 0) so buffer will need to be extended, not truncated, in that case. buffer_string_set_length() is typically used to truncate strings.
1 year ago
#if 0 /*(currently never elen > 2; always cleared in http_etag_create())*/
[multiple] reduce redundant NULL buffer checks This commit is a large set of code changes and results in removal of hundreds, perhaps thousands, of CPU instructions, a portion of which are on hot code paths. Most (buffer *) used by lighttpd are not NULL, especially since buffers were inlined into numerous larger structs such as request_st and chunk. In the small number of instances where that is not the case, a NULL check is often performed earlier in a function where that buffer is later used with a buffer_* func. In the handful of cases that remained, a NULL check was added, e.g. with r->http_host and r->conf.server_tag. - check for empty strings at config time and set value to NULL if blank string will be ignored at runtime; at runtime, simple pointer check for NULL can be used to check for a value that has been set and is not blank ("") - use buffer_is_blank() instead of buffer_string_is_empty(), and use buffer_is_unset() instead of buffer_is_empty(), where buffer is known not to be NULL so that NULL check can be skipped - use buffer_clen() instead of buffer_string_length() when buffer is known not to be NULL (to avoid NULL check at runtime) - use buffer_truncate() instead of buffer_string_set_length() to truncate string, and use buffer_extend() to extend Examples where buffer known not to be NULL: - cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL (though we might set it to NULL if buffer_is_blank(cpv->v.b)) - address of buffer is arg (&foo) (compiler optimizer detects this in most, but not all, cases) - buffer is checked for NULL earlier in func - buffer is accessed in same scope without a NULL check (e.g. b->ptr) internal behavior change: callers must not pass a NULL buffer to some funcs. - buffer_init_buffer() requires non-null args - buffer_copy_buffer() requires non-null args - buffer_append_string_buffer() requires non-null args - buffer_string_space() requires non-null arg
1 year ago
uint32_t elen = buffer_clen(etag);
if (elen > 2) {/*(expect "..." if set)*/
[multiple] etag.[ch] -> http_etag.[ch]; better imp more efficient implementation of HTTP ETag generation and comparison modify dekhash() to take hash value to allow for incremental hashing
2 years ago
h = dekhash(etag->ptr+1, elen-2, h);
[multiple] reduce redundant NULL buffer checks This commit is a large set of code changes and results in removal of hundreds, perhaps thousands, of CPU instructions, a portion of which are on hot code paths. Most (buffer *) used by lighttpd are not NULL, especially since buffers were inlined into numerous larger structs such as request_st and chunk. In the small number of instances where that is not the case, a NULL check is often performed earlier in a function where that buffer is later used with a buffer_* func. In the handful of cases that remained, a NULL check was added, e.g. with r->http_host and r->conf.server_tag. - check for empty strings at config time and set value to NULL if blank string will be ignored at runtime; at runtime, simple pointer check for NULL can be used to check for a value that has been set and is not blank ("") - use buffer_is_blank() instead of buffer_string_is_empty(), and use buffer_is_unset() instead of buffer_is_empty(), where buffer is known not to be NULL so that NULL check can be skipped - use buffer_clen() instead of buffer_string_length() when buffer is known not to be NULL (to avoid NULL check at runtime) - use buffer_truncate() instead of buffer_string_set_length() to truncate string, and use buffer_extend() to extend Examples where buffer known not to be NULL: - cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL (though we might set it to NULL if buffer_is_blank(cpv->v.b)) - address of buffer is arg (&foo) (compiler optimizer detects this in most, but not all, cases) - buffer is checked for NULL earlier in func - buffer is accessed in same scope without a NULL check (e.g. b->ptr) internal behavior change: callers must not pass a NULL buffer to some funcs. - buffer_init_buffer() requires non-null args - buffer_copy_buffer() requires non-null args - buffer_append_string_buffer() requires non-null args - buffer_string_space() requires non-null arg
1 year ago
buffer_truncate(etag, 1);
}
else
buffer_copy_string_len(etag, CONST_STR_LEN("\""));
[core] comment out unused part of http_etag_remix note: etag buffer etag->ptr might be NULL (etag->used = etag->sze = 0) so buffer will need to be extended, not truncated, in that case. buffer_string_set_length() is typically used to truncate strings.
1 year ago
#else
buffer_copy_string_len(etag, CONST_STR_LEN("\""));
#endif
[multiple] etag.[ch] -> http_etag.[ch]; better imp more efficient implementation of HTTP ETag generation and comparison modify dekhash() to take hash value to allow for incremental hashing
2 years ago
buffer_append_int(etag, h);
buffer_append_string_len(etag, CONST_STR_LEN("\""));
}
void
http_etag_create (buffer * const etag, const struct stat * const st, const int flags)
{
if (0 == flags) return;
uint64_t x[4];
uint32_t len = 0;
if (flags & ETAG_USE_INODE)
x[len++] = (uint64_t)st->st_ino;
if (flags & ETAG_USE_SIZE)
x[len++] = (uint64_t)st->st_size;
if (flags & ETAG_USE_MTIME) {
x[len++] = (uint64_t)st->st_mtime;
#ifdef st_mtime /* use high-precision timestamp if available */
#if defined(__APPLE__) && defined(__MACH__)
x[len++] = (uint64_t)st->st_mtimespec.tv_nsec;
#else
x[len++] = (uint64_t)st->st_mtim.tv_nsec;
#endif
#endif
}
buffer_clear(etag);
http_etag_remix(etag, (char *)x, len << 3);
}