diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2020-10-29 14:53:58 +0000 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2020-10-29 14:53:58 +0000 |
| commit | 6f73d24061261884b1c2191629d4f1ced8740d82 (patch) | |
| tree | 883780cf53de409e2ccbd93b8ec4d7e2c566a20e /src/core | |
| parent | c3e8e59a55c4bd144dec6ca1c55f06f8d509ec50 (diff) | |
| parent | db65797133842f3f632460e6a00f5f0ac901cd5f (diff) | |
| download | nginx-6f73d24061261884b1c2191629d4f1ced8740d82.tar.gz nginx-6f73d24061261884b1c2191629d4f1ced8740d82.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.h | 4 | ||||
| -rw-r--r-- | src/core/ngx_conf_file.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index d23b59adf..f92742eff 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1019003 -#define NGINX_VERSION "1.19.3" +#define nginx_version 1019004 +#define NGINX_VERSION "1.19.4" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index 6d1629e9b..fec7bb83a 100644 --- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -1137,7 +1137,7 @@ ngx_conf_set_keyval_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) a = (ngx_array_t **) (p + cmd->offset); - if (*a == NULL) { + if (*a == NGX_CONF_UNSET_PTR || *a == NULL) { *a = ngx_array_create(cf->pool, 4, sizeof(ngx_keyval_t)); if (*a == NULL) { return NGX_CONF_ERROR; |