Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'e3f305a953ef5dbf6802090c7013f4c38d762449' into dev

Browse source
This commit is contained in:
Théophile Diot 2023-11-16 16:35:22 +00:00
commit 7aa6affe10
No known key found for this signature in database
GPG key ID: 248FEA4BAE400D06
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/deps/src/ngx_devel_kit/src/ndk_complex_path.c vendored
View file

@ -99,7 +99,6 @@ ndk_conf_set_http_complex_path_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *c
char *p = conf;
ngx_str_t *path;
ngx_array_t *a;
ngx_conf_post_t *post;
ndk_http_complex_path_t *cp;
@ -113,13 +112,14 @@ ndk_conf_set_http_complex_path_slot (ngx_conf_t *cf, ngx_command_t *cmd, void *c
path++;
cp->a = ndk_http_complex_path_create_compile (cf, path, cp->prefix);
if (cp->a == NULL)
if (cp->a == NULL) {
/* TODO : log */
return NGX_CONF_ERROR;
}
if (cmd->post) {
post = cmd->post;
return post->post_handler (cf, post, a);
return post->post_handler (cf, post, cp->a);
}
return NGX_CONF_OK;

2
src/deps/src/ngx_devel_kit/src/ndk_string_util.h vendored
View file

@ -10,5 +10,5 @@
#define ngx_null_enum { ngx_null_string, 0 }
#define ndk_memcpyp(d,s) ngx_memcpy(d,s,sizeof(s))
#define ndk_memcpyp(d,s) ngx_memcpy(d,s,sizeof(*s))