Squashed 'src/deps/src/ngx_devel_kit/' changes from b4642d6ca..91e30eb05

91e30eb05 Merge pull request #37 from lynch1981/master
7e524bdda fix compile errors

git-subtree-dir: src/deps/src/ngx_devel_kit
git-subtree-split: 91e30eb05085e7f9762f130cbb883a0e753cf74d
This commit is contained in:
Théophile Diot 2023-11-16 16:35:22 +00:00
parent e43880b083
commit e3f305a953
2 changed files with 4 additions and 4 deletions

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;

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))