rdelaage
/
gmid
mirror of https://github.com/omar-polo/gmid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

swap check in vhost_* fns 

it's faster (statistically speaking) to first compute if the option is
set and then fnmatch than the inverse.  This way we can avoid
unnecessary fnmatch.
This commit is contained in:
Omar Polo 2021-02-06 17:31:03 +00:00
parent 6abda252e9
commit cd76162494
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server.c
View File

@ -63,8 +63,8 @@ vhost_lang(struct vhost *v, const char *path)
return NULL; return NULL;
for (loc = &v->locations[1]; loc->match != NULL; ++loc) { for (loc = &v->locations[1]; loc->match != NULL; ++loc) {
if (!fnmatch(loc->match, path, 0)) { if (loc->lang != NULL) {
if (loc->lang != NULL) if (!fnmatch(loc->match, path, 0))
return loc->lang; return loc->lang;
} }
} }
@ -82,8 +82,8 @@ vhost_default_mime(struct vhost *v, const char *path)
return default_mime; return default_mime;
for (loc = &v->locations[1]; loc->match != NULL; ++loc) { for (loc = &v->locations[1]; loc->match != NULL; ++loc) {
if (!fnmatch(loc->match, path, 0)) { if (loc->default_mime != NULL) {
if (loc->default_mime != NULL) if (!fnmatch(loc->match, path, 0))
return loc->default_mime; return loc->default_mime;
} }
} }
@ -103,8 +103,8 @@ vhost_index(struct vhost *v, const char *path)
return index; return index;
for (loc = &v->locations[1]; loc->match != NULL; ++loc) { for (loc = &v->locations[1]; loc->match != NULL; ++loc) {
if (!fnmatch(loc->match, path, 0)) { if (loc->index != NULL) {
if (loc->index != NULL) if (!fnmatch(loc->match, path, 0))
return loc->index; return loc->index;
} }
} }
@ -123,8 +123,8 @@ vhost_auto_index(struct vhost *v, const char *path)
return 0; return 0;
for (loc = &v->locations[1]; loc->match != NULL; ++loc) { for (loc = &v->locations[1]; loc->match != NULL; ++loc) {
if (!fnmatch(loc->match, path, 0)) { if (loc->auto_index != 0) {
if (loc->auto_index != 0) if (!fnmatch(loc->match, path, 0))
return loc->auto_index == 1; return loc->auto_index == 1;
} }
} }
@ -141,8 +141,8 @@ vhost_block_return(struct vhost *v, const char *path, int *code, const char **fm
return 0; return 0;
for (loc = &v->locations[1]; loc->match != NULL; ++loc) { for (loc = &v->locations[1]; loc->match != NULL; ++loc) {
if (!fnmatch(loc->match, path, 0)) { if (loc->block_code != 0) {
if (loc->block_code != 0) { if (!fnmatch(loc->match, path, 0)) {
*code = loc->block_code; *code = loc->block_code;
*fmt = loc->block_fmt; *fmt = loc->block_fmt;
return 1; return 1;
@ -164,8 +164,8 @@ vhost_strip(struct vhost *v, const char *path)
return 0; return 0;
for (loc = &v->locations[1]; loc->match != NULL; ++loc) { for (loc = &v->locations[1]; loc->match != NULL; ++loc) {
if (!fnmatch(loc->match, path, 0)) { if (loc->strip != 0) {
if (loc->strip != 0) if (!fnmatch(loc->match, path, 0))
return loc->strip; return loc->strip;
} }
} }