misc(*) various minor fixes

Extracted from other branches in progress.
Kong · Jul 24, 2024 · 77347e3 · 77347e3
1 parent b8aae2c
commit 77347e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/common/lua/ngx_wasm_lua_resolver.c b/src/common/lua/ngx_wasm_lua_resolver.c
@@ -56,7 +56,7 @@ static const char  *DNS_SOLVING_SCRIPT = ""
     "        resolvConf = {                                               \n"
     "            'nameserver '      .. nameserver,                        \n"
     "            'options timeout:' .. timeout,                           \n"
-#if 1
+#if 0
     "            'options attempts:1',                                    \n"
     "        },                                                           \n"
     "        order = { 'A' },                                             \n"
@@ -101,7 +101,7 @@ ngx_wasm_lua_resolver_error_handler(ngx_wasm_lua_ctx_t *lctx)
 
     dd("enter");
 
-#if (DDEBUG)
+#if (NGX_DEBUG)
     if (!lctx->cancelled) {
         ngx_wa_assert(lctx->co_ctx->co_status == NGX_HTTP_LUA_CO_DEAD);
     }

diff --git a/util/changelog.sh b/util/changelog.sh
@@ -25,7 +25,7 @@ OUT="$(git --no-pager log --format=oneline $LATEST_TAG..)"
 if [[ -n $OUT ]]; then
     # Only show user-facing commits. Include refactor(), misc() and use best
     # judgement whether or not to include them in the final release
-    # description).
+    # description.
     echo "$OUT" \
         | sed "s/^[^ ]* //" \
         | $(which grep) -v -E '^(chore|tests|style|hotfix|docs)'