From e3f305a953ef5dbf6802090c7013f4c38d762449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= Date: Thu, 16 Nov 2023 16:35:22 +0000 Subject: [PATCH] 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 --- src/ndk_complex_path.c | 6 +++--- src/ndk_string_util.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ndk_complex_path.c b/src/ndk_complex_path.c index a66a808b9..8b327134b 100644 --- a/src/ndk_complex_path.c +++ b/src/ndk_complex_path.c @@ -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; diff --git a/src/ndk_string_util.h b/src/ndk_string_util.h index d23b8e177..18a28f04b 100644 --- a/src/ndk_string_util.h +++ b/src/ndk_string_util.h @@ -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))