diff --git a/.github/workflows/staging-release.yaml b/.github/workflows/staging-release.yaml
index 4ae7f30bc4d..58d2660c935 100644
--- a/.github/workflows/staging-release.yaml
+++ b/.github/workflows/staging-release.yaml
@@ -502,8 +502,8 @@ jobs:
           TAG: ${{ steps.get-tag.outputs.tag }}
 
   staging-release-images-latest-tags:
-    # Only update latest tags for 3.0 releases
-    if: startsWith(github.event.inputs.version, '3.0')
+    # Only update latest tags for 3.1 releases
+    if: startsWith(github.event.inputs.version, '3.1')
     name: Release latest Linux container images
     runs-on: ubuntu-latest
     needs:
@@ -791,21 +791,21 @@ jobs:
           target_commitish: '2.1'
           make_latest: false
 
-      - name: Release 2.2 - not latest
+      - name: Release 3.0 - not latest
         uses: softprops/action-gh-release@v2
-        if: startsWith(inputs.version, '2.2')
+        if: startsWith(inputs.version, '3.0')
         with:
           body: "https://fluentbit.io/announcements/v${{ inputs.version }}/"
           draft: false
           generate_release_notes: true
           name: "Fluent Bit ${{ inputs.version }}"
           tag_name: v${{ inputs.version }}
-          target_commitish: '2.2'
+          target_commitish: '3.0'
           make_latest: false
 
-      - name: Release 3.0 and latest
+      - name: Release 3.1 and latest
         uses: softprops/action-gh-release@v2
-        if: startsWith(inputs.version, '3.0')
+        if: startsWith(inputs.version, '3.1')
         with:
           body: "https://fluentbit.io/announcements/v${{ inputs.version }}/"
           draft: false
@@ -898,13 +898,20 @@ jobs:
           ref: 2.2
           token: ${{ secrets.GH_PA_TOKEN }}
 
-      - name: Release 3.0 and latest
+      - name: Release 3.0 - not latest
         if: startsWith(inputs.version, '3.0')
         uses: actions/checkout@v4
         with:
           repository: fluent/fluent-bit-docs
           token: ${{ secrets.GH_PA_TOKEN }}
 
+      - name: Release 3.1 and latest
+        if: startsWith(inputs.version, '3.1')
+        uses: actions/checkout@v4
+        with:
+          repository: fluent/fluent-bit-docs
+          token: ${{ secrets.GH_PA_TOKEN }}
+
       - name: Ensure we have the script we need
         run: |
           if [[ ! -f update-release-version-docs.sh ]] ; then
@@ -977,9 +984,15 @@ jobs:
         with:
           ref: 2.2
 
-      - name: Release 3.0 and latest
+      - name: Release 3.0 not latest
         if: startsWith(inputs.version, '3.0')
         uses: actions/checkout@v4
+        with:
+          ref: 3.0
+
+      - name: Release 3.1 latest
+        if: startsWith(inputs.version, '3.1')
+        uses: actions/checkout@v4
 
       # Get the new version to use
       - name: 'Get next minor version'
diff --git a/cmake/libraries.cmake b/cmake/libraries.cmake
index 1cea558907d..aaa1e293db3 100644
--- a/cmake/libraries.cmake
+++ b/cmake/libraries.cmake
@@ -19,7 +19,7 @@ set(FLB_PATH_LIB_ONIGMO      "lib/onigmo")
 set(FLB_PATH_LIB_MPACK       "lib/mpack-amalgamation-1.1.1")
 set(FLB_PATH_LIB_MINIZ       "lib/miniz")
 set(FLB_PATH_LIB_TUTF8E      "lib/tutf8e")
-set(FLB_PATH_LIB_CARES       "lib/c-ares-1.30.0")
+set(FLB_PATH_LIB_CARES       "lib/c-ares-1.31.0")
 set(FLB_PATH_LIB_SNAPPY      "lib/snappy-fef67ac")
 set(FLB_PATH_LIB_RDKAFKA     "lib/librdkafka-2.3.0")
 set(FLB_PATH_LIB_RING_BUFFER "lib/lwrb")
diff --git a/cmake/plugins_options.cmake b/cmake/plugins_options.cmake
index 88c935689e4..5d08e505fff 100644
--- a/cmake/plugins_options.cmake
+++ b/cmake/plugins_options.cmake
@@ -67,7 +67,7 @@ DEFINE_OPTION(FLB_PROCESSOR_CONTENT_MODIFIER  "Enable content modifier processor
 DEFINE_OPTION(FLB_PROCESSOR_LABELS            "Enable metrics label manipulation processor"  ON)
 DEFINE_OPTION(FLB_PROCESSOR_METRICS_SELECTOR  "Enable metrics selector processor"            ON)
 DEFINE_OPTION(FLB_PROCESSOR_SQL               "Enable SQL processor"                         ON)
-
+DEFINE_OPTION(FLB_PROCESSOR_OPENTELEMETRY_ENVELOPE "Enable OpenTelemetry envelope processor"  ON)
 
 # Filters
 # =======
diff --git a/conf/parsers.conf b/conf/parsers.conf
index c3b6adf50d3..ec1b11bf910 100644
--- a/conf/parsers.conf
+++ b/conf/parsers.conf
@@ -128,3 +128,11 @@
     Name    kube-custom
     Format  regex
     Regex   (?<tag>[^.]+)?\.?(?<pod_name>[a-z0-9](?:[-a-z0-9]*[a-z0-9])?(?:\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)_(?<namespace_name>[^_]+)_(?<container_name>.+)-(?<docker_id>[a-z0-9]{64})\.log$
+
+[PARSER]
+    # Examples: TCP: https://rubular.com/r/Q8YY6fHqlqwGI0  UDP: https://rubular.com/r/B0ID69H9FvN0tp
+    Name    kmsg-netfilter-log
+    Format  regex
+    Regex   ^\<(?<pri>[0-9]{1,5})\>1 (?<time>[^ ]+) (?<host>[^ ]+) kernel - - - \[[0-9\.]*\] (?<logprefix>[^ ]*)\s?IN=(?<in>[^ ]*) OUT=(?<out>[^ ]*) MAC=(?<macsrc>[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}):(?<macdst>[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}):(?<ethtype>[0-9a-f]{2}:[0-9a-f]{2}) SRC=(?<saddr>[^ ]*) DST=(?<daddr>[^ ]*) LEN=(?<len>[^ ]*) TOS=(?<tos>[^ ]*) PREC=(?<prec>[^ ]*) TTL=(?<ttl>[^ ]*) ID=(?<id>[^ ]*) (D*F*)\s*PROTO=(?<proto>[^ ]*)\s?((SPT=)?(?<sport>[0-9]*))\s?((DPT=)?(?<dport>[0-9]*))\s?((LEN=)?(?<protolen>[0-9]*))\s?((WINDOW=)?(?<window>[0-9]*))\s?((RES=)?(?<res>0?x?[0-9]*))\s?(?<flag>[^ ]*)\s?((URGP=)?(?<urgp>[0-9]*))
+    Time_Key  time
+    Time_Format  %Y-%m-%dT%H:%M:%S.%L%z
diff --git a/include/fluent-bit/flb_downstream.h b/include/fluent-bit/flb_downstream.h
index 40ea1033b47..ae475834a63 100644
--- a/include/fluent-bit/flb_downstream.h
+++ b/include/fluent-bit/flb_downstream.h
@@ -42,6 +42,9 @@ struct flb_downstream {
 
     struct mk_list         busy_queue;
     struct mk_list         destroy_queue;
+
+    /* this is a config map reference coming from the plugin net_setup field */
+    struct flb_net_setup  *net_setup;
 };
 
 static inline int flb_downstream_is_shutting_down(struct flb_downstream *downstream)
diff --git a/include/fluent-bit/flb_input.h b/include/fluent-bit/flb_input.h
index 5fb54ca0d86..9140b1dc71f 100644
--- a/include/fluent-bit/flb_input.h
+++ b/include/fluent-bit/flb_input.h
@@ -359,6 +359,7 @@ struct flb_input_instance {
     /* TLS settings */
     int use_tls;                         /* bool, try to use TLS for I/O */
     int tls_verify;                      /* Verify certs (default: true) */
+    int tls_verify_hostname;             /* Verify hostname (default: false) */
     int tls_debug;                       /* mbedtls debug level          */
     char *tls_vhost;                     /* Virtual hostname for SNI     */
     char *tls_ca_path;                   /* Path to certificates         */
diff --git a/include/fluent-bit/flb_metrics.h b/include/fluent-bit/flb_metrics.h
index 25b0443224c..1aa0676f90d 100644
--- a/include/fluent-bit/flb_metrics.h
+++ b/include/fluent-bit/flb_metrics.h
@@ -56,17 +56,20 @@
 #define FLB_METRIC_OUT_DROPPED_RECORDS 15       /* dropped_records_total */
 #define FLB_METRIC_OUT_RETRIED_RECORDS 16       /* retried_records_total */
 
+/* The limitation of title name length */
+#define FLB_METRIC_LENGTH_LIMIT 1024
+
 struct flb_metric {
     int id;
     int title_len;
-    char title[64];
+    char *title;
     size_t val;
     struct mk_list _head;
 };
 
 struct flb_metrics {
     int title_len;         /* Title string length */
-    char title[64];        /* Title or id for this metrics context */
+    char *title;           /* Title or id for this metrics context */
     int count;             /* Total count of metrics registered */
     struct mk_list list;   /* Head of metrics list */
 };
diff --git a/include/fluent-bit/flb_output.h b/include/fluent-bit/flb_output.h
index eab0c983701..58433fcb0d5 100644
--- a/include/fluent-bit/flb_output.h
+++ b/include/fluent-bit/flb_output.h
@@ -284,6 +284,7 @@ struct flb_output_instance {
 
 #ifdef FLB_HAVE_TLS
     int tls_verify;                      /* Verify certs (default: true) */
+    int tls_verify_hostname;             /* Verify hostname (default: false) */
     int tls_debug;                       /* mbedtls debug level          */
     char *tls_vhost;                     /* Virtual hostname for SNI     */
     char *tls_ca_path;                   /* Path to certificates         */
diff --git a/include/fluent-bit/flb_parser.h b/include/fluent-bit/flb_parser.h
index 4f136b9a5c1..0810ed000d3 100644
--- a/include/fluent-bit/flb_parser.h
+++ b/include/fluent-bit/flb_parser.h
@@ -48,6 +48,7 @@ struct flb_parser {
     char *time_fmt_full;  /* original given time format */
     char *time_key;       /* field name that contains the time */
     int time_offset;      /* fixed UTC offset */
+    int time_system_timezone; /* use the system timezone as a fallback */
     int time_keep;        /* keep time field */
     int time_strict;      /* parse time field strictly */
     int logfmt_no_bare_keys; /* in logfmt parsers, require all keys to have values */
@@ -74,13 +75,18 @@ enum {
     FLB_PARSER_TYPE_HEX,
 };
 
-static inline time_t flb_parser_tm2time(const struct flb_tm *src)
+static inline time_t flb_parser_tm2time(const struct flb_tm *src, 
+                                        int use_system_timezone)
 {
     struct tm tmp;
     time_t res;
 
     tmp = src->tm;
-    res = timegm(&tmp) - flb_tm_gmtoff(src);
+    if (use_system_timezone) {
+        res = mktime(&tmp);
+    } else {
+        res = timegm(&tmp) - flb_tm_gmtoff(src);
+    }
     return res;
 }
 
@@ -92,6 +98,7 @@ struct flb_parser *flb_parser_create(const char *name, const char *format,
                                      const char *time_offset,
                                      int time_keep,
                                      int time_strict,
+                                     int time_system_timezone,
                                      int logfmt_no_bare_keys,
                                      struct flb_parser_types *types,
                                      int types_len,
diff --git a/include/fluent-bit/tls/flb_tls.h b/include/fluent-bit/tls/flb_tls.h
index 70a865f15cf..02165d461a5 100644
--- a/include/fluent-bit/tls/flb_tls.h
+++ b/include/fluent-bit/tls/flb_tls.h
@@ -92,6 +92,7 @@ struct flb_tls {
     int debug;                        /* Debug level               */
     char *vhost;                      /* Virtual hostname for SNI  */
     int mode;                         /* Client or Server          */
+    int verify_hostname;              /* Verify hostname           */
 
     /* Bakend library for TLS */
     void *ctx;                        /* TLS context created */
@@ -112,6 +113,8 @@ int flb_tls_destroy(struct flb_tls *tls);
 
 int flb_tls_set_alpn(struct flb_tls *tls, const char *alpn);
 
+int flb_tls_set_verify_hostname(struct flb_tls *tls, int verify_hostname);
+
 int flb_tls_load_system_certificates(struct flb_tls *tls);
 
 struct mk_list *flb_tls_get_config_map(struct flb_config *config);
diff --git a/lib/c-ares-1.30.0/CHANGES b/lib/c-ares-1.30.0/CHANGES
deleted file mode 100644
index f1426fda797..00000000000
--- a/lib/c-ares-1.30.0/CHANGES
+++ /dev/null
@@ -1,7 +0,0 @@
-This file no longer holds the changelog. Now you can generate it yourself
-like this:
-
- $ git log --pretty=fuller --no-color --date=short --decorate=full -1000 |
-   ./git2changes.pl
-
-The older, manually edited, changelog is found in git named CHANGES.0
diff --git a/lib/c-ares-1.30.0/NEWS b/lib/c-ares-1.30.0/NEWS
deleted file mode 100644
index 95a2eeea274..00000000000
--- a/lib/c-ares-1.30.0/NEWS
+++ /dev/null
@@ -1,21 +0,0 @@
-Major changes since:
-* see the CHANGES file
-
-Major changes in release 1.1.1:
-* ares should now compile as C++ code (no longer uses reserved word
-  "class").
-* Added SRV support to adig test program.
-* Fixed a few error handling bugs in query processing.
-
-Major changes in release 1.1.0:
-* Added ares_free_string() function so that memory can be freed in the
-  same layer as it is allocated, a desirable feature in some
-  environments.
-* A few of the ares_dns.h macros are fixed to use the proper bitwise
-  operator.
-* Fixed a couple of fenceposts fixed in ares_expand_name()'s
-  bounds-checking.
-* In process_timeouts(), extract query->next before calling
-  next_server() and possibly freeing the query structure.
-* Casted arguments to ctype macros casted to unsigned char, since not
-  all char values are valid inputs to those macros according to ANSI.
diff --git a/lib/c-ares-1.30.0/README.cares b/lib/c-ares-1.30.0/README.cares
deleted file mode 100644
index ec809ab9483..00000000000
--- a/lib/c-ares-1.30.0/README.cares
+++ /dev/null
@@ -1,15 +0,0 @@
-c-ares
-======
-
-This package is based on ares 1.1.1 (written by Greg Hudson). Daniel Stenberg
-decided to fork and release a separate project since the original ares author
-didn't want the improvements that were vital for our use of it.
-
-This package is dubbed 'c-ares' since Daniel wanted this for use within the
-curl project (hence the letter C) and it makes a nice pun. c-ares is not API
-compatible with ares: a new name makes that more obvious to the public.
-
-The original libares was distributed at
-ftp://athena-dist.mit.edu:pub/ATHENA/ares (which seems to not be alive
-anymore).  A local copy of the original ares package is kept here:
-https://c-ares.org/download/ares-1.1.1.tar.gz
diff --git a/lib/c-ares-1.30.0/RELEASE-NOTES.md b/lib/c-ares-1.30.0/RELEASE-NOTES.md
deleted file mode 100644
index 7d30a3d4e75..00000000000
--- a/lib/c-ares-1.30.0/RELEASE-NOTES.md
+++ /dev/null
@@ -1,33 +0,0 @@
-## c-ares version 1.30.0 - June 7 2024
-
-This is a maintenance and bugfix release.
-
-Features:
-
-* Basic support for SIG RR record (RFC 2931 / RFC 2535) [PR #773](https://github.com/c-ares/c-ares/pull/773)
-
-Changes:
-
-* Validation that DNS strings can only consist of printable ascii characters
-  otherwise will trigger a parse failure.
-  [75de16c](https://github.com/c-ares/c-ares/commit/75de16c) and
-  [40fb125](https://github.com/c-ares/c-ares/commit/40fb125)
-* Windows: use `GetTickCount64()` for a monotonic timer that does not wrap. [1dff8f6](https://github.com/c-ares/c-ares/commit/1dff8f6)
-
-Bugfixes:
-
-* QueryCache: Fix issue where purging on server changes wasn't working. [a6c8fe6](https://github.com/c-ares/c-ares/commit/a6c8fe6)
-* Windows: Fix Y2K38 issue by creating our own `ares_timeval_t` datatype. [PR #772](https://github.com/c-ares/c-ares/pull/772)
-* Fix packaging issue affecting MacOS due to a missing header. [55afad6](https://github.com/c-ares/c-ares/commit/55afad6)
-* MacOS: Fix UBSAN warnings that are likely meaningless due to alignment issues
-  in new MacOS config reader.
-* Android: arm 32bit build failure due to missing symbol. [d1722e6](https://github.com/c-ares/c-ares/commit/d1722e6)
-
-Thanks go to these friendly people for their efforts and contributions for this
-release:
-
-* Brad House (@bradh352)
-* Daniel Stenberg (@bagder)
-
-
-
diff --git a/lib/c-ares-1.30.0/TODO b/lib/c-ares-1.30.0/TODO
deleted file mode 100644
index 3b200926e35..00000000000
--- a/lib/c-ares-1.30.0/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-TODO
-====
-
-Please see https://github.com/c-ares/c-ares/issues
diff --git a/lib/c-ares-1.30.0/get_ver.awk b/lib/c-ares-1.30.0/get_ver.awk
deleted file mode 100644
index 263ca02ded0..00000000000
--- a/lib/c-ares-1.30.0/get_ver.awk
+++ /dev/null
@@ -1,29 +0,0 @@
-# ***************************************************************************
-# *  Project: c-ares
-# *
-# * Copyright (C) The c-ares project and its contributors
-# * SPDX-License-Identifier: MIT
-# ***************************************************************************
-# awk script which fetches c-ares version number and string from input
-# file and writes them to STDOUT. Here you can get an awk version for Win32:
-# http://www.gknw.net/development/prgtools/awk-20100523.zip
-#
-BEGIN {
-  while ((getline < ARGV[1]) > 0) {
-    sub("\r", "") # make MSYS gawk work with CRLF header input.
-    if (match ($0, /^#define ARES_COPYRIGHT "[^"]+"$/))
-      copyright_string = substr($0, 25, length($0)-25)
-    else if (match ($0, /^#define ARES_VERSION_STR "[^"]+"$/))
-      version_string = substr($3, 2, length($3)-2)
-    else if (match ($0, /^#define ARES_VERSION_MAJOR [0-9]+$/))
-      version_major = $3
-    else if (match ($0, /^#define ARES_VERSION_MINOR [0-9]+$/))
-      version_minor = $3
-    else if (match ($0, /^#define ARES_VERSION_PATCH [0-9]+$/))
-      version_patch = $3
-  }
-  print "LIBCARES_VERSION = " version_major "," version_minor "," version_patch
-  print "LIBCARES_VERSION_STR = " version_string
-  print "LIBCARES_COPYRIGHT_STR = " copyright_string
-}
-
diff --git a/lib/c-ares-1.30.0/maketgz b/lib/c-ares-1.30.0/maketgz
deleted file mode 100755
index e97230b2da1..00000000000
--- a/lib/c-ares-1.30.0/maketgz
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env perl
-# Copyright (C) Daniel Stenberg
-# SPDX-License-Identifier: MIT
-
-$version = $ARGV[0];
-
-if($version eq "") {
-    print "Enter version number!\n";
-    exit;
-}
-
-if(!-f "include/ares.h") {
-    print "run this script in the ares source root dir\n";
-    exit;
-}
-
-my ($major, $minor, $patch)=split(/\./, $version);
-
-$major += 0;
-$minor += 0;
-$patch += 0;
-
-open(VER, "<include/ares_version.h") ||
-    die "can't open include/ares_version.h";
-open(NEWV, ">include/ares_version.h.dist");
-while(<VER>) {
-    $_ =~ s/^\#define ARES_VERSION_MAJOR .*/\#define ARES_VERSION_MAJOR $major/;
-    $_ =~ s/^\#define ARES_VERSION_MINOR .*/\#define ARES_VERSION_MINOR $minor/;
-    $_ =~ s/^\#define ARES_VERSION_PATCH .*/\#define ARES_VERSION_PATCH $patch/;
-    $_ =~ s/^\#define ARES_VERSION_STR .*/\#define ARES_VERSION_STR \"$version\"/;
-
-    print NEWV $_;
-}
-close(VER);
-close(NEWV);
-print "include/ares_version.h.dist created\n";
-
-if(!-f "configure") {
-    print "running buildconf\n";
-    `./buildconf`;
-}
-print "adding $version in the configure.ac file\n";
-`sed -e 's/AC_INIT.*/AC_INIT([c-ares], [$version],/' < configure.ac > configure.ac.dist`;
-
-print "adding $version in the CMakeLists.txt file\n";
-`sed -e 's/SET.*CARES_VERSION.*/SET (CARES_VERSION "$version")/' < CMakeLists.txt > CMakeLists.txt.dist && rm -f CMakeLists.txt && mv CMakeLists.txt.dist CMakeLists.txt`;
-
-# now make a new configure script with this
-print "makes a new configure script\n";
-`autoconf configure.ac.dist >configure`;
-
-# now run this new configure to get a fine makefile
-print "running configure\n";
-`./configure`;
-
-print "produce CHANGES\n";
-`git log --pretty=fuller --no-color --date=short --decorate=full -1000 | ./git2changes.pl > CHANGES.dist`;
-
-# now make the actual tarball
-print "running make dist\n";
-`make dist VERSION=$version`;
-
-# remove temporary sourced man pages
-`make -s clean-sourced-manpages`;
-
-print "removing temporary configure.ac file\n";
-`rm configure.ac.dist`;
-print "removing temporary ares_version.h file\n";
-`rm include/ares_version.h.dist`;
-
-print "NOTE: now tag this release!\n";
diff --git a/lib/c-ares-1.30.0/AUTHORS b/lib/c-ares-1.31.0/AUTHORS
similarity index 100%
rename from lib/c-ares-1.30.0/AUTHORS
rename to lib/c-ares-1.31.0/AUTHORS
diff --git a/lib/c-ares-1.30.0/CMakeLists.txt b/lib/c-ares-1.31.0/CMakeLists.txt
similarity index 99%
rename from lib/c-ares-1.30.0/CMakeLists.txt
rename to lib/c-ares-1.31.0/CMakeLists.txt
index 467c55ce66c..0f3c77ba0ae 100644
--- a/lib/c-ares-1.30.0/CMakeLists.txt
+++ b/lib/c-ares-1.31.0/CMakeLists.txt
@@ -12,7 +12,7 @@ INCLUDE (CheckCSourceCompiles)
 INCLUDE (CheckStructHasMember)
 INCLUDE (CheckLibraryExists)
 
-PROJECT (c-ares LANGUAGES C VERSION "1.30.0" )
+PROJECT (c-ares LANGUAGES C VERSION "1.31.0" )
 
 # Set this version before release
 SET (CARES_VERSION "${PROJECT_VERSION}")
@@ -30,7 +30,7 @@ INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are w
 # For example, a version of 4:0:2 would generate output such as:
 #    libname.so   -> libname.so.2
 #    libname.so.2 -> libname.so.2.2.0
-SET (CARES_LIB_VERSIONINFO "17:0:15")
+SET (CARES_LIB_VERSIONINFO "18:0:16")
 
 
 OPTION (CARES_STATIC        "Build as a static library"                                             OFF)
diff --git a/lib/c-ares-1.30.0/CONTRIBUTING.md b/lib/c-ares-1.31.0/CONTRIBUTING.md
similarity index 100%
rename from lib/c-ares-1.30.0/CONTRIBUTING.md
rename to lib/c-ares-1.31.0/CONTRIBUTING.md
diff --git a/lib/c-ares-1.30.0/DEVELOPER-NOTES.md b/lib/c-ares-1.31.0/DEVELOPER-NOTES.md
similarity index 100%
rename from lib/c-ares-1.30.0/DEVELOPER-NOTES.md
rename to lib/c-ares-1.31.0/DEVELOPER-NOTES.md
diff --git a/lib/c-ares-1.30.0/INSTALL.md b/lib/c-ares-1.31.0/INSTALL.md
similarity index 99%
rename from lib/c-ares-1.30.0/INSTALL.md
rename to lib/c-ares-1.31.0/INSTALL.md
index de766aad283..268157b7379 100644
--- a/lib/c-ares-1.30.0/INSTALL.md
+++ b/lib/c-ares-1.31.0/INSTALL.md
@@ -1,5 +1,3 @@
-** This file is adapted from libcurl and not yet fully rewritten for c-ares! **
-
 ```
                           ___       __ _ _ __ ___  ___
                          / __| ___ / _` | '__/ _ \/ __|
diff --git a/lib/c-ares-1.30.0/LICENSE.md b/lib/c-ares-1.31.0/LICENSE.md
similarity index 100%
rename from lib/c-ares-1.30.0/LICENSE.md
rename to lib/c-ares-1.31.0/LICENSE.md
diff --git a/lib/c-ares-1.30.0/Makefile.Watcom b/lib/c-ares-1.31.0/Makefile.Watcom
similarity index 98%
rename from lib/c-ares-1.30.0/Makefile.Watcom
rename to lib/c-ares-1.31.0/Makefile.Watcom
index 0cbae5c53c3..f6eb7c070b2 100644
--- a/lib/c-ares-1.30.0/Makefile.Watcom
+++ b/lib/c-ares-1.31.0/Makefile.Watcom
@@ -42,7 +42,7 @@ RD = rmdir /q /s 2>NUL
 CP = copy
 
 CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm -aa   &
-         -wcd=201 -bt=nt -d+ -dWIN32 -dCARES_BUILDING_LIBRARY &
+         -wcd=201 -bt=nt -d+ -dCARES_BUILDING_LIBRARY &
          -dNTDDI_VERSION=0x06020000 -I. -I.\include -I.\src\lib $(SYS_INCL)
 
 LFLAGS = option quiet, map, caseexact, eliminate
diff --git a/lib/c-ares-1.30.0/Makefile.am b/lib/c-ares-1.31.0/Makefile.am
similarity index 88%
rename from lib/c-ares-1.30.0/Makefile.am
rename to lib/c-ares-1.31.0/Makefile.am
index 22b02cd89ce..6c71f4d77d8 100644
--- a/lib/c-ares-1.30.0/Makefile.am
+++ b/lib/c-ares-1.31.0/Makefile.am
@@ -26,11 +26,11 @@ MSVCFILES = msvc_ver.inc buildconf.bat
 
 # adig and ahost are just sample programs and thus not mentioned with the
 # regular sources and headers
-EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES.md	\
- c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf get_ver.awk \
- maketgz TODO README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
+EXTRA_DIST = AUTHORS $(man_MANS) RELEASE-NOTES.md	\
+ c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf \
+ README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
  CMakeLists.txt Makefile.dj Makefile.m32 Makefile.netware Makefile.msvc \
- Makefile.Watcom AUTHORS CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md TODO \
+ Makefile.Watcom CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md \
  cmake/EnableWarnings.cmake
 
 CLEANFILES = $(PDFPAGES) $(HTMLPAGES)
diff --git a/lib/c-ares-1.30.0/Makefile.dj b/lib/c-ares-1.31.0/Makefile.dj
similarity index 100%
rename from lib/c-ares-1.30.0/Makefile.dj
rename to lib/c-ares-1.31.0/Makefile.dj
diff --git a/lib/c-ares-1.30.0/Makefile.in b/lib/c-ares-1.31.0/Makefile.in
similarity index 98%
rename from lib/c-ares-1.30.0/Makefile.in
rename to lib/c-ares-1.31.0/Makefile.in
index 25d77367202..7b5a962b8cc 100644
--- a/lib/c-ares-1.30.0/Makefile.in
+++ b/lib/c-ares-1.31.0/Makefile.in
@@ -230,8 +230,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libcares.pc.in \
 	$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
 	$(top_srcdir)/config/config.sub \
 	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
-	$(top_srcdir)/config/missing AUTHORS INSTALL.md NEWS README.md \
-	TODO config/compile config/config.guess config/config.sub \
+	$(top_srcdir)/config/missing AUTHORS INSTALL.md README.md \
+	config/compile config/config.guess config/config.sub \
 	config/install-sh config/ltmain.sh config/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -439,11 +439,11 @@ MSVCFILES = msvc_ver.inc buildconf.bat
 
 # adig and ahost are just sample programs and thus not mentioned with the
 # regular sources and headers
-EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES.md	\
- c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf get_ver.awk \
- maketgz TODO README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
+EXTRA_DIST = AUTHORS $(man_MANS) RELEASE-NOTES.md	\
+ c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf \
+ README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
  CMakeLists.txt Makefile.dj Makefile.m32 Makefile.netware Makefile.msvc \
- Makefile.Watcom AUTHORS CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md TODO \
+ Makefile.Watcom CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md \
  cmake/EnableWarnings.cmake
 
 CLEANFILES = $(PDFPAGES) $(HTMLPAGES)
diff --git a/lib/c-ares-1.30.0/Makefile.m32 b/lib/c-ares-1.31.0/Makefile.m32
similarity index 100%
rename from lib/c-ares-1.30.0/Makefile.m32
rename to lib/c-ares-1.31.0/Makefile.m32
diff --git a/lib/c-ares-1.30.0/Makefile.msvc b/lib/c-ares-1.31.0/Makefile.msvc
similarity index 97%
rename from lib/c-ares-1.30.0/Makefile.msvc
rename to lib/c-ares-1.31.0/Makefile.msvc
index f6e8f4e71f2..5969ec705aa 100644
--- a/lib/c-ares-1.30.0/Makefile.msvc
+++ b/lib/c-ares-1.31.0/Makefile.msvc
@@ -71,7 +71,9 @@ RTLIBD = /MTd
 # otherwise Winsock tcp/ip stack will be used as default.
 # --------------------------------------------------------
 
+!IFNDEF USE_WATT32
 USE_WATT32 = 0
+!ENDIF
 
 # --------------------------------------------------------
 # Detect compiler version.
@@ -176,11 +178,14 @@ PROG3_OBJDIR = $(PROG3_OUTDIR)\obj
 # -------------------------------------
 
 !IF "$(USE_WATT32)" == "1"
-CFLAGS  = /UWIN32 /DWATT32 /I$(WATT_ROOT)\inc
-EX_LIBS_REL = $(WATT_ROOT)\lib\wattcpvc_imp.lib
-EX_LIBS_DBG = $(WATT_ROOT)\lib\wattcpvc_imp_d.lib
+CFLAGS  = /D_WIN32_WINNT=0x0602 /DWATT32 /I$(WATT_ROOT)\inc
+!  IFNDEF PLATFORM
+PLATFORM = x86
+!  ENDIF
+EX_LIBS_REL = $(WATT_ROOT)\lib\$(PLATFORM)\wattcpvc_imp.lib advapi32.lib
+EX_LIBS_DBG = $(WATT_ROOT)\lib\$(PLATFORM)\wattcpvc_imp_d.lib advapi32.lib
 !ELSE
-CFLAGS  = /DWIN32 /D_WIN32_WINNT=0x0602
+CFLAGS  = /D_WIN32_WINNT=0x0602
 EX_LIBS_REL = ws2_32.lib advapi32.lib kernel32.lib iphlpapi.lib
 EX_LIBS_DBG = ws2_32.lib advapi32.lib kernel32.lib iphlpapi.lib
 !ENDIF
diff --git a/lib/c-ares-1.30.0/Makefile.netware b/lib/c-ares-1.31.0/Makefile.netware
similarity index 100%
rename from lib/c-ares-1.30.0/Makefile.netware
rename to lib/c-ares-1.31.0/Makefile.netware
diff --git a/lib/c-ares-1.30.0/README.md b/lib/c-ares-1.31.0/README.md
similarity index 97%
rename from lib/c-ares-1.30.0/README.md
rename to lib/c-ares-1.31.0/README.md
index 5e022a85c15..86b25bc3159 100644
--- a/lib/c-ares-1.30.0/README.md
+++ b/lib/c-ares-1.31.0/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://api.cirrus-ci.com/github/c-ares/c-ares.svg?branch=main)](https://cirrus-ci.com/github/c-ares/c-ares)
 [![Windows Build Status](https://ci.appveyor.com/api/projects/status/aevgc5914tm72pvs/branch/main?svg=true)](https://ci.appveyor.com/project/c-ares/c-ares/branch/main)
-[![Coverage Status](https://coveralls.io/repos/github/c-ares/c-ares/badge.svg)](https://coveralls.io/github/c-ares/c-ares)
+[![Coverage Status](https://coveralls.io/repos/github/c-ares/c-ares/badge.svg?branch=main)](https://coveralls.io/github/c-ares/c-ares?branch=main)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/291/badge)](https://bestpractices.coreinfrastructure.org/projects/291)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/c-ares.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:c-ares)
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=c-ares_c-ares&metric=bugs)](https://sonarcloud.io/summary/new_code?id=c-ares_c-ares)
@@ -39,7 +39,7 @@ best practices in regards to C coding standards.
 
 The full source code and revision history is available in our
 [GitHub  repository](https://github.com/c-ares/c-ares).  Our signed releases
-are available in the ['c-ares' release archives](https://c-ares.org/download/).
+are available in the [release archives](https://c-ares.org/download/).
 
 
 See the [INSTALL.md](INSTALL.md) file for build information.
diff --git a/lib/c-ares-1.30.0/README.msvc b/lib/c-ares-1.31.0/README.msvc
similarity index 100%
rename from lib/c-ares-1.30.0/README.msvc
rename to lib/c-ares-1.31.0/README.msvc
diff --git a/lib/c-ares-1.31.0/RELEASE-NOTES.md b/lib/c-ares-1.31.0/RELEASE-NOTES.md
new file mode 100644
index 00000000000..eea305a5b6c
--- /dev/null
+++ b/lib/c-ares-1.31.0/RELEASE-NOTES.md
@@ -0,0 +1,24 @@
+## c-ares version 1.31.0 - June 18 2024
+
+This is a maintenance and bugfix release.
+
+Changes:
+
+* Enable Query Cache by default. [PR #786](https://github.com/c-ares/c-ares/pull/786)
+
+Bugfixes:
+
+* Enhance Windows DNS configuration change detection to also detect manual DNS
+  configuration changes. [PR #785](https://github.com/c-ares/c-ares/issues/785)
+* Various legacy MacOS Build fixes. [Issue #782](https://github.com/c-ares/c-ares/issues/782)
+* Ndots value of zero in resolv.conf was not being honored. [852a60a](https://github.com/c-ares/c-ares/commit/852a60a)
+* Watt-32 build support had been broken for some time. [PR #781](https://github.com/c-ares/c-ares/pull/781)
+* Distribute `ares_dns_rec_type_tostr` manpage. [PR #778](https://github.com/c-ares/c-ares/pull/778)
+
+Thanks go to these friendly people for their efforts and contributions for this
+release:
+
+* Brad House (@bradh352)
+* Gregor Jasny (@gjasny)
+
+
diff --git a/lib/c-ares-1.30.0/SECURITY.md b/lib/c-ares-1.31.0/SECURITY.md
similarity index 100%
rename from lib/c-ares-1.30.0/SECURITY.md
rename to lib/c-ares-1.31.0/SECURITY.md
diff --git a/lib/c-ares-1.30.0/aclocal.m4 b/lib/c-ares-1.31.0/aclocal.m4
similarity index 100%
rename from lib/c-ares-1.30.0/aclocal.m4
rename to lib/c-ares-1.31.0/aclocal.m4
diff --git a/lib/c-ares-1.30.0/aminclude_static.am b/lib/c-ares-1.31.0/aminclude_static.am
similarity index 99%
rename from lib/c-ares-1.30.0/aminclude_static.am
rename to lib/c-ares-1.31.0/aminclude_static.am
index ffebf497eaa..7cafa3443cd 100644
--- a/lib/c-ares-1.30.0/aminclude_static.am
+++ b/lib/c-ares-1.31.0/aminclude_static.am
@@ -1,6 +1,6 @@
 
 # aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Fri Jun  7 06:50:45 EDT 2024
+# from AX_AM_MACROS_STATIC on Tue Jun 18 05:51:32 EDT 2024
 
 
 # Code coverage
diff --git a/lib/c-ares-1.30.0/buildconf b/lib/c-ares-1.31.0/buildconf
similarity index 100%
rename from lib/c-ares-1.30.0/buildconf
rename to lib/c-ares-1.31.0/buildconf
diff --git a/lib/c-ares-1.30.0/buildconf.bat b/lib/c-ares-1.31.0/buildconf.bat
similarity index 100%
rename from lib/c-ares-1.30.0/buildconf.bat
rename to lib/c-ares-1.31.0/buildconf.bat
diff --git a/lib/c-ares-1.30.0/c-ares-config.cmake.in b/lib/c-ares-1.31.0/c-ares-config.cmake.in
similarity index 100%
rename from lib/c-ares-1.30.0/c-ares-config.cmake.in
rename to lib/c-ares-1.31.0/c-ares-config.cmake.in
diff --git a/lib/c-ares-1.30.0/cmake/EnableWarnings.cmake b/lib/c-ares-1.31.0/cmake/EnableWarnings.cmake
similarity index 100%
rename from lib/c-ares-1.30.0/cmake/EnableWarnings.cmake
rename to lib/c-ares-1.31.0/cmake/EnableWarnings.cmake
diff --git a/lib/c-ares-1.30.0/config/compile b/lib/c-ares-1.31.0/config/compile
similarity index 100%
rename from lib/c-ares-1.30.0/config/compile
rename to lib/c-ares-1.31.0/config/compile
diff --git a/lib/c-ares-1.30.0/config/config.guess b/lib/c-ares-1.31.0/config/config.guess
similarity index 100%
rename from lib/c-ares-1.30.0/config/config.guess
rename to lib/c-ares-1.31.0/config/config.guess
diff --git a/lib/c-ares-1.30.0/config/config.sub b/lib/c-ares-1.31.0/config/config.sub
similarity index 100%
rename from lib/c-ares-1.30.0/config/config.sub
rename to lib/c-ares-1.31.0/config/config.sub
diff --git a/lib/c-ares-1.30.0/config/depcomp b/lib/c-ares-1.31.0/config/depcomp
similarity index 100%
rename from lib/c-ares-1.30.0/config/depcomp
rename to lib/c-ares-1.31.0/config/depcomp
diff --git a/lib/c-ares-1.30.0/config/install-sh b/lib/c-ares-1.31.0/config/install-sh
similarity index 100%
rename from lib/c-ares-1.30.0/config/install-sh
rename to lib/c-ares-1.31.0/config/install-sh
diff --git a/lib/c-ares-1.30.0/config/ltmain.sh b/lib/c-ares-1.31.0/config/ltmain.sh
similarity index 100%
rename from lib/c-ares-1.30.0/config/ltmain.sh
rename to lib/c-ares-1.31.0/config/ltmain.sh
diff --git a/lib/c-ares-1.30.0/config/missing b/lib/c-ares-1.31.0/config/missing
similarity index 100%
rename from lib/c-ares-1.30.0/config/missing
rename to lib/c-ares-1.31.0/config/missing
diff --git a/lib/c-ares-1.30.0/config/test-driver b/lib/c-ares-1.31.0/config/test-driver
similarity index 100%
rename from lib/c-ares-1.30.0/config/test-driver
rename to lib/c-ares-1.31.0/config/test-driver
diff --git a/lib/c-ares-1.30.0/configure b/lib/c-ares-1.31.0/configure
similarity index 99%
rename from lib/c-ares-1.30.0/configure
rename to lib/c-ares-1.31.0/configure
index e97df513387..a19193e4206 100755
--- a/lib/c-ares-1.30.0/configure
+++ b/lib/c-ares-1.31.0/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for c-ares 1.30.0.
+# Generated by GNU Autoconf 2.72 for c-ares 1.31.0.
 #
 # Report bugs to <c-ares mailing list: http://lists.haxx.se/listinfo/c-ares>.
 #
@@ -614,8 +614,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='c-ares'
 PACKAGE_TARNAME='c-ares'
-PACKAGE_VERSION='1.30.0'
-PACKAGE_STRING='c-ares 1.30.0'
+PACKAGE_VERSION='1.31.0'
+PACKAGE_STRING='c-ares 1.31.0'
 PACKAGE_BUGREPORT='c-ares mailing list: http://lists.haxx.se/listinfo/c-ares'
 PACKAGE_URL=''
 
@@ -1415,7 +1415,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-'configure' configures c-ares 1.30.0 to adapt to many kinds of systems.
+'configure' configures c-ares 1.31.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1486,7 +1486,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of c-ares 1.30.0:";;
+     short | recursive ) echo "Configuration of c-ares 1.31.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1623,7 +1623,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-c-ares configure 1.30.0
+c-ares configure 1.31.0
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2267,7 +2267,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by c-ares $as_me 1.30.0, which was
+It was created by c-ares $as_me 1.31.0, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3259,7 +3259,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-CARES_VERSION_INFO="17:0:15"
+CARES_VERSION_INFO="18:0:16"
 
 
 
@@ -5999,7 +5999,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='c-ares'
- VERSION='1.30.0'
+ VERSION='1.31.0'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -26370,7 +26370,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by c-ares $as_me 1.30.0, which was
+This file was extended by c-ares $as_me 1.31.0, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26438,7 +26438,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-c-ares config.status 1.30.0
+c-ares config.status 1.31.0
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 
diff --git a/lib/c-ares-1.30.0/configure.ac b/lib/c-ares-1.31.0/configure.ac
similarity index 99%
rename from lib/c-ares-1.30.0/configure.ac
rename to lib/c-ares-1.31.0/configure.ac
index 0e8dd4746d2..9e21619ae73 100644
--- a/lib/c-ares-1.30.0/configure.ac
+++ b/lib/c-ares-1.31.0/configure.ac
@@ -2,10 +2,10 @@ dnl Copyright (C) The c-ares project and its contributors
 dnl SPDX-License-Identifier: MIT
 AC_PREREQ([2.69])
 
-AC_INIT([c-ares], [1.30.0],
+AC_INIT([c-ares], [1.31.0],
   [c-ares mailing list: http://lists.haxx.se/listinfo/c-ares])
 
-CARES_VERSION_INFO="17:0:15"
+CARES_VERSION_INFO="18:0:16"
 dnl This flag accepts an argument of the form current[:revision[:age]]. So,
 dnl passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
 dnl 1.
diff --git a/lib/c-ares-1.30.0/docs/CMakeLists.txt b/lib/c-ares-1.31.0/docs/CMakeLists.txt
similarity index 100%
rename from lib/c-ares-1.30.0/docs/CMakeLists.txt
rename to lib/c-ares-1.31.0/docs/CMakeLists.txt
diff --git a/lib/c-ares-1.30.0/docs/Makefile.am b/lib/c-ares-1.31.0/docs/Makefile.am
similarity index 100%
rename from lib/c-ares-1.30.0/docs/Makefile.am
rename to lib/c-ares-1.31.0/docs/Makefile.am
diff --git a/lib/c-ares-1.30.0/docs/Makefile.in b/lib/c-ares-1.31.0/docs/Makefile.in
similarity index 99%
rename from lib/c-ares-1.30.0/docs/Makefile.in
rename to lib/c-ares-1.31.0/docs/Makefile.in
index 08886323ef5..d4bb7795a58 100644
--- a/lib/c-ares-1.30.0/docs/Makefile.in
+++ b/lib/c-ares-1.31.0/docs/Makefile.in
@@ -375,6 +375,7 @@ MANPAGES = ares_cancel.3		\
   ares_dns_record_rr_get.3		\
   ares_dns_record_rr_get_const.3	\
   ares_dns_rec_type_fromstr.3		\
+  ares_dns_rec_type_tostr.3		\
   ares_dns_rec_type_t.3			\
   ares_dns_rr.3				\
   ares_dns_rr_get_addr.3		\
diff --git a/lib/c-ares-1.30.0/docs/Makefile.inc b/lib/c-ares-1.31.0/docs/Makefile.inc
similarity index 99%
rename from lib/c-ares-1.30.0/docs/Makefile.inc
rename to lib/c-ares-1.31.0/docs/Makefile.inc
index 685978674e3..097bf26589b 100644
--- a/lib/c-ares-1.30.0/docs/Makefile.inc
+++ b/lib/c-ares-1.31.0/docs/Makefile.inc
@@ -37,6 +37,7 @@ MANPAGES = ares_cancel.3		\
   ares_dns_record_rr_get.3		\
   ares_dns_record_rr_get_const.3	\
   ares_dns_rec_type_fromstr.3		\
+  ares_dns_rec_type_tostr.3		\
   ares_dns_rec_type_t.3			\
   ares_dns_rr.3				\
   ares_dns_rr_get_addr.3		\
diff --git a/lib/c-ares-1.30.0/docs/adig.1 b/lib/c-ares-1.31.0/docs/adig.1
similarity index 100%
rename from lib/c-ares-1.30.0/docs/adig.1
rename to lib/c-ares-1.31.0/docs/adig.1
diff --git a/lib/c-ares-1.30.0/docs/ahost.1 b/lib/c-ares-1.31.0/docs/ahost.1
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ahost.1
rename to lib/c-ares-1.31.0/docs/ahost.1
diff --git a/lib/c-ares-1.30.0/docs/ares_cancel.3 b/lib/c-ares-1.31.0/docs/ares_cancel.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_cancel.3
rename to lib/c-ares-1.31.0/docs/ares_cancel.3
diff --git a/lib/c-ares-1.30.0/docs/ares_create_query.3 b/lib/c-ares-1.31.0/docs/ares_create_query.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_create_query.3
rename to lib/c-ares-1.31.0/docs/ares_create_query.3
diff --git a/lib/c-ares-1.30.0/docs/ares_destroy.3 b/lib/c-ares-1.31.0/docs/ares_destroy.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_destroy.3
rename to lib/c-ares-1.31.0/docs/ares_destroy.3
diff --git a/lib/c-ares-1.30.0/docs/ares_destroy_options.3 b/lib/c-ares-1.31.0/docs/ares_destroy_options.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_destroy_options.3
rename to lib/c-ares-1.31.0/docs/ares_destroy_options.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_class_fromstr.3 b/lib/c-ares-1.31.0/docs/ares_dns_class_fromstr.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_class_fromstr.3
rename to lib/c-ares-1.31.0/docs/ares_dns_class_fromstr.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_class_t.3 b/lib/c-ares-1.31.0/docs/ares_dns_class_t.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_class_t.3
rename to lib/c-ares-1.31.0/docs/ares_dns_class_t.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_class_tostr.3 b/lib/c-ares-1.31.0/docs/ares_dns_class_tostr.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_class_tostr.3
rename to lib/c-ares-1.31.0/docs/ares_dns_class_tostr.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_datatype_t.3 b/lib/c-ares-1.31.0/docs/ares_dns_datatype_t.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_datatype_t.3
rename to lib/c-ares-1.31.0/docs/ares_dns_datatype_t.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_flags_t.3 b/lib/c-ares-1.31.0/docs/ares_dns_flags_t.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_flags_t.3
rename to lib/c-ares-1.31.0/docs/ares_dns_flags_t.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_mapping.3 b/lib/c-ares-1.31.0/docs/ares_dns_mapping.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_mapping.3
rename to lib/c-ares-1.31.0/docs/ares_dns_mapping.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_opcode_t.3 b/lib/c-ares-1.31.0/docs/ares_dns_opcode_t.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_opcode_t.3
rename to lib/c-ares-1.31.0/docs/ares_dns_opcode_t.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_opcode_tostr.3 b/lib/c-ares-1.31.0/docs/ares_dns_opcode_tostr.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_opcode_tostr.3
rename to lib/c-ares-1.31.0/docs/ares_dns_opcode_tostr.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_opt_datatype_t.3 b/lib/c-ares-1.31.0/docs/ares_dns_opt_datatype_t.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_opt_datatype_t.3
rename to lib/c-ares-1.31.0/docs/ares_dns_opt_datatype_t.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_opt_get_datatype.3 b/lib/c-ares-1.31.0/docs/ares_dns_opt_get_datatype.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_opt_get_datatype.3
rename to lib/c-ares-1.31.0/docs/ares_dns_opt_get_datatype.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_opt_get_name.3 b/lib/c-ares-1.31.0/docs/ares_dns_opt_get_name.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_opt_get_name.3
rename to lib/c-ares-1.31.0/docs/ares_dns_opt_get_name.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_parse.3 b/lib/c-ares-1.31.0/docs/ares_dns_parse.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_parse.3
rename to lib/c-ares-1.31.0/docs/ares_dns_parse.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rcode_t.3 b/lib/c-ares-1.31.0/docs/ares_dns_rcode_t.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rcode_t.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rcode_t.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rcode_tostr.3 b/lib/c-ares-1.31.0/docs/ares_dns_rcode_tostr.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rcode_tostr.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rcode_tostr.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rec_type_fromstr.3 b/lib/c-ares-1.31.0/docs/ares_dns_rec_type_fromstr.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rec_type_fromstr.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rec_type_fromstr.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rec_type_t.3 b/lib/c-ares-1.31.0/docs/ares_dns_rec_type_t.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rec_type_t.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rec_type_t.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_key_datatype.3 b/lib/c-ares-1.31.0/docs/ares_dns_rec_type_tostr.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_key_datatype.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rec_type_tostr.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record.3 b/lib/c-ares-1.31.0/docs/ares_dns_record.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_create.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_create.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_create.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_create.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_destroy.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_destroy.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_destroy.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_destroy.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_duplicate.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_duplicate.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_duplicate.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_duplicate.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_get_flags.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_get_flags.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_get_flags.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_get_flags.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_get_id.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_get_id.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_get_id.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_get_id.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_get_opcode.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_get_opcode.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_get_opcode.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_get_opcode.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_get_rcode.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_get_rcode.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_get_rcode.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_get_rcode.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_query_add.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_query_add.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_query_add.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_query_add.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_query_cnt.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_query_cnt.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_query_cnt.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_query_cnt.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_query_get.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_query_get.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_query_get.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_query_get.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_query_set_name.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_query_set_name.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_query_set_name.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_query_set_name.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_query_set_type.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_query_set_type.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_query_set_type.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_query_set_type.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_rr_add.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_rr_add.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_rr_add.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_rr_add.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_rr_cnt.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_rr_cnt.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_rr_cnt.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_rr_cnt.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_rr_del.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_rr_del.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_rr_del.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_rr_del.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_rr_get.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_rr_get.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_rr_get.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_rr_get.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_record_rr_get_const.3 b/lib/c-ares-1.31.0/docs/ares_dns_record_rr_get_const.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_record_rr_get_const.3
rename to lib/c-ares-1.31.0/docs/ares_dns_record_rr_get_const.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_addr.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_addr.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_addr.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_addr.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_addr6.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_addr6.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_addr6.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_addr6.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_bin.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_bin.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_bin.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_bin.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_class.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_class.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_class.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_class.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_keys.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_keys.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_keys.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_keys.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_name.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_name.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_name.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_name.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_opt.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_opt.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_opt.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_opt.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_opt_byid.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_opt_byid.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_opt_byid.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_opt_byid.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_opt_cnt.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_opt_cnt.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_opt_cnt.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_opt_cnt.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_str.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_str.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_str.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_str.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_ttl.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_ttl.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_ttl.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_ttl.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_type.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_type.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_type.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_type.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_u16.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_u16.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_u16.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_u16.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_u32.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_u32.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_u32.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_u32.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_get_u8.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_get_u8.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_get_u8.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_get_u8.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_key_to_rec_type.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_key_datatype.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_key_to_rec_type.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_key_datatype.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_key_t.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_key_t.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_key_t.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_key_t.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_key_tostr.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_key_to_rec_type.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_key_tostr.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_key_to_rec_type.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_section_tostr.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_key_tostr.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_section_tostr.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_key_tostr.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_set_addr.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_set_addr.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_set_addr.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_set_addr.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_set_addr6.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_set_addr6.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_set_addr6.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_set_addr6.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_set_bin.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_set_bin.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_set_bin.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_set_bin.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_set_opt.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_set_opt.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_set_opt.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_set_opt.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_set_str.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_set_str.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_set_str.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_set_str.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_set_u16.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_set_u16.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_set_u16.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_set_u16.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_set_u32.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_set_u32.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_set_u32.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_set_u32.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_rr_set_u8.3 b/lib/c-ares-1.31.0/docs/ares_dns_rr_set_u8.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_rr_set_u8.3
rename to lib/c-ares-1.31.0/docs/ares_dns_rr_set_u8.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_section_t.3 b/lib/c-ares-1.31.0/docs/ares_dns_section_t.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_section_t.3
rename to lib/c-ares-1.31.0/docs/ares_dns_section_t.3
diff --git a/lib/c-ares-1.30.0/docs/ares_opt_param_t.3 b/lib/c-ares-1.31.0/docs/ares_dns_section_tostr.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_opt_param_t.3
rename to lib/c-ares-1.31.0/docs/ares_dns_section_tostr.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dns_write.3 b/lib/c-ares-1.31.0/docs/ares_dns_write.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dns_write.3
rename to lib/c-ares-1.31.0/docs/ares_dns_write.3
diff --git a/lib/c-ares-1.30.0/docs/ares_dup.3 b/lib/c-ares-1.31.0/docs/ares_dup.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_dup.3
rename to lib/c-ares-1.31.0/docs/ares_dup.3
diff --git a/lib/c-ares-1.30.0/docs/ares_expand_name.3 b/lib/c-ares-1.31.0/docs/ares_expand_name.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_expand_name.3
rename to lib/c-ares-1.31.0/docs/ares_expand_name.3
diff --git a/lib/c-ares-1.30.0/docs/ares_expand_string.3 b/lib/c-ares-1.31.0/docs/ares_expand_string.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_expand_string.3
rename to lib/c-ares-1.31.0/docs/ares_expand_string.3
diff --git a/lib/c-ares-1.30.0/docs/ares_fds.3 b/lib/c-ares-1.31.0/docs/ares_fds.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_fds.3
rename to lib/c-ares-1.31.0/docs/ares_fds.3
diff --git a/lib/c-ares-1.30.0/docs/ares_free_data.3 b/lib/c-ares-1.31.0/docs/ares_free_data.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_free_data.3
rename to lib/c-ares-1.31.0/docs/ares_free_data.3
diff --git a/lib/c-ares-1.30.0/docs/ares_free_hostent.3 b/lib/c-ares-1.31.0/docs/ares_free_hostent.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_free_hostent.3
rename to lib/c-ares-1.31.0/docs/ares_free_hostent.3
diff --git a/lib/c-ares-1.30.0/docs/ares_free_string.3 b/lib/c-ares-1.31.0/docs/ares_free_string.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_free_string.3
rename to lib/c-ares-1.31.0/docs/ares_free_string.3
diff --git a/lib/c-ares-1.30.0/docs/ares_freeaddrinfo.3 b/lib/c-ares-1.31.0/docs/ares_freeaddrinfo.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_freeaddrinfo.3
rename to lib/c-ares-1.31.0/docs/ares_freeaddrinfo.3
diff --git a/lib/c-ares-1.30.0/docs/ares_get_servers.3 b/lib/c-ares-1.31.0/docs/ares_get_servers.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_get_servers.3
rename to lib/c-ares-1.31.0/docs/ares_get_servers.3
diff --git a/lib/c-ares-1.30.0/docs/ares_get_servers_csv.3 b/lib/c-ares-1.31.0/docs/ares_get_servers_csv.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_get_servers_csv.3
rename to lib/c-ares-1.31.0/docs/ares_get_servers_csv.3
diff --git a/lib/c-ares-1.30.0/docs/ares_get_servers_ports.3 b/lib/c-ares-1.31.0/docs/ares_get_servers_ports.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_get_servers_ports.3
rename to lib/c-ares-1.31.0/docs/ares_get_servers_ports.3
diff --git a/lib/c-ares-1.30.0/docs/ares_getaddrinfo.3 b/lib/c-ares-1.31.0/docs/ares_getaddrinfo.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_getaddrinfo.3
rename to lib/c-ares-1.31.0/docs/ares_getaddrinfo.3
diff --git a/lib/c-ares-1.30.0/docs/ares_gethostbyaddr.3 b/lib/c-ares-1.31.0/docs/ares_gethostbyaddr.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_gethostbyaddr.3
rename to lib/c-ares-1.31.0/docs/ares_gethostbyaddr.3
diff --git a/lib/c-ares-1.30.0/docs/ares_gethostbyname.3 b/lib/c-ares-1.31.0/docs/ares_gethostbyname.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_gethostbyname.3
rename to lib/c-ares-1.31.0/docs/ares_gethostbyname.3
diff --git a/lib/c-ares-1.30.0/docs/ares_gethostbyname_file.3 b/lib/c-ares-1.31.0/docs/ares_gethostbyname_file.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_gethostbyname_file.3
rename to lib/c-ares-1.31.0/docs/ares_gethostbyname_file.3
diff --git a/lib/c-ares-1.30.0/docs/ares_getnameinfo.3 b/lib/c-ares-1.31.0/docs/ares_getnameinfo.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_getnameinfo.3
rename to lib/c-ares-1.31.0/docs/ares_getnameinfo.3
diff --git a/lib/c-ares-1.30.0/docs/ares_getsock.3 b/lib/c-ares-1.31.0/docs/ares_getsock.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_getsock.3
rename to lib/c-ares-1.31.0/docs/ares_getsock.3
diff --git a/lib/c-ares-1.30.0/docs/ares_inet_ntop.3 b/lib/c-ares-1.31.0/docs/ares_inet_ntop.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_inet_ntop.3
rename to lib/c-ares-1.31.0/docs/ares_inet_ntop.3
diff --git a/lib/c-ares-1.30.0/docs/ares_inet_pton.3 b/lib/c-ares-1.31.0/docs/ares_inet_pton.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_inet_pton.3
rename to lib/c-ares-1.31.0/docs/ares_inet_pton.3
diff --git a/lib/c-ares-1.30.0/docs/ares_init.3 b/lib/c-ares-1.31.0/docs/ares_init.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_init.3
rename to lib/c-ares-1.31.0/docs/ares_init.3
diff --git a/lib/c-ares-1.30.0/docs/ares_init_options.3 b/lib/c-ares-1.31.0/docs/ares_init_options.3
similarity index 95%
rename from lib/c-ares-1.30.0/docs/ares_init_options.3
rename to lib/c-ares-1.31.0/docs/ares_init_options.3
index 81e53cd0f28..3d983ebe6dd 100644
--- a/lib/c-ares-1.30.0/docs/ares_init_options.3
+++ b/lib/c-ares-1.31.0/docs/ares_init_options.3
@@ -291,13 +291,15 @@ or less will be considered unlimited, and is the default.
 .B ARES_OPT_QUERY_CACHE
 .B unsigned int \fIqcache_max_ttl\fP;
 .br
-Enable the built-in query cache.  Will cache queries based on the returned TTL
-in the DNS message.  Only fully successful and NXDOMAIN query results will be
-cached.  Fill in the \fIqcache_max_ttl\fP with the maximum number of seconds
-a query result may be cached which will override a larger TTL in the response
-message. This must be a non-zero value otherwise the cache will be disabled.
-Choose a reasonable value for your application such as 300 (5 minutes) or
-3600 (1 hour).
+As of c-ares 1.31.0, the query cache is enabled by default with a TTL of 1hr.
+To disable the query cache, specify this option with a TTL of 0.  The query
+cache is based on the returned TTL in the DNS message.  Only fully successful
+and NXDOMAIN query results will be cached.  Fill in the \fIqcache_max_ttl\fP
+with the maximum number of seconds a query result may be cached which will
+override a larger TTL in the response message. This must be a non-zero value
+otherwise the cache will be disabled. Choose a reasonable value for your
+application such as 300 (5 minutes) or 3600 (1 hour).  The query cache is
+automatically flushed if a server configuration change is made.
 .br
 .TP 18
 .B ARES_OPT_EVENT_THREAD
diff --git a/lib/c-ares-1.30.0/docs/ares_library_cleanup.3 b/lib/c-ares-1.31.0/docs/ares_library_cleanup.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_library_cleanup.3
rename to lib/c-ares-1.31.0/docs/ares_library_cleanup.3
diff --git a/lib/c-ares-1.30.0/docs/ares_library_init.3 b/lib/c-ares-1.31.0/docs/ares_library_init.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_library_init.3
rename to lib/c-ares-1.31.0/docs/ares_library_init.3
diff --git a/lib/c-ares-1.30.0/docs/ares_library_init_android.3 b/lib/c-ares-1.31.0/docs/ares_library_init_android.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_library_init_android.3
rename to lib/c-ares-1.31.0/docs/ares_library_init_android.3
diff --git a/lib/c-ares-1.30.0/docs/ares_library_initialized.3 b/lib/c-ares-1.31.0/docs/ares_library_initialized.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_library_initialized.3
rename to lib/c-ares-1.31.0/docs/ares_library_initialized.3
diff --git a/lib/c-ares-1.30.0/docs/ares_mkquery.3 b/lib/c-ares-1.31.0/docs/ares_mkquery.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_mkquery.3
rename to lib/c-ares-1.31.0/docs/ares_mkquery.3
diff --git a/lib/c-ares-1.30.0/docs/ares_svcb_param_t.3 b/lib/c-ares-1.31.0/docs/ares_opt_param_t.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_svcb_param_t.3
rename to lib/c-ares-1.31.0/docs/ares_opt_param_t.3
diff --git a/lib/c-ares-1.30.0/docs/ares_parse_a_reply.3 b/lib/c-ares-1.31.0/docs/ares_parse_a_reply.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_parse_a_reply.3
rename to lib/c-ares-1.31.0/docs/ares_parse_a_reply.3
diff --git a/lib/c-ares-1.30.0/docs/ares_parse_aaaa_reply.3 b/lib/c-ares-1.31.0/docs/ares_parse_aaaa_reply.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_parse_aaaa_reply.3
rename to lib/c-ares-1.31.0/docs/ares_parse_aaaa_reply.3
diff --git a/lib/c-ares-1.30.0/docs/ares_parse_caa_reply.3 b/lib/c-ares-1.31.0/docs/ares_parse_caa_reply.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_parse_caa_reply.3
rename to lib/c-ares-1.31.0/docs/ares_parse_caa_reply.3
diff --git a/lib/c-ares-1.30.0/docs/ares_parse_mx_reply.3 b/lib/c-ares-1.31.0/docs/ares_parse_mx_reply.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_parse_mx_reply.3
rename to lib/c-ares-1.31.0/docs/ares_parse_mx_reply.3
diff --git a/lib/c-ares-1.30.0/docs/ares_parse_naptr_reply.3 b/lib/c-ares-1.31.0/docs/ares_parse_naptr_reply.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_parse_naptr_reply.3
rename to lib/c-ares-1.31.0/docs/ares_parse_naptr_reply.3
diff --git a/lib/c-ares-1.30.0/docs/ares_parse_ns_reply.3 b/lib/c-ares-1.31.0/docs/ares_parse_ns_reply.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_parse_ns_reply.3
rename to lib/c-ares-1.31.0/docs/ares_parse_ns_reply.3
diff --git a/lib/c-ares-1.30.0/docs/ares_parse_ptr_reply.3 b/lib/c-ares-1.31.0/docs/ares_parse_ptr_reply.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_parse_ptr_reply.3
rename to lib/c-ares-1.31.0/docs/ares_parse_ptr_reply.3
diff --git a/lib/c-ares-1.30.0/docs/ares_parse_soa_reply.3 b/lib/c-ares-1.31.0/docs/ares_parse_soa_reply.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_parse_soa_reply.3
rename to lib/c-ares-1.31.0/docs/ares_parse_soa_reply.3
diff --git a/lib/c-ares-1.30.0/docs/ares_parse_srv_reply.3 b/lib/c-ares-1.31.0/docs/ares_parse_srv_reply.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_parse_srv_reply.3
rename to lib/c-ares-1.31.0/docs/ares_parse_srv_reply.3
diff --git a/lib/c-ares-1.30.0/docs/ares_parse_txt_reply.3 b/lib/c-ares-1.31.0/docs/ares_parse_txt_reply.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_parse_txt_reply.3
rename to lib/c-ares-1.31.0/docs/ares_parse_txt_reply.3
diff --git a/lib/c-ares-1.30.0/docs/ares_parse_uri_reply.3 b/lib/c-ares-1.31.0/docs/ares_parse_uri_reply.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_parse_uri_reply.3
rename to lib/c-ares-1.31.0/docs/ares_parse_uri_reply.3
diff --git a/lib/c-ares-1.30.0/docs/ares_process.3 b/lib/c-ares-1.31.0/docs/ares_process.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_process.3
rename to lib/c-ares-1.31.0/docs/ares_process.3
diff --git a/lib/c-ares-1.30.0/docs/ares_query.3 b/lib/c-ares-1.31.0/docs/ares_query.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_query.3
rename to lib/c-ares-1.31.0/docs/ares_query.3
diff --git a/lib/c-ares-1.30.0/docs/ares_query_dnsrec.3 b/lib/c-ares-1.31.0/docs/ares_query_dnsrec.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_query_dnsrec.3
rename to lib/c-ares-1.31.0/docs/ares_query_dnsrec.3
diff --git a/lib/c-ares-1.30.0/docs/ares_queue.3 b/lib/c-ares-1.31.0/docs/ares_queue.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_queue.3
rename to lib/c-ares-1.31.0/docs/ares_queue.3
diff --git a/lib/c-ares-1.30.0/docs/ares_queue_active_queries.3 b/lib/c-ares-1.31.0/docs/ares_queue_active_queries.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_queue_active_queries.3
rename to lib/c-ares-1.31.0/docs/ares_queue_active_queries.3
diff --git a/lib/c-ares-1.30.0/docs/ares_queue_wait_empty.3 b/lib/c-ares-1.31.0/docs/ares_queue_wait_empty.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_queue_wait_empty.3
rename to lib/c-ares-1.31.0/docs/ares_queue_wait_empty.3
diff --git a/lib/c-ares-1.30.0/docs/ares_reinit.3 b/lib/c-ares-1.31.0/docs/ares_reinit.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_reinit.3
rename to lib/c-ares-1.31.0/docs/ares_reinit.3
diff --git a/lib/c-ares-1.30.0/docs/ares_save_options.3 b/lib/c-ares-1.31.0/docs/ares_save_options.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_save_options.3
rename to lib/c-ares-1.31.0/docs/ares_save_options.3
diff --git a/lib/c-ares-1.30.0/docs/ares_search.3 b/lib/c-ares-1.31.0/docs/ares_search.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_search.3
rename to lib/c-ares-1.31.0/docs/ares_search.3
diff --git a/lib/c-ares-1.30.0/docs/ares_search_dnsrec.3 b/lib/c-ares-1.31.0/docs/ares_search_dnsrec.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_search_dnsrec.3
rename to lib/c-ares-1.31.0/docs/ares_search_dnsrec.3
diff --git a/lib/c-ares-1.30.0/docs/ares_send.3 b/lib/c-ares-1.31.0/docs/ares_send.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_send.3
rename to lib/c-ares-1.31.0/docs/ares_send.3
diff --git a/lib/c-ares-1.30.0/docs/ares_send_dnsrec.3 b/lib/c-ares-1.31.0/docs/ares_send_dnsrec.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_send_dnsrec.3
rename to lib/c-ares-1.31.0/docs/ares_send_dnsrec.3
diff --git a/lib/c-ares-1.30.0/docs/ares_set_local_dev.3 b/lib/c-ares-1.31.0/docs/ares_set_local_dev.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_set_local_dev.3
rename to lib/c-ares-1.31.0/docs/ares_set_local_dev.3
diff --git a/lib/c-ares-1.30.0/docs/ares_set_local_ip4.3 b/lib/c-ares-1.31.0/docs/ares_set_local_ip4.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_set_local_ip4.3
rename to lib/c-ares-1.31.0/docs/ares_set_local_ip4.3
diff --git a/lib/c-ares-1.30.0/docs/ares_set_local_ip6.3 b/lib/c-ares-1.31.0/docs/ares_set_local_ip6.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_set_local_ip6.3
rename to lib/c-ares-1.31.0/docs/ares_set_local_ip6.3
diff --git a/lib/c-ares-1.30.0/docs/ares_set_server_state_callback.3 b/lib/c-ares-1.31.0/docs/ares_set_server_state_callback.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_set_server_state_callback.3
rename to lib/c-ares-1.31.0/docs/ares_set_server_state_callback.3
diff --git a/lib/c-ares-1.30.0/docs/ares_set_servers.3 b/lib/c-ares-1.31.0/docs/ares_set_servers.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_set_servers.3
rename to lib/c-ares-1.31.0/docs/ares_set_servers.3
diff --git a/lib/c-ares-1.30.0/docs/ares_set_servers_csv.3 b/lib/c-ares-1.31.0/docs/ares_set_servers_csv.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_set_servers_csv.3
rename to lib/c-ares-1.31.0/docs/ares_set_servers_csv.3
diff --git a/lib/c-ares-1.30.0/docs/ares_set_servers_ports.3 b/lib/c-ares-1.31.0/docs/ares_set_servers_ports.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_set_servers_ports.3
rename to lib/c-ares-1.31.0/docs/ares_set_servers_ports.3
diff --git a/lib/c-ares-1.30.0/docs/ares_set_servers_ports_csv.3 b/lib/c-ares-1.31.0/docs/ares_set_servers_ports_csv.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_set_servers_ports_csv.3
rename to lib/c-ares-1.31.0/docs/ares_set_servers_ports_csv.3
diff --git a/lib/c-ares-1.30.0/docs/ares_set_socket_callback.3 b/lib/c-ares-1.31.0/docs/ares_set_socket_callback.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_set_socket_callback.3
rename to lib/c-ares-1.31.0/docs/ares_set_socket_callback.3
diff --git a/lib/c-ares-1.30.0/docs/ares_set_socket_configure_callback.3 b/lib/c-ares-1.31.0/docs/ares_set_socket_configure_callback.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_set_socket_configure_callback.3
rename to lib/c-ares-1.31.0/docs/ares_set_socket_configure_callback.3
diff --git a/lib/c-ares-1.30.0/docs/ares_set_socket_functions.3 b/lib/c-ares-1.31.0/docs/ares_set_socket_functions.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_set_socket_functions.3
rename to lib/c-ares-1.31.0/docs/ares_set_socket_functions.3
diff --git a/lib/c-ares-1.30.0/docs/ares_set_sortlist.3 b/lib/c-ares-1.31.0/docs/ares_set_sortlist.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_set_sortlist.3
rename to lib/c-ares-1.31.0/docs/ares_set_sortlist.3
diff --git a/lib/c-ares-1.30.0/docs/ares_strerror.3 b/lib/c-ares-1.31.0/docs/ares_strerror.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_strerror.3
rename to lib/c-ares-1.31.0/docs/ares_strerror.3
diff --git a/lib/c-ares-1.31.0/docs/ares_svcb_param_t.3 b/lib/c-ares-1.31.0/docs/ares_svcb_param_t.3
new file mode 100644
index 00000000000..4587b9a586e
--- /dev/null
+++ b/lib/c-ares-1.31.0/docs/ares_svcb_param_t.3
@@ -0,0 +1,4 @@
+.\"
+.\" Copyright (C) Daniel Stenberg
+.\" SPDX-License-Identifier: MIT
+.so man3/ares_dns_mapping.3
diff --git a/lib/c-ares-1.30.0/docs/ares_threadsafety.3 b/lib/c-ares-1.31.0/docs/ares_threadsafety.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_threadsafety.3
rename to lib/c-ares-1.31.0/docs/ares_threadsafety.3
diff --git a/lib/c-ares-1.30.0/docs/ares_timeout.3 b/lib/c-ares-1.31.0/docs/ares_timeout.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_timeout.3
rename to lib/c-ares-1.31.0/docs/ares_timeout.3
diff --git a/lib/c-ares-1.30.0/docs/ares_tlsa_match_t.3 b/lib/c-ares-1.31.0/docs/ares_tlsa_match_t.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_tlsa_match_t.3
rename to lib/c-ares-1.31.0/docs/ares_tlsa_match_t.3
diff --git a/lib/c-ares-1.30.0/docs/ares_tlsa_selector_t.3 b/lib/c-ares-1.31.0/docs/ares_tlsa_selector_t.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_tlsa_selector_t.3
rename to lib/c-ares-1.31.0/docs/ares_tlsa_selector_t.3
diff --git a/lib/c-ares-1.30.0/docs/ares_tlsa_usage_t.3 b/lib/c-ares-1.31.0/docs/ares_tlsa_usage_t.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_tlsa_usage_t.3
rename to lib/c-ares-1.31.0/docs/ares_tlsa_usage_t.3
diff --git a/lib/c-ares-1.30.0/docs/ares_version.3 b/lib/c-ares-1.31.0/docs/ares_version.3
similarity index 100%
rename from lib/c-ares-1.30.0/docs/ares_version.3
rename to lib/c-ares-1.31.0/docs/ares_version.3
diff --git a/lib/c-ares-1.30.0/include/CMakeLists.txt b/lib/c-ares-1.31.0/include/CMakeLists.txt
similarity index 100%
rename from lib/c-ares-1.30.0/include/CMakeLists.txt
rename to lib/c-ares-1.31.0/include/CMakeLists.txt
diff --git a/lib/c-ares-1.30.0/include/Makefile.am b/lib/c-ares-1.31.0/include/Makefile.am
similarity index 100%
rename from lib/c-ares-1.30.0/include/Makefile.am
rename to lib/c-ares-1.31.0/include/Makefile.am
diff --git a/lib/c-ares-1.30.0/include/Makefile.in b/lib/c-ares-1.31.0/include/Makefile.in
similarity index 100%
rename from lib/c-ares-1.30.0/include/Makefile.in
rename to lib/c-ares-1.31.0/include/Makefile.in
diff --git a/lib/c-ares-1.30.0/include/ares.h b/lib/c-ares-1.31.0/include/ares.h
similarity index 99%
rename from lib/c-ares-1.30.0/include/ares.h
rename to lib/c-ares-1.31.0/include/ares.h
index 0785ae48083..58cac6cd71f 100644
--- a/lib/c-ares-1.30.0/include/ares.h
+++ b/lib/c-ares-1.31.0/include/ares.h
@@ -32,15 +32,6 @@
 #include "ares_build.h"   /* c-ares build definitions */
 #include "ares_rules.h"   /* c-ares rules enforcement */
 
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) && \
-  !defined(__SYMBIAN32__)
-#  define WIN32
-#endif
-
 #include <sys/types.h>
 
 /* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish
@@ -56,20 +47,20 @@
 #  include <sys/bsdskt.h>
 #endif
 
+#if defined(_WIN32)
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#endif
+
 #if defined(WATT32)
 #  include <netinet/in.h>
 #  include <sys/socket.h>
 #  include <tcp.h>
 #elif defined(_WIN32_WCE)
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
 #  include <windows.h>
 #  include <winsock.h>
-#elif defined(WIN32)
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
+#elif defined(_WIN32)
 #  include <windows.h>
 #  include <winsock2.h>
 #  include <ws2tcpip.h>
@@ -315,7 +306,7 @@ typedef enum {
  */
 
 #ifndef ares_socket_typedef
-#  ifdef WIN32
+#  if defined(_WIN32) && !defined(WATT32)
 typedef SOCKET ares_socket_t;
 #    define ARES_SOCKET_BAD INVALID_SOCKET
 #  else
diff --git a/lib/c-ares-1.30.0/include/ares_build.h b/lib/c-ares-1.31.0/include/ares_build.h
similarity index 100%
rename from lib/c-ares-1.30.0/include/ares_build.h
rename to lib/c-ares-1.31.0/include/ares_build.h
diff --git a/lib/c-ares-1.30.0/include/ares_build.h.cmake b/lib/c-ares-1.31.0/include/ares_build.h.cmake
similarity index 100%
rename from lib/c-ares-1.30.0/include/ares_build.h.cmake
rename to lib/c-ares-1.31.0/include/ares_build.h.cmake
diff --git a/lib/c-ares-1.30.0/include/ares_build.h.in b/lib/c-ares-1.31.0/include/ares_build.h.in
similarity index 100%
rename from lib/c-ares-1.30.0/include/ares_build.h.in
rename to lib/c-ares-1.31.0/include/ares_build.h.in
diff --git a/lib/c-ares-1.30.0/include/ares_dns.h b/lib/c-ares-1.31.0/include/ares_dns.h
similarity index 100%
rename from lib/c-ares-1.30.0/include/ares_dns.h
rename to lib/c-ares-1.31.0/include/ares_dns.h
diff --git a/lib/c-ares-1.30.0/include/ares_dns_record.h b/lib/c-ares-1.31.0/include/ares_dns_record.h
similarity index 100%
rename from lib/c-ares-1.30.0/include/ares_dns_record.h
rename to lib/c-ares-1.31.0/include/ares_dns_record.h
diff --git a/lib/c-ares-1.30.0/include/ares_nameser.h b/lib/c-ares-1.31.0/include/ares_nameser.h
similarity index 100%
rename from lib/c-ares-1.30.0/include/ares_nameser.h
rename to lib/c-ares-1.31.0/include/ares_nameser.h
diff --git a/lib/c-ares-1.30.0/include/ares_rules.h b/lib/c-ares-1.31.0/include/ares_rules.h
similarity index 100%
rename from lib/c-ares-1.30.0/include/ares_rules.h
rename to lib/c-ares-1.31.0/include/ares_rules.h
diff --git a/lib/c-ares-1.30.0/include/ares_version.h b/lib/c-ares-1.31.0/include/ares_version.h
similarity index 96%
rename from lib/c-ares-1.30.0/include/ares_version.h
rename to lib/c-ares-1.31.0/include/ares_version.h
index e791568e6bd..cd5a2551534 100644
--- a/lib/c-ares-1.30.0/include/ares_version.h
+++ b/lib/c-ares-1.31.0/include/ares_version.h
@@ -31,12 +31,12 @@
 #define ARES_COPYRIGHT "2004 - 2024 Daniel Stenberg, <daniel@haxx.se>."
 
 #define ARES_VERSION_MAJOR 1
-#define ARES_VERSION_MINOR 30
+#define ARES_VERSION_MINOR 31
 #define ARES_VERSION_PATCH 0
 #define ARES_VERSION                                        \
   ((ARES_VERSION_MAJOR << 16) | (ARES_VERSION_MINOR << 8) | \
    (ARES_VERSION_PATCH))
-#define ARES_VERSION_STR "1.30.0"
+#define ARES_VERSION_STR "1.31.0"
 
 #if (ARES_VERSION >= 0x010700)
 #  define CARES_HAVE_ARES_LIBRARY_INIT    1
diff --git a/lib/c-ares-1.30.0/libcares.pc.cmake b/lib/c-ares-1.31.0/libcares.pc.cmake
similarity index 100%
rename from lib/c-ares-1.30.0/libcares.pc.cmake
rename to lib/c-ares-1.31.0/libcares.pc.cmake
diff --git a/lib/c-ares-1.30.0/libcares.pc.in b/lib/c-ares-1.31.0/libcares.pc.in
similarity index 100%
rename from lib/c-ares-1.30.0/libcares.pc.in
rename to lib/c-ares-1.31.0/libcares.pc.in
diff --git a/lib/c-ares-1.30.0/m4/ax_ac_append_to_file.m4 b/lib/c-ares-1.31.0/m4/ax_ac_append_to_file.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_ac_append_to_file.m4
rename to lib/c-ares-1.31.0/m4/ax_ac_append_to_file.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_ac_print_to_file.m4 b/lib/c-ares-1.31.0/m4/ax_ac_print_to_file.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_ac_print_to_file.m4
rename to lib/c-ares-1.31.0/m4/ax_ac_print_to_file.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_add_am_macro_static.m4 b/lib/c-ares-1.31.0/m4/ax_add_am_macro_static.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_add_am_macro_static.m4
rename to lib/c-ares-1.31.0/m4/ax_add_am_macro_static.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_am_macros_static.m4 b/lib/c-ares-1.31.0/m4/ax_am_macros_static.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_am_macros_static.m4
rename to lib/c-ares-1.31.0/m4/ax_am_macros_static.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_append_compile_flags.m4 b/lib/c-ares-1.31.0/m4/ax_append_compile_flags.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_append_compile_flags.m4
rename to lib/c-ares-1.31.0/m4/ax_append_compile_flags.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_append_flag.m4 b/lib/c-ares-1.31.0/m4/ax_append_flag.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_append_flag.m4
rename to lib/c-ares-1.31.0/m4/ax_append_flag.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_append_link_flags.m4 b/lib/c-ares-1.31.0/m4/ax_append_link_flags.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_append_link_flags.m4
rename to lib/c-ares-1.31.0/m4/ax_append_link_flags.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_check_compile_flag.m4 b/lib/c-ares-1.31.0/m4/ax_check_compile_flag.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_check_compile_flag.m4
rename to lib/c-ares-1.31.0/m4/ax_check_compile_flag.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_check_gnu_make.m4 b/lib/c-ares-1.31.0/m4/ax_check_gnu_make.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_check_gnu_make.m4
rename to lib/c-ares-1.31.0/m4/ax_check_gnu_make.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_check_link_flag.m4 b/lib/c-ares-1.31.0/m4/ax_check_link_flag.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_check_link_flag.m4
rename to lib/c-ares-1.31.0/m4/ax_check_link_flag.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_check_user_namespace.m4 b/lib/c-ares-1.31.0/m4/ax_check_user_namespace.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_check_user_namespace.m4
rename to lib/c-ares-1.31.0/m4/ax_check_user_namespace.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_check_uts_namespace.m4 b/lib/c-ares-1.31.0/m4/ax_check_uts_namespace.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_check_uts_namespace.m4
rename to lib/c-ares-1.31.0/m4/ax_check_uts_namespace.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_code_coverage.m4 b/lib/c-ares-1.31.0/m4/ax_code_coverage.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_code_coverage.m4
rename to lib/c-ares-1.31.0/m4/ax_code_coverage.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_compiler_vendor.m4 b/lib/c-ares-1.31.0/m4/ax_compiler_vendor.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_compiler_vendor.m4
rename to lib/c-ares-1.31.0/m4/ax_compiler_vendor.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_cxx_compile_stdcxx.m4 b/lib/c-ares-1.31.0/m4/ax_cxx_compile_stdcxx.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_cxx_compile_stdcxx.m4
rename to lib/c-ares-1.31.0/m4/ax_cxx_compile_stdcxx.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_cxx_compile_stdcxx_14.m4 b/lib/c-ares-1.31.0/m4/ax_cxx_compile_stdcxx_14.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_cxx_compile_stdcxx_14.m4
rename to lib/c-ares-1.31.0/m4/ax_cxx_compile_stdcxx_14.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_file_escapes.m4 b/lib/c-ares-1.31.0/m4/ax_file_escapes.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_file_escapes.m4
rename to lib/c-ares-1.31.0/m4/ax_file_escapes.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_pthread.m4 b/lib/c-ares-1.31.0/m4/ax_pthread.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_pthread.m4
rename to lib/c-ares-1.31.0/m4/ax_pthread.m4
diff --git a/lib/c-ares-1.30.0/m4/ax_require_defined.m4 b/lib/c-ares-1.31.0/m4/ax_require_defined.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ax_require_defined.m4
rename to lib/c-ares-1.31.0/m4/ax_require_defined.m4
diff --git a/lib/c-ares-1.30.0/m4/libtool.m4 b/lib/c-ares-1.31.0/m4/libtool.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/libtool.m4
rename to lib/c-ares-1.31.0/m4/libtool.m4
diff --git a/lib/c-ares-1.30.0/m4/ltoptions.m4 b/lib/c-ares-1.31.0/m4/ltoptions.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ltoptions.m4
rename to lib/c-ares-1.31.0/m4/ltoptions.m4
diff --git a/lib/c-ares-1.30.0/m4/ltsugar.m4 b/lib/c-ares-1.31.0/m4/ltsugar.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ltsugar.m4
rename to lib/c-ares-1.31.0/m4/ltsugar.m4
diff --git a/lib/c-ares-1.30.0/m4/ltversion.m4 b/lib/c-ares-1.31.0/m4/ltversion.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/ltversion.m4
rename to lib/c-ares-1.31.0/m4/ltversion.m4
diff --git a/lib/c-ares-1.30.0/m4/lt~obsolete.m4 b/lib/c-ares-1.31.0/m4/lt~obsolete.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/lt~obsolete.m4
rename to lib/c-ares-1.31.0/m4/lt~obsolete.m4
diff --git a/lib/c-ares-1.30.0/m4/pkg.m4 b/lib/c-ares-1.31.0/m4/pkg.m4
similarity index 100%
rename from lib/c-ares-1.30.0/m4/pkg.m4
rename to lib/c-ares-1.31.0/m4/pkg.m4
diff --git a/lib/c-ares-1.30.0/msvc_ver.inc b/lib/c-ares-1.31.0/msvc_ver.inc
similarity index 100%
rename from lib/c-ares-1.30.0/msvc_ver.inc
rename to lib/c-ares-1.31.0/msvc_ver.inc
diff --git a/lib/c-ares-1.30.0/src/CMakeLists.txt b/lib/c-ares-1.31.0/src/CMakeLists.txt
similarity index 100%
rename from lib/c-ares-1.30.0/src/CMakeLists.txt
rename to lib/c-ares-1.31.0/src/CMakeLists.txt
diff --git a/lib/c-ares-1.30.0/src/Makefile.am b/lib/c-ares-1.31.0/src/Makefile.am
similarity index 100%
rename from lib/c-ares-1.30.0/src/Makefile.am
rename to lib/c-ares-1.31.0/src/Makefile.am
diff --git a/lib/c-ares-1.30.0/src/Makefile.in b/lib/c-ares-1.31.0/src/Makefile.in
similarity index 100%
rename from lib/c-ares-1.30.0/src/Makefile.in
rename to lib/c-ares-1.31.0/src/Makefile.in
diff --git a/lib/c-ares-1.30.0/src/lib/CMakeLists.txt b/lib/c-ares-1.31.0/src/lib/CMakeLists.txt
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/CMakeLists.txt
rename to lib/c-ares-1.31.0/src/lib/CMakeLists.txt
diff --git a/lib/c-ares-1.30.0/src/lib/Makefile.am b/lib/c-ares-1.31.0/src/lib/Makefile.am
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/Makefile.am
rename to lib/c-ares-1.31.0/src/lib/Makefile.am
diff --git a/lib/c-ares-1.30.0/src/lib/Makefile.in b/lib/c-ares-1.31.0/src/lib/Makefile.in
similarity index 99%
rename from lib/c-ares-1.30.0/src/lib/Makefile.in
rename to lib/c-ares-1.31.0/src/lib/Makefile.in
index 98fc92b68fa..f9e7b7ea1ce 100644
--- a/lib/c-ares-1.30.0/src/lib/Makefile.in
+++ b/lib/c-ares-1.31.0/src/lib/Makefile.in
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 # aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Fri Jun  7 06:50:45 EDT 2024
+# from AX_AM_MACROS_STATIC on Tue Jun 18 05:51:32 EDT 2024
 
 # Copyright (C) The c-ares project and its contributors
 # SPDX-License-Identifier: MIT
diff --git a/lib/c-ares-1.30.0/src/lib/Makefile.inc b/lib/c-ares-1.31.0/src/lib/Makefile.inc
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/Makefile.inc
rename to lib/c-ares-1.31.0/src/lib/Makefile.inc
diff --git a/lib/c-ares-1.30.0/src/lib/ares__addrinfo2hostent.c b/lib/c-ares-1.31.0/src/lib/ares__addrinfo2hostent.c
similarity index 88%
rename from lib/c-ares-1.30.0/src/lib/ares__addrinfo2hostent.c
rename to lib/c-ares-1.31.0/src/lib/ares__addrinfo2hostent.c
index 95717890c2f..3e22bc270f6 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__addrinfo2hostent.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__addrinfo2hostent.c
@@ -39,8 +39,6 @@
 #  include <arpa/inet.h>
 #endif
 
-#include "ares_nameser.h"
-
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif
@@ -50,8 +48,6 @@
 #endif
 
 #include "ares.h"
-#include "ares_dns.h"
-#include "ares_inet_net_pton.h"
 #include "ares_private.h"
 
 ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
@@ -67,7 +63,7 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
   size_t                      i;
 
   if (ai == NULL || host == NULL) {
-    return ARES_EBADQUERY;
+    return ARES_EBADQUERY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Use the first node of the response as the family, since hostent can only
@@ -78,12 +74,12 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
   }
 
   if (family != AF_INET && family != AF_INET6) {
-    return ARES_EBADQUERY;
+    return ARES_EBADQUERY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *host = ares_malloc(sizeof(**host));
   if (!(*host)) {
-    goto enomem;
+    goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
   }
   memset(*host, 0, sizeof(**host));
 
@@ -105,7 +101,7 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
 
   aliases = ares_malloc((naliases + 1) * sizeof(char *));
   if (!aliases) {
-    goto enomem;
+    goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
   }
   (*host)->h_aliases = aliases;
   memset(aliases, 0, (naliases + 1) * sizeof(char *));
@@ -118,7 +114,7 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
       }
       aliases[alias] = ares_strdup(next_cname->alias);
       if (!aliases[alias]) {
-        goto enomem;
+        goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
       }
       alias++;
     }
@@ -127,7 +123,7 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
 
   (*host)->h_addr_list = ares_malloc((naddrs + 1) * sizeof(char *));
   if (!(*host)->h_addr_list) {
-    goto enomem;
+    goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   memset((*host)->h_addr_list, 0, (naddrs + 1) * sizeof(char *));
@@ -135,12 +131,12 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
   if (ai->cnames) {
     (*host)->h_name = ares_strdup(ai->cnames->name);
     if ((*host)->h_name == NULL && ai->cnames->name) {
-      goto enomem;
+      goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   } else {
     (*host)->h_name = ares_strdup(ai->name);
     if ((*host)->h_name == NULL && ai->name) {
-      goto enomem;
+      goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -157,7 +153,7 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
   if (naddrs) {
     addrs = ares_malloc(naddrs * (size_t)(*host)->h_length);
     if (!addrs) {
-      goto enomem;
+      goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     i = 0;
@@ -194,10 +190,12 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
 
   return ARES_SUCCESS;
 
+/* LCOV_EXCL_START: OutOfMemory */
 enomem:
   ares_free_hostent(*host);
   *host = NULL;
   return ARES_ENOMEM;
+/* LCOV_EXCL_STOP */
 }
 
 ares_status_t ares__addrinfo2addrttl(const struct ares_addrinfo *ai, int family,
@@ -211,23 +209,23 @@ ares_status_t ares__addrinfo2addrttl(const struct ares_addrinfo *ai, int family,
   int                         cname_ttl = INT_MAX;
 
   if (family != AF_INET && family != AF_INET6) {
-    return ARES_EBADQUERY;
+    return ARES_EBADQUERY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (ai == NULL || naddrttls == NULL) {
-    return ARES_EBADQUERY;
+    return ARES_EBADQUERY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (family == AF_INET && addrttls == NULL) {
-    return ARES_EBADQUERY;
+    return ARES_EBADQUERY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (family == AF_INET6 && addr6ttls == NULL) {
-    return ARES_EBADQUERY;
+    return ARES_EBADQUERY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (req_naddrttls == 0) {
-    return ARES_EBADQUERY;
+    return ARES_EBADQUERY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *naddrttls = 0;
diff --git a/lib/c-ares-1.30.0/src/lib/ares__addrinfo_localhost.c b/lib/c-ares-1.31.0/src/lib/ares__addrinfo_localhost.c
similarity index 89%
rename from lib/c-ares-1.30.0/src/lib/ares__addrinfo_localhost.c
rename to lib/c-ares-1.31.0/src/lib/ares__addrinfo_localhost.c
index baa9b37212b..89ad35d6ec3 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__addrinfo_localhost.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__addrinfo_localhost.c
@@ -37,11 +37,10 @@
 #  include <arpa/inet.h>
 #endif
 
-#if defined(_WIN32) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600
-#  include <ws2ipdef.h>
-#endif
-
 #if defined(USE_WINSOCK)
+#  if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600
+#    include <ws2ipdef.h>
+#  endif
 #  if defined(HAVE_IPHLPAPI_H)
 #    include <iphlpapi.h>
 #  endif
@@ -62,7 +61,7 @@ ares_status_t ares_append_ai_node(int aftype, unsigned short port,
 
   node = ares__append_addrinfo_node(nodes);
   if (!node) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   memset(node, 0, sizeof(*node));
@@ -70,7 +69,7 @@ ares_status_t ares_append_ai_node(int aftype, unsigned short port,
   if (aftype == AF_INET) {
     struct sockaddr_in *sin = ares_malloc(sizeof(*sin));
     if (!sin) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     memset(sin, 0, sizeof(*sin));
@@ -88,7 +87,7 @@ ares_status_t ares_append_ai_node(int aftype, unsigned short port,
   if (aftype == AF_INET6) {
     struct sockaddr_in6 *sin6 = ares_malloc(sizeof(*sin6));
     if (!sin6) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     memset(sin6, 0, sizeof(*sin6));
@@ -117,7 +116,7 @@ static ares_status_t
     ares_inet_pton(AF_INET6, "::1", &addr6);
     status = ares_append_ai_node(AF_INET6, port, 0, &addr6, nodes);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -126,7 +125,7 @@ static ares_status_t
     ares_inet_pton(AF_INET, "127.0.0.1", &addr4);
     status = ares_append_ai_node(AF_INET, port, 0, &addr4, nodes);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -137,7 +136,7 @@ static ares_status_t
   ares__system_loopback_addrs(int aftype, unsigned short port,
                               struct ares_addrinfo_node **nodes)
 {
-#if defined(_WIN32) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600 && \
+#if defined(USE_WINSOCK) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600 && \
   !defined(__WATCOMC__)
   PMIB_UNICASTIPADDRESS_TABLE table;
   unsigned int                i;
@@ -209,13 +208,13 @@ ares_status_t ares__addrinfo_localhost(const char *name, unsigned short port,
     case AF_INET6:
     case AF_UNSPEC:
       break;
-    default:
-      return ARES_EBADFAMILY;
+    default: /* LCOV_EXCL_LINE: DefensiveCoding */
+      return ARES_EBADFAMILY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ai->name = ares_strdup(name);
   if (!ai->name) {
-    goto enomem;
+    goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__system_loopback_addrs(hints->ai_family, port, &nodes);
@@ -228,9 +227,11 @@ ares_status_t ares__addrinfo_localhost(const char *name, unsigned short port,
 
   return status;
 
+/* LCOV_EXCL_START: OutOfMemory */
 enomem:
   ares__freeaddrinfo_nodes(nodes);
   ares_free(ai->name);
   ai->name = NULL;
   return ARES_ENOMEM;
+/* LCOV_EXCL_STOP */
 }
diff --git a/lib/c-ares-1.30.0/src/lib/ares__buf.c b/lib/c-ares-1.31.0/src/lib/ares__buf.c
similarity index 92%
rename from lib/c-ares-1.30.0/src/lib/ares__buf.c
rename to lib/c-ares-1.31.0/src/lib/ares__buf.c
index 2203662fab5..4388a7d8918 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__buf.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__buf.c
@@ -87,7 +87,7 @@ void ares__buf_destroy(ares__buf_t *buf)
 static ares_bool_t ares__buf_is_const(const ares__buf_t *buf)
 {
   if (buf == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (buf->data != NULL && buf->alloc_buf == NULL) {
@@ -107,7 +107,7 @@ void ares__buf_reclaim(ares__buf_t *buf)
   }
 
   if (ares__buf_is_const(buf)) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Silence coverity.  All lengths are zero so would bail out later but
@@ -135,8 +135,6 @@ void ares__buf_reclaim(ares__buf_t *buf)
   if (buf->tag_offset != SIZE_MAX) {
     buf->tag_offset -= prefix_size;
   }
-
-  return;
 }
 
 static ares_status_t ares__buf_ensure_space(ares__buf_t *buf,
@@ -151,7 +149,7 @@ static ares_status_t ares__buf_ensure_space(ares__buf_t *buf,
   }
 
   if (ares__buf_is_const(buf)) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* When calling ares__buf_finish_str() we end up adding a null terminator,
@@ -201,11 +199,11 @@ static ares_status_t ares__buf_ensure_space(ares__buf_t *buf,
 ares_status_t ares__buf_set_length(ares__buf_t *buf, size_t len)
 {
   if (buf == NULL || ares__buf_is_const(buf)) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (len >= buf->alloc_buf_len - buf->offset) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   buf->data_len = len;
@@ -231,9 +229,9 @@ ares_status_t ares__buf_append(ares__buf_t *buf, const unsigned char *data,
   return ARES_SUCCESS;
 }
 
-ares_status_t ares__buf_append_byte(ares__buf_t *buf, unsigned char byte)
+ares_status_t ares__buf_append_byte(ares__buf_t *buf, unsigned char b)
 {
-  return ares__buf_append(buf, &byte, 1);
+  return ares__buf_append(buf, &b, 1);
 }
 
 ares_status_t ares__buf_append_be16(ares__buf_t *buf, unsigned short u16)
@@ -242,12 +240,12 @@ ares_status_t ares__buf_append_be16(ares__buf_t *buf, unsigned short u16)
 
   status = ares__buf_append_byte(buf, (unsigned char)((u16 >> 8) & 0xff));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__buf_append_byte(buf, (unsigned char)(u16 & 0xff));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
@@ -259,22 +257,22 @@ ares_status_t ares__buf_append_be32(ares__buf_t *buf, unsigned int u32)
 
   status = ares__buf_append_byte(buf, ((unsigned char)(u32 >> 24) & 0xff));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__buf_append_byte(buf, ((unsigned char)(u32 >> 16) & 0xff));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__buf_append_byte(buf, ((unsigned char)(u32 >> 8) & 0xff));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__buf_append_byte(buf, ((unsigned char)u32 & 0xff));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
@@ -319,7 +317,7 @@ unsigned char *ares__buf_finish_bin(ares__buf_t *buf, size_t *len)
   /* We don't want to return NULL except on failure, may be zero-length */
   if (buf->alloc_buf == NULL &&
       ares__buf_ensure_space(buf, 1) != ARES_SUCCESS) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
   ptr  = buf->alloc_buf;
   *len = buf->data_len;
@@ -540,7 +538,7 @@ ares_status_t ares__buf_fetch_bytes_dup(ares__buf_t *buf, size_t len,
 
   *bytes = ares_malloc(null_term ? len + 1 : len);
   if (*bytes == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   memcpy(*bytes, ptr, len);
@@ -561,7 +559,7 @@ ares_status_t ares__buf_fetch_str_dup(ares__buf_t *buf, size_t len, char **str)
 
   *str = ares_malloc(len + 1);
   if (*str == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   memcpy(*str, ptr, len);
@@ -787,7 +785,7 @@ ares_status_t ares__buf_split(ares__buf_t *buf, const unsigned char *delims,
   ares_bool_t   first  = ARES_TRUE;
 
   if (buf == NULL || delims == NULL || delims_len == 0 || list == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *list = ares__llist_create(ares__buf_destroy_cb);
@@ -825,7 +823,7 @@ ares_status_t ares__buf_split(ares__buf_t *buf, const unsigned char *delims,
 
     /* Shouldn't be possible */
     if (ptr == NULL) {
-      status = ARES_EFORMERR;
+      status = ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
       goto done;
     }
 
@@ -934,7 +932,7 @@ ares_status_t ares__buf_set_position(ares__buf_t *buf, size_t idx)
   }
 
   if (idx > buf->data_len) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   buf->offset = idx;
@@ -966,7 +964,7 @@ static ares_status_t ares__buf_parse_dns_binstr_int(
   while (orig_len - ares__buf_len(buf) < remaining_len) {
     status = ares__buf_fetch_bytes(buf, &len, 1);
     if (status != ARES_SUCCESS) {
-      break;
+      break; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (len) {
@@ -1049,13 +1047,13 @@ ares_status_t ares__buf_append_num_dec(ares__buf_t *buf, size_t num, size_t len)
 
     /* Silence coverity.  Shouldn't be possible since we calculate it above */
     if (mod == 0) {
-      return ARES_EFORMERR;
+      return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     digit  /= mod;
     status  = ares__buf_append_byte(buf, '0' + (unsigned char)(digit & 0xFF));
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
   return ARES_SUCCESS;
@@ -1074,7 +1072,7 @@ ares_status_t ares__buf_append_num_hex(ares__buf_t *buf, size_t num, size_t len)
     ares_status_t status;
     status = ares__buf_append_byte(buf, hexbytes[(num >> ((i - 1) * 4)) & 0xF]);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
   return ARES_SUCCESS;
@@ -1095,13 +1093,13 @@ static ares_status_t ares__buf_hexdump_line(ares__buf_t *buf, size_t idx,
   /* Address */
   status = ares__buf_append_num_hex(buf, idx, 6);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* | */
   status = ares__buf_append_str(buf, " | ");
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (i = 0; i < 16; i++) {
@@ -1111,19 +1109,19 @@ static ares_status_t ares__buf_hexdump_line(ares__buf_t *buf, size_t idx,
       status = ares__buf_append_num_hex(buf, data[i], 2);
     }
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     status = ares__buf_append_byte(buf, ' ');
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   /* | */
   status = ares__buf_append_str(buf, " | ");
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (i = 0; i < 16; i++) {
@@ -1132,7 +1130,7 @@ static ares_status_t ares__buf_hexdump_line(ares__buf_t *buf, size_t idx,
     }
     status = ares__buf_append_byte(buf, ares__isprint(data[i]) ? data[i] : '.');
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -1149,7 +1147,7 @@ ares_status_t ares__buf_hexdump(ares__buf_t *buf, const unsigned char *data,
     ares_status_t status;
     status = ares__buf_hexdump_line(buf, i, data + i, len - i);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -1166,7 +1164,7 @@ ares_status_t ares__buf_load_file(const char *filename, ares__buf_t *buf)
   ares_status_t  status;
 
   if (filename == NULL || buf == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   fp = fopen(filename, "rb");
@@ -1188,39 +1186,39 @@ ares_status_t ares__buf_load_file(const char *filename, ares__buf_t *buf)
 
   /* Get length portably, fstat() is POSIX, not C */
   if (fseek(fp, 0, SEEK_END) != 0) {
-    status = ARES_EFILE;
-    goto done;
+    status = ARES_EFILE; /* LCOV_EXCL_LINE: DefensiveCoding */
+    goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ftell_len = ftell(fp);
   if (ftell_len < 0) {
-    status = ARES_EFILE;
-    goto done;
+    status = ARES_EFILE; /* LCOV_EXCL_LINE: DefensiveCoding */
+    goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   len = (size_t)ftell_len;
 
   if (fseek(fp, 0, SEEK_SET) != 0) {
-    status = ARES_EFILE;
-    goto done;
+    status = ARES_EFILE; /* LCOV_EXCL_LINE: DefensiveCoding */
+    goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (len == 0) {
-    status = ARES_SUCCESS;
-    goto done;
+    status = ARES_SUCCESS; /* LCOV_EXCL_LINE: DefensiveCoding */
+    goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Read entire data into buffer */
   ptr_len = len;
   ptr     = ares__buf_append_start(buf, &ptr_len);
   if (ptr == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   ptr_len = fread(ptr, 1, len, fp);
   if (ptr_len != len) {
-    status = ARES_EFILE;
-    goto done;
+    status = ARES_EFILE; /* LCOV_EXCL_LINE: DefensiveCoding */
+    goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__buf_append_finish(buf, len);
diff --git a/lib/c-ares-1.30.0/src/lib/ares__buf.h b/lib/c-ares-1.31.0/src/lib/ares__buf.h
similarity index 99%
rename from lib/c-ares-1.30.0/src/lib/ares__buf.h
rename to lib/c-ares-1.31.0/src/lib/ares__buf.h
index 4298814f7b4..a9af6431e0f 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__buf.h
+++ b/lib/c-ares-1.31.0/src/lib/ares__buf.h
@@ -85,10 +85,10 @@ ares_status_t  ares__buf_append(ares__buf_t *buf, const unsigned char *data,
 /*! Append a single byte to the dynamic buffer object
  *
  *  \param[in] buf      Initialized buffer object
- *  \param[in] byte     Single byte to append to buffer object.
+ *  \param[in] b        Single byte to append to buffer object.
  *  \return ARES_SUCCESS or one of the c-ares error codes
  */
-ares_status_t  ares__buf_append_byte(ares__buf_t *buf, unsigned char byte);
+ares_status_t  ares__buf_append_byte(ares__buf_t *buf, unsigned char b);
 
 /*! Append a null-terminated string to the dynamic buffer object
  *
diff --git a/lib/c-ares-1.30.0/src/lib/ares__close_sockets.c b/lib/c-ares-1.31.0/src/lib/ares__close_sockets.c
similarity index 98%
rename from lib/c-ares-1.30.0/src/lib/ares__close_sockets.c
rename to lib/c-ares-1.31.0/src/lib/ares__close_sockets.c
index 03ba4abf89f..06537a5de75 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__close_sockets.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__close_sockets.c
@@ -85,7 +85,7 @@ void ares__check_cleanup_conn(const ares_channel_t     *channel,
   ares_bool_t do_cleanup = ARES_FALSE;
 
   if (channel == NULL || conn == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (ares__llist_len(conn->queries_to_conn)) {
diff --git a/lib/c-ares-1.30.0/src/lib/ares__hosts_file.c b/lib/c-ares-1.31.0/src/lib/ares__hosts_file.c
similarity index 91%
rename from lib/c-ares-1.30.0/src/lib/ares__hosts_file.c
rename to lib/c-ares-1.31.0/src/lib/ares__hosts_file.c
index e279623de37..0f287576658 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__hosts_file.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__hosts_file.c
@@ -105,7 +105,7 @@ const void *ares_dns_pton(const char *ipaddr, struct ares_addr *addr,
   size_t      ptr_len = 0;
 
   if (ipaddr == NULL || addr == NULL || out_len == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *out_len = 0;
@@ -150,7 +150,7 @@ static ares_bool_t ares__normalize_ipaddr(const char *ipaddr, char *out,
   }
 
   if (!ares_inet_ntop(data.family, addr, out, (ares_socklen_t)out_len)) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   return ARES_TRUE;
@@ -315,8 +315,8 @@ static ares_status_t ares__hosts_file_add(ares_hosts_file_t  *hosts,
   if (matchtype != ARES_MATCH_NONE) {
     status = ares__hosts_file_merge_entry(hosts, match, entry, matchtype);
     if (status != ARES_SUCCESS) {
-      ares__hosts_entry_destroy(entry);
-      return status;
+      ares__hosts_entry_destroy(entry); /* LCOV_EXCL_LINE: DefensiveCoding */
+      return status; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
     /* entry was invalidated above by merging */
     entry = match;
@@ -617,7 +617,7 @@ static ares_bool_t ares__hosts_expired(const char              *filename,
 
   /* Expire every 60s if we can't get a time */
   if (mod_ts == 0) {
-    mod_ts = time(NULL) - 60;
+    mod_ts = time(NULL) - 60; /* LCOV_EXCL_LINE: only on systems without stat() */
   }
 
   /* If filenames are different, its expired */
@@ -642,7 +642,7 @@ static ares_status_t ares__hosts_path(const ares_channel_t *channel,
   if (channel->hosts_path) {
     path_hosts = ares_strdup(channel->hosts_path);
     if (!path_hosts) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -653,12 +653,12 @@ static ares_status_t ares__hosts_path(const ares_channel_t *channel,
 
     path_hosts = ares_strdup(getenv("CARES_HOSTS"));
     if (!path_hosts) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   if (!path_hosts) {
-#ifdef WIN32
+#if defined(USE_WINSOCK)
     char  PATH_HOSTS[MAX_PATH] = "";
     char  tmp[MAX_PATH];
     HKEY  hkeyHosts;
@@ -728,7 +728,7 @@ ares_status_t ares__hosts_search_ipaddr(ares_channel_t *channel,
   }
 
   if (channel->hf == NULL) {
-    return ARES_ENOTFOUND;
+    return ARES_ENOTFOUND; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (!ares__normalize_ipaddr(ipaddr, addr, sizeof(addr))) {
@@ -757,7 +757,7 @@ ares_status_t ares__hosts_search_host(ares_channel_t *channel,
   }
 
   if (channel->hf == NULL) {
-    return ARES_ENOTFOUND;
+    return ARES_ENOTFOUND; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *entry = ares__htable_strvp_get_direct(channel->hf->hosthash, host);
@@ -778,8 +778,8 @@ ares_status_t ares__hosts_entry_to_hostent(const ares_hosts_entry_t *entry,
 
   *hostent = ares_malloc_zero(sizeof(**hostent));
   if (*hostent == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   (*hostent)->h_addrtype = (HOSTENT_ADDRTYPE_TYPE)family;
@@ -813,16 +813,16 @@ ares_status_t ares__hosts_entry_to_hostent(const ares_hosts_entry_t *entry,
                              (idx + 1) * sizeof(*(*hostent)->h_addr_list),
                              (idx + 2) * sizeof(*(*hostent)->h_addr_list));
     if (temp == NULL) {
-      status = ARES_ENOMEM;
-      goto fail;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     (*hostent)->h_addr_list = temp;
 
     (*hostent)->h_addr_list[idx] = ares_malloc(ptr_len);
     if ((*hostent)->h_addr_list[idx] == NULL) {
-      status = ARES_ENOMEM;
-      goto fail;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     memcpy((*hostent)->h_addr_list[idx], ptr, ptr_len);
@@ -839,8 +839,8 @@ ares_status_t ares__hosts_entry_to_hostent(const ares_hosts_entry_t *entry,
   /* Copy main hostname */
   (*hostent)->h_name = ares_strdup(ares__llist_first_val(entry->hosts));
   if ((*hostent)->h_name == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Copy aliases */
@@ -849,14 +849,14 @@ ares_status_t ares__hosts_entry_to_hostent(const ares_hosts_entry_t *entry,
   /* Cap at 100, some people use https://github.com/StevenBlack/hosts and we
    * don't need 200k+ aliases */
   if (naliases > 100) {
-    naliases = 100;
+    naliases = 100; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   (*hostent)->h_aliases =
     ares_malloc_zero((naliases + 1) * sizeof(*(*hostent)->h_aliases));
   if ((*hostent)->h_aliases == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Copy all entries to the alias except the first */
@@ -866,8 +866,8 @@ ares_status_t ares__hosts_entry_to_hostent(const ares_hosts_entry_t *entry,
   while (node != NULL) {
     (*hostent)->h_aliases[idx] = ares_strdup(ares__llist_node_val(node));
     if ((*hostent)->h_aliases[idx] == NULL) {
-      status = ARES_ENOMEM;
-      goto fail;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     idx++;
 
@@ -880,10 +880,12 @@ ares_status_t ares__hosts_entry_to_hostent(const ares_hosts_entry_t *entry,
 
   return ARES_SUCCESS;
 
+/* LCOV_EXCL_START: defensive coding */
 fail:
   ares_free_hostent(*hostent);
   *hostent = NULL;
   return status;
+/* LCOV_EXCL_STOP */
 }
 
 static ares_status_t
@@ -909,25 +911,25 @@ static ares_status_t
      * https://github.com/StevenBlack/hosts and we don't need 200k+ aliases */
     cnt++;
     if (cnt > 100) {
-      break;
+      break; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     cname = ares__append_addrinfo_cname(&cnames);
     if (cname == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     cname->alias = ares_strdup(host);
     if (cname->alias == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     cname->name = ares_strdup(primaryhost);
     if (cname->name == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     node = ares__llist_node_next(node);
@@ -937,22 +939,22 @@ static ares_status_t
   if (cnames == NULL) {
     cname = ares__append_addrinfo_cname(&cnames);
     if (cname == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     cname->name = ares_strdup(primaryhost);
     if (cname->name == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
   status = ARES_SUCCESS;
 
 done:
   if (status != ARES_SUCCESS) {
-    ares__freeaddrinfo_cnames(cnames);
-    return status;
+    ares__freeaddrinfo_cnames(cnames); /* LCOV_EXCL_LINE: DefensiveCoding */
+    return status; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *cnames_out = cnames;
@@ -975,14 +977,14 @@ ares_status_t ares__hosts_entry_to_addrinfo(const ares_hosts_entry_t *entry,
     case AF_INET6:
     case AF_UNSPEC:
       break;
-    default:
-      return ARES_EBADFAMILY;
+    default: /* LCOV_EXCL_LINE: DefensiveCoding */
+      return ARES_EBADFAMILY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ai->name = ares_strdup(name);
   if (ai->name == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (node = ares__llist_node_first(entry->ips); node != NULL;
@@ -1002,14 +1004,14 @@ ares_status_t ares__hosts_entry_to_addrinfo(const ares_hosts_entry_t *entry,
 
     status = ares_append_ai_node(addr.family, port, 0, ptr, &ainodes);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
   }
 
   if (want_cnames) {
     status = ares__hosts_ai_append_cnames(entry, &cnames);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
   }
 
@@ -1017,11 +1019,13 @@ ares_status_t ares__hosts_entry_to_addrinfo(const ares_hosts_entry_t *entry,
 
 done:
   if (status != ARES_SUCCESS) {
+    /* LCOV_EXCL_START: defensive coding */
     ares__freeaddrinfo_cnames(cnames);
     ares__freeaddrinfo_nodes(ainodes);
     ares_free(ai->name);
     ai->name = NULL;
     return status;
+    /* LCOV_EXCL_STOP */
   }
   ares__addrinfo_cat_cnames(&ai->cnames, cnames);
   ares__addrinfo_cat_nodes(&ai->nodes, ainodes);
diff --git a/lib/c-ares-1.30.0/src/lib/ares__htable.c b/lib/c-ares-1.31.0/src/lib/ares__htable.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares__htable.c
rename to lib/c-ares-1.31.0/src/lib/ares__htable.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares__htable.h b/lib/c-ares-1.31.0/src/lib/ares__htable.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares__htable.h
rename to lib/c-ares-1.31.0/src/lib/ares__htable.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares__htable_asvp.c b/lib/c-ares-1.31.0/src/lib/ares__htable_asvp.c
similarity index 94%
rename from lib/c-ares-1.30.0/src/lib/ares__htable_asvp.c
rename to lib/c-ares-1.31.0/src/lib/ares__htable_asvp.c
index 3c1d2a336fa..42951712934 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__htable_asvp.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__htable_asvp.c
@@ -121,7 +121,7 @@ ares_socket_t *ares__htable_asvp_keys(const ares__htable_asvp_t *htable,
   size_t         i;
 
   if (htable == NULL || num == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *num = 0;
@@ -133,8 +133,8 @@ ares_socket_t *ares__htable_asvp_keys(const ares__htable_asvp_t *htable,
 
   out = ares_malloc_zero(sizeof(*out) * cnt);
   if (out == NULL) {
-    ares_free(buckets);
-    return NULL;
+    ares_free(buckets); /* LCOV_EXCL_LINE: OutOfMemory */
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (i = 0; i < cnt; i++) {
@@ -157,7 +157,7 @@ ares_bool_t ares__htable_asvp_insert(ares__htable_asvp_t *htable,
 
   bucket = ares_malloc(sizeof(*bucket));
   if (bucket == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   bucket->parent = htable;
@@ -165,14 +165,14 @@ ares_bool_t ares__htable_asvp_insert(ares__htable_asvp_t *htable,
   bucket->val    = val;
 
   if (!ares__htable_insert(htable->hash, bucket)) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_TRUE;
 
 fail:
   if (bucket) {
-    ares_free(bucket);
+    ares_free(bucket); /* LCOV_EXCL_LINE: OutOfMemory */
   }
   return ARES_FALSE;
 }
diff --git a/lib/c-ares-1.30.0/src/lib/ares__htable_asvp.h b/lib/c-ares-1.31.0/src/lib/ares__htable_asvp.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares__htable_asvp.h
rename to lib/c-ares-1.31.0/src/lib/ares__htable_asvp.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares__htable_strvp.c b/lib/c-ares-1.31.0/src/lib/ares__htable_strvp.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares__htable_strvp.c
rename to lib/c-ares-1.31.0/src/lib/ares__htable_strvp.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares__htable_strvp.h b/lib/c-ares-1.31.0/src/lib/ares__htable_strvp.h
similarity index 99%
rename from lib/c-ares-1.30.0/src/lib/ares__htable_strvp.h
rename to lib/c-ares-1.31.0/src/lib/ares__htable_strvp.h
index 25dd2b90777..878c71869a9 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__htable_strvp.h
+++ b/lib/c-ares-1.31.0/src/lib/ares__htable_strvp.h
@@ -115,4 +115,4 @@ size_t      ares__htable_strvp_num_keys(const ares__htable_strvp_t *htable);
 
 /*! @} */
 
-#endif /* __ARES__HTABLE_STVP_H */
+#endif /* __ARES__HTABLE_STRVP_H */
diff --git a/lib/c-ares-1.30.0/src/lib/ares__htable_szvp.c b/lib/c-ares-1.31.0/src/lib/ares__htable_szvp.c
similarity index 96%
rename from lib/c-ares-1.30.0/src/lib/ares__htable_szvp.c
rename to lib/c-ares-1.31.0/src/lib/ares__htable_szvp.c
index 2ff64784bcd..33d8ed3a8df 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__htable_szvp.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__htable_szvp.c
@@ -123,7 +123,7 @@ ares_bool_t ares__htable_szvp_insert(ares__htable_szvp_t *htable, size_t key,
 
   bucket = ares_malloc(sizeof(*bucket));
   if (bucket == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   bucket->parent = htable;
@@ -131,14 +131,14 @@ ares_bool_t ares__htable_szvp_insert(ares__htable_szvp_t *htable, size_t key,
   bucket->val    = val;
 
   if (!ares__htable_insert(htable->hash, bucket)) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_TRUE;
 
 fail:
   if (bucket) {
-    ares_free(bucket);
+    ares_free(bucket); /* LCOV_EXCL_LINE: OutOfMemory */
   }
   return ARES_FALSE;
 }
diff --git a/lib/c-ares-1.30.0/src/lib/ares__htable_szvp.h b/lib/c-ares-1.31.0/src/lib/ares__htable_szvp.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares__htable_szvp.h
rename to lib/c-ares-1.31.0/src/lib/ares__htable_szvp.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares__htable_vpvp.c b/lib/c-ares-1.31.0/src/lib/ares__htable_vpvp.c
similarity index 95%
rename from lib/c-ares-1.30.0/src/lib/ares__htable_vpvp.c
rename to lib/c-ares-1.31.0/src/lib/ares__htable_vpvp.c
index 3558fa5a9b7..e0c009a6401 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__htable_vpvp.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__htable_vpvp.c
@@ -44,7 +44,7 @@ typedef struct {
 void ares__htable_vpvp_destroy(ares__htable_vpvp_t *htable)
 {
   if (htable == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__htable_destroy(htable->hash);
@@ -93,13 +93,13 @@ ares__htable_vpvp_t *
 {
   ares__htable_vpvp_t *htable = ares_malloc(sizeof(*htable));
   if (htable == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   htable->hash =
     ares__htable_create(hash_func, bucket_key, bucket_free, key_eq);
   if (htable->hash == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   htable->free_key = key_free;
@@ -107,12 +107,14 @@ ares__htable_vpvp_t *
 
   return htable;
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   if (htable) {
     ares__htable_destroy(htable->hash);
     ares_free(htable);
   }
   return NULL;
+/* LCOV_EXCL_STOP */
 }
 
 ares_bool_t ares__htable_vpvp_insert(ares__htable_vpvp_t *htable, void *key,
diff --git a/lib/c-ares-1.30.0/src/lib/ares__htable_vpvp.h b/lib/c-ares-1.31.0/src/lib/ares__htable_vpvp.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares__htable_vpvp.h
rename to lib/c-ares-1.31.0/src/lib/ares__htable_vpvp.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares__iface_ips.c b/lib/c-ares-1.31.0/src/lib/ares__iface_ips.c
similarity index 95%
rename from lib/c-ares-1.30.0/src/lib/ares__iface_ips.c
rename to lib/c-ares-1.31.0/src/lib/ares__iface_ips.c
index b252a7ab492..bc120c70393 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__iface_ips.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__iface_ips.c
@@ -81,15 +81,15 @@ static ares__iface_ips_t *ares__iface_ips_alloc(ares__iface_ip_flags_t flags)
 {
   ares__iface_ips_t *ips = ares_malloc_zero(sizeof(*ips));
   if (ips == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Prealloc 4 entries */
   ips->alloc_size = 4;
   ips->ips        = ares_malloc_zero(ips->alloc_size * sizeof(*ips->ips));
   if (ips->ips == NULL) {
-    ares_free(ips);
-    return NULL;
+    ares_free(ips); /* LCOV_EXCL_LINE: OutOfMemory */
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
   ips->enum_flags = flags;
   return ips;
@@ -98,7 +98,7 @@ static ares__iface_ips_t *ares__iface_ips_alloc(ares__iface_ip_flags_t flags)
 static void ares__iface_ip_destroy(ares__iface_ip_t *ip)
 {
   if (ip == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   ares_free(ip->name);
   memset(ip, 0, sizeof(*ip));
@@ -130,14 +130,16 @@ ares_status_t ares__iface_ips(ares__iface_ips_t    **ips,
 
   *ips = ares__iface_ips_alloc(flags);
   if (*ips == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__iface_ips_enumerate(*ips, name);
   if (status != ARES_SUCCESS) {
+    /* LCOV_EXCL_START: UntestablePath */
     ares__iface_ips_destroy(*ips);
     *ips = NULL;
     return status;
+    /* LCOV_EXCL_STOP */
   }
 
   return ARES_SUCCESS;
@@ -151,7 +153,7 @@ static ares_status_t
   size_t idx;
 
   if (ips == NULL || name == NULL || addr == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Don't want loopback */
@@ -204,7 +206,7 @@ static ares_status_t
     temp = ares_realloc_zero(ips->ips, ips->alloc_size * sizeof(*ips->ips),
                              alloc_size * sizeof(*ips->ips));
     if (temp == NULL) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     ips->ips        = temp;
     ips->alloc_size = alloc_size;
@@ -215,11 +217,13 @@ static ares_status_t
 
   ips->ips[idx].flags    = flags;
   ips->ips[idx].netmask  = netmask;
-  ips->ips[idx].ll_scope = ll_scope;
+  if (flags & ARES_IFACE_IP_LINKLOCAL) {
+    ips->ips[idx].ll_scope = ll_scope;
+  }
   memcpy(&ips->ips[idx].addr, addr, sizeof(*addr));
   ips->ips[idx].name = ares_strdup(name);
   if (ips->ips[idx].name == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
@@ -490,7 +494,7 @@ static ares_status_t ares__iface_ips_enumerate(ares__iface_ips_t *ips,
     }
 
     /* Name mismatch */
-    if (strcasecmp(ifa->ifa_name, name) != 0) {
+    if (name != NULL && strcasecmp(ifa->ifa_name, name) != 0) {
       continue;
     }
 
@@ -522,6 +526,8 @@ static ares_status_t ares__iface_ips_enumerate(ares__iface_ips_t *ips,
 unsigned int ares__if_nametoindex(const char *name)
 {
 #ifdef HAVE_IF_NAMETOINDEX
+  if (name == NULL)
+    return 0;
   return if_nametoindex(name);
 #else
   ares_status_t      status;
@@ -529,6 +535,9 @@ unsigned int ares__if_nametoindex(const char *name)
   size_t             i;
   unsigned int       index = 0;
 
+  if (name == NULL)
+    return 0;
+
   status =
     ares__iface_ips(&ips, ARES_IFACE_IP_V6 | ARES_IFACE_IP_LINKLOCAL, name);
   if (status != ARES_SUCCESS) {
@@ -562,7 +571,7 @@ const char *ares__if_indextoname(unsigned int index, char *name,
   size_t             i;
   const char        *ptr = NULL;
 
-  if (name_len < IF_NAMESIZE) {
+  if (name == NULL || name_len < IF_NAMESIZE) {
     goto done;
   }
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares__iface_ips.h b/lib/c-ares-1.31.0/src/lib/ares__iface_ips.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares__iface_ips.h
rename to lib/c-ares-1.31.0/src/lib/ares__iface_ips.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares__llist.c b/lib/c-ares-1.31.0/src/lib/ares__llist.c
similarity index 96%
rename from lib/c-ares-1.30.0/src/lib/ares__llist.c
rename to lib/c-ares-1.31.0/src/lib/ares__llist.c
index d175da2bd3b..a094889d687 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__llist.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__llist.c
@@ -77,7 +77,7 @@ static void ares__llist_attach_at(ares__llist_t            *list,
                                   ares__llist_node_t       *node)
 {
   if (list == NULL || node == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   node->parent = list;
@@ -127,7 +127,7 @@ static ares__llist_node_t *ares__llist_insert_at(ares__llist_t            *list,
   ares__llist_node_t *node = NULL;
 
   if (list == NULL || val == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   node = ares_malloc_zero(sizeof(*node));
@@ -250,7 +250,7 @@ static void ares__llist_node_detach(ares__llist_node_t *node)
   ares__llist_t *list;
 
   if (node == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   list = node->parent;
@@ -341,7 +341,7 @@ void ares__llist_node_move_parent_last(ares__llist_node_t *node,
                                        ares__llist_t      *new_parent)
 {
   if (node == NULL || new_parent == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__llist_node_detach(node);
@@ -352,7 +352,7 @@ void ares__llist_node_move_parent_first(ares__llist_node_t *node,
                                         ares__llist_t      *new_parent)
 {
   if (node == NULL || new_parent == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__llist_node_detach(node);
diff --git a/lib/c-ares-1.30.0/src/lib/ares__llist.h b/lib/c-ares-1.31.0/src/lib/ares__llist.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares__llist.h
rename to lib/c-ares-1.31.0/src/lib/ares__llist.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares__parse_into_addrinfo.c b/lib/c-ares-1.31.0/src/lib/ares__parse_into_addrinfo.c
similarity index 89%
rename from lib/c-ares-1.30.0/src/lib/ares__parse_into_addrinfo.c
rename to lib/c-ares-1.31.0/src/lib/ares__parse_into_addrinfo.c
index 90e951c02f3..e886585d06a 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__parse_into_addrinfo.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__parse_into_addrinfo.c
@@ -65,7 +65,7 @@ ares_status_t ares__parse_into_addrinfo(const ares_dns_record_t *dnsrec,
   /* Save question hostname */
   status = ares_dns_record_query_get(dnsrec, 0, &hostname, NULL, NULL);
   if (status != ARES_SUCCESS) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ancount = ares_dns_record_rr_cnt(dnsrec, ARES_SECTION_ANSWER);
@@ -107,19 +107,19 @@ ares_status_t ares__parse_into_addrinfo(const ares_dns_record_t *dnsrec,
 
       cname = ares__append_addrinfo_cname(&cnames);
       if (cname == NULL) {
-        status = ARES_ENOMEM;
-        goto done;
+        status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
       cname->ttl   = (int)ares_dns_rr_get_ttl(rr);
       cname->alias = ares_strdup(ares_dns_rr_get_name(rr));
       if (cname->alias == NULL) {
-        status = ARES_ENOMEM;
-        goto done;
+        status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
       cname->name = ares_strdup(hostname);
       if (cname->name == NULL) {
-        status = ARES_ENOMEM;
-        goto done;
+        status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     } else if (rtype == ARES_REC_TYPE_A) {
       got_a = ARES_TRUE;
@@ -127,7 +127,7 @@ ares_status_t ares__parse_into_addrinfo(const ares_dns_record_t *dnsrec,
         ares_append_ai_node(AF_INET, port, ares_dns_rr_get_ttl(rr),
                             ares_dns_rr_get_addr(rr, ARES_RR_A_ADDR), &nodes);
       if (status != ARES_SUCCESS) {
-        goto done;
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     } else if (rtype == ARES_REC_TYPE_AAAA) {
       got_aaaa = ARES_TRUE;
@@ -135,7 +135,7 @@ ares_status_t ares__parse_into_addrinfo(const ares_dns_record_t *dnsrec,
                                      ares_dns_rr_get_addr6(rr, ARES_RR_AAAA_ADDR),
                                      &nodes);
       if (status != ARES_SUCCESS) {
-        goto done;
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     } else {
       continue;
@@ -153,8 +153,8 @@ ares_status_t ares__parse_into_addrinfo(const ares_dns_record_t *dnsrec,
     ares_free(ai->name);
     ai->name = ares_strdup(hostname);
     if (ai->name == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares__slist.c b/lib/c-ares-1.31.0/src/lib/ares__slist.c
similarity index 97%
rename from lib/c-ares-1.30.0/src/lib/ares__slist.c
rename to lib/c-ares-1.31.0/src/lib/ares__slist.c
index 5b809843551..0c92b552ecb 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__slist.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__slist.c
@@ -206,7 +206,7 @@ ares__slist_node_t *ares__slist_insert(ares__slist_t *list, void *val)
   node = ares_malloc_zero(sizeof(*node));
 
   if (node == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   node->data   = val;
@@ -218,12 +218,12 @@ ares__slist_node_t *ares__slist_insert(ares__slist_t *list, void *val)
   /* Allocate array of next and prev nodes for linking each level */
   node->next = ares_malloc_zero(sizeof(*node->next) * node->levels);
   if (node->next == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   node->prev = ares_malloc_zero(sizeof(*node->prev) * node->levels);
   if (node->prev == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* If the number of levels is greater than we currently support in the slist,
@@ -233,7 +233,7 @@ ares__slist_node_t *ares__slist_insert(ares__slist_t *list, void *val)
       ares_realloc_zero(list->head, sizeof(*list->head) * list->levels,
                         sizeof(*list->head) * node->levels);
     if (ptr == NULL) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     list->head   = ptr;
@@ -246,6 +246,7 @@ ares__slist_node_t *ares__slist_insert(ares__slist_t *list, void *val)
 
   return node;
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   if (node) {
     ares_free(node->prev);
@@ -253,6 +254,7 @@ ares__slist_node_t *ares__slist_insert(ares__slist_t *list, void *val)
     ares_free(node);
   }
   return NULL;
+/* LCOV_EXCL_STOP */
 }
 
 static void ares__slist_node_pop(ares__slist_node_t *node)
diff --git a/lib/c-ares-1.30.0/src/lib/ares__slist.h b/lib/c-ares-1.31.0/src/lib/ares__slist.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares__slist.h
rename to lib/c-ares-1.31.0/src/lib/ares__slist.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares__socket.c b/lib/c-ares-1.31.0/src/lib/ares__socket.c
similarity index 95%
rename from lib/c-ares-1.30.0/src/lib/ares__socket.c
rename to lib/c-ares-1.31.0/src/lib/ares__socket.c
index d3990e7660e..7c19574e9f7 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__socket.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__socket.c
@@ -145,7 +145,7 @@ static int setsocknonblock(ares_socket_t sockfd, /* operate on this */
 #endif
 }
 
-#if defined(IPV6_V6ONLY) && defined(WIN32)
+#if defined(IPV6_V6ONLY) && defined(USE_WINSOCK)
 /* It makes support for IPv4-mapped IPv6 addresses.
  * Linux kernel, NetBSD, FreeBSD and Darwin: default is off;
  * Windows Vista and later: default is on;
@@ -191,14 +191,14 @@ static int configure_socket(ares_socket_t s, struct server_state *server)
       setsockopt(s, SOL_SOCKET, SO_SNDBUF,
                  (void *)&channel->socket_send_buffer_size,
                  sizeof(channel->socket_send_buffer_size)) == -1) {
-    return -1;
+    return -1; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   if ((channel->socket_receive_buffer_size > 0) &&
       setsockopt(s, SOL_SOCKET, SO_RCVBUF,
                  (void *)&channel->socket_receive_buffer_size,
                  sizeof(channel->socket_receive_buffer_size)) == -1) {
-    return -1;
+    return -1; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
 #ifdef SO_BINDTODEVICE
@@ -304,8 +304,8 @@ ares_status_t ares__open_connection(ares_channel_t      *channel,
     if ((!channel->sock_funcs || !channel->sock_funcs->asocket) &&
         setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (void *)&opt, sizeof(opt)) ==
           -1) {
-      ares__close_socket(channel, s);
-      return ARES_ECONNREFUSED;
+      ares__close_socket(channel, s); /* LCOV_EXCL_LINE: UntestablePath */
+      return ARES_ECONNREFUSED; /* LCOV_EXCL_LINE: UntestablePath */
     }
   }
 #endif
@@ -338,8 +338,8 @@ ares_status_t ares__open_connection(ares_channel_t      *channel,
 
   conn = ares_malloc(sizeof(*conn));
   if (conn == NULL) {
-    ares__close_socket(channel, s);
-    return ARES_ENOMEM;
+    ares__close_socket(channel, s); /* LCOV_EXCL_LINE: OutOfMemory */
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
   memset(conn, 0, sizeof(*conn));
   conn->fd              = s;
@@ -347,9 +347,11 @@ ares_status_t ares__open_connection(ares_channel_t      *channel,
   conn->queries_to_conn = ares__llist_create(NULL);
   conn->is_tcp          = is_tcp;
   if (conn->queries_to_conn == NULL) {
+    /* LCOV_EXCL_START: OutOfMemory */
     ares__close_socket(channel, s);
     ares_free(conn);
     return ARES_ENOMEM;
+    /* LCOV_EXCL_STOP */
   }
 
   /* TCP connections are thrown to the end as we don't spawn multiple TCP
@@ -361,20 +363,24 @@ ares_status_t ares__open_connection(ares_channel_t      *channel,
     node = ares__llist_insert_first(server->connections, conn);
   }
   if (node == NULL) {
+    /* LCOV_EXCL_START: OutOfMemory */
     ares__close_socket(channel, s);
     ares__llist_destroy(conn->queries_to_conn);
     ares_free(conn);
     return ARES_ENOMEM;
+    /* LCOV_EXCL_STOP */
   }
 
   /* Register globally to quickly map event on file descriptor to connection
    * node object */
   if (!ares__htable_asvp_insert(channel->connnode_by_socket, s, node)) {
+    /* LCOV_EXCL_START: OutOfMemory */
     ares__close_socket(channel, s);
     ares__llist_destroy(conn->queries_to_conn);
     ares__llist_node_claim(node);
     ares_free(conn);
     return ARES_ENOMEM;
+    /* LCOV_EXCL_STOP */
   }
 
   SOCK_STATE_CALLBACK(channel, s, 1, 0);
diff --git a/lib/c-ares-1.30.0/src/lib/ares__sortaddrinfo.c b/lib/c-ares-1.31.0/src/lib/ares__sortaddrinfo.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares__sortaddrinfo.c
rename to lib/c-ares-1.31.0/src/lib/ares__sortaddrinfo.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares__threads.c b/lib/c-ares-1.31.0/src/lib/ares__threads.c
similarity index 96%
rename from lib/c-ares-1.30.0/src/lib/ares__threads.c
rename to lib/c-ares-1.31.0/src/lib/ares__threads.c
index 53c81d41b28..efa0e09ef27 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__threads.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__threads.c
@@ -226,25 +226,27 @@ ares__thread_mutex_t *ares__thread_mutex_create(void)
   }
 
   if (pthread_mutexattr_init(&attr) != 0) {
-    ares_free(mut);
-    return NULL;
+    ares_free(mut); /* LCOV_EXCL_LINE: UntestablePath */
+    return NULL; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   if (pthread_mutex_init(&mut->mutex, &attr) != 0) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   pthread_mutexattr_destroy(&attr);
   return mut;
 
+/* LCOV_EXCL_START: UntestablePath */
 fail:
   pthread_mutexattr_destroy(&attr);
   ares_free(mut);
   return NULL;
+/* LCOV_EXCL_STOP */
 }
 
 void ares__thread_mutex_destroy(ares__thread_mutex_t *mut)
@@ -379,11 +381,11 @@ ares_status_t ares__thread_create(ares__thread_t    **thread,
 
   thr = ares_malloc_zero(sizeof(*thr));
   if (thr == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
   if (pthread_create(&thr->thread, NULL, func, arg) != 0) {
-    ares_free(thr);
-    return ARES_ESERVFAIL;
+    ares_free(thr); /* LCOV_EXCL_LINE: UntestablePath */
+    return ARES_ESERVFAIL; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   *thread = thr;
diff --git a/lib/c-ares-1.30.0/src/lib/ares__threads.h b/lib/c-ares-1.31.0/src/lib/ares__threads.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares__threads.h
rename to lib/c-ares-1.31.0/src/lib/ares__threads.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares__timeval.c b/lib/c-ares-1.31.0/src/lib/ares__timeval.c
similarity index 96%
rename from lib/c-ares-1.30.0/src/lib/ares__timeval.c
rename to lib/c-ares-1.31.0/src/lib/ares__timeval.c
index fae5ad7e871..a41c70631bb 100644
--- a/lib/c-ares-1.30.0/src/lib/ares__timeval.c
+++ b/lib/c-ares-1.31.0/src/lib/ares__timeval.c
@@ -28,7 +28,7 @@
 #include "ares.h"
 #include "ares_private.h"
 
-#if defined(WIN32) && !defined(MSDOS)
+#if defined(_WIN32) && !defined(MSDOS)
 
 ares_timeval_t ares__tvnow(void)
 {
@@ -57,10 +57,12 @@ ares_timeval_t ares__tvnow(void)
     now.sec  = (ares_int64_t)tsnow.tv_sec;
     now.usec = (unsigned int)(tsnow.tv_nsec / 1000);
   } else {
+    /* LCOV_EXCL_START: FallbackCode */
     struct timeval tv;
     (void)gettimeofday(&tv, NULL);
     now.sec  = (ares_int64_t)tv.tv_sec;
     now.usec = (unsigned int)tv.tv_usec;
+    /* LCOV_EXCL_STOP */
   }
   return now;
 }
diff --git a/lib/c-ares-1.30.0/src/lib/ares_android.c b/lib/c-ares-1.31.0/src/lib/ares_android.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_android.c
rename to lib/c-ares-1.31.0/src/lib/ares_android.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_android.h b/lib/c-ares-1.31.0/src/lib/ares_android.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_android.h
rename to lib/c-ares-1.31.0/src/lib/ares_android.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares_cancel.c b/lib/c-ares-1.31.0/src/lib/ares_cancel.c
similarity index 96%
rename from lib/c-ares-1.30.0/src/lib/ares_cancel.c
rename to lib/c-ares-1.31.0/src/lib/ares_cancel.c
index 5a9fb722cb7..8686c366594 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_cancel.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_cancel.c
@@ -57,8 +57,8 @@ void ares_cancel(ares_channel_t *channel)
     /* Out of memory, this function doesn't return a result code though so we
      * can't report to caller */
     if (channel->all_queries == NULL) {
-      channel->all_queries = list_copy;
-      goto done;
+      channel->all_queries = list_copy; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     node = ares__llist_node_first(list_copy);
diff --git a/lib/c-ares-1.30.0/src/lib/ares_config.h.cmake b/lib/c-ares-1.31.0/src/lib/ares_config.h.cmake
similarity index 73%
rename from lib/c-ares-1.30.0/src/lib/ares_config.h.cmake
rename to lib/c-ares-1.31.0/src/lib/ares_config.h.cmake
index 10a1b7a9716..ffe4adf25ae 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_config.h.cmake
+++ b/lib/c-ares-1.31.0/src/lib/ares_config.h.cmake
@@ -41,356 +41,356 @@
 #define GETSERVBYNAME_R_ARGS @GETSERVBYNAME_R_ARGS@
 
 /* Define to 1 if you have AF_INET6. */
-#cmakedefine HAVE_AF_INET6
+#cmakedefine HAVE_AF_INET6 1
 
 /* Define to 1 if you have the <arpa/inet.h> header file. */
-#cmakedefine HAVE_ARPA_INET_H
+#cmakedefine HAVE_ARPA_INET_H 1
 
 /* Define to 1 if you have the <arpa/nameser_compat.h> header file. */
-#cmakedefine HAVE_ARPA_NAMESER_COMPAT_H
+#cmakedefine HAVE_ARPA_NAMESER_COMPAT_H 1
 
 /* Define to 1 if you have the <arpa/nameser.h> header file. */
-#cmakedefine HAVE_ARPA_NAMESER_H
+#cmakedefine HAVE_ARPA_NAMESER_H 1
 
 /* Define to 1 if you have the <assert.h> header file. */
-#cmakedefine HAVE_ASSERT_H
+#cmakedefine HAVE_ASSERT_H 1
 
 /* Define to 1 if you have the clock_gettime function and monotonic timer. */
-#cmakedefine HAVE_CLOCK_GETTIME_MONOTONIC
+#cmakedefine HAVE_CLOCK_GETTIME_MONOTONIC 1
 
 /* Define to 1 if you have the closesocket function. */
-#cmakedefine HAVE_CLOSESOCKET
+#cmakedefine HAVE_CLOSESOCKET 1
 
 /* Define to 1 if you have the CloseSocket camel case function. */
-#cmakedefine HAVE_CLOSESOCKET_CAMEL
+#cmakedefine HAVE_CLOSESOCKET_CAMEL 1
 
 /* Define to 1 if you have the connect function. */
-#cmakedefine HAVE_CONNECT
+#cmakedefine HAVE_CONNECT 1
 
 /* define if the compiler supports basic C++11 syntax */
-#cmakedefine HAVE_CXX11
+#cmakedefine HAVE_CXX11 1
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
-#cmakedefine HAVE_DLFCN_H
+#cmakedefine HAVE_DLFCN_H 1
 
 /* Define to 1 if you have the <errno.h> header file. */
-#cmakedefine HAVE_ERRNO_H
+#cmakedefine HAVE_ERRNO_H 1
 
 /* Define to 1 if you have the <poll.h> header file. */
-#cmakedefine HAVE_POLL_H
+#cmakedefine HAVE_POLL_H 1
 
 /* Define to 1 if you have the poll function. */
-#cmakedefine HAVE_POLL
+#cmakedefine HAVE_POLL 1
 
 /* Define to 1 if you have the pipe function. */
-#cmakedefine HAVE_PIPE
+#cmakedefine HAVE_PIPE 1
 
 /* Define to 1 if you have the pipe2 function. */
-#cmakedefine HAVE_PIPE2
+#cmakedefine HAVE_PIPE2 1
 
 /* Define to 1 if you have the kqueue function. */
-#cmakedefine HAVE_KQUEUE
+#cmakedefine HAVE_KQUEUE 1
 
 /* Define to 1 if you have the epoll{_create,ctl,wait} functions. */
-#cmakedefine HAVE_EPOLL
+#cmakedefine HAVE_EPOLL 1
 
 /* Define to 1 if you have the fcntl function. */
-#cmakedefine HAVE_FCNTL
+#cmakedefine HAVE_FCNTL 1
 
 /* Define to 1 if you have the <fcntl.h> header file. */
-#cmakedefine HAVE_FCNTL_H
+#cmakedefine HAVE_FCNTL_H 1
 
 /* Define to 1 if you have a working fcntl O_NONBLOCK function. */
-#cmakedefine HAVE_FCNTL_O_NONBLOCK
+#cmakedefine HAVE_FCNTL_O_NONBLOCK 1
 
 /* Define to 1 if you have the freeaddrinfo function. */
-#cmakedefine HAVE_FREEADDRINFO
+#cmakedefine HAVE_FREEADDRINFO 1
 
 /* Define to 1 if you have a working getaddrinfo function. */
-#cmakedefine HAVE_GETADDRINFO
+#cmakedefine HAVE_GETADDRINFO 1
 
 /* Define to 1 if the getaddrinfo function is threadsafe. */
-#cmakedefine HAVE_GETADDRINFO_THREADSAFE
+#cmakedefine HAVE_GETADDRINFO_THREADSAFE 1
 
 /* Define to 1 if you have the getenv function. */
-#cmakedefine HAVE_GETENV
+#cmakedefine HAVE_GETENV 1
 
 /* Define to 1 if you have the gethostname function. */
-#cmakedefine HAVE_GETHOSTNAME
+#cmakedefine HAVE_GETHOSTNAME 1
 
 /* Define to 1 if you have the getnameinfo function. */
-#cmakedefine HAVE_GETNAMEINFO
+#cmakedefine HAVE_GETNAMEINFO 1
 
 /* Define to 1 if you have the getrandom function. */
-#cmakedefine HAVE_GETRANDOM
+#cmakedefine HAVE_GETRANDOM 1
 
 /* Define to 1 if you have the getservbyport_r function. */
-#cmakedefine HAVE_GETSERVBYPORT_R
+#cmakedefine HAVE_GETSERVBYPORT_R 1
 
 /* Define to 1 if you have the getservbyname_r function. */
-#cmakedefine HAVE_GETSERVBYNAME_R
+#cmakedefine HAVE_GETSERVBYNAME_R 1
 
 /* Define to 1 if you have the `gettimeofday' function. */
-#cmakedefine HAVE_GETTIMEOFDAY
+#cmakedefine HAVE_GETTIMEOFDAY 1
 
 /* Define to 1 if you have the `if_indextoname' function. */
-#cmakedefine HAVE_IF_INDEXTONAME
+#cmakedefine HAVE_IF_INDEXTONAME 1
 
 /* Define to 1 if you have the `if_nametoindex' function. */
-#cmakedefine HAVE_IF_NAMETOINDEX
+#cmakedefine HAVE_IF_NAMETOINDEX 1
 
 /* Define to 1 if you have the `ConvertInterfaceIndexToLuid' function. */
-#cmakedefine HAVE_CONVERTINTERFACEINDEXTOLUID
+#cmakedefine HAVE_CONVERTINTERFACEINDEXTOLUID 1
 
 /* Define to 1 if you have the `ConvertInterfaceLuidToNameA' function. */
-#cmakedefine HAVE_CONVERTINTERFACELUIDTONAMEA
+#cmakedefine HAVE_CONVERTINTERFACELUIDTONAMEA 1
 
 /* Define to 1 if you have a IPv6 capable working inet_net_pton function. */
-#cmakedefine HAVE_INET_NET_PTON
+#cmakedefine HAVE_INET_NET_PTON 1
 
 /* Define to 1 if you have a IPv6 capable working inet_ntop function. */
-#cmakedefine HAVE_INET_NTOP
+#cmakedefine HAVE_INET_NTOP 1
 
 /* Define to 1 if you have a IPv6 capable working inet_pton function. */
-#cmakedefine HAVE_INET_PTON
+#cmakedefine HAVE_INET_PTON 1
 
 /* Define to 1 if you have the <inttypes.h> header file. */
-#cmakedefine HAVE_INTTYPES_H
+#cmakedefine HAVE_INTTYPES_H 1
 
 /* Define to 1 if you have the ioctl function. */
-#cmakedefine HAVE_IOCTL
+#cmakedefine HAVE_IOCTL 1
 
 /* Define to 1 if you have the ioctlsocket function. */
-#cmakedefine HAVE_IOCTLSOCKET
+#cmakedefine HAVE_IOCTLSOCKET 1
 
 /* Define to 1 if you have the IoctlSocket camel case function. */
-#cmakedefine HAVE_IOCTLSOCKET_CAMEL
+#cmakedefine HAVE_IOCTLSOCKET_CAMEL 1
 
 /* Define to 1 if you have a working IoctlSocket camel case FIONBIO function.
    */
-#cmakedefine HAVE_IOCTLSOCKET_CAMEL_FIONBIO
+#cmakedefine HAVE_IOCTLSOCKET_CAMEL_FIONBIO 1
 
 /* Define to 1 if you have a working ioctlsocket FIONBIO function. */
-#cmakedefine HAVE_IOCTLSOCKET_FIONBIO
+#cmakedefine HAVE_IOCTLSOCKET_FIONBIO 1
 
 /* Define to 1 if you have a working ioctl FIONBIO function. */
-#cmakedefine HAVE_IOCTL_FIONBIO
+#cmakedefine HAVE_IOCTL_FIONBIO 1
 
 /* Define to 1 if you have a working ioctl SIOCGIFADDR function. */
-#cmakedefine HAVE_IOCTL_SIOCGIFADDR
+#cmakedefine HAVE_IOCTL_SIOCGIFADDR 1
 
 /* Define to 1 if you have the `resolve' library (-lresolve). */
-#cmakedefine HAVE_LIBRESOLV
+#cmakedefine HAVE_LIBRESOLV 1
 
 /* Define to 1 if you have iphlpapi.h */
-#cmakedefine HAVE_IPHLPAPI_H
+#cmakedefine HAVE_IPHLPAPI_H 1
 
 /* Define to 1 if you have netioapi.h */
-#cmakedefine HAVE_NETIOAPI_H
+#cmakedefine HAVE_NETIOAPI_H 1
 
 /* Define to 1 if you have the <limits.h> header file. */
-#cmakedefine HAVE_LIMITS_H
+#cmakedefine HAVE_LIMITS_H 1
 
 /* Define to 1 if the compiler supports the 'long long' data type. */
-#cmakedefine HAVE_LONGLONG
+#cmakedefine HAVE_LONGLONG 1
 
 /* Define to 1 if you have the malloc.h header file. */
-#cmakedefine HAVE_MALLOC_H
+#cmakedefine HAVE_MALLOC_H 1
 
 /* Define to 1 if you have the memory.h header file. */
-#cmakedefine HAVE_MEMORY_H
+#cmakedefine HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the AvailabilityMacros.h header file. */
-#cmakedefine HAVE_AVAILABILITYMACROS_H
+#cmakedefine HAVE_AVAILABILITYMACROS_H 1
 
 /* Define to 1 if you have the MSG_NOSIGNAL flag. */
-#cmakedefine HAVE_MSG_NOSIGNAL
+#cmakedefine HAVE_MSG_NOSIGNAL 1
 
 /* Define to 1 if you have the <netdb.h> header file. */
-#cmakedefine HAVE_NETDB_H
+#cmakedefine HAVE_NETDB_H 1
 
 /* Define to 1 if you have the <netinet/in.h> header file. */
-#cmakedefine HAVE_NETINET_IN_H
+#cmakedefine HAVE_NETINET_IN_H 1
 
 /* Define to 1 if you have the <netinet6/in6.h> header file. */
-#cmakedefine HAVE_NETINET6_IN6_H
+#cmakedefine HAVE_NETINET6_IN6_H 1
 
 /* Define to 1 if you have the <netinet/tcp.h> header file. */
-#cmakedefine HAVE_NETINET_TCP_H
+#cmakedefine HAVE_NETINET_TCP_H 1
 
 /* Define to 1 if you have the <net/if.h> header file. */
-#cmakedefine HAVE_NET_IF_H
+#cmakedefine HAVE_NET_IF_H 1
 
 /* Define to 1 if you have PF_INET6. */
-#cmakedefine HAVE_PF_INET6
+#cmakedefine HAVE_PF_INET6 1
 
 /* Define to 1 if you have the recv function. */
-#cmakedefine HAVE_RECV
+#cmakedefine HAVE_RECV 1
 
 /* Define to 1 if you have the recvfrom function. */
-#cmakedefine HAVE_RECVFROM
+#cmakedefine HAVE_RECVFROM 1
 
 /* Define to 1 if you have the send function. */
-#cmakedefine HAVE_SEND
+#cmakedefine HAVE_SEND 1
 
 /* Define to 1 if you have the setsockopt function. */
-#cmakedefine HAVE_SETSOCKOPT
+#cmakedefine HAVE_SETSOCKOPT 1
 
 /* Define to 1 if you have a working setsockopt SO_NONBLOCK function. */
-#cmakedefine HAVE_SETSOCKOPT_SO_NONBLOCK
+#cmakedefine HAVE_SETSOCKOPT_SO_NONBLOCK 1
 
 /* Define to 1 if you have the <signal.h> header file. */
-#cmakedefine HAVE_SIGNAL_H
+#cmakedefine HAVE_SIGNAL_H 1
 
 /* Define to 1 if your struct sockaddr_in6 has sin6_scope_id. */
-#cmakedefine HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
+#cmakedefine HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
 
 /* Define to 1 if you have the socket function. */
-#cmakedefine HAVE_SOCKET
+#cmakedefine HAVE_SOCKET 1
 
 /* Define to 1 if you have the <socket.h> header file. */
-#cmakedefine HAVE_SOCKET_H
+#cmakedefine HAVE_SOCKET_H 1
 
 /* Define to 1 if you have the <stdbool.h> header file. */
-#cmakedefine HAVE_STDBOOL_H
+#cmakedefine HAVE_STDBOOL_H 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
-#cmakedefine HAVE_STDINT_H
+#cmakedefine HAVE_STDINT_H 1
 
 /* Define to 1 if you have the <stdlib.h> header file. */
-#cmakedefine HAVE_STDLIB_H
+#cmakedefine HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the strcasecmp function. */
-#cmakedefine HAVE_STRCASECMP
+#cmakedefine HAVE_STRCASECMP 1
 
 /* Define to 1 if you have the strcmpi function. */
-#cmakedefine HAVE_STRCMPI
+#cmakedefine HAVE_STRCMPI 1
 
 /* Define to 1 if you have the strdup function. */
-#cmakedefine HAVE_STRDUP
+#cmakedefine HAVE_STRDUP 1
 
 /* Define to 1 if you have the stricmp function. */
-#cmakedefine HAVE_STRICMP
+#cmakedefine HAVE_STRICMP 1
 
 /* Define to 1 if you have the <strings.h> header file. */
-#cmakedefine HAVE_STRINGS_H
+#cmakedefine HAVE_STRINGS_H 1
 
 /* Define to 1 if you have the <string.h> header file. */
-#cmakedefine HAVE_STRING_H
+#cmakedefine HAVE_STRING_H 1
 
 /* Define to 1 if you have the strncasecmp function. */
-#cmakedefine HAVE_STRNCASECMP
+#cmakedefine HAVE_STRNCASECMP 1
 
 /* Define to 1 if you have the strncmpi function. */
-#cmakedefine HAVE_STRNCMPI
+#cmakedefine HAVE_STRNCMPI 1
 
 /* Define to 1 if you have the strnicmp function. */
-#cmakedefine HAVE_STRNICMP
+#cmakedefine HAVE_STRNICMP 1
 
 /* Define to 1 if you have the <stropts.h> header file. */
-#cmakedefine HAVE_STROPTS_H
+#cmakedefine HAVE_STROPTS_H 1
 
 /* Define to 1 if you have struct addrinfo. */
-#cmakedefine HAVE_STRUCT_ADDRINFO
+#cmakedefine HAVE_STRUCT_ADDRINFO 1
 
 /* Define to 1 if you have struct in6_addr. */
-#cmakedefine HAVE_STRUCT_IN6_ADDR
+#cmakedefine HAVE_STRUCT_IN6_ADDR 1
 
 /* Define to 1 if you have struct sockaddr_in6. */
-#cmakedefine HAVE_STRUCT_SOCKADDR_IN6
+#cmakedefine HAVE_STRUCT_SOCKADDR_IN6 1
 
 /* if struct sockaddr_storage is defined */
-#cmakedefine HAVE_STRUCT_SOCKADDR_STORAGE
+#cmakedefine HAVE_STRUCT_SOCKADDR_STORAGE 1
 
 /* Define to 1 if you have the timeval struct. */
-#cmakedefine HAVE_STRUCT_TIMEVAL
+#cmakedefine HAVE_STRUCT_TIMEVAL 1
 
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
-#cmakedefine HAVE_SYS_IOCTL_H
+#cmakedefine HAVE_SYS_IOCTL_H 1
 
 /* Define to 1 if you have the <sys/param.h> header file. */
-#cmakedefine HAVE_SYS_PARAM_H
+#cmakedefine HAVE_SYS_PARAM_H 1
 
 /* Define to 1 if you have the <sys/random.h> header file. */
-#cmakedefine HAVE_SYS_RANDOM_H
+#cmakedefine HAVE_SYS_RANDOM_H 1
 
 /* Define to 1 if you have the <sys/event.h> header file. */
-#cmakedefine HAVE_SYS_EVENT_H
+#cmakedefine HAVE_SYS_EVENT_H 1
 
 /* Define to 1 if you have the <sys/epoll.h> header file. */
-#cmakedefine HAVE_SYS_EPOLL_H
+#cmakedefine HAVE_SYS_EPOLL_H 1
 
 /* Define to 1 if you have the <sys/select.h> header file. */
-#cmakedefine HAVE_SYS_SELECT_H
+#cmakedefine HAVE_SYS_SELECT_H 1
 
 /* Define to 1 if you have the <sys/socket.h> header file. */
-#cmakedefine HAVE_SYS_SOCKET_H
+#cmakedefine HAVE_SYS_SOCKET_H 1
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
-#cmakedefine HAVE_SYS_STAT_H
+#cmakedefine HAVE_SYS_STAT_H 1
 
 /* Define to 1 if you have the <sys/time.h> header file. */
-#cmakedefine HAVE_SYS_TIME_H
+#cmakedefine HAVE_SYS_TIME_H 1
 
 /* Define to 1 if you have the <sys/types.h> header file. */
-#cmakedefine HAVE_SYS_TYPES_H
+#cmakedefine HAVE_SYS_TYPES_H 1
 
 /* Define to 1 if you have the <sys/uio.h> header file. */
-#cmakedefine HAVE_SYS_UIO_H
+#cmakedefine HAVE_SYS_UIO_H 1
 
 /* Define to 1 if you have the <time.h> header file. */
-#cmakedefine HAVE_TIME_H
+#cmakedefine HAVE_TIME_H 1
 
 /* Define to 1 if you have the <ifaddrs.h> header file. */
-#cmakedefine HAVE_IFADDRS_H
+#cmakedefine HAVE_IFADDRS_H 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
-#cmakedefine HAVE_UNISTD_H
+#cmakedefine HAVE_UNISTD_H 1
 
 /* Define to 1 if you have the windows.h header file. */
-#cmakedefine HAVE_WINDOWS_H
+#cmakedefine HAVE_WINDOWS_H 1
 
 /* Define to 1 if you have the winsock2.h header file. */
-#cmakedefine HAVE_WINSOCK2_H
+#cmakedefine HAVE_WINSOCK2_H 1
 
 /* Define to 1 if you have the winsock.h header file. */
-#cmakedefine HAVE_WINSOCK_H
+#cmakedefine HAVE_WINSOCK_H 1
 
 /* Define to 1 if you have the mswsock.h header file. */
-#cmakedefine HAVE_MSWSOCK_H
+#cmakedefine HAVE_MSWSOCK_H 1
 
 /* Define to 1 if you have the winternl.h header file. */
-#cmakedefine HAVE_WINTERNL_H
+#cmakedefine HAVE_WINTERNL_H 1
 
 /* Define to 1 if you have the ntstatus.h header file. */
-#cmakedefine HAVE_NTSTATUS_H
+#cmakedefine HAVE_NTSTATUS_H 1
 
 /* Define to 1 if you have the ntdef.h header file. */
-#cmakedefine HAVE_NTDEF_H
+#cmakedefine HAVE_NTDEF_H 1
 
 /* Define to 1 if you have the writev function. */
-#cmakedefine HAVE_WRITEV
+#cmakedefine HAVE_WRITEV 1
 
 /* Define to 1 if you have the ws2tcpip.h header file. */
-#cmakedefine HAVE_WS2TCPIP_H
+#cmakedefine HAVE_WS2TCPIP_H 1
 
 /* Define to 1 if you have the __system_property_get function */
-#cmakedefine HAVE___SYSTEM_PROPERTY_GET
+#cmakedefine HAVE___SYSTEM_PROPERTY_GET 1
 
 /* Define to 1 if you need the malloc.h header file even with stdlib.h */
-#cmakedefine NEED_MALLOC_H
+#cmakedefine NEED_MALLOC_H 1
 
 /* Define to 1 if you need the memory.h header file even with stdlib.h */
-#cmakedefine NEED_MEMORY_H
+#cmakedefine NEED_MEMORY_H 1
 
 /* Define if have arc4random_buf() */
-#cmakedefine HAVE_ARC4RANDOM_BUF
+#cmakedefine HAVE_ARC4RANDOM_BUF 1
 
 /* Define if have getifaddrs() */
-#cmakedefine HAVE_GETIFADDRS
+#cmakedefine HAVE_GETIFADDRS 1
 
 /* Define if have stat() */
-#cmakedefine HAVE_STAT
+#cmakedefine HAVE_STAT 1
 
 /* a suitable file/device to read random data from */
 #cmakedefine CARES_RANDOM_FILE "@CARES_RANDOM_FILE@"
@@ -468,14 +468,14 @@
 #undef WIN32_LEAN_AND_MEAN
 
 /* Define to 1 if you have the pthread.h header file. */
-#cmakedefine HAVE_PTHREAD_H
+#cmakedefine HAVE_PTHREAD_H 1
 
 /* Define to 1 if you have the pthread_np.h header file. */
-#cmakedefine HAVE_PTHREAD_NP_H
+#cmakedefine HAVE_PTHREAD_NP_H 1
 
 /* Define to 1 if threads are enabled */
-#cmakedefine CARES_THREADS
+#cmakedefine CARES_THREADS 1
 
 /* Define to 1 if pthread_init() exists */
-#cmakedefine HAVE_PTHREAD_INIT
+#cmakedefine HAVE_PTHREAD_INIT 1
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares_config.h.in b/lib/c-ares-1.31.0/src/lib/ares_config.h.in
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_config.h.in
rename to lib/c-ares-1.31.0/src/lib/ares_config.h.in
diff --git a/lib/c-ares-1.30.0/src/lib/ares_create_query.c b/lib/c-ares-1.31.0/src/lib/ares_create_query.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_create_query.c
rename to lib/c-ares-1.31.0/src/lib/ares_create_query.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_data.c b/lib/c-ares-1.31.0/src/lib/ares_data.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_data.c
rename to lib/c-ares-1.31.0/src/lib/ares_data.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_data.h b/lib/c-ares-1.31.0/src/lib/ares_data.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_data.h
rename to lib/c-ares-1.31.0/src/lib/ares_data.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares_destroy.c b/lib/c-ares-1.31.0/src/lib/ares_destroy.c
similarity index 98%
rename from lib/c-ares-1.30.0/src/lib/ares_destroy.c
rename to lib/c-ares-1.31.0/src/lib/ares_destroy.c
index 672f8b06184..a19e6d0d97c 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_destroy.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_destroy.c
@@ -129,7 +129,7 @@ void ares_destroy(ares_channel_t *channel)
 void ares__destroy_server(struct server_state *server)
 {
   if (server == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__close_sockets(server);
diff --git a/lib/c-ares-1.30.0/src/lib/ares_dns_mapping.c b/lib/c-ares-1.31.0/src/lib/ares_dns_mapping.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_dns_mapping.c
rename to lib/c-ares-1.31.0/src/lib/ares_dns_mapping.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_dns_name.c b/lib/c-ares-1.31.0/src/lib/ares_dns_name.c
similarity index 89%
rename from lib/c-ares-1.30.0/src/lib/ares_dns_name.c
rename to lib/c-ares-1.31.0/src/lib/ares_dns_name.c
index 85e26cd25b5..754f9fadd2b 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_dns_name.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_dns_name.c
@@ -37,7 +37,7 @@ static void ares__nameoffset_free(void *arg)
 {
   ares_nameoffset_t *off = arg;
   if (off == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   ares_free(off->name);
   ares_free(off);
@@ -51,20 +51,20 @@ static ares_status_t ares__nameoffset_create(ares__llist_t **list,
 
   if (list == NULL || name == NULL || ares_strlen(name) == 0 ||
       ares_strlen(name) > 255) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (*list == NULL) {
     *list = ares__llist_create(ares__nameoffset_free);
   }
   if (*list == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   off = ares_malloc_zero(sizeof(*off));
   if (off == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   off->name     = ares_strdup(name);
@@ -72,15 +72,17 @@ static ares_status_t ares__nameoffset_create(ares__llist_t **list,
   off->idx      = idx;
 
   if (ares__llist_insert_last(*list, off) == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   ares__nameoffset_free(off);
   return status;
+/* LCOV_EXCL_STOP */
 }
 
 static const ares_nameoffset_t *ares__nameoffset_find(ares__llist_t *list,
@@ -138,7 +140,7 @@ static void ares_dns_labels_free(ares_dns_labels_t *labels)
   size_t i;
 
   if (labels == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   for (i = 0; i < labels->num; i++) {
@@ -155,20 +157,20 @@ static ares__buf_t *ares_dns_labels_add(ares_dns_labels_t *labels)
   void *temp;
 
   if (labels == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   temp = ares_realloc_zero(labels->label, sizeof(*labels->label) * labels->num,
                            sizeof(*labels->label) * (labels->num + 1));
   if (temp == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   labels->label = temp;
 
   labels->label[labels->num] = ares__buf_create();
   if (labels->label[labels->num] == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   labels->num++;
@@ -179,7 +181,7 @@ static const ares__buf_t *
   ares_dns_labels_get_last(const ares_dns_labels_t *labels)
 {
   if (labels == NULL || labels->num == 0) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   return labels->label[labels->num - 1];
@@ -188,7 +190,7 @@ static const ares__buf_t *
 static void ares_dns_name_labels_del_last(ares_dns_labels_t *labels)
 {
   if (labels == NULL || labels->num == 0) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__buf_destroy(labels->label[labels->num - 1]);
@@ -260,29 +262,29 @@ static ares_status_t ares_split_dns_name(ares_dns_labels_t *labels,
   unsigned char c;
 
   if (name == NULL || labels == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Put name into a buffer for parsing */
   namebuf = ares__buf_create();
   if (namebuf == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (*name != '\0') {
     status =
       ares__buf_append(namebuf, (const unsigned char *)name, ares_strlen(name));
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   /* Start with 1 label */
   label = ares_dns_labels_add(labels);
   if (label == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   while (ares__buf_fetch_bytes(namebuf, &c, 1) == ARES_SUCCESS) {
@@ -290,8 +292,8 @@ static ares_status_t ares_split_dns_name(ares_dns_labels_t *labels,
     if (c == '.') {
       label = ares_dns_labels_add(labels);
       if (label == NULL) {
-        status = ARES_ENOMEM;
-        goto done;
+        status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
       continue;
     }
@@ -313,7 +315,7 @@ static ares_status_t ares_split_dns_name(ares_dns_labels_t *labels,
 
     status = ares__buf_append_byte(label, c);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -369,7 +371,7 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
   ares_status_t            status;
 
   if (buf == NULL || name == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   memset(&labels, 0, sizeof(labels));
@@ -404,12 +406,12 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
 
       status = ares__buf_append_byte(buf, (unsigned char)(len & 0xFF));
       if (status != ARES_SUCCESS) {
-        goto done;
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
 
       status = ares__buf_append(buf, ptr, len);
       if (status != ARES_SUCCESS) {
-        goto done;
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
 
@@ -417,7 +419,7 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
     if (off == NULL) {
       status = ares__buf_append_byte(buf, 0);
       if (status != ARES_SUCCESS) {
-        goto done;
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -428,7 +430,7 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
       (unsigned short)0xC000 | (unsigned short)(off->idx & 0x3FFF);
     status = ares__buf_append_be16(buf, u16);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -438,7 +440,7 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
       name_len > 0) {
     status = ares__nameoffset_create(list, name /* not truncated copy! */, pos);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -509,7 +511,7 @@ static ares_status_t ares__fetch_dnsname_into_buf(ares__buf_t *buf,
 
       status = ares__buf_append(dest, escape, sizeof(escape));
       if (status != ARES_SUCCESS) {
-        goto fail;
+        goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
       }
 
       continue;
@@ -519,13 +521,13 @@ static ares_status_t ares__fetch_dnsname_into_buf(ares__buf_t *buf,
     if (is_reservedch(c)) {
       status = ares__buf_append_byte(dest, '\\');
       if (status != ARES_SUCCESS) {
-        goto fail;
+        goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
 
     status = ares__buf_append_byte(dest, c);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -641,7 +643,7 @@ ares_status_t ares__dns_name_parse(ares__buf_t *buf, char **name,
     if (ares__buf_len(namebuf) != 0 && name != NULL) {
       status = ares__buf_append_byte(namebuf, '.');
       if (status != ARES_SUCCESS) {
-        goto fail;
+        goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
 
@@ -660,8 +662,8 @@ ares_status_t ares__dns_name_parse(ares__buf_t *buf, char **name,
   if (name != NULL) {
     *name = ares__buf_finish_str(namebuf, NULL);
     if (*name == NULL) {
-      status = ARES_ENOMEM;
-      goto fail;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares_dns_parse.c b/lib/c-ares-1.31.0/src/lib/ares_dns_parse.c
similarity index 99%
rename from lib/c-ares-1.30.0/src/lib/ares_dns_parse.c
rename to lib/c-ares-1.31.0/src/lib/ares_dns_parse.c
index 8b771ee1faf..765f70ce636 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_dns_parse.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_dns_parse.c
@@ -925,7 +925,7 @@ static ares_status_t ares_dns_parse_header(ares__buf_t *buf, unsigned int flags,
     status =
       ares_dns_record_rr_prealloc(*dnsrec, ARES_SECTION_ANSWER, *ancount);
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -933,7 +933,7 @@ static ares_status_t ares_dns_parse_header(ares__buf_t *buf, unsigned int flags,
     status =
       ares_dns_record_rr_prealloc(*dnsrec, ARES_SECTION_AUTHORITY, *nscount);
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -941,7 +941,7 @@ static ares_status_t ares_dns_parse_header(ares__buf_t *buf, unsigned int flags,
     status =
       ares_dns_record_rr_prealloc(*dnsrec, ARES_SECTION_ADDITIONAL, *arcount);
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -1216,7 +1216,7 @@ static ares_status_t ares_dns_parse_buf(ares__buf_t *buf, unsigned int flags,
   unsigned short i;
 
   if (buf == NULL || dnsrec == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Maximum DNS packet size is 64k, even over TCP */
diff --git a/lib/c-ares-1.30.0/src/lib/ares_dns_private.h b/lib/c-ares-1.31.0/src/lib/ares_dns_private.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_dns_private.h
rename to lib/c-ares-1.31.0/src/lib/ares_dns_private.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares_dns_record.c b/lib/c-ares-1.31.0/src/lib/ares_dns_record.c
similarity index 98%
rename from lib/c-ares-1.30.0/src/lib/ares_dns_record.c
rename to lib/c-ares-1.31.0/src/lib/ares_dns_record.c
index e6b7bf7fe1d..5d109999946 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_dns_record.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_dns_record.c
@@ -292,8 +292,8 @@ ares_status_t ares_dns_record_query_set_name(ares_dns_record_t *dnsrec,
   orig_name            = dnsrec->qd[idx].name;
   dnsrec->qd[idx].name = ares_strdup(name);
   if (dnsrec->qd[idx].name == NULL) {
-    dnsrec->qd[idx].name = orig_name;
-    return ARES_ENOMEM;
+    dnsrec->qd[idx].name = orig_name; /* LCOV_EXCL_LINE: OutOfMemory */
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   ares_free(orig_name);
@@ -354,7 +354,7 @@ size_t ares_dns_record_rr_cnt(const ares_dns_record_t *dnsrec,
       return dnsrec->arcount;
   }
 
-  return 0;
+  return 0; /* LCOV_EXCL_LINE: DefensiveCoding */
 }
 
 ares_status_t ares_dns_record_rr_prealloc(ares_dns_record_t *dnsrec,
@@ -365,7 +365,7 @@ ares_status_t ares_dns_record_rr_prealloc(ares_dns_record_t *dnsrec,
   ares_dns_rr_t  *temp     = NULL;
 
   if (dnsrec == NULL || cnt == 0 || !ares_dns_section_isvalid(sect)) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   switch (sect) {
@@ -440,7 +440,7 @@ ares_status_t ares_dns_record_rr_add(ares_dns_rr_t    **rr_out,
 
   status = ares_dns_record_rr_prealloc(dnsrec, sect, *rr_len + 1);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   idx = *rr_len;
@@ -580,7 +580,7 @@ static void *ares_dns_rr_data_ptr(ares_dns_rr_t *dns_rr, ares_dns_rr_key_t key,
                                   size_t **lenptr)
 {
   if (dns_rr == NULL || dns_rr->type != ares_dns_rr_key_to_rec_type(key)) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   switch (key) {
diff --git a/lib/c-ares-1.30.0/src/lib/ares_dns_write.c b/lib/c-ares-1.31.0/src/lib/ares_dns_write.c
similarity index 88%
rename from lib/c-ares-1.30.0/src/lib/ares_dns_write.c
rename to lib/c-ares-1.31.0/src/lib/ares_dns_write.c
index 1643f081032..6cf15bf4e61 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_dns_write.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_dns_write.c
@@ -44,7 +44,7 @@ static ares_status_t ares_dns_write_header(const ares_dns_record_t *dnsrec,
   /* ID */
   status = ares__buf_append_be16(buf, dnsrec->id);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Flags */
@@ -103,31 +103,31 @@ static ares_status_t ares_dns_write_header(const ares_dns_record_t *dnsrec,
 
   status = ares__buf_append_be16(buf, u16);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* QDCOUNT */
   status = ares__buf_append_be16(buf, (unsigned short)dnsrec->qdcount);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* ANCOUNT */
   status = ares__buf_append_be16(buf, (unsigned short)dnsrec->ancount);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* NSCOUNT */
   status = ares__buf_append_be16(buf, (unsigned short)dnsrec->nscount);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* ARCOUNT */
   status = ares__buf_append_be16(buf, (unsigned short)dnsrec->arcount);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
@@ -159,13 +159,13 @@ static ares_status_t ares_dns_write_questions(const ares_dns_record_t *dnsrec,
     /* Type */
     status = ares__buf_append_be16(buf, (unsigned short)qtype);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Class */
     status = ares__buf_append_be16(buf, (unsigned short)qclass);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -182,7 +182,7 @@ static ares_status_t ares_dns_write_rr_name(ares__buf_t         *buf,
 
   name = ares_dns_rr_get_str(rr, key);
   if (name == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   return ares__dns_name_write(buf, namelist, validate_hostname, name);
@@ -198,7 +198,7 @@ static ares_status_t ares_dns_write_rr_str(ares__buf_t         *buf,
 
   str = ares_dns_rr_get_str(rr, key);
   if (str == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   len = ares_strlen(str);
@@ -209,7 +209,7 @@ static ares_status_t ares_dns_write_rr_str(ares__buf_t         *buf,
   /* Write 1 byte length */
   status = ares__buf_append_byte(buf, (unsigned char)(len & 0xFF));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (len == 0) {
@@ -232,7 +232,7 @@ static ares_status_t ares_dns_write_rr_binstrs(ares__buf_t         *buf,
 
   bin = ares_dns_rr_get_bin(rr, key, &bin_len);
   if (bin == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   /* split into possible multiple 255-byte or less length strings */
   ptr     = bin;
@@ -246,14 +246,14 @@ static ares_status_t ares_dns_write_rr_binstrs(ares__buf_t         *buf,
     /* Length */
     status = ares__buf_append_byte(buf, (unsigned char)(len & 0xFF));
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* String */
     if (len) {
       status = ares__buf_append(buf, ptr, len);
       if (status != ARES_SUCCESS) {
-        return status;
+        return status; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
 
@@ -269,7 +269,7 @@ static ares_status_t ares_dns_write_rr_be32(ares__buf_t         *buf,
                                             ares_dns_rr_key_t    key)
 {
   if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_U32) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   return ares__buf_append_be32(buf, ares_dns_rr_get_u32(rr, key));
 }
@@ -279,7 +279,7 @@ static ares_status_t ares_dns_write_rr_be16(ares__buf_t         *buf,
                                             ares_dns_rr_key_t    key)
 {
   if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_U16) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   return ares__buf_append_be16(buf, ares_dns_rr_get_u16(rr, key));
 }
@@ -289,7 +289,7 @@ static ares_status_t ares_dns_write_rr_u8(ares__buf_t         *buf,
                                           ares_dns_rr_key_t    key)
 {
   if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_U8) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   return ares__buf_append_byte(buf, ares_dns_rr_get_u8(rr, key));
 }
@@ -303,7 +303,7 @@ static ares_status_t ares_dns_write_rr_a(ares__buf_t         *buf,
 
   addr = ares_dns_rr_get_addr(rr, ARES_RR_A_ADDR);
   if (addr == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   return ares__buf_append(buf, (const unsigned char *)addr, sizeof(*addr));
@@ -348,25 +348,25 @@ static ares_status_t ares_dns_write_rr_soa(ares__buf_t         *buf,
   /* SERIAL */
   status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SOA_SERIAL);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* REFRESH */
   status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SOA_REFRESH);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* RETRY */
   status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SOA_RETRY);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* EXPIRE */
   status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SOA_EXPIRE);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* MINIMUM */
@@ -408,7 +408,7 @@ static ares_status_t ares_dns_write_rr_mx(ares__buf_t         *buf,
   /* PREFERENCE */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_MX_PREFERENCE);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* EXCHANGE */
@@ -437,43 +437,43 @@ static ares_status_t ares_dns_write_rr_sig(ares__buf_t         *buf,
   /* TYPE COVERED */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_SIG_TYPE_COVERED);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* ALGORITHM */
   status = ares_dns_write_rr_u8(buf, rr, ARES_RR_SIG_ALGORITHM);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* LABELS */
   status = ares_dns_write_rr_u8(buf, rr, ARES_RR_SIG_LABELS);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* ORIGINAL TTL */
   status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SIG_ORIGINAL_TTL);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* EXPIRATION */
   status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SIG_EXPIRATION);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* INCEPTION */
   status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SIG_INCEPTION);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* KEY TAG */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_SIG_KEY_TAG);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* SIGNERS NAME */
@@ -501,7 +501,7 @@ static ares_status_t ares_dns_write_rr_aaaa(ares__buf_t         *buf,
 
   addr = ares_dns_rr_get_addr6(rr, ARES_RR_AAAA_ADDR);
   if (addr == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   return ares__buf_append(buf, (const unsigned char *)addr, sizeof(*addr));
@@ -516,19 +516,19 @@ static ares_status_t ares_dns_write_rr_srv(ares__buf_t         *buf,
   /* PRIORITY */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_SRV_PRIORITY);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* WEIGHT */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_SRV_WEIGHT);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* PORT */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_SRV_PORT);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* TARGET */
@@ -545,31 +545,31 @@ static ares_status_t ares_dns_write_rr_naptr(ares__buf_t         *buf,
   /* ORDER */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_NAPTR_ORDER);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* PREFERENCE */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_NAPTR_PREFERENCE);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* FLAGS */
   status = ares_dns_write_rr_str(buf, rr, ARES_RR_NAPTR_FLAGS);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* SERVICES */
   status = ares_dns_write_rr_str(buf, rr, ARES_RR_NAPTR_SERVICES);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* REGEXP */
   status = ares_dns_write_rr_str(buf, rr, ARES_RR_NAPTR_REGEXP);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* REPLACEMENT */
@@ -601,7 +601,7 @@ static ares_status_t ares_dns_write_rr_opt(ares__buf_t         *buf,
   /* Class -> UDP Size */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_OPT_UDP_SIZE);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* TTL -> rcode (u8) << 24 | version (u8) << 16 | flags (u16) */
@@ -611,7 +611,7 @@ static ares_status_t ares_dns_write_rr_opt(ares__buf_t         *buf,
 
   status = ares__buf_append_be32(buf, ttl);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Now go back to real end */
@@ -631,20 +631,20 @@ static ares_status_t ares_dns_write_rr_opt(ares__buf_t         *buf,
     /* BE16 option */
     status = ares__buf_append_be16(buf, opt);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* BE16 length */
     status = ares__buf_append_be16(buf, (unsigned short)(val_len & 0xFFFF));
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Value */
     if (val && val_len) {
       status = ares__buf_append(buf, val, val_len);
       if (status != ARES_SUCCESS) {
-        return status;
+        return status; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -665,19 +665,19 @@ static ares_status_t ares_dns_write_rr_tlsa(ares__buf_t         *buf,
   /* CERT_USAGE */
   status = ares_dns_write_rr_u8(buf, rr, ARES_RR_TLSA_CERT_USAGE);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* SELECTOR */
   status = ares_dns_write_rr_u8(buf, rr, ARES_RR_TLSA_SELECTOR);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* MATCH */
   status = ares_dns_write_rr_u8(buf, rr, ARES_RR_TLSA_MATCH);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* DATA -- binary, rest of buffer, required to be non-zero length */
@@ -699,7 +699,7 @@ static ares_status_t ares_dns_write_rr_svcb(ares__buf_t         *buf,
   /* PRIORITY */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_SVCB_PRIORITY);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* TARGET */
@@ -720,20 +720,20 @@ static ares_status_t ares_dns_write_rr_svcb(ares__buf_t         *buf,
     /* BE16 option */
     status = ares__buf_append_be16(buf, opt);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* BE16 length */
     status = ares__buf_append_be16(buf, (unsigned short)(val_len & 0xFFFF));
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Value */
     if (val && val_len) {
       status = ares__buf_append(buf, val, val_len);
       if (status != ARES_SUCCESS) {
-        return status;
+        return status; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -750,7 +750,7 @@ static ares_status_t ares_dns_write_rr_https(ares__buf_t         *buf,
   /* PRIORITY */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_HTTPS_PRIORITY);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* TARGET */
@@ -771,20 +771,20 @@ static ares_status_t ares_dns_write_rr_https(ares__buf_t         *buf,
     /* BE16 option */
     status = ares__buf_append_be16(buf, opt);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* BE16 length */
     status = ares__buf_append_be16(buf, (unsigned short)(val_len & 0xFFFF));
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Value */
     if (val && val_len) {
       status = ares__buf_append(buf, val, val_len);
       if (status != ARES_SUCCESS) {
-        return status;
+        return status; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -803,13 +803,13 @@ static ares_status_t ares_dns_write_rr_uri(ares__buf_t         *buf,
   /* PRIORITY */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_URI_PRIORITY);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* WEIGHT */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_URI_WEIGHT);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* TARGET -- not in DNS string format, rest of buffer, required to be
@@ -836,13 +836,13 @@ static ares_status_t ares_dns_write_rr_caa(ares__buf_t         *buf,
   /* CRITICAL */
   status = ares_dns_write_rr_u8(buf, rr, ARES_RR_CAA_CRITICAL);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Tag */
   status = ares_dns_write_rr_str(buf, rr, ARES_RR_CAA_TAG);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Value - binary! (remaining buffer */
@@ -877,7 +877,7 @@ static ares_status_t ares_dns_write_rr_raw_rr(ares__buf_t         *buf,
 
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_RAW_RR_TYPE);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Now go back to real end */
@@ -919,7 +919,7 @@ static ares_status_t ares_dns_write_rr(const ares_dns_record_t *dnsrec,
 
     rr = ares_dns_record_rr_get_const(dnsrec, section, i);
     if (rr == NULL) {
-      return ARES_EFORMERR;
+      return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     type           = ares_dns_rr_get_type(rr);
@@ -938,14 +938,14 @@ static ares_status_t ares_dns_write_rr(const ares_dns_record_t *dnsrec,
     /* Type */
     status = ares__buf_append_be16(buf, (unsigned short)type);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Class */
     status =
       ares__buf_append_be16(buf, (unsigned short)ares_dns_rr_get_class(rr));
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* TTL */
@@ -957,14 +957,14 @@ static ares_status_t ares_dns_write_rr(const ares_dns_record_t *dnsrec,
     }
     status = ares__buf_append_be32(buf, ttl);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Length */
     pos_len = ares__buf_len(buf); /* Save to write real length later */
     status  = ares__buf_append_be16(buf, 0);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Data */
@@ -1047,7 +1047,7 @@ static ares_status_t ares_dns_write_rr(const ares_dns_record_t *dnsrec,
 
     status = ares__buf_append_be16(buf, (unsigned short)(rdlength & 0xFFFF));
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     status = ares__buf_set_length(buf, end_length);
@@ -1075,7 +1075,7 @@ ares_status_t ares_dns_write(const ares_dns_record_t *dnsrec,
 
   b = ares__buf_create();
   if (b == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares_dns_write_header(dnsrec, b);
diff --git a/lib/c-ares-1.30.0/src/lib/ares_event.h b/lib/c-ares-1.31.0/src/lib/ares_event.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_event.h
rename to lib/c-ares-1.31.0/src/lib/ares_event.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares_event_configchg.c b/lib/c-ares-1.31.0/src/lib/ares_event_configchg.c
similarity index 71%
rename from lib/c-ares-1.30.0/src/lib/ares_event_configchg.c
rename to lib/c-ares-1.31.0/src/lib/ares_event_configchg.c
index c7bc9ffd58b..b7c5ad8c75b 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_event_configchg.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_event_configchg.c
@@ -54,7 +54,7 @@ struct ares_event_configchg {
 void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
 {
   if (configchg == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Tell event system to stop monitoring for changes.  This will cause the
@@ -67,7 +67,7 @@ static void ares_event_configchg_free(void *data)
 {
   ares_event_configchg_t *configchg = data;
   if (configchg == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (configchg->inotify_fd >= 0) {
@@ -142,22 +142,22 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
 
   c = ares_malloc_zero(sizeof(*c));
   if (c == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   c->e          = e;
   c->inotify_fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
   if (c->inotify_fd == -1) {
-    status = ARES_ESERVFAIL;
-    goto done;
+    status = ARES_ESERVFAIL; /* LCOV_EXCL_LINE: UntestablePath */
+    goto done; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   /* We need to monitor /etc/resolv.conf, /etc/nsswitch.conf */
   if (inotify_add_watch(c->inotify_fd, "/etc",
                         IN_CREATE | IN_MODIFY | IN_MOVED_TO | IN_ONLYDIR) ==
       -1) {
-    status = ARES_ESERVFAIL;
-    goto done;
+    status = ARES_ESERVFAIL; /* LCOV_EXCL_LINE: UntestablePath */
+    goto done; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   status =
@@ -173,7 +173,7 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
   return status;
 }
 
-#elif defined(_WIN32)
+#elif defined(USE_WINSOCK)
 
 #  include <winsock2.h>
 #  include <iphlpapi.h>
@@ -182,31 +182,66 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
 
 struct ares_event_configchg {
   HANDLE               ifchg_hnd;
+  HKEY                 regip4;
+  HANDLE               regip4_event;
+  HANDLE               regip4_wait;
+  HKEY                 regip6;
+  HANDLE               regip6_event;
+  HANDLE               regip6_wait;
   ares_event_thread_t *e;
 };
 
 void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
 {
-#  ifdef __WATCOMC__
-  /* Not supported */
-#  else
   if (configchg == NULL) {
     return;
   }
 
+#  ifndef __WATCOMC__
   if (configchg->ifchg_hnd != NULL) {
     CancelMibChangeNotify2(configchg->ifchg_hnd);
     configchg->ifchg_hnd = NULL;
   }
+#  endif
+
+  if (configchg->regip4_wait != NULL) {
+    UnregisterWait(configchg->regip4_wait);
+    configchg->regip4_wait = NULL;
+  }
+
+  if (configchg->regip6_wait != NULL) {
+    UnregisterWait(configchg->regip6_wait);
+    configchg->regip6_wait = NULL;
+  }
+
+  if (configchg->regip4 != NULL) {
+    RegCloseKey(configchg->regip4);
+    configchg->regip4 = NULL;
+  }
+
+  if (configchg->regip6 != NULL) {
+    RegCloseKey(configchg->regip6);
+    configchg->regip6 = NULL;
+  }
+
+  if (configchg->regip4_event != NULL) {
+    CloseHandle(configchg->regip4_event);
+    configchg->regip4_event = NULL;
+  }
+
+  if (configchg->regip6_event != NULL) {
+    CloseHandle(configchg->regip6_event);
+    configchg->regip6_event = NULL;
+  }
 
   ares_free(configchg);
-#  endif
 }
 
+
 #  ifndef __WATCOMC__
-static void ares_event_configchg_cb(PVOID                 CallerContext,
-                                    PMIB_IPINTERFACE_ROW  Row,
-                                    MIB_NOTIFICATION_TYPE NotificationType)
+static void ares_event_configchg_ip_cb(PVOID                 CallerContext,
+                                       PMIB_IPINTERFACE_ROW  Row,
+                                       MIB_NOTIFICATION_TYPE NotificationType)
 {
   ares_event_configchg_t *configchg = CallerContext;
   (void)Row;
@@ -215,43 +250,125 @@ static void ares_event_configchg_cb(PVOID                 CallerContext,
 }
 #  endif
 
+static ares_bool_t ares_event_configchg_regnotify(ares_event_configchg_t *configchg)
+{
+#  if defined(__WATCOMC__) && !defined(REG_NOTIFY_THREAD_AGNOSTIC)
+#    define REG_NOTIFY_THREAD_AGNOSTIC 0x10000000L
+#  endif
+  DWORD flags =
+    REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_LAST_SET|REG_NOTIFY_THREAD_AGNOSTIC;
+
+  if (RegNotifyChangeKeyValue(configchg->regip4, TRUE,
+                              flags,
+                              configchg->regip4_event,
+                              TRUE) != ERROR_SUCCESS) {
+    return ARES_FALSE;
+  }
+
+  if (RegNotifyChangeKeyValue(configchg->regip6, TRUE,
+                              flags,
+                              configchg->regip6_event,
+                              TRUE) != ERROR_SUCCESS) {
+    return ARES_FALSE;
+  }
+
+  return ARES_TRUE;
+}
+
+static VOID CALLBACK ares_event_configchg_reg_cb(PVOID lpParameter,
+                                                 BOOLEAN TimerOrWaitFired)
+{
+  ares_event_configchg_t *configchg = lpParameter;
+  (void)TimerOrWaitFired;
+
+  ares_reinit(configchg->e->channel);
+
+  /* Re-arm, as its single-shot.  However, we don't know which one needs to
+   * be re-armed, so we just do both */
+  ares_event_configchg_regnotify(configchg);
+}
 
 ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
                                         ares_event_thread_t     *e)
 {
-#  ifdef __WATCOMC__
-  return ARES_ENOTIMP;
-#  else
-  ares_status_t status = ARES_SUCCESS;
+  ares_status_t           status = ARES_SUCCESS;
+  ares_event_configchg_t *c      = NULL;
 
-  *configchg = ares_malloc_zero(sizeof(**configchg));
-  if (*configchg == NULL) {
+  c = ares_malloc_zero(sizeof(**configchg));
+  if (c == NULL) {
     return ARES_ENOMEM;
   }
 
-  (*configchg)->e = e;
+  c->e = e;
 
+#ifndef __WATCOMC__
   /* NOTE: If a user goes into the control panel and changes the network
    *       adapter DNS addresses manually, this will NOT trigger a notification.
    *       We've also tried listening on NotifyUnicastIpAddressChange(), but
    *       that didn't get triggered either.
    */
-
   if (NotifyIpInterfaceChange(
-        AF_UNSPEC, (PIPINTERFACE_CHANGE_CALLBACK)ares_event_configchg_cb,
-        *configchg, FALSE, &(*configchg)->ifchg_hnd) != NO_ERROR) {
+        AF_UNSPEC, (PIPINTERFACE_CHANGE_CALLBACK)ares_event_configchg_ip_cb,
+        *configchg, FALSE, &c->ifchg_hnd) != NO_ERROR) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+#endif
+
+  /* Monitor HKLM\SYSTEM\CurrentControlSet\Services\Tcpip6\Parameters\Interfaces
+   * and HKLM\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces
+   * for changes via RegNotifyChangeKeyValue() */
+  if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+        "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces",
+        0, KEY_NOTIFY, &c->regip4) != ERROR_SUCCESS) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+        "SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters\\Interfaces",
+        0, KEY_NOTIFY, &c->regip6) != ERROR_SUCCESS) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  c->regip4_event = CreateEvent(NULL, TRUE, FALSE, NULL);
+  if (c->regip4_event == NULL) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  c->regip6_event = CreateEvent(NULL, TRUE, FALSE, NULL);
+  if (c->regip6_event == NULL) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  if (!RegisterWaitForSingleObject(&c->regip4_wait, c->regip4_event,
+    ares_event_configchg_reg_cb, c, INFINITE, WT_EXECUTEDEFAULT)) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  if (!RegisterWaitForSingleObject(&c->regip6_wait, c->regip6_event,
+    ares_event_configchg_reg_cb, c, INFINITE, WT_EXECUTEDEFAULT)) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  if (!ares_event_configchg_regnotify(c)) {
     status = ARES_ESERVFAIL;
     goto done;
   }
 
 done:
   if (status != ARES_SUCCESS) {
-    ares_event_configchg_destroy(*configchg);
-    *configchg = NULL;
+    ares_event_configchg_destroy(c);
+  } else {
+    *configchg = c;
   }
 
   return status;
-#  endif
 }
 
 #elif defined(__APPLE__)
@@ -260,6 +377,7 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
 #  include <unistd.h>
 #  include <notify.h>
 #  include <dlfcn.h>
+#  include <fcntl.h>
 
 struct ares_event_configchg {
   int fd;
@@ -328,11 +446,17 @@ static void ares_event_configchg_cb(ares_event_thread_t *e, ares_socket_t fd,
 ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
                                         ares_event_thread_t     *e)
 {
-  ares_status_t status                               = ARES_SUCCESS;
-  void         *handle                               = NULL;
-  const char *(*pdns_configuration_notify_key)(void) = NULL;
-  const char *notify_key                             = NULL;
-  int         flags;
+  ares_status_t   status                               = ARES_SUCCESS;
+  void           *handle                               = NULL;
+  const char   *(*pdns_configuration_notify_key)(void) = NULL;
+  const char     *notify_key                           = NULL;
+  int             flags;
+  size_t          i;
+  const char     *searchlibs[]                         = {
+    "/usr/lib/libSystem.dylib",
+    "/System/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration",
+    NULL
+  };
 
   *configchg = ares_malloc_zero(sizeof(**configchg));
   if (*configchg == NULL) {
@@ -340,13 +464,22 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
   }
 
   /* Load symbol as it isn't normally public */
-  handle = dlopen("/usr/lib/libSystem.dylib", RTLD_LAZY | RTLD_NOLOAD);
-  if (handle == NULL) {
-    status = ARES_ESERVFAIL;
-    goto done;
-  }
+  for (i=0; searchlibs[i] != NULL; i++) {
+    handle = dlopen(searchlibs[i], RTLD_LAZY);
+    if (handle == NULL) {
+      /* Fail, loop! */
+      continue;
+    }
 
-  pdns_configuration_notify_key = dlsym(handle, "dns_configuration_notify_key");
+    pdns_configuration_notify_key = dlsym(handle, "dns_configuration_notify_key");
+    if (pdns_configuration_notify_key != NULL) {
+      break;
+    }
+
+    /* Fail, loop! */
+    dlclose(handle);
+    handle = NULL;
+  }
 
   if (pdns_configuration_notify_key == NULL) {
     status = ARES_ESERVFAIL;
@@ -388,7 +521,7 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
   return status;
 }
 
-#elif defined(HAVE_STAT)
+#elif defined(HAVE_STAT) && !defined(_WIN32)
 #  ifdef HAVE_SYS_TYPES_H
 #    include <sys/types.h>
 #  endif
diff --git a/lib/c-ares-1.30.0/src/lib/ares_event_epoll.c b/lib/c-ares-1.31.0/src/lib/ares_event_epoll.c
similarity index 90%
rename from lib/c-ares-1.30.0/src/lib/ares_event_epoll.c
rename to lib/c-ares-1.31.0/src/lib/ares_event_epoll.c
index 78cbbc368c8..9ebd87c05c2 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_event_epoll.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_event_epoll.c
@@ -46,12 +46,12 @@ static void ares_evsys_epoll_destroy(ares_event_thread_t *e)
   ares_evsys_epoll_t *ep = NULL;
 
   if (e == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ep = e->ev_sys_data;
   if (ep == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (ep->epoll_fd != -1) {
@@ -68,15 +68,15 @@ static ares_bool_t ares_evsys_epoll_init(ares_event_thread_t *e)
 
   ep = ares_malloc_zero(sizeof(*ep));
   if (ep == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   e->ev_sys_data = ep;
 
   ep->epoll_fd = epoll_create1(0);
   if (ep->epoll_fd == -1) {
-    ares_evsys_epoll_destroy(e);
-    return ARES_FALSE;
+    ares_evsys_epoll_destroy(e); /* LCOV_EXCL_LINE: UntestablePath */
+    return ARES_FALSE; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
 #  ifdef FD_CLOEXEC
@@ -85,8 +85,8 @@ static ares_bool_t ares_evsys_epoll_init(ares_event_thread_t *e)
 
   e->ev_signal = ares_pipeevent_create(e);
   if (e->ev_signal == NULL) {
-    ares_evsys_epoll_destroy(e);
-    return ARES_FALSE;
+    ares_evsys_epoll_destroy(e); /* LCOV_EXCL_LINE: UntestablePath */
+    return ARES_FALSE; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   return ARES_TRUE;
@@ -108,7 +108,7 @@ static ares_bool_t ares_evsys_epoll_event_add(ares_event_t *event)
     epev.events |= EPOLLOUT;
   }
   if (epoll_ctl(ep->epoll_fd, EPOLL_CTL_ADD, event->fd, &epev) != 0) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: UntestablePath */
   }
   return ARES_TRUE;
 }
@@ -158,7 +158,7 @@ static size_t ares_evsys_epoll_wait(ares_event_thread_t *e,
   rv = epoll_wait(ep->epoll_fd, events, (int)nevents,
                   (timeout_ms == 0) ? -1 : (int)timeout_ms);
   if (rv < 0) {
-    return 0;
+    return 0; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   nevents = (size_t)rv;
@@ -170,7 +170,7 @@ static size_t ares_evsys_epoll_wait(ares_event_thread_t *e,
     ev = ares__htable_asvp_get_direct(e->ev_sock_handles,
                                       (ares_socket_t)events[i].data.fd);
     if (ev == NULL || ev->cb == NULL) {
-      continue;
+      continue; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     cnt++;
diff --git a/lib/c-ares-1.30.0/src/lib/ares_event_kqueue.c b/lib/c-ares-1.31.0/src/lib/ares_event_kqueue.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_event_kqueue.c
rename to lib/c-ares-1.31.0/src/lib/ares_event_kqueue.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_event_poll.c b/lib/c-ares-1.31.0/src/lib/ares_event_poll.c
similarity index 96%
rename from lib/c-ares-1.30.0/src/lib/ares_event_poll.c
rename to lib/c-ares-1.31.0/src/lib/ares_event_poll.c
index a06c6e3fc41..bcaac791994 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_event_poll.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_event_poll.c
@@ -37,7 +37,7 @@ static ares_bool_t ares_evsys_poll_init(ares_event_thread_t *e)
 {
   e->ev_signal = ares_pipeevent_create(e);
   if (e->ev_signal == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: UntestablePath */
   }
   return ARES_TRUE;
 }
@@ -78,7 +78,7 @@ static size_t ares_evsys_poll_wait(ares_event_thread_t *e,
   if (fdlist != NULL && num_fds) {
     pollfd = ares_malloc_zero(sizeof(*pollfd) * num_fds);
     if (pollfd == NULL) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     for (i = 0; i < num_fds; i++) {
       const ares_event_t *ev =
@@ -111,7 +111,7 @@ static size_t ares_evsys_poll_wait(ares_event_thread_t *e,
 
     ev = ares__htable_asvp_get_direct(e->ev_sock_handles, pollfd[i].fd);
     if (ev == NULL || ev->cb == NULL) {
-      continue;
+      continue; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (pollfd[i].revents & (POLLERR | POLLHUP | POLLIN)) {
diff --git a/lib/c-ares-1.30.0/src/lib/ares_event_select.c b/lib/c-ares-1.31.0/src/lib/ares_event_select.c
similarity index 97%
rename from lib/c-ares-1.30.0/src/lib/ares_event_select.c
rename to lib/c-ares-1.31.0/src/lib/ares_event_select.c
index 57a4271ea7d..89b399b92ac 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_event_select.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_event_select.c
@@ -45,7 +45,7 @@ static ares_bool_t ares_evsys_select_init(ares_event_thread_t *e)
 {
   e->ev_signal = ares_pipeevent_create(e);
   if (e->ev_signal == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: UntestablePath */
   }
   return ARES_TRUE;
 }
@@ -118,7 +118,7 @@ static size_t ares_evsys_select_wait(ares_event_thread_t *e,
 
       ev = ares__htable_asvp_get_direct(e->ev_sock_handles, fdlist[i]);
       if (ev == NULL || ev->cb == NULL) {
-        continue;
+        continue; /* LCOV_EXCL_LINE: DefensiveCoding */
       }
 
       if (FD_ISSET(fdlist[i], &read_fds)) {
diff --git a/lib/c-ares-1.30.0/src/lib/ares_event_thread.c b/lib/c-ares-1.31.0/src/lib/ares_event_thread.c
similarity index 90%
rename from lib/c-ares-1.30.0/src/lib/ares_event_thread.c
rename to lib/c-ares-1.31.0/src/lib/ares_event_thread.c
index d9d904f29ba..e87313f6296 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_event_thread.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_event_thread.c
@@ -32,7 +32,7 @@ static void ares_event_destroy_cb(void *arg)
 {
   ares_event_t *event = arg;
   if (event == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Unregister from the event thread if it was registered with one */
@@ -90,7 +90,7 @@ ares_status_t ares_event_update(ares_event_t **event, ares_event_thread_t *e,
   ares_event_t *ev = NULL;
 
   if (e == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Callback must be specified if not a removal event. */
@@ -124,12 +124,12 @@ ares_status_t ares_event_update(ares_event_t **event, ares_event_thread_t *e,
     /* Allocate a new one */
     ev = ares_malloc_zero(sizeof(*ev));
     if (ev == NULL) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     if (ares__llist_insert_last(e->ev_updates, ev) == NULL) {
-      ares_free(ev);
-      return ARES_ENOMEM;
+      ares_free(ev); /* LCOV_EXCL_LINE: OutOfMemory */
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -158,7 +158,7 @@ ares_status_t ares_event_update(ares_event_t **event, ares_event_thread_t *e,
 static void ares_event_signal(const ares_event_t *event)
 {
   if (event == NULL || event->signal_cb == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   event->signal_cb(event);
 }
@@ -166,7 +166,7 @@ static void ares_event_signal(const ares_event_t *event)
 static void ares_event_thread_wake(const ares_event_thread_t *e)
 {
   if (e == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares_event_signal(e->ev_signal);
@@ -345,7 +345,7 @@ void ares_event_thread_destroy(ares_channel_t *channel)
   ares_event_thread_t *e = channel->sock_state_cb_data;
 
   if (e == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares_event_thread_destroy_int(e);
@@ -355,7 +355,7 @@ static const ares_event_sys_t *ares_event_fetch_sys(ares_evsys_t evsys)
 {
   switch (evsys) {
     case ARES_EVSYS_WIN32:
-#if defined(_WIN32)
+#if defined(USE_WINSOCK)
       return &ares_evsys_win32;
 #else
       return NULL;
@@ -391,7 +391,7 @@ static const ares_event_sys_t *ares_event_fetch_sys(ares_evsys_t evsys)
 
     /* case ARES_EVSYS_DEFAULT: */
     default:
-#if defined(_WIN32)
+#if defined(USE_WINSOCK)
       return &ares_evsys_win32;
 #elif defined(HAVE_KQUEUE)
       return &ares_evsys_kqueue;
@@ -415,49 +415,51 @@ ares_status_t ares_event_thread_init(ares_channel_t *channel)
 
   e = ares_malloc_zero(sizeof(*e));
   if (e == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   e->mutex = ares__thread_mutex_create();
   if (e->mutex == NULL) {
-    ares_event_thread_destroy_int(e);
-    return ARES_ENOMEM;
+    ares_event_thread_destroy_int(e); /* LCOV_EXCL_LINE: OutOfMemory */
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   e->ev_updates = ares__llist_create(NULL);
   if (e->ev_updates == NULL) {
-    ares_event_thread_destroy_int(e);
-    return ARES_ENOMEM;
+    ares_event_thread_destroy_int(e); /* LCOV_EXCL_LINE: OutOfMemory */
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   e->ev_sock_handles = ares__htable_asvp_create(ares_event_destroy_cb);
   if (e->ev_sock_handles == NULL) {
-    ares_event_thread_destroy_int(e);
-    return ARES_ENOMEM;
+    ares_event_thread_destroy_int(e); /* LCOV_EXCL_LINE: OutOfMemory */
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   e->ev_cust_handles = ares__htable_vpvp_create(NULL, ares_event_destroy_cb);
   if (e->ev_cust_handles == NULL) {
-    ares_event_thread_destroy_int(e);
-    return ARES_ENOMEM;
+    ares_event_thread_destroy_int(e); /* LCOV_EXCL_LINE: OutOfMemory */
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   e->channel = channel;
   e->isup    = ARES_TRUE;
   e->ev_sys  = ares_event_fetch_sys(channel->evsys);
   if (e->ev_sys == NULL) {
-    ares_event_thread_destroy_int(e);
-    return ARES_ENOTIMP;
+    ares_event_thread_destroy_int(e); /* LCOV_EXCL_LINE: UntestablePath */
+    return ARES_ENOTIMP; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   channel->sock_state_cb      = ares_event_thread_sockstate_cb;
   channel->sock_state_cb_data = e;
 
   if (!e->ev_sys->init(e)) {
+    /* LCOV_EXCL_START: UntestablePath */
     ares_event_thread_destroy_int(e);
     channel->sock_state_cb      = NULL;
     channel->sock_state_cb_data = NULL;
     return ARES_ESERVFAIL;
+    /* LCOV_EXCL_STOP */
   }
 
   /* Before starting the thread, process any possible events the initialization
@@ -469,10 +471,12 @@ ares_status_t ares_event_thread_init(ares_channel_t *channel)
 
   /* Start thread */
   if (ares__thread_create(&e->thread, ares_event_thread, e) != ARES_SUCCESS) {
+    /* LCOV_EXCL_START: UntestablePath */
     ares_event_thread_destroy_int(e);
     channel->sock_state_cb      = NULL;
     channel->sock_state_cb_data = NULL;
     return ARES_ESERVFAIL;
+    /* LCOV_EXCL_STOP */
   }
 
   return ARES_SUCCESS;
diff --git a/lib/c-ares-1.30.0/src/lib/ares_event_wake_pipe.c b/lib/c-ares-1.31.0/src/lib/ares_event_wake_pipe.c
similarity index 90%
rename from lib/c-ares-1.30.0/src/lib/ares_event_wake_pipe.c
rename to lib/c-ares-1.31.0/src/lib/ares_event_wake_pipe.c
index a2cd6f609a4..c0aa70b5dea 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_event_wake_pipe.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_event_wake_pipe.c
@@ -60,7 +60,7 @@ static ares_pipeevent_t *ares_pipeevent_init(void)
 {
   ares_pipeevent_t *p = ares_malloc_zero(sizeof(*p));
   if (p == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   p->filedes[0] = -1;
@@ -68,8 +68,8 @@ static ares_pipeevent_t *ares_pipeevent_init(void)
 
 #  ifdef HAVE_PIPE2
   if (pipe2(p->filedes, O_NONBLOCK | O_CLOEXEC) != 0) {
-    ares_pipeevent_destroy(p);
-    return NULL;
+    ares_pipeevent_destroy(p); /* LCOV_EXCL_LINE: UntestablePath */
+    return NULL; /* LCOV_EXCL_LINE: UntestablePath */
   }
 #  else
   if (pipe(p->filedes) != 0) {
@@ -113,7 +113,7 @@ static void ares_pipeevent_signal(const ares_event_t *e)
   const ares_pipeevent_t *p;
 
   if (e == NULL || e->data == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   p = e->data;
@@ -131,7 +131,7 @@ static void ares_pipeevent_cb(ares_event_thread_t *e, ares_socket_t fd,
   (void)flags;
 
   if (data == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   p = data;
@@ -156,8 +156,8 @@ ares_event_t *ares_pipeevent_create(ares_event_thread_t *e)
                              p->filedes[0], p, ares_pipeevent_destroy_cb,
                              ares_pipeevent_signal);
   if (status != ARES_SUCCESS) {
-    ares_pipeevent_destroy(p);
-    return NULL;
+    ares_pipeevent_destroy(p); /* LCOV_EXCL_LINE: DefensiveCoding */
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   return event;
diff --git a/lib/c-ares-1.30.0/src/lib/ares_event_win32.c b/lib/c-ares-1.31.0/src/lib/ares_event_win32.c
similarity index 99%
rename from lib/c-ares-1.30.0/src/lib/ares_event_win32.c
rename to lib/c-ares-1.31.0/src/lib/ares_event_win32.c
index 718e8650851..fa84864b4be 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_event_win32.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_event_win32.c
@@ -33,7 +33,7 @@
 #  include <limits.h>
 #endif
 
-#ifdef _WIN32
+#if defined(USE_WINSOCK)
 
 /* IMPLEMENTATION NOTES
  * ====================
diff --git a/lib/c-ares-1.30.0/src/lib/ares_event_win32.h b/lib/c-ares-1.31.0/src/lib/ares_event_win32.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_event_win32.h
rename to lib/c-ares-1.31.0/src/lib/ares_event_win32.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares_expand_name.c b/lib/c-ares-1.31.0/src/lib/ares_expand_name.c
similarity index 81%
rename from lib/c-ares-1.30.0/src/lib/ares_expand_name.c
rename to lib/c-ares-1.31.0/src/lib/ares_expand_name.c
index 280490b86a3..8f6728dedd3 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_expand_name.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_expand_name.c
@@ -91,8 +91,8 @@ int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
   size_t        enclen_temp = 0;
   ares_status_t status;
 
-  if (alen < 0) {
-    return ARES_EBADRESP;
+  if (encoded == NULL || abuf == NULL || alen <= 0 || enclen == NULL) {
+    return ARES_EBADNAME;
   }
 
   status  = ares__expand_name_validated(encoded, abuf, (size_t)alen, s,
@@ -100,19 +100,3 @@ int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
   *enclen = (long)enclen_temp;
   return (int)status;
 }
-
-/* Like ares_expand_name_validated  but returns EBADRESP in case of invalid
- * input. */
-ares_status_t ares__expand_name_for_response(const unsigned char *encoded,
-                                             const unsigned char *abuf,
-                                             size_t alen, char **s,
-                                             size_t     *enclen,
-                                             ares_bool_t is_hostname)
-{
-  ares_status_t status =
-    ares__expand_name_validated(encoded, abuf, alen, s, enclen, is_hostname);
-  if (status == ARES_EBADNAME) {
-    status = ARES_EBADRESP;
-  }
-  return status;
-}
diff --git a/lib/c-ares-1.30.0/src/lib/ares_expand_string.c b/lib/c-ares-1.31.0/src/lib/ares_expand_string.c
similarity index 97%
rename from lib/c-ares-1.30.0/src/lib/ares_expand_string.c
rename to lib/c-ares-1.31.0/src/lib/ares_expand_string.c
index be7034e2719..502125a8af5 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_expand_string.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_expand_string.c
@@ -100,7 +100,7 @@ int ares_expand_string(const unsigned char *encoded, const unsigned char *abuf,
   ares_status_t status;
   size_t        temp_enclen = 0;
 
-  if (alen < 0) {
+  if (encoded == NULL || abuf == NULL || alen <= 0 || enclen == NULL) {
     return ARES_EBADRESP;
   }
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares_fds.c b/lib/c-ares-1.31.0/src/lib/ares_fds.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_fds.c
rename to lib/c-ares-1.31.0/src/lib/ares_fds.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_free_hostent.c b/lib/c-ares-1.31.0/src/lib/ares_free_hostent.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_free_hostent.c
rename to lib/c-ares-1.31.0/src/lib/ares_free_hostent.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_free_string.c b/lib/c-ares-1.31.0/src/lib/ares_free_string.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_free_string.c
rename to lib/c-ares-1.31.0/src/lib/ares_free_string.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_freeaddrinfo.c b/lib/c-ares-1.31.0/src/lib/ares_freeaddrinfo.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_freeaddrinfo.c
rename to lib/c-ares-1.31.0/src/lib/ares_freeaddrinfo.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_getaddrinfo.c b/lib/c-ares-1.31.0/src/lib/ares_getaddrinfo.c
similarity index 96%
rename from lib/c-ares-1.30.0/src/lib/ares_getaddrinfo.c
rename to lib/c-ares-1.31.0/src/lib/ares_getaddrinfo.c
index cfc889c70a8..51463402e2f 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_getaddrinfo.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_getaddrinfo.c
@@ -60,10 +60,7 @@
 #include "ares_private.h"
 #include "ares_dns.h"
 
-#ifdef WATT32
-#  undef WIN32
-#endif
-#ifdef WIN32
+#ifdef _WIN32
 #  include "ares_platform.h"
 #endif
 
@@ -112,7 +109,7 @@ struct ares_addrinfo_cname *
   struct ares_addrinfo_cname *last = *head;
 
   if (tail == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (!last) {
@@ -152,7 +149,7 @@ struct ares_addrinfo_node *
   struct ares_addrinfo_node *last = *head;
 
   if (tail == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (!last) {
@@ -277,8 +274,8 @@ static ares_bool_t fake_addrinfo(const char *name, unsigned short port,
       if (result) {
         status = ares_append_ai_node(AF_INET, port, 0, &addr4, &ai->nodes);
         if (status != ARES_SUCCESS) {
-          callback(arg, (int)status, 0, NULL);
-          return ARES_TRUE;
+          callback(arg, (int)status, 0, NULL); /* LCOV_EXCL_LINE: OutOfMemory */
+          return ARES_TRUE; /* LCOV_EXCL_LINE: OutOfMemory */
         }
       }
     }
@@ -291,8 +288,8 @@ static ares_bool_t fake_addrinfo(const char *name, unsigned short port,
     if (result) {
       status = ares_append_ai_node(AF_INET6, port, 0, &addr6, &ai->nodes);
       if (status != ARES_SUCCESS) {
-        callback(arg, (int)status, 0, NULL);
-        return ARES_TRUE;
+        callback(arg, (int)status, 0, NULL); /* LCOV_EXCL_LINE: OutOfMemory */
+        return ARES_TRUE; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -304,9 +301,11 @@ static ares_bool_t fake_addrinfo(const char *name, unsigned short port,
   if (hints->ai_flags & ARES_AI_CANONNAME) {
     cname = ares__append_addrinfo_cname(&ai->cnames);
     if (!cname) {
+      /* LCOV_EXCL_START: OutOfMemory */
       ares_freeaddrinfo(ai);
       callback(arg, ARES_ENOMEM, 0, NULL);
       return ARES_TRUE;
+      /* LCOV_EXCL_STOP */
     }
 
     /* Duplicate the name, to avoid a constness violation. */
@@ -371,7 +370,7 @@ ares_bool_t ares__is_localhost(const char *name)
   size_t len;
 
   if (name == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (strcmp(name, "localhost") == 0) {
@@ -415,7 +414,7 @@ static ares_status_t file_lookup(struct host_query *hquery)
     hquery->ai);
 
   if (status != ARES_SUCCESS) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
 
@@ -497,7 +496,7 @@ static void host_callback(void *arg, ares_status_t status, size_t timeouts,
 
   if (status == ARES_SUCCESS) {
     if (dnsrec == NULL) {
-      addinfostatus = ARES_EBADRESP;
+      addinfostatus = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
     } else {
       addinfostatus =
         ares__parse_into_addrinfo(dnsrec, ARES_TRUE, hquery->port, hquery->ai);
diff --git a/lib/c-ares-1.30.0/src/lib/ares_getenv.c b/lib/c-ares-1.31.0/src/lib/ares_getenv.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_getenv.c
rename to lib/c-ares-1.31.0/src/lib/ares_getenv.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_getenv.h b/lib/c-ares-1.31.0/src/lib/ares_getenv.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_getenv.h
rename to lib/c-ares-1.31.0/src/lib/ares_getenv.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares_gethostbyaddr.c b/lib/c-ares-1.31.0/src/lib/ares_gethostbyaddr.c
similarity index 96%
rename from lib/c-ares-1.30.0/src/lib/ares_gethostbyaddr.c
rename to lib/c-ares-1.31.0/src/lib/ares_gethostbyaddr.c
index 453673260dc..9676e17edfb 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_gethostbyaddr.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_gethostbyaddr.c
@@ -44,10 +44,6 @@
 #include "ares_platform.h"
 #include "ares_private.h"
 
-#ifdef WATT32
-#  undef WIN32
-#endif
-
 struct addr_query {
   /* Arguments passed to ares_gethostbyaddr() */
   ares_channel_t    *channel;
@@ -92,9 +88,11 @@ static void ares_gethostbyaddr_int(ares_channel_t *channel, const void *addr,
   }
   aquery->lookups = ares_strdup(channel->lookups);
   if (aquery->lookups == NULL) {
+    /* LCOV_EXCL_START: OutOfMemory */
     ares_free(aquery);
     callback(arg, ARES_ENOMEM, 0, NULL);
     return;
+    /* LCOV_EXCL_STOP */
   }
   aquery->channel = channel;
   if (family == AF_INET) {
@@ -134,8 +132,8 @@ static void next_lookup(struct addr_query *aquery)
       case 'b':
         name = ares_dns_addr_to_ptr(&aquery->addr);
         if (name == NULL) {
-          end_aquery(aquery, ARES_ENOMEM, NULL);
-          return;
+          end_aquery(aquery, ARES_ENOMEM, NULL); /* LCOV_EXCL_LINE: OutOfMemory */
+          return; /* LCOV_EXCL_LINE: OutOfMemory */
         }
         aquery->remaining_lookups = p + 1;
         ares_query_dnsrec(aquery->channel, name, ARES_CLASS_IN,
@@ -227,7 +225,7 @@ static ares_status_t file_lookup(ares_channel_t         *channel,
 
   status = ares__hosts_entry_to_hostent(entry, addr->family, host);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
diff --git a/lib/c-ares-1.30.0/src/lib/ares_gethostbyname.c b/lib/c-ares-1.31.0/src/lib/ares_gethostbyname.c
similarity index 97%
rename from lib/c-ares-1.30.0/src/lib/ares_gethostbyname.c
rename to lib/c-ares-1.31.0/src/lib/ares_gethostbyname.c
index 299c35b4169..2a8ec555d4e 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_gethostbyname.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_gethostbyname.c
@@ -248,18 +248,18 @@ static ares_status_t ares__hostent_localhost(const char *name, int family,
 
   ai = ares_malloc_zero(sizeof(*ai));
   if (ai == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__addrinfo_localhost(name, 0, &hints, ai);
   if (status != ARES_SUCCESS) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__addrinfo2hostent(ai, family, host_out);
   if (status != ARES_SUCCESS) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
 done:
@@ -298,7 +298,7 @@ static ares_status_t ares_gethostbyname_file_int(ares_channel_t *channel,
 
   status = ares__hosts_entry_to_hostent(entry, family, host);
   if (status != ARES_SUCCESS) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
 done:
diff --git a/lib/c-ares-1.30.0/src/lib/ares_getnameinfo.c b/lib/c-ares-1.31.0/src/lib/ares_getnameinfo.c
similarity index 99%
rename from lib/c-ares-1.30.0/src/lib/ares_getnameinfo.c
rename to lib/c-ares-1.31.0/src/lib/ares_getnameinfo.c
index d4cf58ea516..57c6ddaf999 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_getnameinfo.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_getnameinfo.c
@@ -82,7 +82,7 @@ static char *lookup_service(unsigned short port, unsigned int flags, char *buf,
                             size_t buflen);
 #ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
 static void append_scopeid(const struct sockaddr_in6 *addr6,
-                           unsigned int scopeid, char *buf, size_t buflen);
+                           unsigned int flags, char *buf, size_t buflen);
 #endif
 static char *ares_striendstr(const char *s1, const char *s2);
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares_getsock.c b/lib/c-ares-1.31.0/src/lib/ares_getsock.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_getsock.c
rename to lib/c-ares-1.31.0/src/lib/ares_getsock.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_inet_net_pton.h b/lib/c-ares-1.31.0/src/lib/ares_inet_net_pton.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_inet_net_pton.h
rename to lib/c-ares-1.31.0/src/lib/ares_inet_net_pton.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares_init.c b/lib/c-ares-1.31.0/src/lib/ares_init.c
similarity index 92%
rename from lib/c-ares-1.30.0/src/lib/ares_init.c
rename to lib/c-ares-1.31.0/src/lib/ares_init.c
index c8b4c345641..be3cfacf581 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_init.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_init.c
@@ -67,11 +67,6 @@
 #include "ares_private.h"
 #include "ares_event.h"
 
-#ifdef WATT32
-#  undef WIN32 /* Redefined in MingW/MSVC headers */
-#endif
-
-
 int ares_init(ares_channel_t **channelptr)
 {
   return ares_init_options(channelptr, NULL, 0);
@@ -122,7 +117,7 @@ static int server_sort_cb(const void *data1, const void *data2)
 static void server_destroy_cb(void *data)
 {
   if (data == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   ares__destroy_server(data);
 }
@@ -167,7 +162,7 @@ static ares_status_t init_by_defaults(ares_channel_t *channel)
 
     rc = ares__sconfig_append(&sconfig, &addr, 0, 0, NULL);
     if (rc != ARES_SUCCESS) {
-      goto error;
+      goto error; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     rc = ares__servers_update(channel, sconfig, ARES_FALSE);
@@ -201,8 +196,8 @@ static ares_status_t init_by_defaults(ares_channel_t *channel)
 
     hostname = ares_malloc(len);
     if (!hostname) {
-      rc = ARES_ENOMEM;
-      goto error;
+      rc = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto error; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     do {
@@ -214,8 +209,8 @@ static ares_status_t init_by_defaults(ares_channel_t *channel)
         lenv *= 2;
         p     = ares_realloc(hostname, len);
         if (!p) {
-          rc = ARES_ENOMEM;
-          goto error;
+          rc = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+          goto error; /* LCOV_EXCL_LINE: OutOfMemory */
         }
         hostname = p;
         continue;
@@ -233,13 +228,13 @@ static ares_status_t init_by_defaults(ares_channel_t *channel)
       /* a dot was found */
       channel->domains = ares_malloc(sizeof(char *));
       if (!channel->domains) {
-        rc = ARES_ENOMEM;
-        goto error;
+        rc = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+        goto error; /* LCOV_EXCL_LINE: OutOfMemory */
       }
       channel->domains[0] = ares_strdup(dot + 1);
       if (!channel->domains[0]) {
-        rc = ARES_ENOMEM;
-        goto error;
+        rc = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+        goto error; /* LCOV_EXCL_LINE: OutOfMemory */
       }
       channel->ndomains = 1;
     }
@@ -253,7 +248,7 @@ static ares_status_t init_by_defaults(ares_channel_t *channel)
   if (!channel->lookups) {
     channel->lookups = ares_strdup("fb");
     if (!channel->lookups) {
-      rc = ARES_ENOMEM;
+      rc = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -351,12 +346,13 @@ int ares_init_options(ares_channel_t           **channelptr,
     goto done;
   }
 
-  if (channel->qcache_max_ttl > 0) {
-    status = ares__qcache_create(channel->rand_state, channel->qcache_max_ttl,
-                                 &channel->qcache);
-    if (status != ARES_SUCCESS) {
-      goto done;
-    }
+  /* Go ahead and let it initialize the query cache even if the ttl is 0 and
+   * completely unused.  This reduces the number of different code paths that
+   * might be followed even if there is a minor performance hit. */
+  status = ares__qcache_create(channel->rand_state, channel->qcache_max_ttl,
+                               &channel->qcache);
+  if (status != ARES_SUCCESS) {
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (status == ARES_SUCCESS) {
@@ -384,7 +380,7 @@ int ares_init_options(ares_channel_t           **channelptr,
 
     status = ares_event_thread_init(channel);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: UntestablePath */
     }
 
     /* Initialize monitor for configuration changes.  In some rare cases,
@@ -392,7 +388,7 @@ int ares_init_options(ares_channel_t           **channelptr,
     e      = channel->sock_state_cb_data;
     status = ares_event_configchg_init(&e->configchg, e);
     if (status != ARES_SUCCESS && status != ARES_ENOTIMP) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: UntestablePath */
     }
     status = ARES_SUCCESS;
   }
@@ -464,9 +460,11 @@ ares_status_t ares_reinit(ares_channel_t *channel)
     status =
       ares__thread_create(&channel->reinit_thread, ares_reinit_thread, channel);
     if (status != ARES_SUCCESS) {
+      /* LCOV_EXCL_START: UntestablePath */
       ares__channel_lock(channel);
       channel->reinit_pending = ARES_FALSE;
       ares__channel_unlock(channel);
+      /* LCOV_EXCL_STOP */
     }
   } else {
     /* Threading support not available, call directly */
@@ -539,18 +537,22 @@ int ares_dup(ares_channel_t **dest, const ares_channel_t *src)
   if (optmask & ARES_OPT_SERVERS) {
     char *csv = ares_get_servers_csv(src);
     if (csv == NULL) {
+      /* LCOV_EXCL_START: OutOfMemory */
       ares_destroy(*dest);
       *dest = NULL;
       rc    = ARES_ENOMEM;
       goto done;
+      /* LCOV_EXCL_STOP */
     }
 
     rc = (ares_status_t)ares_set_servers_ports_csv(*dest, csv);
     ares_free_string(csv);
     if (rc != ARES_SUCCESS) {
+      /* LCOV_EXCL_START: OutOfMemory */
       ares_destroy(*dest);
       *dest = NULL;
       goto done;
+      /* LCOV_EXCL_STOP */
     }
   }
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares_ipv6.h b/lib/c-ares-1.31.0/src/lib/ares_ipv6.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_ipv6.h
rename to lib/c-ares-1.31.0/src/lib/ares_ipv6.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares_library_init.c b/lib/c-ares-1.31.0/src/lib/ares_library_init.c
similarity index 99%
rename from lib/c-ares-1.30.0/src/lib/ares_library_init.c
rename to lib/c-ares-1.31.0/src/lib/ares_library_init.c
index 2767f1f93c7..1d98acc403e 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_library_init.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_library_init.c
@@ -55,7 +55,7 @@ static void        *default_malloc(size_t size)
   return malloc(size);
 }
 
-#if defined(WIN32)
+#if defined(_WIN32)
 /* We need indirections to handle Windows DLL rules. */
 static void *default_realloc(void *p, size_t size)
 {
diff --git a/lib/c-ares-1.30.0/src/lib/ares_math.c b/lib/c-ares-1.31.0/src/lib/ares_math.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_math.c
rename to lib/c-ares-1.31.0/src/lib/ares_math.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_options.c b/lib/c-ares-1.31.0/src/lib/ares_options.c
similarity index 93%
rename from lib/c-ares-1.30.0/src/lib/ares_options.c
rename to lib/c-ares-1.31.0/src/lib/ares_options.c
index 6f50f2e4981..959c4f7a8c9 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_options.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_options.c
@@ -249,7 +249,7 @@ static ares_status_t ares__init_options_servers(ares_channel_t       *channel,
 
   status = ares_in_addr_to_server_config_llist(servers, nservers, &slist);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__servers_update(channel, slist, ARES_TRUE);
@@ -266,12 +266,12 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
   size_t i;
 
   if (channel == NULL) {
-    return ARES_ENODATA;
+    return ARES_ENODATA; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (options == NULL) {
     if (optmask != 0) {
-      return ARES_ENODATA;
+      return ARES_ENODATA; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
     return ARES_SUCCESS;
   }
@@ -389,13 +389,13 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
     channel->domains =
       ares_malloc_zero((size_t)options->ndomains * sizeof(char *));
     if (!channel->domains) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     channel->ndomains = (size_t)options->ndomains;
     for (i = 0; i < (size_t)options->ndomains; i++) {
       channel->domains[i] = ares_strdup(options->domains[i]);
       if (!channel->domains[i]) {
-        return ARES_ENOMEM;
+        return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -407,7 +407,7 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
     } else {
       channel->lookups = ares_strdup(options->lookups);
       if (!channel->lookups) {
-        return ARES_ENOMEM;
+        return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -418,7 +418,7 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
     channel->sortlist =
       ares_malloc((size_t)options->nsort * sizeof(struct apattern));
     if (!channel->sortlist) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     for (i = 0; i < (size_t)options->nsort; i++) {
       channel->sortlist[i] = options->sortlist[i];
@@ -432,7 +432,7 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
     } else {
       channel->resolvconf_path = ares_strdup(options->resolvconf_path);
       if (channel->resolvconf_path == NULL) {
-        return ARES_ENOMEM;
+        return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -444,7 +444,7 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
     } else {
       channel->hosts_path = ares_strdup(options->hosts_path);
       if (channel->hosts_path == NULL) {
-        return ARES_ENOMEM;
+        return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -457,13 +457,15 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
     }
   }
 
+  /* As of c-ares 1.31.0, the Query Cache is on by default.  The only way to
+   * disable it is to set options->qcache_max_ttl = 0 while specifying the
+   * ARES_OPT_QUERY_CACHE which will actually disable it completely. */
   if (optmask & ARES_OPT_QUERY_CACHE) {
     /* qcache_max_ttl is unsigned unlike the others */
-    if (options->qcache_max_ttl == 0) {
-      optmask &= ~(ARES_OPT_QUERY_CACHE);
-    } else {
-      channel->qcache_max_ttl = options->qcache_max_ttl;
-    }
+    channel->qcache_max_ttl = options->qcache_max_ttl;
+  } else {
+    optmask                |= ARES_OPT_QUERY_CACHE;
+    channel->qcache_max_ttl = 3600;
   }
 
   /* Initialize the ipv4 servers if provided */
@@ -475,7 +477,7 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
       status = ares__init_options_servers(channel, options->servers,
                                           (size_t)options->nservers);
       if (status != ARES_SUCCESS) {
-        return status;
+        return status; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
diff --git a/lib/c-ares-1.30.0/src/lib/ares_parse_a_reply.c b/lib/c-ares-1.31.0/src/lib/ares_parse_a_reply.c
similarity index 98%
rename from lib/c-ares-1.30.0/src/lib/ares_parse_a_reply.c
rename to lib/c-ares-1.31.0/src/lib/ares_parse_a_reply.c
index da841f0da9a..2b7b0e6be28 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_parse_a_reply.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_parse_a_reply.c
@@ -85,7 +85,7 @@ int ares_parse_a_reply(const unsigned char *abuf, int alen,
   if (host != NULL) {
     status = ares__addrinfo2hostent(&ai, AF_INET, host);
     if (status != ARES_SUCCESS && status != ARES_ENODATA) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
   }
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares_parse_aaaa_reply.c b/lib/c-ares-1.31.0/src/lib/ares_parse_aaaa_reply.c
similarity index 98%
rename from lib/c-ares-1.30.0/src/lib/ares_parse_aaaa_reply.c
rename to lib/c-ares-1.31.0/src/lib/ares_parse_aaaa_reply.c
index b3eba166be6..6e2a466482a 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_parse_aaaa_reply.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_parse_aaaa_reply.c
@@ -87,7 +87,7 @@ int ares_parse_aaaa_reply(const unsigned char *abuf, int alen,
   if (host != NULL) {
     status = ares__addrinfo2hostent(&ai, AF_INET6, host);
     if (status != ARES_SUCCESS && status != ARES_ENODATA) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
   }
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares_parse_caa_reply.c b/lib/c-ares-1.31.0/src/lib/ares_parse_caa_reply.c
similarity index 87%
rename from lib/c-ares-1.30.0/src/lib/ares_parse_caa_reply.c
rename to lib/c-ares-1.31.0/src/lib/ares_parse_caa_reply.c
index 6c30305ee18..42f2525697d 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_parse_caa_reply.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_parse_caa_reply.c
@@ -66,8 +66,8 @@ int ares_parse_caa_reply(const unsigned char *abuf, int alen_int,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     /* XXX: Why do we allow Chaos class? */
@@ -84,8 +84,8 @@ int ares_parse_caa_reply(const unsigned char *abuf, int alen_int,
     /* Allocate storage for this CAA answer appending it to the list */
     caa_curr = ares_malloc_data(ARES_DATATYPE_CAA_REPLY);
     if (caa_curr == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Link in the record */
@@ -100,8 +100,8 @@ int ares_parse_caa_reply(const unsigned char *abuf, int alen_int,
     caa_curr->property =
       (unsigned char *)ares_strdup(ares_dns_rr_get_str(rr, ARES_RR_CAA_TAG));
     if (caa_curr->property == NULL) {
-      status = ARES_ENOMEM;
-      break;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      break; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     /* RFC6844 says this can only be ascii, so not sure why we're recording a
      * length */
@@ -109,15 +109,15 @@ int ares_parse_caa_reply(const unsigned char *abuf, int alen_int,
 
     ptr = ares_dns_rr_get_bin(rr, ARES_RR_CAA_VALUE, &ptr_len);
     if (ptr == NULL) {
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     /* Wants NULL termination for some reason */
     caa_curr->value = ares_malloc(ptr_len + 1);
     if (caa_curr->value == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     memcpy(caa_curr->value, ptr, ptr_len);
     caa_curr->value[ptr_len] = 0;
diff --git a/lib/c-ares-1.30.0/src/lib/ares_parse_mx_reply.c b/lib/c-ares-1.31.0/src/lib/ares_parse_mx_reply.c
similarity index 89%
rename from lib/c-ares-1.30.0/src/lib/ares_parse_mx_reply.c
rename to lib/c-ares-1.31.0/src/lib/ares_parse_mx_reply.c
index db7155d2e8f..f9e5f025a8f 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_parse_mx_reply.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_parse_mx_reply.c
@@ -64,8 +64,8 @@ int ares_parse_mx_reply(const unsigned char *abuf, int alen_int,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN ||
@@ -76,8 +76,8 @@ int ares_parse_mx_reply(const unsigned char *abuf, int alen_int,
     /* Allocate storage for this MX answer appending it to the list */
     mx_curr = ares_malloc_data(ARES_DATATYPE_MX_REPLY);
     if (mx_curr == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Link in the record */
@@ -92,8 +92,8 @@ int ares_parse_mx_reply(const unsigned char *abuf, int alen_int,
     mx_curr->host = ares_strdup(ares_dns_rr_get_str(rr, ARES_RR_MX_EXCHANGE));
 
     if (mx_curr->host == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares_parse_naptr_reply.c b/lib/c-ares-1.31.0/src/lib/ares_parse_naptr_reply.c
similarity index 85%
rename from lib/c-ares-1.30.0/src/lib/ares_parse_naptr_reply.c
rename to lib/c-ares-1.31.0/src/lib/ares_parse_naptr_reply.c
index 1a304ccdd3a..51ee6f38a5a 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_parse_naptr_reply.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_parse_naptr_reply.c
@@ -63,8 +63,8 @@ int ares_parse_naptr_reply(const unsigned char *abuf, int alen_int,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN ||
@@ -75,8 +75,8 @@ int ares_parse_naptr_reply(const unsigned char *abuf, int alen_int,
     /* Allocate storage for this NAPTR answer appending it to the list */
     naptr_curr = ares_malloc_data(ARES_DATATYPE_NAPTR_REPLY);
     if (naptr_curr == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Link in the record */
@@ -94,28 +94,28 @@ int ares_parse_naptr_reply(const unsigned char *abuf, int alen_int,
     naptr_curr->flags = (unsigned char *)ares_strdup(
       ares_dns_rr_get_str(rr, ARES_RR_NAPTR_FLAGS));
     if (naptr_curr->flags == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     /* XXX: Why is this unsigned char * ? */
     naptr_curr->service = (unsigned char *)ares_strdup(
       ares_dns_rr_get_str(rr, ARES_RR_NAPTR_SERVICES));
     if (naptr_curr->service == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     /* XXX: Why is this unsigned char * ? */
     naptr_curr->regexp = (unsigned char *)ares_strdup(
       ares_dns_rr_get_str(rr, ARES_RR_NAPTR_REGEXP));
     if (naptr_curr->regexp == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     naptr_curr->replacement =
       ares_strdup(ares_dns_rr_get_str(rr, ARES_RR_NAPTR_REPLACEMENT));
     if (naptr_curr->replacement == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares_parse_ns_reply.c b/lib/c-ares-1.31.0/src/lib/ares_parse_ns_reply.c
similarity index 84%
rename from lib/c-ares-1.30.0/src/lib/ares_parse_ns_reply.c
rename to lib/c-ares-1.31.0/src/lib/ares_parse_ns_reply.c
index 18fda82f412..762353964e2 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_parse_ns_reply.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_parse_ns_reply.c
@@ -73,16 +73,16 @@ int ares_parse_ns_reply(const unsigned char *abuf, int alen_int,
   /* Response structure */
   hostent = ares_malloc(sizeof(*hostent));
   if (hostent == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   memset(hostent, 0, sizeof(*hostent));
 
   hostent->h_addr_list = ares_malloc(sizeof(*hostent->h_addr_list));
   if (hostent->h_addr_list == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
   hostent->h_addr_list[0] = NULL;
   hostent->h_addrtype     = AF_INET;
@@ -91,19 +91,19 @@ int ares_parse_ns_reply(const unsigned char *abuf, int alen_int,
   /* Fill in hostname */
   status = ares_dns_record_query_get(dnsrec, 0, &hostname, NULL, NULL);
   if (status != ARES_SUCCESS) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   hostent->h_name = ares_strdup(hostname);
   if (hostent->h_name == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Preallocate the maximum number + 1 */
   hostent->h_aliases = ares_malloc((ancount + 1) * sizeof(*hostent->h_aliases));
   if (hostent->h_aliases == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
   memset(hostent->h_aliases, 0, (ancount + 1) * sizeof(*hostent->h_aliases));
 
@@ -113,8 +113,8 @@ int ares_parse_ns_reply(const unsigned char *abuf, int alen_int,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN ||
@@ -124,8 +124,8 @@ int ares_parse_ns_reply(const unsigned char *abuf, int alen_int,
 
     hostname = ares_dns_rr_get_str(rr, ARES_RR_NS_NSDNAME);
     if (hostname == NULL) {
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     hostent->h_aliases[nscount] = ares_strdup(hostname);
diff --git a/lib/c-ares-1.30.0/src/lib/ares_parse_ptr_reply.c b/lib/c-ares-1.31.0/src/lib/ares_parse_ptr_reply.c
similarity index 92%
rename from lib/c-ares-1.30.0/src/lib/ares_parse_ptr_reply.c
rename to lib/c-ares-1.31.0/src/lib/ares_parse_ptr_reply.c
index 6ee20f722e3..3f8cc122b0c 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_parse_ptr_reply.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_parse_ptr_reply.c
@@ -105,8 +105,8 @@ ares_status_t ares_parse_ptr_reply_dnsrec(const ares_dns_record_t *dnsrec,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN) {
@@ -117,8 +117,8 @@ ares_status_t ares_parse_ptr_reply_dnsrec(const ares_dns_record_t *dnsrec,
     if (ares_dns_rr_get_type(rr) == ARES_REC_TYPE_CNAME) {
       ptrname = ares_dns_rr_get_str(rr, ARES_RR_CNAME_CNAME);
       if (ptrname == NULL) {
-        status = ARES_EBADRESP;
-        goto done;
+        status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+        goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
       }
     }
 
@@ -145,8 +145,8 @@ ares_status_t ares_parse_ptr_reply_dnsrec(const ares_dns_record_t *dnsrec,
     /* Save most recent PTR record as the hostname */
     hostname = ares_dns_rr_get_str(rr, ARES_RR_PTR_DNAME);
     if (hostname == NULL) {
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     /* Append as an alias */
@@ -168,8 +168,8 @@ ares_status_t ares_parse_ptr_reply_dnsrec(const ares_dns_record_t *dnsrec,
   /* Fill in hostname */
   hostent->h_name = ares_strdup(hostname);
   if (hostent->h_name == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
 done:
diff --git a/lib/c-ares-1.30.0/src/lib/ares_parse_soa_reply.c b/lib/c-ares-1.31.0/src/lib/ares_parse_soa_reply.c
similarity index 87%
rename from lib/c-ares-1.30.0/src/lib/ares_parse_soa_reply.c
rename to lib/c-ares-1.31.0/src/lib/ares_parse_soa_reply.c
index 2777dbcb0bb..d471471aad8 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_parse_soa_reply.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_parse_soa_reply.c
@@ -62,8 +62,8 @@ int ares_parse_soa_reply(const unsigned char *abuf, int alen_int,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN ||
@@ -74,8 +74,8 @@ int ares_parse_soa_reply(const unsigned char *abuf, int alen_int,
     /* allocate result struct */
     soa = ares_malloc_data(ARES_DATATYPE_SOA_REPLY);
     if (soa == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     soa->serial  = ares_dns_rr_get_u32(rr, ARES_RR_SOA_SERIAL);
@@ -85,13 +85,13 @@ int ares_parse_soa_reply(const unsigned char *abuf, int alen_int,
     soa->minttl  = ares_dns_rr_get_u32(rr, ARES_RR_SOA_MINIMUM);
     soa->nsname  = ares_strdup(ares_dns_rr_get_str(rr, ARES_RR_SOA_MNAME));
     if (soa->nsname == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     soa->hostmaster = ares_strdup(ares_dns_rr_get_str(rr, ARES_RR_SOA_RNAME));
     if (soa->hostmaster == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     break;
   }
diff --git a/lib/c-ares-1.30.0/src/lib/ares_parse_srv_reply.c b/lib/c-ares-1.31.0/src/lib/ares_parse_srv_reply.c
similarity index 90%
rename from lib/c-ares-1.30.0/src/lib/ares_parse_srv_reply.c
rename to lib/c-ares-1.31.0/src/lib/ares_parse_srv_reply.c
index f27bcce7330..438737b79ac 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_parse_srv_reply.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_parse_srv_reply.c
@@ -64,8 +64,8 @@ int ares_parse_srv_reply(const unsigned char *abuf, int alen_int,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN ||
@@ -76,8 +76,8 @@ int ares_parse_srv_reply(const unsigned char *abuf, int alen_int,
     /* Allocate storage for this SRV answer appending it to the list */
     srv_curr = ares_malloc_data(ARES_DATATYPE_SRV_REPLY);
     if (srv_curr == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Link in the record */
@@ -96,8 +96,8 @@ int ares_parse_srv_reply(const unsigned char *abuf, int alen_int,
     srv_curr->host = ares_strdup(ares_dns_rr_get_str(rr, ARES_RR_SRV_TARGET));
 
     if (srv_curr->host == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares_parse_txt_reply.c b/lib/c-ares-1.31.0/src/lib/ares_parse_txt_reply.c
similarity index 91%
rename from lib/c-ares-1.30.0/src/lib/ares_parse_txt_reply.c
rename to lib/c-ares-1.31.0/src/lib/ares_parse_txt_reply.c
index 85c3644b8cb..2555734c7df 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_parse_txt_reply.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_parse_txt_reply.c
@@ -59,8 +59,8 @@ static int ares__parse_txt_reply(const unsigned char *abuf, size_t alen,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     /* XXX: Why Chaos? */
@@ -74,8 +74,8 @@ static int ares__parse_txt_reply(const unsigned char *abuf, size_t alen,
     txt_curr =
       ares_malloc_data(ex ? ARES_DATATYPE_TXT_EXT : ARES_DATATYPE_TXT_REPLY);
     if (txt_curr == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Link in the record */
@@ -95,8 +95,8 @@ static int ares__parse_txt_reply(const unsigned char *abuf, size_t alen,
 
     txt_curr->txt = ares_malloc(ptr_len + 1);
     if (txt_curr->txt == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     memcpy(txt_curr->txt, ptr, ptr_len);
     txt_curr->txt[ptr_len] = 0;
diff --git a/lib/c-ares-1.30.0/src/lib/ares_parse_uri_reply.c b/lib/c-ares-1.31.0/src/lib/ares_parse_uri_reply.c
similarity index 93%
rename from lib/c-ares-1.30.0/src/lib/ares_parse_uri_reply.c
rename to lib/c-ares-1.31.0/src/lib/ares_parse_uri_reply.c
index bff7023f78a..5966b946969 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_parse_uri_reply.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_parse_uri_reply.c
@@ -64,8 +64,8 @@ int ares_parse_uri_reply(const unsigned char *abuf, int alen_int,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN ||
@@ -76,8 +76,8 @@ int ares_parse_uri_reply(const unsigned char *abuf, int alen_int,
     /* Allocate storage for this URI answer appending it to the list */
     uri_curr = ares_malloc_data(ARES_DATATYPE_URI_REPLY);
     if (uri_curr == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Link in the record */
diff --git a/lib/c-ares-1.30.0/src/lib/ares_platform.c b/lib/c-ares-1.31.0/src/lib/ares_platform.c
similarity index 99%
rename from lib/c-ares-1.30.0/src/lib/ares_platform.c
rename to lib/c-ares-1.31.0/src/lib/ares_platform.c
index 58a50198713..cd1470f832f 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_platform.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_platform.c
@@ -31,7 +31,7 @@
 #include "ares_platform.h"
 #include "ares_private.h"
 
-#if defined(WIN32) && !defined(MSDOS)
+#if defined(_WIN32) && !defined(MSDOS)
 
 #  define V_PLATFORM_WIN32s        0
 #  define V_PLATFORM_WIN32_WINDOWS 1
@@ -78,7 +78,7 @@ win_platform ares__getplatform(void)
   }
 }
 
-#endif /* WIN32 && ! MSDOS */
+#endif /* _WIN32 && ! MSDOS */
 
 #if defined(_WIN32_WCE)
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares_platform.h b/lib/c-ares-1.31.0/src/lib/ares_platform.h
similarity index 97%
rename from lib/c-ares-1.30.0/src/lib/ares_platform.h
rename to lib/c-ares-1.31.0/src/lib/ares_platform.h
index 44b2c036443..df07f77a493 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_platform.h
+++ b/lib/c-ares-1.31.0/src/lib/ares_platform.h
@@ -29,7 +29,7 @@
 
 #include "ares_setup.h"
 
-#if defined(WIN32) && !defined(MSDOS)
+#if defined(_WIN32) && !defined(MSDOS)
 
 typedef enum {
   WIN_UNKNOWN,
diff --git a/lib/c-ares-1.30.0/src/lib/ares_private.h b/lib/c-ares-1.31.0/src/lib/ares_private.h
similarity index 98%
rename from lib/c-ares-1.30.0/src/lib/ares_private.h
rename to lib/c-ares-1.31.0/src/lib/ares_private.h
index 6d9fc117712..1fc4fda045b 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_private.h
+++ b/lib/c-ares-1.31.0/src/lib/ares_private.h
@@ -27,14 +27,6 @@
 #ifndef __ARES_PRIVATE_H
 #define __ARES_PRIVATE_H
 
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#  define WIN32
-#endif
-
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
@@ -56,7 +48,7 @@
  */
 #define CARES_INADDR_CAST(type, var) ((type)((void *)var))
 
-#if defined(WIN32) && !defined(WATT32)
+#if defined(USE_WINSOCK)
 
 #  define WIN_NS_9X     "System\\CurrentControlSet\\Services\\VxD\\MSTCP"
 #  define WIN_NS_NT_KEY "System\\CurrentControlSet\\Services\\Tcpip\\Parameters"
@@ -427,11 +419,6 @@ ares_status_t  ares__expand_name_validated(const unsigned char *encoded,
                                            const unsigned char *abuf,
                                            size_t alen, char **s, size_t *enclen,
                                            ares_bool_t is_hostname);
-ares_status_t  ares__expand_name_for_response(const unsigned char *encoded,
-                                              const unsigned char *abuf,
-                                              size_t alen, char **s,
-                                              size_t     *enclen,
-                                              ares_bool_t is_hostname);
 ares_status_t  ares_expand_string_ex(const unsigned char *encoded,
                                      const unsigned char *abuf, size_t alen,
                                      unsigned char **s, size_t *enclen);
diff --git a/lib/c-ares-1.30.0/src/lib/ares_process.c b/lib/c-ares-1.31.0/src/lib/ares_process.c
similarity index 97%
rename from lib/c-ares-1.30.0/src/lib/ares_process.c
rename to lib/c-ares-1.31.0/src/lib/ares_process.c
index 0d8f3ca9ed0..6e50902b71d 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_process.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_process.c
@@ -87,19 +87,19 @@ static void          invoke_server_state_cb(const struct server_state *server,
 
   buf = ares__buf_create();
   if (buf == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares_get_server_addr(server, buf);
   if (status != ARES_SUCCESS) {
-    ares__buf_destroy(buf);
-    return;
+    ares__buf_destroy(buf); /* LCOV_EXCL_LINE: OutOfMemory */
+    return; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   server_string = ares__buf_finish_str(buf, NULL);
   buf           = NULL;
   if (server_string == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   channel->server_state_cb(server_string, success, flags,
@@ -116,7 +116,7 @@ static void server_increment_failures(struct server_state *server,
 
   node = ares__slist_node_find(channel->servers, server);
   if (node == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   server->consec_failures++;
@@ -138,7 +138,7 @@ static void server_set_good(struct server_state *server, ares_bool_t used_tcp)
 
   node = ares__slist_node_find(channel->servers, server);
   if (node == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (server->consec_failures > 0) {
@@ -195,7 +195,7 @@ static void processfds(ares_channel_t *channel, fd_set *read_fds,
   ares_timeval_t now;
 
   if (channel == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__channel_lock(channel);
@@ -412,7 +412,7 @@ static int socket_list_append(ares_socket_t **socketlist, ares_socket_t fd,
     ares_socket_t *new_list =
       ares_realloc(socketlist, new_alloc * sizeof(*new_list));
     if (new_list == NULL) {
-      return 0;
+      return 0; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     *alloc_cnt  = new_alloc;
     *socketlist = new_list;
@@ -432,7 +432,7 @@ static ares_socket_t *channel_socket_list(const ares_channel_t *channel,
   *num = 0;
 
   if (out == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (snode = ares__slist_node_first(channel->servers); snode != NULL;
@@ -449,7 +449,7 @@ static ares_socket_t *channel_socket_list(const ares_channel_t *channel,
       }
 
       if (!socket_list_append(&out, conn->fd, &alloc_cnt, num)) {
-        goto fail;
+        goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -652,7 +652,7 @@ static ares_status_t rewrite_without_edns(ares_dns_record_t *qdnsrec,
   /* Rewrite the DNS message */
   status = ares_dns_write(qdnsrec, &msg, &msglen);
   if (status != ARES_SUCCESS) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   ares_free(query->qbuf);
@@ -893,7 +893,7 @@ static struct server_state *ares__failover_server(ares_channel_t *channel)
 
   /* Defensive code against no servers being available on the channel. */
   if (first_server == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* If no servers have failures, then prefer the first server in the list. */
@@ -939,7 +939,7 @@ static ares_status_t ares__append_tcpbuf(struct server_state *server,
 
   status = ares__buf_append_be16(server->tcp_send, (unsigned short)query->qlen);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
   return ares__buf_append(server->tcp_send, query->qbuf, query->qlen);
 }
@@ -952,7 +952,7 @@ static size_t ares__calc_query_timeout(const struct query *query)
   size_t                num_servers = ares__slist_len(channel->servers);
 
   if (num_servers == 0) {
-    return 0;
+    return 0; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* For each trip through the entire server list, we want to double the
@@ -1132,6 +1132,7 @@ ares_status_t ares__send_query(struct query *query, const ares_timeval_t *now)
   query->node_queries_by_timeout =
     ares__slist_insert(channel->queries_by_timeout, query);
   if (!query->node_queries_by_timeout) {
+    /* LCOV_EXCL_START: OutOfMemory */
     end_query(channel, query, ARES_ENOMEM, NULL);
     /* Only safe to kill connection if it was new, otherwise it should be
      * cleaned up by another process later */
@@ -1139,6 +1140,7 @@ ares_status_t ares__send_query(struct query *query, const ares_timeval_t *now)
       ares__close_connection(conn);
     }
     return ARES_ENOMEM;
+    /* LCOV_EXCL_STOP */
   }
 
   /* Keep track of queries bucketed by connection, so we can process errors
@@ -1148,6 +1150,7 @@ ares_status_t ares__send_query(struct query *query, const ares_timeval_t *now)
     ares__llist_insert_last(conn->queries_to_conn, query);
 
   if (query->node_queries_to_conn == NULL) {
+    /* LCOV_EXCL_START: OutOfMemory */
     end_query(channel, query, ARES_ENOMEM, NULL);
     /* Only safe to kill connection if it was new, otherwise it should be
      * cleaned up by another process later */
@@ -1155,6 +1158,7 @@ ares_status_t ares__send_query(struct query *query, const ares_timeval_t *now)
       ares__close_connection(conn);
     }
     return ARES_ENOMEM;
+    /* LCOV_EXCL_STOP */
   }
 
   query->conn = conn;
diff --git a/lib/c-ares-1.30.0/src/lib/ares_qcache.c b/lib/c-ares-1.31.0/src/lib/ares_qcache.c
similarity index 88%
rename from lib/c-ares-1.30.0/src/lib/ares_qcache.c
rename to lib/c-ares-1.31.0/src/lib/ares_qcache.c
index 087518d7b80..e03d0692226 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_qcache.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_qcache.c
@@ -48,7 +48,7 @@ static char *ares__qcache_calc_key(const ares_dns_record_t *dnsrec)
   ares_dns_flags_t flags;
 
   if (dnsrec == NULL || buf == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Format is OPCODE|FLAGS[|QTYPE1|QCLASS1|QNAME1]... */
@@ -56,12 +56,12 @@ static char *ares__qcache_calc_key(const ares_dns_record_t *dnsrec)
   status = ares__buf_append_str(
     buf, ares_dns_opcode_tostr(ares_dns_record_get_opcode(dnsrec)));
   if (status != ARES_SUCCESS) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__buf_append_byte(buf, '|');
   if (status != ARES_SUCCESS) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   flags = ares_dns_record_get_flags(dnsrec);
@@ -69,13 +69,13 @@ static char *ares__qcache_calc_key(const ares_dns_record_t *dnsrec)
   if (flags & ARES_FLAG_RD) {
     status = ares__buf_append_str(buf, "rd");
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
   if (flags & ARES_FLAG_CD) {
     status = ares__buf_append_str(buf, "cd");
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -87,32 +87,32 @@ static char *ares__qcache_calc_key(const ares_dns_record_t *dnsrec)
 
     status = ares_dns_record_query_get(dnsrec, i, &name, &qtype, &qclass);
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     status = ares__buf_append_byte(buf, '|');
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     status = ares__buf_append_str(buf, ares_dns_rec_type_tostr(qtype));
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     status = ares__buf_append_byte(buf, '|');
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     status = ares__buf_append_str(buf, ares_dns_class_tostr(qclass));
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     status = ares__buf_append_byte(buf, '|');
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* On queries, a '.' may be appended to the name to indicate an explicit
@@ -125,15 +125,17 @@ static char *ares__qcache_calc_key(const ares_dns_record_t *dnsrec)
 
     status = ares__buf_append(buf, (const unsigned char *)name, name_len);
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   return ares__buf_finish_str(buf, NULL);
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   ares__buf_destroy(buf);
   return NULL;
+/* LCOV_EXCL_STOP */
 }
 
 static void ares__qcache_expire(ares__qcache_t       *cache,
@@ -194,7 +196,7 @@ static void ares__qcache_entry_destroy_cb(void *arg)
 {
   ares__qcache_entry_t *entry = arg;
   if (entry == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares_free(entry->key);
@@ -211,21 +213,21 @@ ares_status_t ares__qcache_create(ares_rand_state *rand_state,
 
   cache = ares_malloc_zero(sizeof(*cache));
   if (cache == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   cache->cache = ares__htable_strvp_create(NULL);
   if (cache->cache == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   cache->expire = ares__slist_create(rand_state, ares__qcache_entry_sort_cb,
                                      ares__qcache_entry_destroy_cb);
   if (cache->expire == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   cache->max_ttl = max_ttl;
@@ -350,18 +352,18 @@ static ares_status_t ares__qcache_insert(ares__qcache_t      *qcache,
     ttl = ares__qcache_calc_minttl(dnsrec);
   }
 
+  if (ttl > qcache->max_ttl) {
+    ttl = qcache->max_ttl;
+  }
+
   /* Don't cache something that is already expired */
   if (ttl == 0) {
     return ARES_EREFUSED;
   }
 
-  if (ttl > qcache->max_ttl) {
-    ttl = qcache->max_ttl;
-  }
-
   entry = ares_malloc_zero(sizeof(*entry));
   if (entry == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   entry->dnsrec    = dnsrec;
@@ -374,19 +376,20 @@ static ares_status_t ares__qcache_insert(ares__qcache_t      *qcache,
    * want to cache it */
   entry->key = ares__qcache_calc_key_frombuf(qbuf, qlen);
   if (entry->key == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (!ares__htable_strvp_insert(qcache->cache, entry->key, entry)) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (ares__slist_insert(qcache->expire, entry) == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   if (entry != NULL && entry->key != NULL) {
     ares__htable_strvp_remove(qcache->cache, entry->key);
@@ -394,6 +397,7 @@ static ares_status_t ares__qcache_insert(ares__qcache_t      *qcache,
     ares_free(entry);
   }
   return ARES_ENOMEM;
+/* LCOV_EXCL_STOP */
 }
 
 ares_status_t ares_qcache_fetch(ares_channel_t           *channel,
@@ -417,8 +421,8 @@ ares_status_t ares_qcache_fetch(ares_channel_t           *channel,
 
   key = ares__qcache_calc_key(dnsrec);
   if (key == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   entry = ares__htable_strvp_get_direct(channel->qcache->cache, key);
diff --git a/lib/c-ares-1.30.0/src/lib/ares_query.c b/lib/c-ares-1.31.0/src/lib/ares_query.c
similarity index 92%
rename from lib/c-ares-1.30.0/src/lib/ares_query.c
rename to lib/c-ares-1.31.0/src/lib/ares_query.c
index 0eea80e7fc1..35214bc4a5b 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_query.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_query.c
@@ -76,11 +76,13 @@ static ares_status_t ares_query_int(ares_channel_t *channel, const char *name,
   ares_query_dnsrec_arg_t *qquery = NULL;
 
   if (channel == NULL || name == NULL || callback == NULL) {
+    /* LCOV_EXCL_START: DefensiveCoding */
     status = ARES_EFORMERR;
     if (callback != NULL) {
       callback(arg, status, 0, NULL);
     }
     return status;
+    /* LCOV_EXCL_STOP */
   }
 
   if (!(channel->flags & ARES_FLAG_NORECURSE)) {
@@ -91,16 +93,18 @@ static ares_status_t ares_query_int(ares_channel_t *channel, const char *name,
     &dnsrec, name, dnsclass, type, 0, flags,
     (size_t)(channel->flags & ARES_FLAG_EDNS) ? channel->ednspsz : 0);
   if (status != ARES_SUCCESS) {
-    callback(arg, status, 0, NULL);
-    return status;
+    callback(arg, status, 0, NULL); /* LCOV_EXCL_LINE: OutOfMemory */
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   qquery = ares_malloc(sizeof(*qquery));
   if (qquery == NULL) {
+    /* LCOV_EXCL_START: OutOfMemory */
     status = ARES_ENOMEM;
     callback(arg, status, 0, NULL);
     ares_dns_record_destroy(dnsrec);
     return status;
+    /* LCOV_EXCL_STOP */
   }
 
   qquery->callback = callback;
@@ -142,8 +146,8 @@ void ares_query(ares_channel_t *channel, const char *name, int dnsclass,
 
   carg = ares__dnsrec_convert_arg(callback, arg);
   if (carg == NULL) {
-    callback(arg, ARES_ENOMEM, 0, NULL, 0);
-    return;
+    callback(arg, ARES_ENOMEM, 0, NULL, 0); /* LCOV_EXCL_LINE: OutOfMemory */
+    return; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   ares_query_dnsrec(channel, name, (ares_dns_class_t)dnsclass,
diff --git a/lib/c-ares-1.30.0/src/lib/ares_rand.c b/lib/c-ares-1.31.0/src/lib/ares_rand.c
similarity index 91%
rename from lib/c-ares-1.30.0/src/lib/ares_rand.c
rename to lib/c-ares-1.31.0/src/lib/ares_rand.c
index bf3a695c9c2..e36cbc67d70 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_rand.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_rand.c
@@ -56,17 +56,20 @@ typedef struct ares_rand_rc4 {
 
 static unsigned int ares_u32_from_ptr(void *addr)
 {
+  /* LCOV_EXCL_START: FallbackCode */
   if (sizeof(void *) == 8) {
     return (unsigned int)((((ares_uint64_t)addr >> 32) & 0xFFFFFFFF) |
                           ((ares_uint64_t)addr & 0xFFFFFFFF));
   }
   return (unsigned int)((size_t)addr & 0xFFFFFFFF);
+  /* LCOV_EXCL_STOP */
 }
 
 /* initialize an rc4 key as the last possible fallback. */
 static void ares_rc4_generate_key(ares_rand_rc4 *rc4_state, unsigned char *key,
                                   size_t key_len)
 {
+  /* LCOV_EXCL_START: FallbackCode */
   size_t         i;
   size_t         len = 0;
   unsigned int   data;
@@ -99,10 +102,12 @@ static void ares_rc4_generate_key(ares_rand_rc4 *rc4_state, unsigned char *key,
   for (i = len; i < key_len; i++) {
     key[i] = (unsigned char)(rand() % 256); /* LCOV_EXCL_LINE */
   }
+  /* LCOV_EXCL_STOP */
 }
 
 static void ares_rc4_init(ares_rand_rc4 *rc4_state)
 {
+  /* LCOV_EXCL_START: FallbackCode */
   unsigned char key[ARES_RC4_KEY_LEN];
   size_t        i;
   size_t        j;
@@ -120,6 +125,7 @@ static void ares_rc4_init(ares_rand_rc4 *rc4_state)
 
   rc4_state->i = 0;
   rc4_state->j = 0;
+  /* LCOV_EXCL_STOP */
 }
 
 /* Just outputs the key schedule, no need to XOR with any data since we have
@@ -127,6 +133,7 @@ static void ares_rc4_init(ares_rand_rc4 *rc4_state)
 static void ares_rc4_prng(ares_rand_rc4 *rc4_state, unsigned char *buf,
                           size_t len)
 {
+  /* LCOV_EXCL_START: FallbackCode */
   unsigned char *S = rc4_state->S;
   size_t         i = rc4_state->i;
   size_t         j = rc4_state->j;
@@ -142,6 +149,7 @@ static void ares_rc4_prng(ares_rand_rc4 *rc4_state, unsigned char *buf,
 
   rc4_state->i = i;
   rc4_state->j = j;
+  /* LCOV_EXCL_STOP */
 }
 
 struct ares_rand_state {
@@ -187,6 +195,7 @@ static ares_bool_t ares__init_rand_engine(ares_rand_state *state)
 #endif
 
 #if defined(CARES_RANDOM_FILE)
+  /* LCOV_EXCL_START: FallbackCode */
   if (!(state->bad_backends & ARES_RAND_FILE)) {
     state->type            = ARES_RAND_FILE;
     state->state.rand_file = fopen(CARES_RANDOM_FILE, "rb");
@@ -195,14 +204,18 @@ static ares_bool_t ares__init_rand_engine(ares_rand_state *state)
       return ARES_TRUE;
     }
   }
+  /* LCOV_EXCL_STOP */
+
   /* Fall-Thru on failure to RC4 */
 #endif
 
+  /* LCOV_EXCL_START: FallbackCode */
   state->type = ARES_RAND_RC4;
   ares_rc4_init(&state->state.rc4);
+  /* LCOV_EXCL_STOP */
 
   /* Currently cannot fail */
-  return ARES_TRUE;
+  return ARES_TRUE; /* LCOV_EXCL_LINE: UntestablePath */
 }
 
 ares_rand_state *ares__init_rand_state(void)
@@ -215,8 +228,8 @@ ares_rand_state *ares__init_rand_state(void)
   }
 
   if (!ares__init_rand_engine(state)) {
-    ares_free(state);
-    return NULL;
+    ares_free(state); /* LCOV_EXCL_LINE: UntestablePath */
+    return NULL; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   return state;
@@ -225,24 +238,28 @@ ares_rand_state *ares__init_rand_state(void)
 static void ares__clear_rand_state(ares_rand_state *state)
 {
   if (!state) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   switch (state->type) {
     case ARES_RAND_OS:
       break;
+    /* LCOV_EXCL_START: FallbackCode */
     case ARES_RAND_FILE:
       fclose(state->state.rand_file);
       break;
     case ARES_RAND_RC4:
       break;
+    /* LCOV_EXCL_STOP */
   }
 }
 
 static void ares__reinit_rand(ares_rand_state *state)
 {
+  /* LCOV_EXCL_START: UntestablePath */
   ares__clear_rand_state(state);
   ares__init_rand_engine(state);
+  /* LCOV_EXCL_STOP */
 }
 
 void ares__destroy_rand_state(ares_rand_state *state)
@@ -296,6 +313,8 @@ static void ares__rand_bytes_fetch(ares_rand_state *state, unsigned char *buf,
         break;
 #endif
 
+      /* LCOV_EXCL_START: FallbackCode */
+
       case ARES_RAND_FILE:
         while (1) {
           size_t rv = fread(buf + bytes_read, 1, len - bytes_read,
@@ -314,11 +333,14 @@ static void ares__rand_bytes_fetch(ares_rand_state *state, unsigned char *buf,
       case ARES_RAND_RC4:
         ares_rc4_prng(&state->state.rc4, buf, len);
         return;
+
+      /* LCOV_EXCL_STOP */
+
     }
 
     /* If we didn't return before we got here, that means we had a critical rand
      * failure and need to reinitialized */
-    ares__reinit_rand(state);
+    ares__reinit_rand(state); /* LCOV_EXCL_LINE: UntestablePath */
   }
 }
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares_search.c b/lib/c-ares-1.31.0/src/lib/ares_search.c
similarity index 94%
rename from lib/c-ares-1.30.0/src/lib/ares_search.c
rename to lib/c-ares-1.31.0/src/lib/ares_search.c
index 4fd909cd4f8..7403de1674d 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_search.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_search.c
@@ -57,7 +57,7 @@ struct search_query {
 static void squery_free(struct search_query *squery)
 {
   if (squery == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   ares__strsplit_free(squery->names, squery->names_cnt);
   ares_dns_record_destroy(squery->dnsrec);
@@ -87,7 +87,7 @@ static ares_status_t ares_search_next(ares_channel_t      *channel,
 
   /* Misuse check */
   if (squery->next_name_idx >= squery->names_cnt) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   status = ares_dns_record_query_set_name(
@@ -200,8 +200,8 @@ ares_status_t ares__search_name_list(const ares_channel_t *channel,
     list_len = 1;
     list     = ares_malloc_zero(sizeof(*list) * list_len);
     if (list == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     list[0] = alias;
     alias   = NULL;
@@ -215,12 +215,12 @@ ares_status_t ares__search_name_list(const ares_channel_t *channel,
     list_len = 1;
     list     = ares_malloc_zero(sizeof(*list) * list_len);
     if (list == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     list[0] = ares_strdup(name);
     if (list[0] == NULL) {
-      status = ARES_ENOMEM;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     } else {
       status = ARES_SUCCESS;
     }
@@ -322,8 +322,8 @@ static ares_status_t ares_search_int(ares_channel_t          *channel,
    */
   squery = ares_malloc_zero(sizeof(*squery));
   if (squery == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   squery->channel = channel;
@@ -331,8 +331,8 @@ static ares_status_t ares_search_int(ares_channel_t          *channel,
   /* Duplicate DNS record since, name will need to be rewritten */
   squery->dnsrec = ares_dns_record_duplicate(dnsrec);
   if (squery->dnsrec == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   squery->callback        = callback;
@@ -456,7 +456,7 @@ ares_status_t ares_search_dnsrec(ares_channel_t          *channel,
   ares_status_t status;
 
   if (channel == NULL || dnsrec == NULL || callback == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR;  /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__channel_lock(channel);
@@ -498,7 +498,7 @@ ares_status_t ares__lookup_hostaliases(const ares_channel_t *channel,
   ares__llist_node_t *node;
 
   if (channel == NULL || name == NULL || alias == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR;  /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *alias = NULL;
@@ -521,8 +521,8 @@ ares_status_t ares__lookup_hostaliases(const ares_channel_t *channel,
 
   buf = ares__buf_create();
   if (buf == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM;  /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__buf_load_file(hostaliases, buf);
@@ -581,8 +581,8 @@ ares_status_t ares__lookup_hostaliases(const ares_channel_t *channel,
 
     *alias = ares_strdup(fqdn);
     if (*alias == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM;  /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Good! */
diff --git a/lib/c-ares-1.30.0/src/lib/ares_send.c b/lib/c-ares-1.31.0/src/lib/ares_send.c
similarity index 94%
rename from lib/c-ares-1.30.0/src/lib/ares_send.c
rename to lib/c-ares-1.31.0/src/lib/ares_send.c
index 8bbc6e758b4..800edce63dc 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_send.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_send.c
@@ -77,8 +77,8 @@ static ares_status_t ares_send_dnsrec_int(ares_channel_t          *channel,
   /* Allocate space for query and allocated fields. */
   query = ares_malloc(sizeof(struct query));
   if (!query) {
-    callback(arg, ARES_ENOMEM, 0, NULL);
-    return ARES_ENOMEM;
+    callback(arg, ARES_ENOMEM, 0, NULL); /* LCOV_EXCL_LINE: OutOfMemory */
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
   memset(query, 0, sizeof(*query));
 
@@ -121,18 +121,22 @@ static ares_status_t ares_send_dnsrec_int(ares_channel_t          *channel,
   query->node_all_queries =
     ares__llist_insert_last(channel->all_queries, query);
   if (query->node_all_queries == NULL) {
+    /* LCOV_EXCL_START: OutOfMemory */
     callback(arg, ARES_ENOMEM, 0, NULL);
     ares__free_query(query);
     return ARES_ENOMEM;
+    /* LCOV_EXCL_STOP */
   }
 
   /* Keep track of queries bucketed by qid, so we can process DNS
    * responses quickly.
    */
   if (!ares__htable_szvp_insert(channel->queries_by_qid, query->qid, query)) {
+    /* LCOV_EXCL_START: OutOfMemory */
     callback(arg, ARES_ENOMEM, 0, NULL);
     ares__free_query(query);
     return ARES_ENOMEM;
+    /* LCOV_EXCL_STOP */
   }
 
   /* Perform the first query action. */
@@ -152,7 +156,7 @@ ares_status_t ares_send_dnsrec(ares_channel_t          *channel,
   ares_status_t status;
 
   if (channel == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__channel_lock(channel);
@@ -189,10 +193,12 @@ void ares_send(ares_channel_t *channel, const unsigned char *qbuf, int qlen,
 
   carg = ares__dnsrec_convert_arg(callback, arg);
   if (carg == NULL) {
+    /* LCOV_EXCL_START: OutOfMemory */
     status = ARES_ENOMEM;
     ares_dns_record_destroy(dnsrec);
     callback(arg, (int)status, 0, NULL, 0);
     return;
+    /* LCOV_EXCL_STOP */
   }
 
   ares_send_dnsrec(channel, dnsrec, ares__dnsrec_convert_cb, carg, NULL);
diff --git a/lib/c-ares-1.30.0/src/lib/ares_setup.h b/lib/c-ares-1.31.0/src/lib/ares_setup.h
similarity index 96%
rename from lib/c-ares-1.30.0/src/lib/ares_setup.h
rename to lib/c-ares-1.31.0/src/lib/ares_setup.h
index 0387f3e35f7..ea66b1115bf 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_setup.h
+++ b/lib/c-ares-1.31.0/src/lib/ares_setup.h
@@ -26,14 +26,6 @@
 #ifndef HEADER_CARES_SETUP_H
 #define HEADER_CARES_SETUP_H
 
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#  define WIN32
-#endif
-
 /*
  * Include configuration script results or hand-crafted
  * configuration file for platforms which lack config tool.
@@ -43,7 +35,7 @@
 #  include "ares_config.h"
 #else
 
-#  ifdef WIN32
+#  ifdef _WIN32
 #    include "config-win32.h"
 #  endif
 
@@ -163,7 +155,7 @@
 #    define HAVE_UNISTD_H 1
 #  endif
 
-#  if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
+#  if !defined(HAVE_SYS_UIO_H) && !defined(_WIN32) && !defined(MSDOS)
 #    define HAVE_SYS_UIO_H
 #  endif
 
diff --git a/lib/c-ares-1.30.0/src/lib/ares_str.c b/lib/c-ares-1.31.0/src/lib/ares_str.c
similarity index 96%
rename from lib/c-ares-1.30.0/src/lib/ares_str.c
rename to lib/c-ares-1.31.0/src/lib/ares_str.c
index 44a5e452fb8..db0a12bd2fd 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_str.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_str.c
@@ -56,7 +56,7 @@ char *ares_strdup(const char *s1)
 
   /* Don't see how this is possible */
   if (len == SIZE_MAX) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   out = ares_malloc(len + 1);
@@ -77,7 +77,7 @@ size_t ares_strcpy(char *dest, const char *src, size_t dest_size)
   size_t len = 0;
 
   if (dest == NULL || dest_size == 0) {
-    return 0;
+    return 0; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   len = ares_strlen(src);
@@ -116,7 +116,7 @@ void ares__str_rtrim(char *str)
   size_t i;
 
   if (str == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   len = ares_strlen(str);
@@ -134,7 +134,7 @@ void ares__str_ltrim(char *str)
   size_t len;
 
   if (str == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   for (i = 0; str[i] != 0 && ares__isspace(str[i]); i++) {
@@ -262,7 +262,7 @@ ares_bool_t ares__is_hostname(const char *str)
   size_t i;
 
   if (str == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   for (i = 0; str[i] != 0; i++) {
diff --git a/lib/c-ares-1.30.0/src/lib/ares_str.h b/lib/c-ares-1.31.0/src/lib/ares_str.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_str.h
rename to lib/c-ares-1.31.0/src/lib/ares_str.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares_strcasecmp.c b/lib/c-ares-1.31.0/src/lib/ares_strcasecmp.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_strcasecmp.c
rename to lib/c-ares-1.31.0/src/lib/ares_strcasecmp.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_strcasecmp.h b/lib/c-ares-1.31.0/src/lib/ares_strcasecmp.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_strcasecmp.h
rename to lib/c-ares-1.31.0/src/lib/ares_strcasecmp.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares_strerror.c b/lib/c-ares-1.31.0/src/lib/ares_strerror.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_strerror.c
rename to lib/c-ares-1.31.0/src/lib/ares_strerror.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_strsplit.c b/lib/c-ares-1.31.0/src/lib/ares_strsplit.c
similarity index 89%
rename from lib/c-ares-1.30.0/src/lib/ares_strsplit.c
rename to lib/c-ares-1.31.0/src/lib/ares_strsplit.c
index 395bf1ebb9a..432a2d6cebb 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_strsplit.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_strsplit.c
@@ -52,19 +52,19 @@ char **ares__strsplit_duplicate(char **elms, size_t num_elm)
   char **out;
 
   if (elms == NULL || num_elm == 0) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   out = ares_malloc_zero(sizeof(*elms) * num_elm);
   if (out == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (i = 0; i < num_elm; i++) {
     out[i] = ares_strdup(elms[i]);
     if (out[i] == NULL) {
-      ares__strsplit_free(out, num_elm);
-      return NULL;
+      ares__strsplit_free(out, num_elm); /* LCOV_EXCL_LINE: OutOfMemory */
+      return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -82,7 +82,7 @@ char **ares__strsplit(const char *in, const char *delms, size_t *num_elm)
   size_t              idx = 0;
 
   if (in == NULL || delms == NULL || num_elm == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *num_elm = 0;
@@ -108,8 +108,8 @@ char **ares__strsplit(const char *in, const char *delms, size_t *num_elm)
 
   out = ares_malloc_zero(cnt * sizeof(*out));
   if (out == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (node = ares__llist_node_first(llist); node != NULL;
diff --git a/lib/c-ares-1.30.0/src/lib/ares_strsplit.h b/lib/c-ares-1.31.0/src/lib/ares_strsplit.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_strsplit.h
rename to lib/c-ares-1.31.0/src/lib/ares_strsplit.h
diff --git a/lib/c-ares-1.30.0/src/lib/ares_sysconfig.c b/lib/c-ares-1.31.0/src/lib/ares_sysconfig.c
similarity index 99%
rename from lib/c-ares-1.30.0/src/lib/ares_sysconfig.c
rename to lib/c-ares-1.31.0/src/lib/ares_sysconfig.c
index d56ee22e088..32f8b7f8ba1 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_sysconfig.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_sysconfig.c
@@ -71,12 +71,7 @@
 #include "ares_platform.h"
 #include "ares_private.h"
 
-#ifdef WATT32
-#  undef WIN32 /* Redefined in MingW/MSVC headers */
-#endif
-
-
-#ifdef WIN32
+#if defined(USE_WINSOCK)
 /*
  * get_REG_SZ()
  *
@@ -1012,7 +1007,7 @@ static ares_status_t ares_sysconfig_apply(ares_channel_t         *channel,
     char **temp =
       ares__strsplit_duplicate(sysconfig->domains, sysconfig->ndomains);
     if (temp == NULL) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     ares__strsplit_free(channel->domains, channel->ndomains);
@@ -1023,7 +1018,7 @@ static ares_status_t ares_sysconfig_apply(ares_channel_t         *channel,
   if (sysconfig->lookups && !(channel->optmask & ARES_OPT_LOOKUPS)) {
     char *temp = ares_strdup(sysconfig->lookups);
     if (temp == NULL) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     ares_free(channel->lookups);
@@ -1034,7 +1029,7 @@ static ares_status_t ares_sysconfig_apply(ares_channel_t         *channel,
     struct apattern *temp =
       ares_malloc(sizeof(*channel->sortlist) * sysconfig->nsortlist);
     if (temp == NULL) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     memcpy(temp, sysconfig->sortlist,
            sizeof(*channel->sortlist) * sysconfig->nsortlist);
@@ -1044,7 +1039,7 @@ static ares_status_t ares_sysconfig_apply(ares_channel_t         *channel,
     channel->nsort    = sysconfig->nsortlist;
   }
 
-  if (sysconfig->ndots && !(channel->optmask & ARES_OPT_NDOTS)) {
+  if (!(channel->optmask & ARES_OPT_NDOTS)) {
     channel->ndots = sysconfig->ndots;
   }
 
@@ -1074,7 +1069,7 @@ ares_status_t ares__init_by_sysconfig(ares_channel_t *channel)
 
   memset(&sysconfig, 0, sizeof(sysconfig));
 
-#ifdef _WIN32
+#if defined(USE_WINSOCK)
   status = ares__init_sysconfig_windows(&sysconfig);
 #elif defined(__MVS__)
   status = ares__init_sysconfig_mvs(&sysconfig);
diff --git a/lib/c-ares-1.30.0/src/lib/ares_sysconfig_files.c b/lib/c-ares-1.31.0/src/lib/ares_sysconfig_files.c
similarity index 98%
rename from lib/c-ares-1.30.0/src/lib/ares_sysconfig_files.c
rename to lib/c-ares-1.31.0/src/lib/ares_sysconfig_files.c
index 5771a581db5..f71043000a4 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_sysconfig_files.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_sysconfig_files.c
@@ -103,7 +103,7 @@ static ares_bool_t sortlist_append(struct apattern **sortlist, size_t *nsort,
 
   newsort = ares_realloc(*sortlist, (*nsort + 1) * sizeof(*newsort));
   if (newsort == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   *sortlist = newsort;
@@ -223,7 +223,7 @@ ares_status_t ares__parse_sortlist(struct apattern **sortlist, size_t *nsort,
   ares__llist_node_t *node   = NULL;
 
   if (sortlist == NULL || nsort == NULL || str == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (*sortlist != NULL) {
@@ -262,8 +262,8 @@ ares_status_t ares__parse_sortlist(struct apattern **sortlist, size_t *nsort,
     }
 
     if (!sortlist_append(sortlist, nsort, &pat)) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -371,7 +371,7 @@ static ares_status_t config_lookup(ares_sysconfig_t *sysconfig,
     ares_free(sysconfig->lookups);
     sysconfig->lookups = ares_strdup(lookupstr);
     if (sysconfig->lookups == NULL) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -462,7 +462,7 @@ ares_status_t ares__sysconfig_set_options(ares_sysconfig_t *sysconfig,
     status = process_option(sysconfig, valbuf);
     /* Out of memory is the only fatal condition */
     if (status == ARES_ENOMEM) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -484,7 +484,7 @@ ares_status_t ares__init_by_environment(ares_sysconfig_t *sysconfig)
   if (localdomain) {
     char *temp = ares_strdup(localdomain);
     if (temp == NULL) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     status = config_search(sysconfig, temp, 1);
     ares_free(temp);
diff --git a/lib/c-ares-1.30.0/src/lib/ares_sysconfig_mac.c b/lib/c-ares-1.31.0/src/lib/ares_sysconfig_mac.c
similarity index 84%
rename from lib/c-ares-1.30.0/src/lib/ares_sysconfig_mac.c
rename to lib/c-ares-1.31.0/src/lib/ares_sysconfig_mac.c
index 302bd0d3449..6ec499e59f5 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_sysconfig_mac.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_sysconfig_mac.c
@@ -52,7 +52,10 @@
 #  include <dlfcn.h>
 #  include <arpa/inet.h>
 #  include "thirdparty/apple/dnsinfo.h"
-#  include <SystemConfiguration/SCNetworkConfiguration.h>
+#  include <AvailabilityMacros.h>
+#  if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 /* MacOS 10.8 */
+#    include <SystemConfiguration/SCNetworkConfiguration.h>
+#  endif
 #  include "ares.h"
 #  include "ares_private.h"
 
@@ -77,8 +80,14 @@ static void dnsinfo_destroy(dnsinfo_t *dnsinfo)
 
 static ares_status_t dnsinfo_init(dnsinfo_t **dnsinfo_out)
 {
-  dnsinfo_t    *dnsinfo = NULL;
-  ares_status_t status  = ARES_SUCCESS;
+  dnsinfo_t    *dnsinfo       = NULL;
+  ares_status_t status        = ARES_SUCCESS;
+  size_t        i;
+  const char   *searchlibs[]  = {
+    "/usr/lib/libSystem.dylib",
+    "/System/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration",
+    NULL
+  };
 
   if (dnsinfo_out == NULL) {
     status = ARES_EFORMERR;
@@ -88,22 +97,34 @@ static ares_status_t dnsinfo_init(dnsinfo_t **dnsinfo_out)
   *dnsinfo_out = NULL;
 
   dnsinfo = ares_malloc_zero(sizeof(*dnsinfo));
-
   if (dnsinfo == NULL) {
     status = ARES_ENOMEM;
     goto done;
   }
 
-  dnsinfo->handle = dlopen("/usr/lib/libSystem.dylib", RTLD_LAZY | RTLD_NOLOAD);
-  if (dnsinfo->handle == NULL) {
-    status = ARES_ESERVFAIL;
-    goto done;
+  for (i=0; searchlibs[i] != NULL; i++) {
+    dnsinfo->handle = dlopen(searchlibs[i], RTLD_LAZY /* | RTLD_NOLOAD */);
+    if (dnsinfo->handle == NULL) {
+      /* Fail, loop */
+      continue;
+    }
+
+    dnsinfo->dns_configuration_copy =
+      dlsym(dnsinfo->handle, "dns_configuration_copy");
+
+    dnsinfo->dns_configuration_free =
+      dlsym(dnsinfo->handle, "dns_configuration_free");
+
+    if (dnsinfo->dns_configuration_copy != NULL &&
+        dnsinfo->dns_configuration_free != NULL) {
+      break;
+    }
+
+    /* Fail, loop */
+    dlclose(dnsinfo->handle);
+    dnsinfo->handle = NULL;
   }
 
-  dnsinfo->dns_configuration_copy =
-    dlsym(dnsinfo->handle, "dns_configuration_copy");
-  dnsinfo->dns_configuration_free =
-    dlsym(dnsinfo->handle, "dns_configuration_free");
 
   if (dnsinfo->dns_configuration_copy == NULL ||
       dnsinfo->dns_configuration_free == NULL) {
@@ -141,13 +162,19 @@ static ares_status_t read_resolver(const dns_resolver_t *resolver,
   unsigned short port   = 0;
   ares_status_t  status = ARES_SUCCESS;
 
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 /* MacOS 10.8 */
   /* XXX: resolver->domain is for domain-specific servers.  When we implement
    *      this support, we'll want to use this.  But for now, we're going to
-   *      skip any servers which set this since we can't properly route. */
+   *      skip any servers which set this since we can't properly route.
+   *      MacOS used to use this setting for a different purpose in the
+   *      past however, so on versions of MacOS < 10.8 just ignore this
+   *      completely. */
   if (resolver->domain != NULL) {
     return ARES_SUCCESS;
   }
+#endif
 
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 /* MacOS 10.8 */
   /* Check to see if DNS server should be used, base this on if the server is
    * reachable or can be reachable automatically if we send traffic that
    * direction. */
@@ -156,6 +183,7 @@ static ares_status_t read_resolver(const dns_resolver_t *resolver,
          kSCNetworkReachabilityFlagsConnectionOnTraffic))) {
     return ARES_SUCCESS;
   }
+#endif
 
   /* NOTE: it doesn't look like resolver->flags is relevant */
 
@@ -219,7 +247,8 @@ static ares_status_t read_resolver(const dns_resolver_t *resolver,
    *   - resolver->timeout appears unused, always 0, so we ignore this
    *   - resolver->service_identifier doesn't appear relevant to us
    *   - resolver->cid also isn't relevant
-   *   - resolver->if_index we don't need, if_name is used instead.
+   *   - resolver->if_name we won't use since it isn't available in MacOS 10.8
+   *     or earlier, use resolver->if_index instead to then lookup the name.
    */
 
   /* XXX: resolver->search_order appears like it might be relevant, we might
@@ -233,6 +262,8 @@ static ares_status_t read_resolver(const dns_resolver_t *resolver,
     struct ares_addr       addr;
     unsigned short         addrport;
     const struct sockaddr *sockaddr;
+    char                   if_name_str[256] = "";
+    const char            *if_name;
 
     /* UBSAN alignment workaround to fetch memory address */
     memcpy(&sockaddr, resolver->nameserver + i, sizeof(sockaddr));
@@ -262,8 +293,11 @@ static ares_status_t read_resolver(const dns_resolver_t *resolver,
     if (addrport == 0) {
       addrport = port;
     }
+
+    if_name = ares__if_indextoname(resolver->if_index, if_name_str,
+                                   sizeof(if_name_str));
     status = ares__sconfig_append(&sysconfig->sconfig, &addr, addrport,
-                                  addrport, resolver->if_name);
+                                  addrport, if_name);
     if (status != ARES_SUCCESS) {
       return status;
     }
@@ -280,7 +314,6 @@ static ares_status_t read_resolvers(dns_resolver_t **resolvers, int nresolvers,
 
   for (i = 0; status == ARES_SUCCESS && i < nresolvers; i++) {
     const dns_resolver_t *resolver_ptr;
-    dns_resolver_t        resolver;
 
     /* UBSAN doesn't like that this is unaligned, lets use memcpy to get the
      * address.  Equivalent to:
@@ -288,10 +321,7 @@ static ares_status_t read_resolvers(dns_resolver_t **resolvers, int nresolvers,
      */
     memcpy(&resolver_ptr, resolvers + i, sizeof(resolver_ptr));
 
-    /* UBSAN. If the pointer is misaligned, try to use memcpy to get the data
-     * into a new structure that is hopefully aligned properly */
-    memcpy(&resolver, resolver_ptr, sizeof(resolver));
-    status = read_resolver(&resolver, sysconfig);
+    status = read_resolver(resolver_ptr, sysconfig);
   }
 
   return status;
diff --git a/lib/c-ares-1.30.0/src/lib/ares_timeout.c b/lib/c-ares-1.31.0/src/lib/ares_timeout.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_timeout.c
rename to lib/c-ares-1.31.0/src/lib/ares_timeout.c
diff --git a/lib/c-ares-1.30.0/src/lib/ares_update_servers.c b/lib/c-ares-1.31.0/src/lib/ares_update_servers.c
similarity index 92%
rename from lib/c-ares-1.30.0/src/lib/ares_update_servers.c
rename to lib/c-ares-1.31.0/src/lib/ares_update_servers.c
index 8075b1d1c0d..77ed7dd2503 100644
--- a/lib/c-ares-1.30.0/src/lib/ares_update_servers.c
+++ b/lib/c-ares-1.31.0/src/lib/ares_update_servers.c
@@ -67,11 +67,11 @@ static ares_bool_t ares__addr_match(const struct ares_addr *addr1,
                                     const struct ares_addr *addr2)
 {
   if (addr1 == NULL && addr2 == NULL) {
-    return ARES_TRUE;
+    return ARES_TRUE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (addr1 == NULL || addr2 == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (addr1->family != addr2->family) {
@@ -102,7 +102,7 @@ ares_bool_t ares__subnet_match(const struct ares_addr *addr,
   size_t               i;
 
   if (addr == NULL || subnet == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (addr->family != subnet->family) {
@@ -115,7 +115,7 @@ ares_bool_t ares__subnet_match(const struct ares_addr *addr,
     len        = 4;
 
     if (netmask > 32) {
-      return ARES_FALSE;
+      return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
   } else if (addr->family == AF_INET6) {
     addr_ptr   = (const unsigned char *)&addr->addr.addr6;
@@ -123,10 +123,10 @@ ares_bool_t ares__subnet_match(const struct ares_addr *addr,
     len        = 16;
 
     if (netmask > 128) {
-      return ARES_FALSE;
+      return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
   } else {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   for (i = 0; i < len && netmask > 0; i++) {
@@ -380,7 +380,7 @@ ares_status_t ares__sconfig_append(ares__llist_t         **sconfig,
   ares_status_t   status;
 
   if (sconfig == NULL || addr == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Silently skip blacklisted IPv6 servers. */
@@ -390,14 +390,14 @@ ares_status_t ares__sconfig_append(ares__llist_t         **sconfig,
 
   s = ares_malloc_zero(sizeof(*s));
   if (s == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (*sconfig == NULL) {
     *sconfig = ares__llist_create(ares_free);
     if (*sconfig == NULL) {
-      status = ARES_ENOMEM;
-      goto fail;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -422,8 +422,8 @@ ares_status_t ares__sconfig_append(ares__llist_t         **sconfig,
   }
 
   if (ares__llist_insert_last(*sconfig, s) == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
@@ -491,7 +491,7 @@ ares_status_t ares__sconfig_append_fromstr(ares__llist_t **sconfig,
     status = ares__sconfig_append(sconfig, &s.addr, s.udp_port, s.tcp_port,
                                   s.ll_iface);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -585,7 +585,7 @@ static ares_status_t ares__server_create(ares_channel_t       *channel,
   struct server_state *server = ares_malloc_zero(sizeof(*server));
 
   if (server == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   server->idx         = idx;
@@ -612,32 +612,32 @@ static ares_status_t ares__server_create(ares_channel_t       *channel,
 
   server->tcp_parser = ares__buf_create();
   if (server->tcp_parser == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   server->tcp_send = ares__buf_create();
   if (server->tcp_send == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   server->connections = ares__llist_create(NULL);
   if (server->connections == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (ares__slist_insert(channel->servers, server) == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ARES_SUCCESS;
 
 done:
   if (status != ARES_SUCCESS) {
-    ares__destroy_server(server);
+    ares__destroy_server(server); /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return status;
@@ -708,7 +708,7 @@ ares_status_t ares__servers_update(ares_channel_t *channel,
   ares_bool_t         list_changed = ARES_FALSE;
 
   if (channel == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__channel_lock(channel);
@@ -796,7 +796,7 @@ static ares_status_t
 
   s = ares__llist_create(ares_free);
   if (s == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (node = servers; node != NULL; node = node->next) {
@@ -809,7 +809,7 @@ static ares_status_t
 
     sconfig = ares_malloc_zero(sizeof(*sconfig));
     if (sconfig == NULL) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     sconfig->addr.family = node->family;
@@ -822,17 +822,19 @@ static ares_status_t
     }
 
     if (ares__llist_insert_last(s, sconfig) == NULL) {
-      ares_free(sconfig);
-      goto fail;
+      ares_free(sconfig); /* LCOV_EXCL_LINE: OutOfMemory */
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   *llist = s;
   return ARES_SUCCESS;
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   ares__llist_destroy(s);
   return ARES_ENOMEM;
+/* LCOV_EXCL_STOP */
 }
 
 static ares_status_t ares_addr_port_node_to_server_config_llist(
@@ -845,7 +847,7 @@ static ares_status_t ares_addr_port_node_to_server_config_llist(
 
   s = ares__llist_create(ares_free);
   if (s == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (node = servers; node != NULL; node = node->next) {
@@ -858,7 +860,7 @@ static ares_status_t ares_addr_port_node_to_server_config_llist(
 
     sconfig = ares_malloc_zero(sizeof(*sconfig));
     if (sconfig == NULL) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     sconfig->addr.family = node->family;
@@ -874,17 +876,19 @@ static ares_status_t ares_addr_port_node_to_server_config_llist(
     sconfig->udp_port = (unsigned short)node->udp_port;
 
     if (ares__llist_insert_last(s, sconfig) == NULL) {
-      ares_free(sconfig);
-      goto fail;
+      ares_free(sconfig); /* LCOV_EXCL_LINE: OutOfMemory */
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   *llist = s;
   return ARES_SUCCESS;
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   ares__llist_destroy(s);
   return ARES_ENOMEM;
+/* LCOV_EXCL_STOP */
 }
 
 ares_status_t ares_in_addr_to_server_config_llist(const struct in_addr *servers,
@@ -898,7 +902,7 @@ ares_status_t ares_in_addr_to_server_config_llist(const struct in_addr *servers,
 
   s = ares__llist_create(ares_free);
   if (s == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (i = 0; servers != NULL && i < nservers; i++) {
@@ -906,7 +910,7 @@ ares_status_t ares_in_addr_to_server_config_llist(const struct in_addr *servers,
 
     sconfig = ares_malloc_zero(sizeof(*sconfig));
     if (sconfig == NULL) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     sconfig->addr.family = AF_INET;
@@ -914,16 +918,18 @@ ares_status_t ares_in_addr_to_server_config_llist(const struct in_addr *servers,
            sizeof(sconfig->addr.addr.addr4));
 
     if (ares__llist_insert_last(s, sconfig) == NULL) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   *llist = s;
   return ARES_SUCCESS;
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   ares__llist_destroy(s);
   return ARES_ENOMEM;
+/* LCOV_EXCL_STOP */
 }
 
 /* Write out the details of a server to a buffer */
@@ -937,7 +943,7 @@ ares_status_t ares_get_server_addr(const struct server_state *server,
   if (server->addr.family == AF_INET6) {
     status = ares__buf_append_byte(buf, '[');
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -945,37 +951,37 @@ ares_status_t ares_get_server_addr(const struct server_state *server,
 
   status = ares__buf_append_str(buf, addr);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (server->addr.family == AF_INET6) {
     status = ares__buf_append_byte(buf, ']');
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   /* :port */
   status = ares__buf_append_byte(buf, ':');
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__buf_append_num_dec(buf, server->udp_port, 0);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* %iface */
   if (ares_strlen(server->ll_iface)) {
     status = ares__buf_append_byte(buf, '%');
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     status = ares__buf_append_str(buf, server->ll_iface);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -1195,7 +1201,7 @@ char *ares_get_servers_csv(const ares_channel_t *channel)
 
   buf = ares__buf_create();
   if (buf == NULL) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (node = ares__slist_node_first(channel->servers); node != NULL;
@@ -1206,13 +1212,13 @@ char *ares_get_servers_csv(const ares_channel_t *channel)
     if (ares__buf_len(buf)) {
       status = ares__buf_append_byte(buf, ',');
       if (status != ARES_SUCCESS) {
-        goto done;
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
 
     status = ares_get_server_addr(server, buf);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -1229,7 +1235,7 @@ void ares_set_server_state_callback(ares_channel_t            *channel,
                                     ares_server_state_callback cb, void *data)
 {
   if (channel == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   channel->server_state_cb      = cb;
   channel->server_state_cb_data = data;
diff --git a/lib/c-ares-1.30.0/src/lib/ares_version.c b/lib/c-ares-1.31.0/src/lib/ares_version.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/ares_version.c
rename to lib/c-ares-1.31.0/src/lib/ares_version.c
diff --git a/lib/c-ares-1.30.0/src/lib/cares.rc b/lib/c-ares-1.31.0/src/lib/cares.rc
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/cares.rc
rename to lib/c-ares-1.31.0/src/lib/cares.rc
diff --git a/lib/c-ares-1.30.0/src/lib/config-dos.h b/lib/c-ares-1.31.0/src/lib/config-dos.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/config-dos.h
rename to lib/c-ares-1.31.0/src/lib/config-dos.h
diff --git a/lib/c-ares-1.30.0/src/lib/config-win32.h b/lib/c-ares-1.31.0/src/lib/config-win32.h
similarity index 96%
rename from lib/c-ares-1.30.0/src/lib/config-win32.h
rename to lib/c-ares-1.31.0/src/lib/config-win32.h
index 50d77313675..a55cf9e2dbb 100644
--- a/lib/c-ares-1.30.0/src/lib/config-win32.h
+++ b/lib/c-ares-1.31.0/src/lib/config-win32.h
@@ -88,7 +88,7 @@
 #define HAVE_IPHLPAPI_H 1
 
 /* Define if you have <netioapi.h> header file */
-#ifndef __WATCOMC__
+#if !defined(__WATCOMC__) && !defined(WATT32)
 #  define HAVE_NETIOAPI_H 1
 #endif
 
@@ -207,7 +207,12 @@
 
 /* Specifics for the Watt-32 tcp/ip stack. */
 #ifdef WATT32
-#  define SOCKET                   int
+#  undef RECV_TYPE_ARG1
+#  define RECV_TYPE_ARG1 int
+#  undef SEND_TYPE_ARG1
+#  define SEND_TYPE_ARG1 int
+#  undef RECVFROM_TYPE_ARG1
+#  define RECVFROM_TYPE_ARG1 int
 #  define NS_INADDRSZ              4
 #  define HAVE_ARPA_NAMESER_H      1
 #  define HAVE_ARPA_INET_H         1
@@ -219,9 +224,12 @@
 #  define HAVE_PF_INET6            1
 #  define HAVE_STRUCT_IN6_ADDR     1
 #  define HAVE_STRUCT_SOCKADDR_IN6 1
+#  define HAVE_WRITEV              1
 #  undef HAVE_WINSOCK_H
 #  undef HAVE_WINSOCK2_H
 #  undef HAVE_WS2TCPIP_H
+#  undef HAVE_IPHLPAPI_H
+#  undef HAVE_NETIOAPI_H
 #endif
 
 /* Threading support enabled */
@@ -342,7 +350,8 @@
 #  define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
 #endif
 
-#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) && !defined(__WATCOMC__)
+#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) && \
+   !defined(__WATCOMC__) && !defined(WATT32)
 /* Define if you have if_nametoindex() */
 #  define HAVE_IF_NAMETOINDEX 1
 /* Define if you have if_indextoname() */
diff --git a/lib/c-ares-1.30.0/src/lib/inet_net_pton.c b/lib/c-ares-1.31.0/src/lib/inet_net_pton.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/inet_net_pton.c
rename to lib/c-ares-1.31.0/src/lib/inet_net_pton.c
diff --git a/lib/c-ares-1.30.0/src/lib/inet_ntop.c b/lib/c-ares-1.31.0/src/lib/inet_ntop.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/lib/inet_ntop.c
rename to lib/c-ares-1.31.0/src/lib/inet_ntop.c
diff --git a/lib/c-ares-1.30.0/src/lib/setup_once.h b/lib/c-ares-1.31.0/src/lib/setup_once.h
similarity index 99%
rename from lib/c-ares-1.30.0/src/lib/setup_once.h
rename to lib/c-ares-1.31.0/src/lib/setup_once.h
index a6168c9aed5..649d6ac4d61 100644
--- a/lib/c-ares-1.30.0/src/lib/setup_once.h
+++ b/lib/c-ares-1.31.0/src/lib/setup_once.h
@@ -75,11 +75,6 @@
 #  include <time.h>
 #endif
 
-#ifdef WIN32
-#  include <io.h>
-#  include <fcntl.h>
-#endif
-
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
diff --git a/lib/c-ares-1.30.0/src/lib/thirdparty/apple/dnsinfo.h b/lib/c-ares-1.31.0/src/lib/thirdparty/apple/dnsinfo.h
similarity index 65%
rename from lib/c-ares-1.30.0/src/lib/thirdparty/apple/dnsinfo.h
rename to lib/c-ares-1.31.0/src/lib/thirdparty/apple/dnsinfo.h
index d5a0e70e2f3..d92a1d80305 100644
--- a/lib/c-ares-1.30.0/src/lib/thirdparty/apple/dnsinfo.h
+++ b/lib/c-ares-1.31.0/src/lib/thirdparty/apple/dnsinfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2006, 2008, 2009, 2011-2013, 2015-2018 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2006, 2008, 2009, 2011 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -28,14 +28,15 @@
  * These routines provide access to the systems DNS configuration
  */
 
-#include <os/availability.h>
+#include <Availability.h>
 #include <sys/cdefs.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <AvailabilityMacros.h>
 
-#define	DNSINFO_VERSION		20170629
+#define	DNSINFO_VERSION		20111104
 
 #define DEFAULT_SEARCH_ORDER    200000   /* search order for the "default" resolver domain name */
 
@@ -72,23 +73,17 @@ typedef struct {
 	DNS_VAR(uint32_t,		search_order);	/* search_order */
 	DNS_VAR(uint32_t,		if_index);
 	DNS_VAR(uint32_t,		flags);
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080 /* MacOS 10.8 */
+	DNS_VAR(uint32_t,		reserved[6]);
+#else
 	DNS_VAR(uint32_t,		reach_flags);	/* SCNetworkReachabilityFlags */
-	DNS_VAR(uint32_t,		service_identifier);
-	DNS_PTR(char *,			cid);		/* configuration identifer */
-	DNS_PTR(char *,			if_name);	/* if_index interface name */
+	DNS_VAR(uint32_t,		reserved[5]);
+#endif
 } dns_resolver_t;
 #pragma pack()
 
 
-#define DNS_RESOLVER_FLAGS_REQUEST_A_RECORDS	0x0002		/* always requesting for A dns records in queries */
-#define DNS_RESOLVER_FLAGS_REQUEST_AAAA_RECORDS	0x0004		/* always requesting for AAAA dns records in queries */
-
-#define	DNS_RESOLVER_FLAGS_REQUEST_ALL_RECORDS	\
-	(DNS_RESOLVER_FLAGS_REQUEST_A_RECORDS | DNS_RESOLVER_FLAGS_REQUEST_AAAA_RECORDS)
-
-#define DNS_RESOLVER_FLAGS_SCOPED		0x1000		/* configuration is for scoped questions */
-#define DNS_RESOLVER_FLAGS_SERVICE_SPECIFIC	0x2000		/* configuration is service-specific */
-#define DNS_RESOLVER_FLAGS_SUPPLEMENTAL		0x4000		/* supplemental match configuration */
+#define DNS_RESOLVER_FLAGS_SCOPED	1		/* configuration is for scoped questions */
 
 
 #pragma pack(4)
@@ -97,10 +92,7 @@ typedef struct {
 	DNS_PTR(dns_resolver_t **,	resolver);
 	DNS_VAR(int32_t,		n_scoped_resolver);	/* "scoped" resolver configurations */
 	DNS_PTR(dns_resolver_t **,	scoped_resolver);
-	DNS_VAR(uint64_t,		generation);
-	DNS_VAR(int32_t,		n_service_specific_resolver);
-	DNS_PTR(dns_resolver_t **,	service_specific_resolver);
-	DNS_VAR(uint32_t,		version);
+	DNS_VAR(uint32_t,		reserved[5]);
 } dns_config_t;
 #pragma pack()
 
@@ -111,17 +103,19 @@ __BEGIN_DECLS
  * DNS configuration access APIs
  */
 const char *
-dns_configuration_notify_key    (void)				API_AVAILABLE(macos(10.4), ios(2.0));
+dns_configuration_notify_key    (void)				__OSX_AVAILABLE_STARTING(__MAC_10_4,__IPHONE_2_0);
 
 dns_config_t *
-dns_configuration_copy		(void)				API_AVAILABLE(macos(10.4), ios(2.0));
+dns_configuration_copy		(void)				__OSX_AVAILABLE_STARTING(__MAC_10_4,__IPHONE_2_0);
 
 void
-dns_configuration_free		(dns_config_t	*config)	API_AVAILABLE(macos(10.4), ios(2.0));
+dns_configuration_free		(dns_config_t	*config)	__OSX_AVAILABLE_STARTING(__MAC_10_4,__IPHONE_2_0);
 
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
 void
 _dns_configuration_ack		(dns_config_t	*config,
-				 const char	*bundle_id)	API_AVAILABLE(macos(10.8), ios(6.0));
+				 const char	*bundle_id)	__OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_6_0);
+#endif
 
 __END_DECLS
 
diff --git a/lib/c-ares-1.30.0/src/lib/windows_port.c b/lib/c-ares-1.31.0/src/lib/windows_port.c
similarity index 90%
rename from lib/c-ares-1.30.0/src/lib/windows_port.c
rename to lib/c-ares-1.31.0/src/lib/windows_port.c
index d5f0ad3abf6..5395f203601 100644
--- a/lib/c-ares-1.30.0/src/lib/windows_port.c
+++ b/lib/c-ares-1.31.0/src/lib/windows_port.c
@@ -11,7 +11,7 @@
 
 /* only do the following on windows
  */
-#if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS)
+#if defined(_WIN32) && !defined(MSDOS)
 
 #  ifdef __WATCOMC__
 /*
diff --git a/lib/c-ares-1.30.0/src/tools/CMakeLists.txt b/lib/c-ares-1.31.0/src/tools/CMakeLists.txt
similarity index 100%
rename from lib/c-ares-1.30.0/src/tools/CMakeLists.txt
rename to lib/c-ares-1.31.0/src/tools/CMakeLists.txt
diff --git a/lib/c-ares-1.30.0/src/tools/Makefile.am b/lib/c-ares-1.31.0/src/tools/Makefile.am
similarity index 100%
rename from lib/c-ares-1.30.0/src/tools/Makefile.am
rename to lib/c-ares-1.31.0/src/tools/Makefile.am
diff --git a/lib/c-ares-1.30.0/src/tools/Makefile.in b/lib/c-ares-1.31.0/src/tools/Makefile.in
similarity index 100%
rename from lib/c-ares-1.30.0/src/tools/Makefile.in
rename to lib/c-ares-1.31.0/src/tools/Makefile.in
diff --git a/lib/c-ares-1.30.0/src/tools/Makefile.inc b/lib/c-ares-1.31.0/src/tools/Makefile.inc
similarity index 100%
rename from lib/c-ares-1.30.0/src/tools/Makefile.inc
rename to lib/c-ares-1.31.0/src/tools/Makefile.inc
diff --git a/lib/c-ares-1.30.0/src/tools/adig.c b/lib/c-ares-1.31.0/src/tools/adig.c
similarity index 99%
rename from lib/c-ares-1.30.0/src/tools/adig.c
rename to lib/c-ares-1.31.0/src/tools/adig.c
index 66c118844e8..e0d5c915aa5 100644
--- a/lib/c-ares-1.30.0/src/tools/adig.c
+++ b/lib/c-ares-1.31.0/src/tools/adig.c
@@ -62,11 +62,6 @@
 
 #include "ares_getopt.h"
 
-#ifdef WATT32
-#  undef WIN32 /* Redefined in MingW headers */
-#endif
-
-
 typedef struct {
   ares_bool_t         is_help;
   struct ares_options options;
diff --git a/lib/c-ares-1.30.0/src/tools/ahost.c b/lib/c-ares-1.31.0/src/tools/ahost.c
similarity index 99%
rename from lib/c-ares-1.30.0/src/tools/ahost.c
rename to lib/c-ares-1.31.0/src/tools/ahost.c
index bbcd2b1d633..8d74d5d8482 100644
--- a/lib/c-ares-1.30.0/src/tools/ahost.c
+++ b/lib/c-ares-1.31.0/src/tools/ahost.c
@@ -27,7 +27,7 @@
 
 #include "ares_setup.h"
 
-#if !defined(WIN32) || defined(WATT32)
+#if !defined(_WIN32) || defined(WATT32)
 #  include <netinet/in.h>
 #  include <arpa/inet.h>
 #  include <netdb.h>
diff --git a/lib/c-ares-1.30.0/src/tools/ares_getopt.c b/lib/c-ares-1.31.0/src/tools/ares_getopt.c
similarity index 100%
rename from lib/c-ares-1.30.0/src/tools/ares_getopt.c
rename to lib/c-ares-1.31.0/src/tools/ares_getopt.c
diff --git a/lib/c-ares-1.30.0/src/tools/ares_getopt.h b/lib/c-ares-1.31.0/src/tools/ares_getopt.h
similarity index 100%
rename from lib/c-ares-1.30.0/src/tools/ares_getopt.h
rename to lib/c-ares-1.31.0/src/tools/ares_getopt.h
diff --git a/lib/c-ares-1.30.0/test/CMakeLists.txt b/lib/c-ares-1.31.0/test/CMakeLists.txt
similarity index 100%
rename from lib/c-ares-1.30.0/test/CMakeLists.txt
rename to lib/c-ares-1.31.0/test/CMakeLists.txt
diff --git a/lib/c-ares-1.30.0/test/Makefile.am b/lib/c-ares-1.31.0/test/Makefile.am
similarity index 100%
rename from lib/c-ares-1.30.0/test/Makefile.am
rename to lib/c-ares-1.31.0/test/Makefile.am
diff --git a/lib/c-ares-1.30.0/test/Makefile.in b/lib/c-ares-1.31.0/test/Makefile.in
similarity index 100%
rename from lib/c-ares-1.30.0/test/Makefile.in
rename to lib/c-ares-1.31.0/test/Makefile.in
diff --git a/lib/c-ares-1.30.0/test/Makefile.inc b/lib/c-ares-1.31.0/test/Makefile.inc
similarity index 100%
rename from lib/c-ares-1.30.0/test/Makefile.inc
rename to lib/c-ares-1.31.0/test/Makefile.inc
diff --git a/lib/c-ares-1.30.0/test/Makefile.m32 b/lib/c-ares-1.31.0/test/Makefile.m32
similarity index 100%
rename from lib/c-ares-1.30.0/test/Makefile.m32
rename to lib/c-ares-1.31.0/test/Makefile.m32
diff --git a/lib/c-ares-1.30.0/test/Makefile.msvc b/lib/c-ares-1.31.0/test/Makefile.msvc
similarity index 100%
rename from lib/c-ares-1.30.0/test/Makefile.msvc
rename to lib/c-ares-1.31.0/test/Makefile.msvc
diff --git a/lib/c-ares-1.30.0/test/README.md b/lib/c-ares-1.31.0/test/README.md
similarity index 100%
rename from lib/c-ares-1.30.0/test/README.md
rename to lib/c-ares-1.31.0/test/README.md
diff --git a/lib/c-ares-1.30.0/test/ares-fuzz.c b/lib/c-ares-1.31.0/test/ares-fuzz.c
similarity index 100%
rename from lib/c-ares-1.30.0/test/ares-fuzz.c
rename to lib/c-ares-1.31.0/test/ares-fuzz.c
diff --git a/lib/c-ares-1.30.0/test/ares-test-ai.h b/lib/c-ares-1.31.0/test/ares-test-ai.h
similarity index 100%
rename from lib/c-ares-1.30.0/test/ares-test-ai.h
rename to lib/c-ares-1.31.0/test/ares-test-ai.h
diff --git a/lib/c-ares-1.30.0/test/ares-test-fuzz-name.c b/lib/c-ares-1.31.0/test/ares-test-fuzz-name.c
similarity index 100%
rename from lib/c-ares-1.30.0/test/ares-test-fuzz-name.c
rename to lib/c-ares-1.31.0/test/ares-test-fuzz-name.c
diff --git a/lib/c-ares-1.30.0/test/ares-test-fuzz.c b/lib/c-ares-1.31.0/test/ares-test-fuzz.c
similarity index 100%
rename from lib/c-ares-1.30.0/test/ares-test-fuzz.c
rename to lib/c-ares-1.31.0/test/ares-test-fuzz.c
diff --git a/lib/c-ares-1.30.0/test/ares-test-init.cc b/lib/c-ares-1.31.0/test/ares-test-init.cc
similarity index 100%
rename from lib/c-ares-1.30.0/test/ares-test-init.cc
rename to lib/c-ares-1.31.0/test/ares-test-init.cc
diff --git a/lib/c-ares-1.30.0/test/ares-test-internal.cc b/lib/c-ares-1.31.0/test/ares-test-internal.cc
similarity index 91%
rename from lib/c-ares-1.30.0/test/ares-test-internal.cc
rename to lib/c-ares-1.31.0/test/ares-test-internal.cc
index b5771878037..d0e7f282fff 100644
--- a/lib/c-ares-1.30.0/test/ares-test-internal.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-internal.cc
@@ -805,6 +805,50 @@ TEST_F(LibraryTest, DNSRecord) {
 
   ares_dns_record_destroy(dnsrec);
   ares_free_string(msg);
+
+  // Invalid
+  EXPECT_NE(ARES_SUCCESS, ares_dns_parse(NULL, 0, 0, NULL));
+  EXPECT_NE(ARES_SUCCESS, ares_dns_record_create(NULL, 0, 0, ARES_OPCODE_QUERY, ARES_RCODE_NOERROR));
+  EXPECT_EQ(0, ares_dns_record_get_id(NULL));
+  EXPECT_EQ(0, ares_dns_record_get_flags(NULL));
+  EXPECT_EQ(0, (int)ares_dns_record_get_opcode(NULL));
+  EXPECT_EQ(0, (int)ares_dns_record_get_rcode(NULL));
+  EXPECT_EQ(0, (int)ares_dns_record_query_cnt(NULL));
+  EXPECT_NE(ARES_SUCCESS, ares_dns_record_query_set_name(NULL, 0, NULL));
+  EXPECT_NE(ARES_SUCCESS, ares_dns_record_query_set_type(NULL, 0, ARES_REC_TYPE_A));
+  EXPECT_NE(ARES_SUCCESS, ares_dns_record_query_get(NULL, 0, NULL, NULL, NULL));
+  EXPECT_EQ(0, ares_dns_record_rr_cnt(NULL, ARES_SECTION_ANSWER));
+  EXPECT_NE(ARES_SUCCESS, ares_dns_record_rr_add(NULL, NULL, ARES_SECTION_ANSWER, NULL, ARES_REC_TYPE_A, ARES_CLASS_IN, 0));
+  EXPECT_NE(ARES_SUCCESS, ares_dns_record_rr_del(NULL, ARES_SECTION_ANSWER, 0));
+  EXPECT_EQ(nullptr, ares_dns_record_rr_get(NULL, ARES_SECTION_ANSWER, 0));
+  EXPECT_EQ(nullptr, ares_dns_rr_get_name(NULL));
+  EXPECT_EQ(0, (int)ares_dns_rr_get_type(NULL));
+  EXPECT_EQ(0, (int)ares_dns_rr_get_class(NULL));
+  EXPECT_EQ(0, ares_dns_rr_get_ttl(NULL));
+  EXPECT_NE(ARES_SUCCESS, ares_dns_write(NULL, NULL, NULL));
+#ifndef CARES_SYMBOL_HIDING
+  ares_dns_record_write_ttl_decrement(NULL, 0);
+#endif
+  EXPECT_EQ(nullptr, ares_dns_rr_get_addr(NULL, ARES_RR_A_ADDR));
+  EXPECT_EQ(nullptr, ares_dns_rr_get_addr(NULL, ARES_RR_NS_NSDNAME));
+  EXPECT_EQ(nullptr, ares_dns_rr_get_addr6(NULL, ARES_RR_AAAA_ADDR));
+  EXPECT_EQ(nullptr, ares_dns_rr_get_addr6(NULL, ARES_RR_NS_NSDNAME));
+  EXPECT_EQ(0, ares_dns_rr_get_u8(NULL, ARES_RR_SIG_ALGORITHM));
+  EXPECT_EQ(0, ares_dns_rr_get_u8(NULL, ARES_RR_NS_NSDNAME));
+  EXPECT_EQ(0, ares_dns_rr_get_u16(NULL, ARES_RR_MX_PREFERENCE));
+  EXPECT_EQ(0, ares_dns_rr_get_u16(NULL, ARES_RR_NS_NSDNAME));
+  EXPECT_EQ(0, ares_dns_rr_get_u32(NULL, ARES_RR_SOA_SERIAL));
+  EXPECT_EQ(0, ares_dns_rr_get_u32(NULL, ARES_RR_NS_NSDNAME));
+  EXPECT_EQ(nullptr, ares_dns_rr_get_bin(NULL, ARES_RR_TXT_DATA, NULL));
+  EXPECT_EQ(nullptr, ares_dns_rr_get_bin(NULL, ARES_RR_NS_NSDNAME, NULL));
+  EXPECT_EQ(nullptr, ares_dns_rr_get_str(NULL, ARES_RR_NS_NSDNAME));
+  EXPECT_EQ(nullptr, ares_dns_rr_get_str(NULL, ARES_RR_MX_PREFERENCE));
+  EXPECT_EQ(0, ares_dns_rr_get_opt_cnt(NULL, ARES_RR_OPT_OPTIONS));
+  EXPECT_EQ(0, ares_dns_rr_get_opt_cnt(NULL, ARES_RR_A_ADDR));
+  EXPECT_EQ(65535, ares_dns_rr_get_opt(NULL, ARES_RR_OPT_OPTIONS, 0, NULL, NULL));
+  EXPECT_EQ(65535, ares_dns_rr_get_opt(NULL, ARES_RR_A_ADDR, 0, NULL, NULL));
+  EXPECT_EQ(ARES_FALSE, ares_dns_rr_get_opt_byid(NULL, ARES_RR_OPT_OPTIONS, 1, NULL, NULL));
+  EXPECT_EQ(ARES_FALSE, ares_dns_rr_get_opt_byid(NULL, ARES_RR_A_ADDR, 1, NULL, NULL));
 }
 
 TEST_F(LibraryTest, DNSParseFlags) {
@@ -1229,6 +1273,63 @@ TEST_F(LibraryTest, HtableStrvp) {
   ares__htable_strvp_destroy(h);
 }
 
+TEST_F(LibraryTest, IfaceIPs) {
+  ares_status_t      status;
+  ares__iface_ips_t *ips = NULL;
+  size_t             i;
+
+  status = ares__iface_ips(&ips, ARES_IFACE_IP_DEFAULT, NULL);
+  EXPECT_TRUE(status == ARES_SUCCESS || status == ARES_ENOTIMP);
+
+  /* Not implemented, can't run tests */
+  if (status == ARES_ENOTIMP)
+    return;
+
+  EXPECT_NE(nullptr, ips);
+
+  for (i=0; i<ares__iface_ips_cnt(ips); i++) {
+    const char *name = ares__iface_ips_get_name(ips, i);
+    EXPECT_NE(nullptr, name);
+    int flags = (int)ares__iface_ips_get_flags(ips, i);
+    EXPECT_NE(0, (int)flags);
+    EXPECT_NE(nullptr, ares__iface_ips_get_addr(ips, i));
+    EXPECT_NE(0, ares__iface_ips_get_netmask(ips, i));
+    if (flags & ARES_IFACE_IP_LINKLOCAL && flags & ARES_IFACE_IP_V6) {
+      /* Hmm, seems not to work at least on MacOS
+       * EXPECT_NE(0, ares__iface_ips_get_ll_scope(ips, i));
+       */
+    } else {
+      EXPECT_EQ(0, ares__iface_ips_get_ll_scope(ips, i));
+    }
+    unsigned int idx = ares__if_nametoindex(name);
+    EXPECT_NE(0, idx);
+    char namebuf[256];
+    EXPECT_EQ(std::string(ares__if_indextoname(idx, namebuf, sizeof(namebuf))), std::string(name));
+  }
+
+
+  /* Negative checking */
+  ares__iface_ips_get_name(ips, ares__iface_ips_cnt(ips));
+  ares__iface_ips_get_flags(ips, ares__iface_ips_cnt(ips));
+  ares__iface_ips_get_addr(ips, ares__iface_ips_cnt(ips));
+  ares__iface_ips_get_netmask(ips, ares__iface_ips_cnt(ips));
+  ares__iface_ips_get_ll_scope(ips, ares__iface_ips_cnt(ips));
+
+  ares__iface_ips(NULL, ARES_IFACE_IP_DEFAULT, NULL);
+  ares__iface_ips_cnt(NULL);
+  ares__iface_ips_get_name(NULL, 0);
+  ares__iface_ips_get_flags(NULL, 0);
+  ares__iface_ips_get_addr(NULL, 0);
+  ares__iface_ips_get_netmask(NULL, 0);
+  ares__iface_ips_get_ll_scope(NULL, 0);
+  ares__iface_ips_destroy(NULL);
+  ares__if_nametoindex(NULL);
+  ares__if_indextoname(0, NULL, 0);
+
+  ares__iface_ips_destroy(ips);
+}
+
+
 #endif
 
 TEST_F(DefaultChannelTest, SaveInvalidChannel) {
diff --git a/lib/c-ares-1.30.0/test/ares-test-live.cc b/lib/c-ares-1.31.0/test/ares-test-live.cc
similarity index 99%
rename from lib/c-ares-1.30.0/test/ares-test-live.cc
rename to lib/c-ares-1.31.0/test/ares-test-live.cc
index 9e5c4c35726..88d2153cb7d 100644
--- a/lib/c-ares-1.30.0/test/ares-test-live.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-live.cc
@@ -807,7 +807,7 @@ TEST_F(DefaultChannelTest, LiveSetServersPorts) {
   server2.family = AF_INET;
   server2.addr.addr4.s_addr = htonl(0x02030405);
   server2.udp_port = 0;
-  server2.tcp_port = 0;;
+  server2.tcp_port = 0;
   EXPECT_EQ(ARES_ENODATA, ares_set_servers_ports(nullptr, &server1));
 
   // Change while pending will requeue any requests to new servers
diff --git a/lib/c-ares-1.30.0/test/ares-test-main.cc b/lib/c-ares-1.31.0/test/ares-test-main.cc
similarity index 100%
rename from lib/c-ares-1.30.0/test/ares-test-main.cc
rename to lib/c-ares-1.31.0/test/ares-test-main.cc
diff --git a/lib/c-ares-1.30.0/test/ares-test-misc.cc b/lib/c-ares-1.31.0/test/ares-test-misc.cc
similarity index 87%
rename from lib/c-ares-1.30.0/test/ares-test-misc.cc
rename to lib/c-ares-1.31.0/test/ares-test-misc.cc
index e680481a8df..5d5641a90a3 100644
--- a/lib/c-ares-1.30.0/test/ares-test-misc.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-misc.cc
@@ -104,7 +104,7 @@ TEST_F(DefaultChannelTest, SetServersPorts) {
   server2.family = AF_INET;
   server2.addr.addr4.s_addr = htonl(0x02030405);
   server2.udp_port = 0;
-  server2.tcp_port = 0;;
+  server2.tcp_port = 0;
   EXPECT_EQ(ARES_ENODATA, ares_set_servers_ports(nullptr, &server1));
 
   EXPECT_EQ(ARES_SUCCESS, ares_set_servers_ports(channel_, &server1));
@@ -308,6 +308,9 @@ TEST_F(LibraryTest, CreateQueryFailures) {
             ares_create_query("example..com", C_IN, T_A, 0x1234, 0,
                     &p, &len, 0));
   if (p) ares_free_string(p);
+
+  EXPECT_EQ(ARES_EFORMERR,
+            ares_create_query(NULL, C_IN, T_A, 0x1234, 0, NULL, NULL, 0));
 }
 
 TEST_F(LibraryTest, CreateQueryOnionDomain) {
@@ -544,15 +547,6 @@ TEST_F(LibraryTest, Version) {
   EXPECT_EQ(ARES_VERSION, version);
 }
 
-TEST_F(LibraryTest, Strerror) {
-  EXPECT_EQ("Successful completion",
-            std::string(ares_strerror(ARES_SUCCESS)));
-  EXPECT_EQ("DNS query cancelled",
-            std::string(ares_strerror(ARES_ECANCELLED)));
-  EXPECT_EQ("unknown",
-            std::string(ares_strerror(99)));
-}
-
 TEST_F(LibraryTest, ExpandString) {
   std::vector<byte> s1 = { 3, 'a', 'b', 'c'};
   char* result = nullptr;
@@ -576,5 +570,90 @@ TEST_F(LibraryTest, ExpandString) {
                                (unsigned char**)&result, &len));
 }
 
+TEST_F(LibraryTest, DNSMapping) {
+  ares_dns_rec_type_t types[] = {
+    ARES_REC_TYPE_A,
+    ARES_REC_TYPE_NS,
+    ARES_REC_TYPE_CNAME,
+    ARES_REC_TYPE_SOA,
+    ARES_REC_TYPE_PTR,
+    ARES_REC_TYPE_HINFO,
+    ARES_REC_TYPE_MX,
+    ARES_REC_TYPE_TXT,
+    ARES_REC_TYPE_SIG,
+    ARES_REC_TYPE_AAAA,
+    ARES_REC_TYPE_SRV,
+    ARES_REC_TYPE_NAPTR,
+    ARES_REC_TYPE_OPT,
+    ARES_REC_TYPE_TLSA,
+    ARES_REC_TYPE_SVCB,
+    ARES_REC_TYPE_HTTPS,
+    ARES_REC_TYPE_ANY,
+    ARES_REC_TYPE_URI,
+    ARES_REC_TYPE_CAA
+  };
+
+  for (size_t i=0; i<sizeof(types) / sizeof(*types); i++) {
+    ares_dns_rec_type_t type;
+    EXPECT_TRUE(ares_dns_rec_type_fromstr(&type, ares_dns_rec_type_tostr(types[i])));
+    EXPECT_EQ(types[i], type);
+    size_t cnt;
+    const ares_dns_rr_key_t *keys = ares_dns_rr_get_keys(type, &cnt);
+    for (size_t j=0; j<cnt; j++) {
+      const char *name = ares_dns_rr_key_tostr(keys[j]);
+      EXPECT_NE(nullptr, name);
+      EXPECT_NE("UNKNOWN", std::string(name));
+      EXPECT_EQ(type, ares_dns_rr_key_to_rec_type(keys[j]));
+      EXPECT_NE(0, (int)ares_dns_rr_key_datatype(keys[j]));
+    }
+  }
+}
+
+TEST_F(LibraryTest, StrError) {
+  ares_status_t status[] = {
+    ARES_SUCCESS, ARES_ENODATA, ARES_EFORMERR, ARES_ESERVFAIL, ARES_ENOTFOUND,
+    ARES_ENOTIMP, ARES_EREFUSED, ARES_EBADQUERY, ARES_EBADNAME, ARES_EBADFAMILY,
+    ARES_EBADRESP, ARES_ECONNREFUSED, ARES_ETIMEOUT, ARES_EOF, ARES_EFILE,
+    ARES_ENOMEM, ARES_EDESTRUCTION, ARES_EBADSTR, ARES_EBADFLAGS, ARES_ENONAME,
+    ARES_EBADHINTS, ARES_ENOTINITIALIZED, ARES_ELOADIPHLPAPI,
+    ARES_EADDRGETNETWORKPARAMS, ARES_ECANCELLED, ARES_ESERVICE, ARES_ENOSERVER
+  };
+  size_t i;
+  const char *str = nullptr;
+
+  for (i=0; i < sizeof(status) / sizeof(*status); i++) {
+    str = ares_strerror((int)status[i]);
+    EXPECT_NE(nullptr, str);
+    EXPECT_NE("unknown", std::string(str));
+  }
+
+  /* unknown value */
+  str = ares_strerror(0x12345678);
+  EXPECT_NE(nullptr, str);
+  EXPECT_EQ("unknown", std::string(str));
+}
+
+TEST_F(LibraryTest, UsageErrors) {
+  ares_cancel(NULL);
+  ares_set_socket_callback(NULL, NULL, NULL);
+  ares_set_socket_configure_callback(NULL, NULL, NULL);
+  ares_set_socket_functions(NULL, NULL, NULL);
+  ares_destroy(NULL);
+  ares_expand_name(NULL, NULL, 0, NULL, NULL);
+  ares_expand_string(NULL, NULL, 0, NULL, NULL);
+  ares_fds(NULL, NULL, NULL);
+  ares_getaddrinfo(NULL, NULL, NULL, NULL, NULL, NULL);
+  ares_gethostbyaddr(NULL, NULL, 0, 0, NULL, NULL);
+  ares_getnameinfo(NULL, NULL, 0, 0, NULL, NULL);
+  ares_reinit(NULL);
+  ares_dup(NULL, NULL);
+  ares_set_local_ip4(NULL, 0);
+  ares_set_local_ip6(NULL, NULL);
+  ares_set_local_dev(NULL, NULL);
+  ares_query_dnsrec(NULL, NULL, ARES_CLASS_IN, ARES_REC_TYPE_A, NULL, NULL, NULL);
+  ares_query(NULL, NULL, ARES_CLASS_IN, ARES_REC_TYPE_A, NULL, NULL);
+}
+
+
 }  // namespace test
 }  // namespace ares
diff --git a/lib/c-ares-1.30.0/test/ares-test-mock-ai.cc b/lib/c-ares-1.31.0/test/ares-test-mock-ai.cc
similarity index 100%
rename from lib/c-ares-1.30.0/test/ares-test-mock-ai.cc
rename to lib/c-ares-1.31.0/test/ares-test-mock-ai.cc
diff --git a/lib/c-ares-1.30.0/test/ares-test-mock-et.cc b/lib/c-ares-1.31.0/test/ares-test-mock-et.cc
similarity index 100%
rename from lib/c-ares-1.30.0/test/ares-test-mock-et.cc
rename to lib/c-ares-1.31.0/test/ares-test-mock-et.cc
diff --git a/lib/c-ares-1.30.0/test/ares-test-mock.cc b/lib/c-ares-1.31.0/test/ares-test-mock.cc
similarity index 100%
rename from lib/c-ares-1.30.0/test/ares-test-mock.cc
rename to lib/c-ares-1.31.0/test/ares-test-mock.cc
diff --git a/lib/c-ares-1.30.0/test/ares-test-ns.cc b/lib/c-ares-1.31.0/test/ares-test-ns.cc
similarity index 100%
rename from lib/c-ares-1.30.0/test/ares-test-ns.cc
rename to lib/c-ares-1.31.0/test/ares-test-ns.cc
diff --git a/lib/c-ares-1.30.0/test/ares-test-parse-a.cc b/lib/c-ares-1.31.0/test/ares-test-parse-a.cc
similarity index 98%
rename from lib/c-ares-1.30.0/test/ares-test-parse-a.cc
rename to lib/c-ares-1.31.0/test/ares-test-parse-a.cc
index e5dbd7980d7..7e045dcc924 100644
--- a/lib/c-ares-1.30.0/test/ares-test-parse-a.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-parse-a.cc
@@ -139,6 +139,10 @@ TEST_F(LibraryTest, ParseMalformedAReply) {
   // Truncate mid-answer.
   EXPECT_EQ(ARES_EBADRESP, ares_parse_a_reply(data.data(), 42,
                                               &host, info, &count));
+
+  // Negative length
+  EXPECT_EQ(ARES_EBADRESP, ares_parse_a_reply(data.data(), -1,
+                                              &host, info, &count));
 }
 
 TEST_F(LibraryTest, ParseAReplyNoData) {
diff --git a/lib/c-ares-1.30.0/test/ares-test-parse-aaaa.cc b/lib/c-ares-1.31.0/test/ares-test-parse-aaaa.cc
similarity index 98%
rename from lib/c-ares-1.30.0/test/ares-test-parse-aaaa.cc
rename to lib/c-ares-1.31.0/test/ares-test-parse-aaaa.cc
index 6b79675e35d..17255b0d7d3 100644
--- a/lib/c-ares-1.30.0/test/ares-test-parse-aaaa.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-parse-aaaa.cc
@@ -195,6 +195,10 @@ TEST_F(LibraryTest, ParseAaaaReplyErrors) {
     EXPECT_EQ(ARES_EBADRESP, ares_parse_aaaa_reply(data.data(), (int)len,
                                                    nullptr, info, &count));
   }
+
+  // Negative length
+  EXPECT_EQ(ARES_EBADRESP, ares_parse_aaaa_reply(data.data(), -1,
+                                                 &host, info, &count));
 }
 
 TEST_F(LibraryTest, ParseAaaaReplyAllocFail) {
diff --git a/lib/c-ares-1.30.0/test/ares-test-parse-caa.cc b/lib/c-ares-1.31.0/test/ares-test-parse-caa.cc
similarity index 87%
rename from lib/c-ares-1.30.0/test/ares-test-parse-caa.cc
rename to lib/c-ares-1.31.0/test/ares-test-parse-caa.cc
index 04da8e43e7d..d83d4fdc8fb 100644
--- a/lib/c-ares-1.30.0/test/ares-test-parse-caa.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-parse-caa.cc
@@ -134,5 +134,20 @@ TEST_F(LibraryTest, ParseCaaEmptyReply) {
   ASSERT_EQ(nullptr, caa);
 }
 
+TEST_F(LibraryTest, ParseNegativeReply) {
+  std::vector<byte> data = {
+    0x27, 0x86, 0x81, 0x80, 0x00, 0x01, 0x00, 0x00,  0x00, 0x01, 0x00, 0x00, 0x09, 0x77, 0x69, 0x6B,  //  '............wik
+    0x69, 0x70, 0x65, 0x64, 0x69, 0x61, 0x02, 0x64,  0x65, 0x00, 0x01, 0x01, 0x00, 0x01, 0xC0, 0x0C,  //  ipedia.de.......
+    0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x02, 0x58,  0x00, 0x3B, 0x04, 0x6E, 0x73, 0x38, 0x31, 0x0D,  //  .......X.;.ns81.
+    0x64, 0x6F, 0x6D, 0x61, 0x69, 0x6E, 0x63, 0x6F,  0x6E, 0x74, 0x72, 0x6F, 0x6C, 0x03, 0x63, 0x6F,  //  domaincontrol.co
+    0x6D, 0x00, 0x03, 0x64, 0x6E, 0x73, 0x05, 0x6A,  0x6F, 0x6D, 0x61, 0x78, 0x03, 0x6E, 0x65, 0x74,  //  m..dns.jomax.net
+    0x00, 0x78, 0x67, 0xFE, 0x34, 0x00, 0x00, 0x70,  0x80, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x3A,  //  .xg.4..p.... ..:
+    0x80, 0x00, 0x00, 0x02, 0x58                                                                      //  ....X
+  };
+
+  struct ares_caa_reply* caa = nullptr;
+  EXPECT_EQ(ARES_EBADRESP, ares_parse_caa_reply(data.data(), -1, &caa));
+}
+
 }  // namespace test
 }  // namespace ares
diff --git a/lib/c-ares-1.30.0/test/ares-test-parse-mx.cc b/lib/c-ares-1.31.0/test/ares-test-parse-mx.cc
similarity index 98%
rename from lib/c-ares-1.30.0/test/ares-test-parse-mx.cc
rename to lib/c-ares-1.31.0/test/ares-test-parse-mx.cc
index a5a0bae6232..3be5bfd86ac 100644
--- a/lib/c-ares-1.30.0/test/ares-test-parse-mx.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-parse-mx.cc
@@ -144,6 +144,9 @@ TEST_F(LibraryTest, ParseMxReplyErrors) {
     EXPECT_EQ(nullptr, mx);
     EXPECT_TRUE(rc == ARES_EBADRESP || rc == ARES_EBADNAME);
   }
+
+  // Negative Length
+  EXPECT_EQ(ARES_EBADRESP, ares_parse_mx_reply(data.data(), -1, &mx));
 }
 
 TEST_F(LibraryTest, ParseMxReplyAllocFail) {
diff --git a/lib/c-ares-1.30.0/test/ares-test-parse-naptr.cc b/lib/c-ares-1.31.0/test/ares-test-parse-naptr.cc
similarity index 98%
rename from lib/c-ares-1.30.0/test/ares-test-parse-naptr.cc
rename to lib/c-ares-1.31.0/test/ares-test-parse-naptr.cc
index 6e6ab45b59f..a0d08f75b49 100644
--- a/lib/c-ares-1.30.0/test/ares-test-parse-naptr.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-parse-naptr.cc
@@ -120,6 +120,9 @@ TEST_F(LibraryTest, ParseNaptrReplyErrors) {
     int rc = ares_parse_naptr_reply(data.data(), (int)len, &naptr);
     EXPECT_TRUE(rc == ARES_EBADRESP || rc == ARES_EBADNAME);
   }
+
+  // Negative Length
+  EXPECT_EQ(ARES_EBADRESP, ares_parse_naptr_reply(data.data(), -1, &naptr));
 }
 
 TEST_F(LibraryTest, ParseNaptrReplyTooShort) {
diff --git a/lib/c-ares-1.30.0/test/ares-test-parse-ns.cc b/lib/c-ares-1.31.0/test/ares-test-parse-ns.cc
similarity index 98%
rename from lib/c-ares-1.30.0/test/ares-test-parse-ns.cc
rename to lib/c-ares-1.31.0/test/ares-test-parse-ns.cc
index 8abadbb2ca6..eee2c6357b8 100644
--- a/lib/c-ares-1.30.0/test/ares-test-parse-ns.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-parse-ns.cc
@@ -121,6 +121,9 @@ TEST_F(LibraryTest, ParseNsReplyErrors) {
   for (size_t len = 1; len < data.size(); len++) {
     EXPECT_EQ(ARES_EBADRESP, ares_parse_ns_reply(data.data(), (int)len, &host));
   }
+
+  // Negative Length
+  EXPECT_EQ(ARES_EBADRESP, ares_parse_ns_reply(data.data(), -1, &host));
 }
 
 TEST_F(LibraryTest, ParseNsReplyAllocFail) {
diff --git a/lib/c-ares-1.30.0/test/ares-test-parse-ptr.cc b/lib/c-ares-1.31.0/test/ares-test-parse-ptr.cc
similarity index 98%
rename from lib/c-ares-1.30.0/test/ares-test-parse-ptr.cc
rename to lib/c-ares-1.31.0/test/ares-test-parse-ptr.cc
index bd413e8f77b..2ebe1b9f86b 100644
--- a/lib/c-ares-1.30.0/test/ares-test-parse-ptr.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-parse-ptr.cc
@@ -223,6 +223,10 @@ TEST_F(LibraryTest, ParsePtrReplyErrors) {
                                                   addrv4, sizeof(addrv4), AF_INET, &host));
     EXPECT_EQ(nullptr, host);
   }
+
+  // Negative Length
+  EXPECT_EQ(ARES_EBADRESP, ares_parse_ptr_reply(data.data(), -1,
+                                                addrv4, sizeof(addrv4), AF_INET, &host));
 }
 
 TEST_F(LibraryTest, ParsePtrReplyAllocFailSome) {
diff --git a/lib/c-ares-1.30.0/test/ares-test-parse-soa-any.cc b/lib/c-ares-1.31.0/test/ares-test-parse-soa-any.cc
similarity index 98%
rename from lib/c-ares-1.30.0/test/ares-test-parse-soa-any.cc
rename to lib/c-ares-1.31.0/test/ares-test-parse-soa-any.cc
index 0c16201bd31..4c5721593c5 100644
--- a/lib/c-ares-1.30.0/test/ares-test-parse-soa-any.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-parse-soa-any.cc
@@ -113,6 +113,9 @@ TEST_F(LibraryTest, ParseSoaAnyReplyErrors) {
   for (size_t len = 1; len < data.size(); len++) {
     EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), (int)len, &soa));
   }
+
+  // Negative Length
+  EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), -1, &soa));
 }
 
 TEST_F(LibraryTest, ParseSoaAnyReplyAllocFail) {
diff --git a/lib/c-ares-1.30.0/test/ares-test-parse-soa.cc b/lib/c-ares-1.31.0/test/ares-test-parse-soa.cc
similarity index 98%
rename from lib/c-ares-1.30.0/test/ares-test-parse-soa.cc
rename to lib/c-ares-1.31.0/test/ares-test-parse-soa.cc
index debb84bdcc7..52fa530c858 100644
--- a/lib/c-ares-1.30.0/test/ares-test-parse-soa.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-parse-soa.cc
@@ -110,6 +110,9 @@ TEST_F(LibraryTest, ParseSoaReplyErrors) {
   for (size_t len = 1; len < data.size(); len++) {
     EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), (int)len, &soa));
   }
+
+  // Negative Length
+  EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), -1, &soa));
 }
 
 TEST_F(LibraryTest, ParseSoaReplyAllocFail) {
diff --git a/lib/c-ares-1.30.0/test/ares-test-parse-srv.cc b/lib/c-ares-1.31.0/test/ares-test-parse-srv.cc
similarity index 99%
rename from lib/c-ares-1.30.0/test/ares-test-parse-srv.cc
rename to lib/c-ares-1.31.0/test/ares-test-parse-srv.cc
index f049246647f..6956bebe46f 100644
--- a/lib/c-ares-1.30.0/test/ares-test-parse-srv.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-parse-srv.cc
@@ -291,6 +291,9 @@ TEST_F(LibraryTest, ParseSrvReplyErrors) {
     int rc = ares_parse_srv_reply(data.data(), (int)len, &srv);
     EXPECT_TRUE(rc == ARES_EBADRESP || rc == ARES_EBADNAME);
   }
+
+  // Negative Length
+  EXPECT_EQ(ARES_EBADRESP, ares_parse_srv_reply(data.data(), -1, &srv));
 }
 
 TEST_F(LibraryTest, ParseSrvReplyAllocFail) {
diff --git a/lib/c-ares-1.30.0/test/ares-test-parse-txt.cc b/lib/c-ares-1.31.0/test/ares-test-parse-txt.cc
similarity index 97%
rename from lib/c-ares-1.30.0/test/ares-test-parse-txt.cc
rename to lib/c-ares-1.31.0/test/ares-test-parse-txt.cc
index 19c3ab9ccb1..181a34e11d6 100644
--- a/lib/c-ares-1.30.0/test/ares-test-parse-txt.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-parse-txt.cc
@@ -212,6 +212,7 @@ TEST_F(LibraryTest, ParseTxtReplyErrors) {
     .add_answer(new DNSTxtRR("example.com", 100, {expected2a, expected2b}));
   std::vector<byte> data = pkt.data();
   struct ares_txt_reply* txt = nullptr;
+  struct ares_txt_ext* txt_ext = nullptr;
 
   // No question.
   pkt.questions_.clear();
@@ -254,6 +255,10 @@ TEST_F(LibraryTest, ParseTxtReplyErrors) {
     EXPECT_NE(ARES_SUCCESS, ares_parse_txt_reply(data.data(), (int)len, &txt));
     EXPECT_EQ(nullptr, txt);
   }
+
+  // Negative Length
+  EXPECT_EQ(ARES_EBADRESP, ares_parse_txt_reply(data.data(), -1, &txt));
+  EXPECT_EQ(ARES_EBADRESP, ares_parse_txt_reply_ext(data.data(), -1, &txt_ext));
 }
 
 TEST_F(LibraryTest, ParseTxtReplyAllocFail) {
diff --git a/lib/c-ares-1.30.0/test/ares-test-parse-uri.cc b/lib/c-ares-1.31.0/test/ares-test-parse-uri.cc
similarity index 99%
rename from lib/c-ares-1.30.0/test/ares-test-parse-uri.cc
rename to lib/c-ares-1.31.0/test/ares-test-parse-uri.cc
index 75ae409a89c..5442ee85677 100644
--- a/lib/c-ares-1.30.0/test/ares-test-parse-uri.cc
+++ b/lib/c-ares-1.31.0/test/ares-test-parse-uri.cc
@@ -291,6 +291,9 @@ TEST_F(LibraryTest, ParseUriReplyErrors) {
     int rc = ares_parse_uri_reply(data.data(), (int)len, &uri);
     EXPECT_TRUE(rc == ARES_EBADRESP || rc == ARES_EBADNAME);
   }
+
+  // Negative Length
+  EXPECT_EQ(ARES_EBADRESP, ares_parse_uri_reply(data.data(), -1, &uri));
 }
 
 TEST_F(LibraryTest, ParseUriReplyAllocFail) {
diff --git a/lib/c-ares-1.30.0/test/ares-test-parse.cc b/lib/c-ares-1.31.0/test/ares-test-parse.cc
similarity index 100%
rename from lib/c-ares-1.30.0/test/ares-test-parse.cc
rename to lib/c-ares-1.31.0/test/ares-test-parse.cc
diff --git a/lib/c-ares-1.30.0/test/ares-test.cc b/lib/c-ares-1.31.0/test/ares-test.cc
similarity index 98%
rename from lib/c-ares-1.30.0/test/ares-test.cc
rename to lib/c-ares-1.31.0/test/ares-test.cc
index aa28b0df5cf..c4498f053fb 100644
--- a/lib/c-ares-1.30.0/test/ares-test.cc
+++ b/lib/c-ares-1.31.0/test/ares-test.cc
@@ -763,6 +763,21 @@ MockChannelOptsTest::MockChannelOptsTest(int count,
     optmask |= ARES_OPT_FLAGS;
   }
 
+  /* Tests expect ndots=1 in general, the system config may not default to this
+   * so we don't want to inherit that. */
+  if (!(optmask & ARES_OPT_NDOTS)) {
+    opts.ndots = 1;
+    optmask |= ARES_OPT_NDOTS;
+  }
+
+  /* Disable the query cache for tests unless explicitly enabled. As of
+   * c-ares 1.31.0, the query cache is enabled by default so we have to set
+   * the option and set the TTL to 0 to effectively disable it. */
+  if (!(optmask & ARES_OPT_QUERY_CACHE)) {
+    opts.qcache_max_ttl = 0;
+    optmask |= ARES_OPT_QUERY_CACHE;
+  }
+
   EXPECT_EQ(ARES_SUCCESS, ares_init_options(&channel_, &opts, optmask));
   EXPECT_NE(nullptr, channel_);
 
diff --git a/lib/c-ares-1.30.0/test/ares-test.h b/lib/c-ares-1.31.0/test/ares-test.h
similarity index 100%
rename from lib/c-ares-1.30.0/test/ares-test.h
rename to lib/c-ares-1.31.0/test/ares-test.h
diff --git a/lib/c-ares-1.30.0/test/ares_queryloop.c b/lib/c-ares-1.31.0/test/ares_queryloop.c
similarity index 100%
rename from lib/c-ares-1.30.0/test/ares_queryloop.c
rename to lib/c-ares-1.31.0/test/ares_queryloop.c
diff --git a/lib/c-ares-1.30.0/test/dns-dump.cc b/lib/c-ares-1.31.0/test/dns-dump.cc
similarity index 100%
rename from lib/c-ares-1.30.0/test/dns-dump.cc
rename to lib/c-ares-1.31.0/test/dns-dump.cc
diff --git a/lib/c-ares-1.30.0/test/dns-proto-test.cc b/lib/c-ares-1.31.0/test/dns-proto-test.cc
similarity index 100%
rename from lib/c-ares-1.30.0/test/dns-proto-test.cc
rename to lib/c-ares-1.31.0/test/dns-proto-test.cc
diff --git a/lib/c-ares-1.30.0/test/dns-proto.cc b/lib/c-ares-1.31.0/test/dns-proto.cc
similarity index 100%
rename from lib/c-ares-1.30.0/test/dns-proto.cc
rename to lib/c-ares-1.31.0/test/dns-proto.cc
diff --git a/lib/c-ares-1.30.0/test/dns-proto.h b/lib/c-ares-1.31.0/test/dns-proto.h
similarity index 100%
rename from lib/c-ares-1.30.0/test/dns-proto.h
rename to lib/c-ares-1.31.0/test/dns-proto.h
diff --git a/lib/c-ares-1.30.0/test/fuzzcheck.sh b/lib/c-ares-1.31.0/test/fuzzcheck.sh
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzcheck.sh
rename to lib/c-ares-1.31.0/test/fuzzcheck.sh
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/004a216d3cff18b0c5c6b68b807f1529 b/lib/c-ares-1.31.0/test/fuzzinput/004a216d3cff18b0c5c6b68b807f1529
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/004a216d3cff18b0c5c6b68b807f1529
rename to lib/c-ares-1.31.0/test/fuzzinput/004a216d3cff18b0c5c6b68b807f1529
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/00539467ca159b36aea95e61f9729115 b/lib/c-ares-1.31.0/test/fuzzinput/00539467ca159b36aea95e61f9729115
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/00539467ca159b36aea95e61f9729115
rename to lib/c-ares-1.31.0/test/fuzzinput/00539467ca159b36aea95e61f9729115
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/00e846db8f43f2f507cd1666ed5a753e b/lib/c-ares-1.31.0/test/fuzzinput/00e846db8f43f2f507cd1666ed5a753e
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/00e846db8f43f2f507cd1666ed5a753e
rename to lib/c-ares-1.31.0/test/fuzzinput/00e846db8f43f2f507cd1666ed5a753e
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/0177b7566f08c013699eaea9a77abeb3 b/lib/c-ares-1.31.0/test/fuzzinput/0177b7566f08c013699eaea9a77abeb3
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/0177b7566f08c013699eaea9a77abeb3
rename to lib/c-ares-1.31.0/test/fuzzinput/0177b7566f08c013699eaea9a77abeb3
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/020a4fa317715bfdb236ed13751e6b65 b/lib/c-ares-1.31.0/test/fuzzinput/020a4fa317715bfdb236ed13751e6b65
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/020a4fa317715bfdb236ed13751e6b65
rename to lib/c-ares-1.31.0/test/fuzzinput/020a4fa317715bfdb236ed13751e6b65
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/0310f2e81bea31f4fe3f330872a877dd b/lib/c-ares-1.31.0/test/fuzzinput/0310f2e81bea31f4fe3f330872a877dd
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/0310f2e81bea31f4fe3f330872a877dd
rename to lib/c-ares-1.31.0/test/fuzzinput/0310f2e81bea31f4fe3f330872a877dd
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/0449be67df1730b2d0887d412a9b7cc4 b/lib/c-ares-1.31.0/test/fuzzinput/0449be67df1730b2d0887d412a9b7cc4
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/0449be67df1730b2d0887d412a9b7cc4
rename to lib/c-ares-1.31.0/test/fuzzinput/0449be67df1730b2d0887d412a9b7cc4
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/0449dd14f7aa94bf0d716bfe09b287a8 b/lib/c-ares-1.31.0/test/fuzzinput/0449dd14f7aa94bf0d716bfe09b287a8
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/0449dd14f7aa94bf0d716bfe09b287a8
rename to lib/c-ares-1.31.0/test/fuzzinput/0449dd14f7aa94bf0d716bfe09b287a8
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/04c93cdf7208979aa4df80a3a0d5a2d8 b/lib/c-ares-1.31.0/test/fuzzinput/04c93cdf7208979aa4df80a3a0d5a2d8
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/04c93cdf7208979aa4df80a3a0d5a2d8
rename to lib/c-ares-1.31.0/test/fuzzinput/04c93cdf7208979aa4df80a3a0d5a2d8
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/0567e7171e08e75f3f91c4ca74c17adc b/lib/c-ares-1.31.0/test/fuzzinput/0567e7171e08e75f3f91c4ca74c17adc
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/0567e7171e08e75f3f91c4ca74c17adc
rename to lib/c-ares-1.31.0/test/fuzzinput/0567e7171e08e75f3f91c4ca74c17adc
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/05ba948578a397e9cbc6a7b3e78622fa b/lib/c-ares-1.31.0/test/fuzzinput/05ba948578a397e9cbc6a7b3e78622fa
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/05ba948578a397e9cbc6a7b3e78622fa
rename to lib/c-ares-1.31.0/test/fuzzinput/05ba948578a397e9cbc6a7b3e78622fa
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/060afe5ed25f3e2e86167e545f27edca b/lib/c-ares-1.31.0/test/fuzzinput/060afe5ed25f3e2e86167e545f27edca
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/060afe5ed25f3e2e86167e545f27edca
rename to lib/c-ares-1.31.0/test/fuzzinput/060afe5ed25f3e2e86167e545f27edca
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/06d47d3681493f1b1d41236f460d896f b/lib/c-ares-1.31.0/test/fuzzinput/06d47d3681493f1b1d41236f460d896f
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/06d47d3681493f1b1d41236f460d896f
rename to lib/c-ares-1.31.0/test/fuzzinput/06d47d3681493f1b1d41236f460d896f
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/0724a810b0e131c2fddb6de9003b9064 b/lib/c-ares-1.31.0/test/fuzzinput/0724a810b0e131c2fddb6de9003b9064
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/0724a810b0e131c2fddb6de9003b9064
rename to lib/c-ares-1.31.0/test/fuzzinput/0724a810b0e131c2fddb6de9003b9064
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/0b5279148826f5b962bcf1896bdb4ede b/lib/c-ares-1.31.0/test/fuzzinput/0b5279148826f5b962bcf1896bdb4ede
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/0b5279148826f5b962bcf1896bdb4ede
rename to lib/c-ares-1.31.0/test/fuzzinput/0b5279148826f5b962bcf1896bdb4ede
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/114048c0f6b10bdc67ce9166405d195e b/lib/c-ares-1.31.0/test/fuzzinput/114048c0f6b10bdc67ce9166405d195e
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/114048c0f6b10bdc67ce9166405d195e
rename to lib/c-ares-1.31.0/test/fuzzinput/114048c0f6b10bdc67ce9166405d195e
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/11b8464a0ef8735d202955c34c36b0c7 b/lib/c-ares-1.31.0/test/fuzzinput/11b8464a0ef8735d202955c34c36b0c7
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/11b8464a0ef8735d202955c34c36b0c7
rename to lib/c-ares-1.31.0/test/fuzzinput/11b8464a0ef8735d202955c34c36b0c7
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/11cb626f1668c7b41954ce7d768fe528 b/lib/c-ares-1.31.0/test/fuzzinput/11cb626f1668c7b41954ce7d768fe528
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/11cb626f1668c7b41954ce7d768fe528
rename to lib/c-ares-1.31.0/test/fuzzinput/11cb626f1668c7b41954ce7d768fe528
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/14b133bf18125b75a1976fa63a1df6b7 b/lib/c-ares-1.31.0/test/fuzzinput/14b133bf18125b75a1976fa63a1df6b7
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/14b133bf18125b75a1976fa63a1df6b7
rename to lib/c-ares-1.31.0/test/fuzzinput/14b133bf18125b75a1976fa63a1df6b7
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/153c6b3afa8faa03c8bc28f936a6d4cf b/lib/c-ares-1.31.0/test/fuzzinput/153c6b3afa8faa03c8bc28f936a6d4cf
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/153c6b3afa8faa03c8bc28f936a6d4cf
rename to lib/c-ares-1.31.0/test/fuzzinput/153c6b3afa8faa03c8bc28f936a6d4cf
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/182cad2a342ed7317b7c21a5d17020d1 b/lib/c-ares-1.31.0/test/fuzzinput/182cad2a342ed7317b7c21a5d17020d1
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/182cad2a342ed7317b7c21a5d17020d1
rename to lib/c-ares-1.31.0/test/fuzzinput/182cad2a342ed7317b7c21a5d17020d1
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/1c61a61bb7057b52c5b15188345a5238 b/lib/c-ares-1.31.0/test/fuzzinput/1c61a61bb7057b52c5b15188345a5238
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/1c61a61bb7057b52c5b15188345a5238
rename to lib/c-ares-1.31.0/test/fuzzinput/1c61a61bb7057b52c5b15188345a5238
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/1dbe2cf62ed2e4fa1c3cb473f08710b5 b/lib/c-ares-1.31.0/test/fuzzinput/1dbe2cf62ed2e4fa1c3cb473f08710b5
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/1dbe2cf62ed2e4fa1c3cb473f08710b5
rename to lib/c-ares-1.31.0/test/fuzzinput/1dbe2cf62ed2e4fa1c3cb473f08710b5
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/21199be504fcfece5c7096ee0dbba507 b/lib/c-ares-1.31.0/test/fuzzinput/21199be504fcfece5c7096ee0dbba507
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/21199be504fcfece5c7096ee0dbba507
rename to lib/c-ares-1.31.0/test/fuzzinput/21199be504fcfece5c7096ee0dbba507
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/21891480074b5635dbbe7137bdcabccd b/lib/c-ares-1.31.0/test/fuzzinput/21891480074b5635dbbe7137bdcabccd
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/21891480074b5635dbbe7137bdcabccd
rename to lib/c-ares-1.31.0/test/fuzzinput/21891480074b5635dbbe7137bdcabccd
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/233aea42e15aa73e131eefabf16088c9 b/lib/c-ares-1.31.0/test/fuzzinput/233aea42e15aa73e131eefabf16088c9
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/233aea42e15aa73e131eefabf16088c9
rename to lib/c-ares-1.31.0/test/fuzzinput/233aea42e15aa73e131eefabf16088c9
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/24660d4e7ac7aa21d600ea7a3d198bbb b/lib/c-ares-1.31.0/test/fuzzinput/24660d4e7ac7aa21d600ea7a3d198bbb
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/24660d4e7ac7aa21d600ea7a3d198bbb
rename to lib/c-ares-1.31.0/test/fuzzinput/24660d4e7ac7aa21d600ea7a3d198bbb
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/25589deb55c08429345f289d1c9b0254 b/lib/c-ares-1.31.0/test/fuzzinput/25589deb55c08429345f289d1c9b0254
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/25589deb55c08429345f289d1c9b0254
rename to lib/c-ares-1.31.0/test/fuzzinput/25589deb55c08429345f289d1c9b0254
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/2573bd823e4da11f727a17f8e1f35c26 b/lib/c-ares-1.31.0/test/fuzzinput/2573bd823e4da11f727a17f8e1f35c26
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/2573bd823e4da11f727a17f8e1f35c26
rename to lib/c-ares-1.31.0/test/fuzzinput/2573bd823e4da11f727a17f8e1f35c26
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/276f12da56866273e76059ad0e7be97e b/lib/c-ares-1.31.0/test/fuzzinput/276f12da56866273e76059ad0e7be97e
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/276f12da56866273e76059ad0e7be97e
rename to lib/c-ares-1.31.0/test/fuzzinput/276f12da56866273e76059ad0e7be97e
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/29198a2e380cb19babec9e02116d213e b/lib/c-ares-1.31.0/test/fuzzinput/29198a2e380cb19babec9e02116d213e
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/29198a2e380cb19babec9e02116d213e
rename to lib/c-ares-1.31.0/test/fuzzinput/29198a2e380cb19babec9e02116d213e
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/2c94ba9434b1a1b9396fc5364f101363 b/lib/c-ares-1.31.0/test/fuzzinput/2c94ba9434b1a1b9396fc5364f101363
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/2c94ba9434b1a1b9396fc5364f101363
rename to lib/c-ares-1.31.0/test/fuzzinput/2c94ba9434b1a1b9396fc5364f101363
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/2d578c357dc2f5e02dc55cddb30641d1 b/lib/c-ares-1.31.0/test/fuzzinput/2d578c357dc2f5e02dc55cddb30641d1
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/2d578c357dc2f5e02dc55cddb30641d1
rename to lib/c-ares-1.31.0/test/fuzzinput/2d578c357dc2f5e02dc55cddb30641d1
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/2dff6cc5a223e67fde9e5e79af456992 b/lib/c-ares-1.31.0/test/fuzzinput/2dff6cc5a223e67fde9e5e79af456992
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/2dff6cc5a223e67fde9e5e79af456992
rename to lib/c-ares-1.31.0/test/fuzzinput/2dff6cc5a223e67fde9e5e79af456992
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/2f103b1f9477f2d8934bd84328d51c75 b/lib/c-ares-1.31.0/test/fuzzinput/2f103b1f9477f2d8934bd84328d51c75
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/2f103b1f9477f2d8934bd84328d51c75
rename to lib/c-ares-1.31.0/test/fuzzinput/2f103b1f9477f2d8934bd84328d51c75
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/31cd3a8413de13d9624adbb1613784bf b/lib/c-ares-1.31.0/test/fuzzinput/31cd3a8413de13d9624adbb1613784bf
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/31cd3a8413de13d9624adbb1613784bf
rename to lib/c-ares-1.31.0/test/fuzzinput/31cd3a8413de13d9624adbb1613784bf
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/36415bdf1d180098fe6234b4186e69f3 b/lib/c-ares-1.31.0/test/fuzzinput/36415bdf1d180098fe6234b4186e69f3
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/36415bdf1d180098fe6234b4186e69f3
rename to lib/c-ares-1.31.0/test/fuzzinput/36415bdf1d180098fe6234b4186e69f3
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/3a04a80f0242e8dff0cd732e7c4767da b/lib/c-ares-1.31.0/test/fuzzinput/3a04a80f0242e8dff0cd732e7c4767da
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/3a04a80f0242e8dff0cd732e7c4767da
rename to lib/c-ares-1.31.0/test/fuzzinput/3a04a80f0242e8dff0cd732e7c4767da
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/44d0f973b7b0fb3e4a07770c943dcd5a b/lib/c-ares-1.31.0/test/fuzzinput/44d0f973b7b0fb3e4a07770c943dcd5a
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/44d0f973b7b0fb3e4a07770c943dcd5a
rename to lib/c-ares-1.31.0/test/fuzzinput/44d0f973b7b0fb3e4a07770c943dcd5a
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/50bc00daa0ddcd6cfb2b5d9f62c81f47 b/lib/c-ares-1.31.0/test/fuzzinput/50bc00daa0ddcd6cfb2b5d9f62c81f47
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/50bc00daa0ddcd6cfb2b5d9f62c81f47
rename to lib/c-ares-1.31.0/test/fuzzinput/50bc00daa0ddcd6cfb2b5d9f62c81f47
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/51ed2d1fb77b3078b54e94e85606b7df b/lib/c-ares-1.31.0/test/fuzzinput/51ed2d1fb77b3078b54e94e85606b7df
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/51ed2d1fb77b3078b54e94e85606b7df
rename to lib/c-ares-1.31.0/test/fuzzinput/51ed2d1fb77b3078b54e94e85606b7df
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/5c5e0e899cf2e7d053a9e45fb76f6e5a b/lib/c-ares-1.31.0/test/fuzzinput/5c5e0e899cf2e7d053a9e45fb76f6e5a
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/5c5e0e899cf2e7d053a9e45fb76f6e5a
rename to lib/c-ares-1.31.0/test/fuzzinput/5c5e0e899cf2e7d053a9e45fb76f6e5a
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/70152ed033f139443fbfb1b858bb3b1b b/lib/c-ares-1.31.0/test/fuzzinput/70152ed033f139443fbfb1b858bb3b1b
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/70152ed033f139443fbfb1b858bb3b1b
rename to lib/c-ares-1.31.0/test/fuzzinput/70152ed033f139443fbfb1b858bb3b1b
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/7030ca2b24e5a7f9dd8f62096a48eb33 b/lib/c-ares-1.31.0/test/fuzzinput/7030ca2b24e5a7f9dd8f62096a48eb33
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/7030ca2b24e5a7f9dd8f62096a48eb33
rename to lib/c-ares-1.31.0/test/fuzzinput/7030ca2b24e5a7f9dd8f62096a48eb33
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/71eec1a0ef2d25bb9e2ef17f23be7e9e b/lib/c-ares-1.31.0/test/fuzzinput/71eec1a0ef2d25bb9e2ef17f23be7e9e
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/71eec1a0ef2d25bb9e2ef17f23be7e9e
rename to lib/c-ares-1.31.0/test/fuzzinput/71eec1a0ef2d25bb9e2ef17f23be7e9e
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/7a6b0177210ea4ef40b254daf99393c5 b/lib/c-ares-1.31.0/test/fuzzinput/7a6b0177210ea4ef40b254daf99393c5
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/7a6b0177210ea4ef40b254daf99393c5
rename to lib/c-ares-1.31.0/test/fuzzinput/7a6b0177210ea4ef40b254daf99393c5
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/7f1567733711ffb61839621af0cbfa33 b/lib/c-ares-1.31.0/test/fuzzinput/7f1567733711ffb61839621af0cbfa33
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/7f1567733711ffb61839621af0cbfa33
rename to lib/c-ares-1.31.0/test/fuzzinput/7f1567733711ffb61839621af0cbfa33
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/850c6d57c5bb7be8205fc2438d14d7e5 b/lib/c-ares-1.31.0/test/fuzzinput/850c6d57c5bb7be8205fc2438d14d7e5
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/850c6d57c5bb7be8205fc2438d14d7e5
rename to lib/c-ares-1.31.0/test/fuzzinput/850c6d57c5bb7be8205fc2438d14d7e5
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/a5c8cd2784a5792b9e91c2d7895b3b34 b/lib/c-ares-1.31.0/test/fuzzinput/a5c8cd2784a5792b9e91c2d7895b3b34
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/a5c8cd2784a5792b9e91c2d7895b3b34
rename to lib/c-ares-1.31.0/test/fuzzinput/a5c8cd2784a5792b9e91c2d7895b3b34
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/a9135cdc7151d023300ff194bad90af9 b/lib/c-ares-1.31.0/test/fuzzinput/a9135cdc7151d023300ff194bad90af9
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/a9135cdc7151d023300ff194bad90af9
rename to lib/c-ares-1.31.0/test/fuzzinput/a9135cdc7151d023300ff194bad90af9
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/af2597e8ac7dec1e8b4a47518312912a b/lib/c-ares-1.31.0/test/fuzzinput/af2597e8ac7dec1e8b4a47518312912a
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/af2597e8ac7dec1e8b4a47518312912a
rename to lib/c-ares-1.31.0/test/fuzzinput/af2597e8ac7dec1e8b4a47518312912a
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/answer_a b/lib/c-ares-1.31.0/test/fuzzinput/answer_a
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/answer_a
rename to lib/c-ares-1.31.0/test/fuzzinput/answer_a
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/answer_aaaa b/lib/c-ares-1.31.0/test/fuzzinput/answer_aaaa
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/answer_aaaa
rename to lib/c-ares-1.31.0/test/fuzzinput/answer_aaaa
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/b3f53ef826b831bb09dd25c7f5960249 b/lib/c-ares-1.31.0/test/fuzzinput/b3f53ef826b831bb09dd25c7f5960249
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/b3f53ef826b831bb09dd25c7f5960249
rename to lib/c-ares-1.31.0/test/fuzzinput/b3f53ef826b831bb09dd25c7f5960249
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/cda0f8751f5c4993974c2b549d29bcc8 b/lib/c-ares-1.31.0/test/fuzzinput/cda0f8751f5c4993974c2b549d29bcc8
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/cda0f8751f5c4993974c2b549d29bcc8
rename to lib/c-ares-1.31.0/test/fuzzinput/cda0f8751f5c4993974c2b549d29bcc8
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/ce6c26c0e469339873d0e7f616ab0945 b/lib/c-ares-1.31.0/test/fuzzinput/ce6c26c0e469339873d0e7f616ab0945
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/ce6c26c0e469339873d0e7f616ab0945
rename to lib/c-ares-1.31.0/test/fuzzinput/ce6c26c0e469339873d0e7f616ab0945
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5637790584012800 b/lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5637790584012800
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5637790584012800
rename to lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5637790584012800
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5650695891451904 b/lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5650695891451904
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5650695891451904
rename to lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5650695891451904
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5651369832218624 b/lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5651369832218624
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5651369832218624
rename to lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5651369832218624
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5674462260756480 b/lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5674462260756480
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5674462260756480
rename to lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5674462260756480
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5680630672654336 b/lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5680630672654336
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5680630672654336
rename to lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5680630672654336
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5683497160671232 b/lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5683497160671232
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5683497160671232
rename to lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5683497160671232
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5687310655422464 b/lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5687310655422464
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5687310655422464
rename to lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5687310655422464
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5695341573177344 b/lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5695341573177344
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5695341573177344
rename to lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5695341573177344
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5697835103682560 b/lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5697835103682560
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5697835103682560
rename to lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5697835103682560
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5728518081609728 b/lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5728518081609728
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5728518081609728
rename to lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5728518081609728
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5732960017317888 b/lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5732960017317888
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/clusterfuzz-5732960017317888
rename to lib/c-ares-1.31.0/test/fuzzinput/clusterfuzz-5732960017317888
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/e4dd7e7c2dd4ed7c2e17a6af5d04f9c9 b/lib/c-ares-1.31.0/test/fuzzinput/e4dd7e7c2dd4ed7c2e17a6af5d04f9c9
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/e4dd7e7c2dd4ed7c2e17a6af5d04f9c9
rename to lib/c-ares-1.31.0/test/fuzzinput/e4dd7e7c2dd4ed7c2e17a6af5d04f9c9
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/ed50ed8ee36230a5a69746ad830437e5 b/lib/c-ares-1.31.0/test/fuzzinput/ed50ed8ee36230a5a69746ad830437e5
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/ed50ed8ee36230a5a69746ad830437e5
rename to lib/c-ares-1.31.0/test/fuzzinput/ed50ed8ee36230a5a69746ad830437e5
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/f1b900d50806021953321c3b604ee497 b/lib/c-ares-1.31.0/test/fuzzinput/f1b900d50806021953321c3b604ee497
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/f1b900d50806021953321c3b604ee497
rename to lib/c-ares-1.31.0/test/fuzzinput/f1b900d50806021953321c3b604ee497
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/f6606f624be8c628328cea01d2cd07a9 b/lib/c-ares-1.31.0/test/fuzzinput/f6606f624be8c628328cea01d2cd07a9
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/f6606f624be8c628328cea01d2cd07a9
rename to lib/c-ares-1.31.0/test/fuzzinput/f6606f624be8c628328cea01d2cd07a9
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/f89f6c8176b564a7dd646f14305573ce b/lib/c-ares-1.31.0/test/fuzzinput/f89f6c8176b564a7dd646f14305573ce
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/f89f6c8176b564a7dd646f14305573ce
rename to lib/c-ares-1.31.0/test/fuzzinput/f89f6c8176b564a7dd646f14305573ce
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/f9ad508d2dbd08d3aaaabc7d1174677d b/lib/c-ares-1.31.0/test/fuzzinput/f9ad508d2dbd08d3aaaabc7d1174677d
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/f9ad508d2dbd08d3aaaabc7d1174677d
rename to lib/c-ares-1.31.0/test/fuzzinput/f9ad508d2dbd08d3aaaabc7d1174677d
diff --git a/lib/c-ares-1.30.0/test/fuzzinput/multi-indir b/lib/c-ares-1.31.0/test/fuzzinput/multi-indir
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzzinput/multi-indir
rename to lib/c-ares-1.31.0/test/fuzzinput/multi-indir
diff --git a/lib/c-ares-1.30.0/test/fuzznames/name01 b/lib/c-ares-1.31.0/test/fuzznames/name01
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzznames/name01
rename to lib/c-ares-1.31.0/test/fuzznames/name01
diff --git a/lib/c-ares-1.30.0/test/fuzznames/name02 b/lib/c-ares-1.31.0/test/fuzznames/name02
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzznames/name02
rename to lib/c-ares-1.31.0/test/fuzznames/name02
diff --git a/lib/c-ares-1.30.0/test/fuzznames/name03 b/lib/c-ares-1.31.0/test/fuzznames/name03
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzznames/name03
rename to lib/c-ares-1.31.0/test/fuzznames/name03
diff --git a/lib/c-ares-1.30.0/test/fuzznames/name04 b/lib/c-ares-1.31.0/test/fuzznames/name04
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzznames/name04
rename to lib/c-ares-1.31.0/test/fuzznames/name04
diff --git a/lib/c-ares-1.30.0/test/fuzznames/name05 b/lib/c-ares-1.31.0/test/fuzznames/name05
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzznames/name05
rename to lib/c-ares-1.31.0/test/fuzznames/name05
diff --git a/lib/c-ares-1.30.0/test/fuzznames/name06 b/lib/c-ares-1.31.0/test/fuzznames/name06
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzznames/name06
rename to lib/c-ares-1.31.0/test/fuzznames/name06
diff --git a/lib/c-ares-1.30.0/test/fuzznames/name07 b/lib/c-ares-1.31.0/test/fuzznames/name07
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzznames/name07
rename to lib/c-ares-1.31.0/test/fuzznames/name07
diff --git a/lib/c-ares-1.30.0/test/fuzznames/name08 b/lib/c-ares-1.31.0/test/fuzznames/name08
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzznames/name08
rename to lib/c-ares-1.31.0/test/fuzznames/name08
diff --git a/lib/c-ares-1.30.0/test/fuzznames/name09 b/lib/c-ares-1.31.0/test/fuzznames/name09
similarity index 100%
rename from lib/c-ares-1.30.0/test/fuzznames/name09
rename to lib/c-ares-1.31.0/test/fuzznames/name09
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 9006ef6d823..ce8cae64d97 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -286,6 +286,7 @@ REGISTER_PROCESSOR_PLUGIN("processor_content_modifier")
 REGISTER_PROCESSOR_PLUGIN("processor_labels")
 REGISTER_PROCESSOR_PLUGIN("processor_metrics_selector")
 REGISTER_PROCESSOR_PLUGIN("processor_sql")
+REGISTER_PROCESSOR_PLUGIN("processor_opentelemetry_envelope")
 
 # OUTPUTS
 # =======
diff --git a/plugins/filter_kubernetes/kube_conf.h b/plugins/filter_kubernetes/kube_conf.h
index 77ae62de931..3c044b8970b 100644
--- a/plugins/filter_kubernetes/kube_conf.h
+++ b/plugins/filter_kubernetes/kube_conf.h
@@ -80,6 +80,7 @@ struct flb_kube {
     int dummy_meta;
     int tls_debug;
     int tls_verify;
+    int tls_verify_hostname;
     int kube_token_ttl;
     flb_sds_t meta_preload_cache_dir;
 
diff --git a/plugins/filter_kubernetes/kube_meta.c b/plugins/filter_kubernetes/kube_meta.c
index 13be9d26ae4..91417a1a3db 100644
--- a/plugins/filter_kubernetes/kube_meta.c
+++ b/plugins/filter_kubernetes/kube_meta.c
@@ -1681,6 +1681,7 @@ static int wait_for_dns(struct flb_kube *ctx)
 
 static int flb_kubelet_network_init(struct flb_kube *ctx, struct flb_config *config)
 {
+    int ret;
     int io_type = FLB_IO_TCP;
     int api_https = FLB_TRUE;
     ctx->kubelet_upstream = NULL;    
@@ -1709,6 +1710,14 @@ static int flb_kubelet_network_init(struct flb_kube *ctx, struct flb_config *con
             return -1;
         }
 
+        if (ctx->tls_verify_hostname == FLB_TRUE) {
+            ret = flb_tls_set_verify_hostname(ctx->kubelet_tls, ctx->tls_verify_hostname);
+            if (ret == -1) {
+                flb_plg_debug(ctx->ins, "kubelet network tls set up failed for hostname verification");
+                return -1;
+            }
+        }
+
         io_type = FLB_IO_TLS;
     }
 
@@ -1726,12 +1735,13 @@ static int flb_kubelet_network_init(struct flb_kube *ctx, struct flb_config *con
 
     /* Remove async flag from upstream */
     flb_stream_disable_async_mode(&ctx->kubelet_upstream->base);
-    
+
     return 0;
 }
 
 static int flb_kube_network_init(struct flb_kube *ctx, struct flb_config *config)
 {
+    int ret;
     int io_type = FLB_IO_TCP;
     int kubelet_network_init_ret = 0;
 
@@ -1753,6 +1763,14 @@ static int flb_kube_network_init(struct flb_kube *ctx, struct flb_config *config
             return -1;
         }
 
+        if (ctx->tls_verify_hostname == FLB_TRUE) {
+            ret = flb_tls_set_verify_hostname(ctx->tls, ctx->tls_verify_hostname);
+            if (ret == -1) {
+                flb_plg_debug(ctx->ins, "network tls set up failed for hostname verification");
+                return -1;
+            }
+        }
+
         io_type = FLB_IO_TLS;
     }
 
diff --git a/plugins/filter_kubernetes/kubernetes.c b/plugins/filter_kubernetes/kubernetes.c
index 76a06573fd0..ccbd4b168e5 100644
--- a/plugins/filter_kubernetes/kubernetes.c
+++ b/plugins/filter_kubernetes/kubernetes.c
@@ -800,6 +800,13 @@ static struct flb_config_map config_map[] = {
      "set optional TLS virtual host"
     },
 
+    /* TLS: set tls.hostame_verification feature */
+    {
+     FLB_CONFIG_MAP_BOOL, "tls.verify_hostname", "off",
+     0, FLB_TRUE, offsetof(struct flb_kube, tls_verify_hostname),
+     "enable or disable to verify hostname"
+    },
+
     /* Merge structured record as independent keys */
     {
      FLB_CONFIG_MAP_BOOL, "merge_log", "false",
diff --git a/plugins/in_docker/cgroup_v2.c b/plugins/in_docker/cgroup_v2.c
index b44633c7d2b..2844e1319bd 100644
--- a/plugins/in_docker/cgroup_v2.c
+++ b/plugins/in_docker/cgroup_v2.c
@@ -422,6 +422,7 @@ static uint64_t get_docker_mem_limit(struct flb_docker *ctx, char *id)
             if (c != 1) {
                 flb_plg_error(ctx->ins, "error scanning used mem_limit from %s",
                               limit_file);
+                flb_free(line);
                 flb_free(limit_file);
                 fclose(f);
                 return 0;
diff --git a/plugins/in_kubernetes_events/kubernetes_events.c b/plugins/in_kubernetes_events/kubernetes_events.c
index 9b98a88c0e9..38b2edff822 100644
--- a/plugins/in_kubernetes_events/kubernetes_events.c
+++ b/plugins/in_kubernetes_events/kubernetes_events.c
@@ -42,6 +42,8 @@
 static int k8s_events_sql_insert_event(struct k8s_events *ctx, msgpack_object *item);
 #endif
 
+#define JSON_ARRAY_DELIM "\r\n"
+
 static int file_to_buffer(const char *path,
                           char **out_buf, size_t *out_size)
 {
@@ -79,7 +81,7 @@ static int file_to_buffer(const char *path,
 
     fclose(fp);
 
-    // trim new lines
+    /* trim new lines */
     for (len = st.st_size; len > 0; len--) {
         if (buf[len-1] != '\n' && buf[len-1] != '\r') {
             break;
@@ -225,7 +227,7 @@ static int record_get_field_time(msgpack_object *obj, const char *fieldname, str
         return -2;
     }
 
-    val->tm.tv_sec = flb_parser_tm2time(&tm);
+    val->tm.tv_sec = flb_parser_tm2time(&tm, FLB_FALSE);
     val->tm.tv_nsec = 0;
 
     return 0;
@@ -241,7 +243,7 @@ static int record_get_field_uint64(msgpack_object *obj, const char *fieldname, u
         return -1;
     }
 
-    // attempt to parse string as number...
+    /* attempt to parse string as number... */
     if (v->type == MSGPACK_OBJECT_STR) {
         *val = strtoul(v->via.str.ptr, &end, 10);
         if (end == NULL || (end < v->via.str.ptr + v->via.str.size)) {
@@ -265,8 +267,9 @@ static int item_get_timestamp(msgpack_object *obj, struct flb_time *event_time)
     int ret;
     msgpack_object *metadata;
 
-    // some events can have lastTimestamp and firstTimestamp set to
-    // NULL while having metadata.creationTimestamp set.
+    /* some events can have lastTimestamp and firstTimestamp set to
+     * NULL while having metadata.creationTimestamp set.
+     */
     ret = record_get_field_time(obj, "lastTimestamp", event_time);
     if (ret != -1) {
         return FLB_TRUE;
@@ -294,15 +297,15 @@ static bool check_event_is_filtered(struct k8s_events *ctx, msgpack_object *obj,
                                     struct flb_time *event_time)
 {
     int ret;
-    time_t now;
+    uint64_t outdated;
     msgpack_object *metadata;
     flb_sds_t uid;
     uint64_t resource_version;
 
-    now = (time_t)(cfl_time_now() / 1000000000);
-    if (event_time->tm.tv_sec < (now - ctx->retention_time)) {
+    outdated = cfl_time_now() - (ctx->retention_time * 1000000000L);
+    if (flb_time_to_nanosec(event_time) < outdated) {
         flb_plg_debug(ctx->ins, "Item is older than retention_time: %ld < %ld",
-                      *event_time,  (now - ctx->retention_time));
+                      flb_time_to_nanosec(event_time),  outdated);
         return FLB_TRUE;
     }
 
@@ -354,7 +357,7 @@ static bool check_event_is_filtered(struct k8s_events *ctx, msgpack_object *obj,
     }
 #endif
 
-    // check if this is an old event.
+    /* check if this is an old event. */
     if (ctx->last_resource_version && resource_version <= ctx->last_resource_version) {
         flb_plg_debug(ctx->ins, "skipping old object: %llu (< %llu)", resource_version,
                         ctx->last_resource_version);
@@ -366,7 +369,121 @@ static bool check_event_is_filtered(struct k8s_events *ctx, msgpack_object *obj,
     return FLB_FALSE;
 }
 
-static int process_events(struct k8s_events *ctx, char *in_data, size_t in_size, uint64_t *max_resource_version, flb_sds_t *continue_token)
+
+static int process_event_object(struct k8s_events *ctx, flb_sds_t action,
+                         msgpack_object *item)
+{
+    int ret = -1;
+    struct flb_time ts;
+    uint64_t resource_version;
+    msgpack_object* item_metadata;
+
+    if(strncmp(action, "ADDED", 5) != 0 && strncmp(action, "MODIFIED", 8) != 0 ) {
+        /* We don't process DELETED nor BOOKMARK */
+        return 0;
+    }
+
+    item_metadata = record_get_field_ptr(item, "metadata");
+    if (item_metadata == NULL) {
+        flb_plg_warn(ctx->ins, "Event without metadata");
+        return -1;
+    }
+    ret = record_get_field_uint64(item_metadata, "resourceVersion", &resource_version);
+    if (ret == -1) {
+        return ret;
+    }
+
+    /* reset the log encoder */
+    flb_log_event_encoder_reset(ctx->encoder);
+
+    /* print every item from the items array */
+    if (item->type != MSGPACK_OBJECT_MAP) {
+        flb_plg_error(ctx->ins, "Cannot unpack item in response");
+        return -1;
+    }
+
+    /* get event timestamp */
+    ret = item_get_timestamp(item, &ts);
+    if (ret == FLB_FALSE) {
+        flb_plg_error(ctx->ins, "cannot retrieve event timestamp");
+        return -1;
+    }
+
+    if (check_event_is_filtered(ctx, item, &ts) == FLB_TRUE) {
+        return 0;
+    }
+
+#ifdef FLB_HAVE_SQLDB
+    if (ctx->db) {
+        k8s_events_sql_insert_event(ctx, item);
+    }
+#endif
+
+    /* encode content as a log event */
+    flb_log_event_encoder_begin_record(ctx->encoder);
+    flb_log_event_encoder_set_timestamp(ctx->encoder, &ts);
+
+    ret = flb_log_event_encoder_set_body_from_msgpack_object(ctx->encoder, item);
+    if (ret == FLB_EVENT_ENCODER_SUCCESS) {
+        ret = flb_log_event_encoder_commit_record(ctx->encoder);
+    }
+    else {
+        flb_plg_warn(ctx->ins, "unable to encode: %llu", resource_version);
+    }
+
+    if (ctx->encoder->output_length > 0) {
+        flb_input_log_append(ctx->ins, NULL, 0,
+                             ctx->encoder->output_buffer,
+                             ctx->encoder->output_length);
+    }
+
+    return 0;
+}
+
+static int process_watched_event(struct k8s_events *ctx, char *buf_data, size_t buf_size) {
+    int ret = -1;
+    size_t off = 0;
+    msgpack_unpacked result;
+    msgpack_object root;
+    msgpack_object *item = NULL;
+    flb_sds_t event_type = NULL;
+
+    /* unpack */
+    msgpack_unpacked_init(&result);
+    ret = msgpack_unpack_next(&result, buf_data, buf_size, &off);
+    if (ret != MSGPACK_UNPACK_SUCCESS) {
+        flb_plg_error(ctx->ins, "Cannot unpack response");
+        return -1;
+    }
+
+    root = result.data;
+    if (root.type != MSGPACK_OBJECT_MAP) {
+        return -1;
+    }    
+
+    ret = record_get_field_sds(&root, "type", &event_type);
+    if (ret == -1) {
+        flb_plg_warn(ctx->ins, "Streamed Event 'type' not found");
+        goto msg_error;
+    }
+
+    item = record_get_field_ptr(&root, "object");
+    if (item == NULL || item->type != MSGPACK_OBJECT_MAP) {
+        flb_plg_warn(ctx->ins, "Streamed Event 'object' not found");
+        ret = -1;
+        goto msg_error;
+    }
+
+    ret = process_event_object(ctx, event_type, item);
+
+msg_error:
+    flb_sds_destroy(event_type);
+    msgpack_unpacked_destroy(&result);
+    return ret;
+}
+
+static int process_event_list(struct k8s_events *ctx, char *in_data, size_t in_size,
+                          uint64_t *max_resource_version, flb_sds_t *continue_token)
 {
     int i;
     int ret = -1;
@@ -375,16 +492,13 @@ static int process_events(struct k8s_events *ctx, char *in_data, size_t in_size,
     char *buf_data;
     size_t buf_size;
     size_t off = 0;
-    struct flb_time ts;
-    uint64_t resource_version;
     msgpack_unpacked result;
     msgpack_object root;
     msgpack_object k;
     msgpack_object *items = NULL;
     msgpack_object *item = NULL;
-    msgpack_object *item_metadata = NULL;
     msgpack_object *metadata = NULL;
-
+    const flb_sds_t action = "ADDED"; /* All items from a k8s list we consider as 'ADDED' */
 
     ret = flb_pack_json(in_data, in_size, &buf_data, &buf_size, &root_type, &consumed);
     if (ret == -1) {
@@ -406,8 +520,9 @@ static int process_events(struct k8s_events *ctx, char *in_data, size_t in_size,
         return -1;
     }
 
-    // Traverse the EventList for the metadata (for the continue token) and the items.
-    // https://kubernetes.io/docs/reference/kubernetes-api/cluster-resources/event-v1/#EventList
+    /* Traverse the EventList for the metadata (for the continue token) and the items.
+     * https://kubernetes.io/docs/reference/kubernetes-api/cluster-resources/event-v1/#EventList
+     */
     for (i = 0; i < root.via.map.size; i++) {
         k = root.via.map.ptr[i].key;
         if (k.type != MSGPACK_OBJECT_STR) {
@@ -437,82 +552,29 @@ static int process_events(struct k8s_events *ctx, char *in_data, size_t in_size,
     }
 
     if (metadata == NULL) {
-        flb_plg_error(ctx->ins, "Cannot find metatada in response");
+        flb_plg_error(ctx->ins, "Cannot find metadata in response");
         goto msg_error;
     }
 
-    ret = record_get_field_sds(metadata, "continue", continue_token);
+    ret = record_get_field_uint64(metadata, "resourceVersion", max_resource_version);
     if (ret == -1) {
-        if (ret == -1) {
-            flb_plg_error(ctx->ins, "Cannot process continue token");
+        flb_plg_error(ctx->ins, "Cannot find EventList resourceVersion");
             goto msg_error;
-        }
     }
 
-    for (i = 0; i < items->via.array.size; i++) {
-        if (items->via.array.ptr[i].type != MSGPACK_OBJECT_MAP) {
-            flb_plg_warn(ctx->ins, "Event that is not a map");
-            continue;
-        }
-        item_metadata = record_get_field_ptr(&items->via.array.ptr[i], "metadata");
-        if (item_metadata == NULL) {
-            flb_plg_warn(ctx->ins, "Event without metadata");
-            continue;
-        }
-        ret = record_get_field_uint64(item_metadata,
-                                      "resourceVersion", &resource_version);
-        if (ret == -1) {
-            continue;
-        }
-        if (resource_version > *max_resource_version) {
-            *max_resource_version = resource_version;
-        }
+    ret = record_get_field_sds(metadata, "continue", continue_token);
+    if (ret == -1) {
+        flb_plg_error(ctx->ins, "Cannot process continue token");
+        goto msg_error;
     }
 
-    /* reset the log encoder */
-    flb_log_event_encoder_reset(ctx->encoder);
-
-    /* print every item from the items array */
     for (i = 0; i < items->via.array.size; i++) {
         item = &items->via.array.ptr[i];
         if (item->type != MSGPACK_OBJECT_MAP) {
             flb_plg_error(ctx->ins, "Cannot unpack item in response");
             goto msg_error;
         }
-
-        /* get event timestamp */
-        ret = item_get_timestamp(item, &ts);
-        if (ret == FLB_FALSE) {
-            flb_plg_error(ctx->ins, "cannot retrieve event timestamp");
-            goto msg_error;
-        }
-
-        if (check_event_is_filtered(ctx, item, (time_t *) &ts) == FLB_TRUE) {
-            continue;
-        }
-
-#ifdef FLB_HAVE_SQLDB
-        if (ctx->db) {
-            k8s_events_sql_insert_event(ctx, item);
-        }
-#endif
-
-        /* encode content as a log event */
-        flb_log_event_encoder_begin_record(ctx->encoder);
-        flb_log_event_encoder_set_timestamp(ctx->encoder, &ts);
-
-        ret = flb_log_event_encoder_set_body_from_msgpack_object(ctx->encoder, item);
-        if (ret == FLB_EVENT_ENCODER_SUCCESS) {
-            ret = flb_log_event_encoder_commit_record(ctx->encoder);
-        } else {
-            flb_plg_warn(ctx->ins, "unable to encode: %llu", resource_version);
-        }
-    }
-
-    if (ctx->encoder->output_length > 0) {
-        flb_input_log_append(ctx->ins, NULL, 0,
-                             ctx->encoder->output_buffer,
-                             ctx->encoder->output_length);
+        process_event_object(ctx, action, item);
     }
 
 msg_error:
@@ -523,23 +585,45 @@ static int process_events(struct k8s_events *ctx, char *in_data, size_t in_size,
     return ret;
 }
 
-static struct flb_http_client *make_event_api_request(struct k8s_events *ctx,
-                                                      struct flb_connection *u_conn,
-                                                      flb_sds_t continue_token)
+static struct flb_http_client *make_event_watch_api_request(struct k8s_events *ctx,
+                                                      uint64_t max_resource_version)
 {
     flb_sds_t url;
     struct flb_http_client *c;
 
+    if (ctx->namespace == NULL) {
+        url = flb_sds_create(K8S_EVENTS_KUBE_API_URI);
+    }
+    else {
+        url = flb_sds_create_size(strlen(K8S_EVENTS_KUBE_NAMESPACE_API_URI) +
+                                  strlen(ctx->namespace));
+        flb_sds_printf(&url, K8S_EVENTS_KUBE_NAMESPACE_API_URI, ctx->namespace);
+    }
+
+    flb_sds_printf(&url, "?watch=1&resourceVersion=%llu", max_resource_version);
+    flb_plg_info(ctx->ins, "Requesting %s", url);
+    c = flb_http_client(ctx->current_connection, FLB_HTTP_GET, url,
+                        NULL, 0, ctx->api_host, ctx->api_port, NULL, 0);
+    flb_sds_destroy(url);
+    return c;
+ }
+
+static struct flb_http_client *make_event_list_api_request(struct k8s_events *ctx,
+                                                      flb_sds_t continue_token)
+{
+    flb_sds_t url;
+    struct flb_http_client *c;
 
     if (continue_token == NULL && ctx->limit_request == 0 && ctx->namespace == NULL) {
-        return flb_http_client(u_conn, FLB_HTTP_GET, K8S_EVENTS_KUBE_API_URI,
+        return flb_http_client(ctx->current_connection, FLB_HTTP_GET, K8S_EVENTS_KUBE_API_URI,
                             NULL, 0, ctx->api_host, ctx->api_port, NULL, 0);
     }
 
     if (ctx->namespace == NULL) {
         url = flb_sds_create(K8S_EVENTS_KUBE_API_URI);
-    } else {
-        url = flb_sds_create_size(strlen(K8S_EVENTS_KUBE_NAMESPACE_API_URI) + 
+    }
+    else {
+        url = flb_sds_create_size(strlen(K8S_EVENTS_KUBE_NAMESPACE_API_URI) +
                                   strlen(ctx->namespace));
         flb_sds_printf(&url, K8S_EVENTS_KUBE_NAMESPACE_API_URI, ctx->namespace);
     }
@@ -551,7 +635,7 @@ static struct flb_http_client *make_event_api_request(struct k8s_events *ctx,
         }
         flb_sds_printf(&url, "limit=%d", ctx->limit_request);
     }
-    c = flb_http_client(u_conn, FLB_HTTP_GET, url,
+    c = flb_http_client(ctx->current_connection, FLB_HTTP_GET, url,
                         NULL, 0, ctx->api_host, ctx->api_port, NULL, 0);
     flb_sds_destroy(url);
     return c;
@@ -641,8 +725,8 @@ static int k8s_events_sql_insert_event(struct k8s_events *ctx, msgpack_object *i
     }
 
     flb_plg_debug(ctx->ins,
-                  "inserted k8s event: uid=%s, resource_version=%llu, last=%ld",
-                  uid, resource_version, last);
+                  "inserted k8s event: uid=%s, resource_version=%llu, last=%llu",
+                  uid, resource_version, flb_time_to_nanosec(&last));
     sqlite3_clear_bindings(ctx->stmt_insert_kubernetes_event);
     sqlite3_reset(ctx->stmt_insert_kubernetes_event);
 
@@ -652,66 +736,115 @@ static int k8s_events_sql_insert_event(struct k8s_events *ctx, msgpack_object *i
 
 #endif
 
-static int k8s_events_collect(struct flb_input_instance *ins,
-                              struct flb_config *config, void *in_context)
+static int process_http_chunk(struct k8s_events* ctx, struct flb_http_client *c,
+                              size_t *bytes_consumed)
 {
-    int ret;
-    size_t b_sent;
-    struct flb_connection *u_conn = NULL;
-    struct flb_http_client *c = NULL;
-    struct k8s_events *ctx = in_context;
+    int ret = 0;
+    int root_type;
+    size_t consumed = 0;
+    char *buf_data = NULL;
+    size_t buf_size;
+    size_t token_size = 0;
+    char *token_start = 0;
+    char *token_end = NULL;
+
+    token_start = c->resp.payload;
+    token_end = strpbrk(token_start, JSON_ARRAY_DELIM);
+    while ( token_end != NULL && ret == 0 ) {
+        token_size = token_end - token_start;
+        ret = flb_pack_json(token_start, token_size, &buf_data, &buf_size, &root_type, &consumed);
+        if (ret == -1) {
+            flb_plg_debug(ctx->ins, "could not process payload, incomplete or bad formed JSON: %s",
+                          c->resp.payload);
+        }
+        else {
+            *bytes_consumed += token_size + 1;
+            ret = process_watched_event(ctx, buf_data, buf_size);
+        }
+
+        flb_free(buf_data);
+        if (buf_data) {
+            buf_data = NULL;
+        }
+        token_start = token_end+1;
+        token_end = strpbrk(token_start, JSON_ARRAY_DELIM);
+    }
+
+    if (buf_data) {
+        flb_free(buf_data);
+    }
+    return ret;
+}
+
+static void initialize_http_client(struct flb_http_client* c, struct k8s_events* ctx)
+{
+    flb_http_buffer_size(c, 0);
+
+    flb_http_add_header(c, "User-Agent", 10, "Fluent-Bit", 10);
+    if (ctx->auth_len > 0) {
+        flb_http_add_header(c, "Authorization", 13, ctx->auth, ctx->auth_len);
+    }
+}
+
+static int check_and_init_stream(struct k8s_events *ctx)
+{
+    /* Returns FLB_TRUE if stream has been initialized */
     flb_sds_t continue_token = NULL;
     uint64_t max_resource_version = 0;
+    size_t b_sent;
+    int ret;
+    struct flb_http_client *c = NULL;
 
-    if (pthread_mutex_trylock(&ctx->lock) != 0) {
-        FLB_INPUT_RETURN(0);
+    /* if the streaming client is already active, just return it */
+    if(ctx->streaming_client) {
+        return FLB_TRUE;
     }
 
-    u_conn = flb_upstream_conn_get(ctx->upstream);
-    if (!u_conn) {
-        flb_plg_error(ins, "upstream connection initialization error");
-        goto exit;
-    }
+    /* setup connection if one does not exist */
+    if(!ctx->current_connection) {
+        ctx->current_connection = flb_upstream_conn_get(ctx->upstream);
+        if (!ctx->current_connection) {
+            flb_plg_error(ctx->ins, "upstream connection initialization error");
+            goto failure;
+        }
 
-    ret = refresh_token_if_needed(ctx);
-    if (ret == -1) {
-        flb_plg_error(ctx->ins, "failed to refresh token");
-        goto exit;
+        ret = refresh_token_if_needed(ctx);
+        if (ret == -1) {
+            flb_plg_error(ctx->ins, "failed to refresh token");
+            goto failure;
+        }
     }
 
     do {
-        c = make_event_api_request(ctx, u_conn, continue_token);
+        c = make_event_list_api_request(ctx, continue_token);
         if (continue_token != NULL) {
             flb_sds_destroy(continue_token);
             continue_token = NULL;
         }
         if (!c) {
-            flb_plg_error(ins, "unable to create http client");
-            goto exit;
+            flb_plg_error(ctx->ins, "unable to create http client");
+            goto failure;
         }
-        flb_http_buffer_size(c, 0);
-
-        flb_http_add_header(c, "User-Agent", 10, "Fluent-Bit", 10);
-        if (ctx->auth_len > 0) {
-            flb_http_add_header(c, "Authorization", 13, ctx->auth, ctx->auth_len);
-        }
-
+        initialize_http_client(c, ctx);
         ret = flb_http_do(c, &b_sent);
         if (ret != 0) {
-            flb_plg_error(ins, "http do error");
-            goto exit;
+            flb_plg_error(ctx->ins, "http do error");
+            goto failure;
         }
 
-        if (c->resp.status == 200) {
-            ret = process_events(ctx, c->resp.payload, c->resp.payload_size, &max_resource_version, &continue_token);
+        if (c->resp.status == 200 && c->resp.payload_size > 0) {
+            ret = process_event_list(ctx, c->resp.payload, c->resp.payload_size,
+                                     &max_resource_version, &continue_token);
         }
-        else {
+        else
+        {
             if (c->resp.payload_size > 0) {
                 flb_plg_error(ctx->ins, "http_status=%i:\n%s", c->resp.status, c->resp.payload);
             }
             else {
                 flb_plg_error(ctx->ins, "http_status=%i", c->resp.status);
             }
+            goto failure;
         }
         flb_http_client_destroy(c);
         c = NULL;
@@ -722,14 +855,88 @@ static int k8s_events_collect(struct flb_input_instance *ins,
         ctx->last_resource_version = max_resource_version;
     }
 
-exit:
-    pthread_mutex_unlock(&ctx->lock);
+    /* Now that we've done a full list, we can use the resource version and do a watch
+     * to stream updates efficiently
+     */
+    ctx->streaming_client = make_event_watch_api_request(ctx, max_resource_version);
+    if (!ctx->streaming_client) {
+        flb_plg_error(ctx->ins, "unable to create http client");
+        goto failure;
+    }
+    initialize_http_client(ctx->streaming_client, ctx);
+
+    /* Watch will stream chunked json data, so we only send
+     * the http request, then use flb_http_get_response_data
+     * to attempt processing on available streamed data
+     */
+    b_sent = 0;
+    ret = flb_http_do_request(ctx->streaming_client, &b_sent);
+    if (ret != 0) {
+        flb_plg_error(ctx->ins, "http do request error");
+        goto failure;
+    }
+
+    return FLB_TRUE;
+
+failure:
     if (c) {
         flb_http_client_destroy(c);
     }
-    if (u_conn) {
-        flb_upstream_conn_release(u_conn);
+    if (ctx->streaming_client) {
+        flb_http_client_destroy(ctx->streaming_client);
+        ctx->streaming_client = NULL;
+    }
+    if (ctx->current_connection) {
+        flb_upstream_conn_release(ctx->current_connection);
+        ctx->current_connection = NULL;
     }
+    return FLB_FALSE;
+}
+
+static int k8s_events_collect(struct flb_input_instance *ins,
+                              struct flb_config *config, void *in_context)
+{
+    int ret;
+    struct k8s_events *ctx = in_context;
+    size_t bytes_consumed;
+    int chunk_proc_ret;
+
+    if (pthread_mutex_trylock(&ctx->lock) != 0) {
+        FLB_INPUT_RETURN(0);
+    }
+
+    if (check_and_init_stream(ctx) == FLB_FALSE) {
+        FLB_INPUT_RETURN(0);
+    }
+
+    ret = FLB_HTTP_MORE;
+    bytes_consumed = 0;
+    chunk_proc_ret = 0;
+    while ((ret == FLB_HTTP_MORE || ret == FLB_HTTP_CHUNK_AVAILABLE) && chunk_proc_ret == 0) {
+        ret = flb_http_get_response_data(ctx->streaming_client, bytes_consumed);
+        bytes_consumed = 0;
+        if(ctx->streaming_client->resp.status == 200 && ret == FLB_HTTP_CHUNK_AVAILABLE ) {
+            chunk_proc_ret = process_http_chunk(ctx, ctx->streaming_client, &bytes_consumed);
+        }
+    }
+    /* NOTE: skipping any processing after streaming socket closes */
+
+    if (ctx->streaming_client->resp.status != 200 || ret == FLB_HTTP_ERROR) {
+        if (ret == FLB_HTTP_ERROR) {
+            flb_plg_warn(ins, "kubernetes chunked stream error.");
+        }
+        else {
+            flb_plg_warn(ins, "events watch failure, http_status=%d payload=%s",
+                         ctx->streaming_client->resp.status, ctx->streaming_client->resp.payload);
+        }
+
+        flb_http_client_destroy(ctx->streaming_client);
+        flb_upstream_conn_release(ctx->current_connection);
+        ctx->streaming_client = NULL;
+        ctx->current_connection = NULL;
+    }
+
+    pthread_mutex_unlock(&ctx->lock);
     FLB_INPUT_RETURN(0);
 }
 
@@ -863,12 +1070,6 @@ static struct flb_config_map config_map[] = {
       "kubernetes namespace to get events from, gets event from all namespaces by default."
     },
 
-    {
-       FLB_CONFIG_MAP_STR, "timestamp_key", NULL,
-       0, FLB_TRUE, offsetof(struct k8s_events, timestamp_key),
-       "Deprecated. To be removed in v3.0"
-    },
-
 #ifdef FLB_HAVE_SQLDB
     {
       FLB_CONFIG_MAP_STR, "db", NULL,
diff --git a/plugins/in_kubernetes_events/kubernetes_events.h b/plugins/in_kubernetes_events/kubernetes_events.h
index a4bcbf19d11..734b63a2afb 100644
--- a/plugins/in_kubernetes_events/kubernetes_events.h
+++ b/plugins/in_kubernetes_events/kubernetes_events.h
@@ -74,9 +74,6 @@ struct k8s_events {
 
     struct flb_log_event_encoder *encoder;
 
-    /* timestamp key - deprecated, to be removed in v3.0 */
-    flb_sds_t timestamp_key;
-
     /* record accessor */
     struct flb_record_accessor *ra_resource_version;
 
@@ -85,6 +82,9 @@ struct k8s_events {
     struct flb_upstream *upstream;
     struct flb_input_instance *ins;
 
+    struct flb_connection *current_connection;
+    struct flb_http_client *streaming_client;
+
     /* limit for event queries */
     int limit_request;
     /* last highest seen resource_version */
@@ -105,4 +105,4 @@ struct k8s_events {
     pthread_mutex_t lock;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/plugins/in_kubernetes_events/kubernetes_events_conf.c b/plugins/in_kubernetes_events/kubernetes_events_conf.c
index bc14b0ad09f..e40d67b415e 100644
--- a/plugins/in_kubernetes_events/kubernetes_events_conf.c
+++ b/plugins/in_kubernetes_events/kubernetes_events_conf.c
@@ -94,6 +94,8 @@ static int network_init(struct k8s_events *ctx, struct flb_config *config)
     int io_type = FLB_IO_TCP;
 
     ctx->upstream = NULL;
+    ctx->current_connection = NULL;
+    ctx->streaming_client = NULL;
 
     if (ctx->api_https == FLB_TRUE) {
         if (!ctx->tls_ca_path && !ctx->tls_ca_file) {
@@ -280,6 +282,14 @@ void k8s_events_conf_destroy(struct k8s_events *ctx)
         flb_ra_destroy(ctx->ra_resource_version);
     }
 
+    if(ctx->streaming_client) {
+        flb_http_client_destroy(ctx->streaming_client);
+    }
+
+    if(ctx->current_connection) {
+        flb_upstream_conn_release(ctx->current_connection);
+    }
+
     if (ctx->upstream) {
         flb_upstream_destroy(ctx->upstream);
     }
diff --git a/plugins/in_opentelemetry/opentelemetry_prot.c b/plugins/in_opentelemetry/opentelemetry_prot.c
index 0de3c3b1221..c1a45c41967 100644
--- a/plugins/in_opentelemetry/opentelemetry_prot.c
+++ b/plugins/in_opentelemetry/opentelemetry_prot.c
@@ -103,7 +103,7 @@ static int send_response(struct http_conn *conn, int http_status, char *message)
     }
     else if (http_status == 400) {
         flb_sds_printf(&out,
-                       "HTTP/1.1 400 Forbidden\r\n"
+                       "HTTP/1.1 400 Bad Request\r\n"
                        "Server: Fluent Bit v%s\r\n"
                        "Content-Length: %i\r\n\r\n%s",
                        FLB_VERSION_STR,
@@ -1773,7 +1773,7 @@ int opentelemetry_prot_uncompress(struct mk_http_session *session,
 
 
 /*
- * Handle an incoming request. It perform extra checks over the request, if
+ * Handle an incoming request. It performs extra checks over the request, if
  * everything is OK, it enqueue the incoming payload.
  */
 int opentelemetry_prot_handle(struct flb_opentelemetry *ctx, struct http_conn *conn,
@@ -1820,7 +1820,7 @@ int opentelemetry_prot_handle(struct flb_opentelemetry *ctx, struct http_conn *c
         return -1;
     }
 
-    /* Try to match a query string so we can remove it */
+    /* Try to match a query string, so we can remove it */
     qs = strchr(uri, '?');
     if (qs) {
         /* remove the query string part */
@@ -1963,7 +1963,7 @@ static int send_response_ng(struct flb_http_response *response,
         flb_http_response_set_message(response, "No Content");
     }
     else if (http_status == 400) {
-        flb_http_response_set_message(response, "Forbidden");
+        flb_http_response_set_message(response, "Bad Request");
     }
 
     if (message != NULL) {
@@ -2175,6 +2175,12 @@ static int process_payload_metrics_ng(struct flb_opentelemetry *ctx,
 
     offset = 0;
 
+    if (request->content_type == NULL) {
+        flb_error("[otel] content type missing");
+
+        return -1;
+    }
+
     if (strcasecmp(request->content_type, "application/grpc") == 0) {
         if (cfl_sds_len(request->body) < 5) {
             return -1;
@@ -2185,12 +2191,18 @@ static int process_payload_metrics_ng(struct flb_opentelemetry *ctx,
                                                  cfl_sds_len(request->body) - 5,
                                                  &offset);
     }
-    else {
+    else if (strcasecmp(request->content_type, "application/x-protobuf") == 0 ||
+             strcasecmp(request->content_type, "application/json") == 0) {
         result = cmt_decode_opentelemetry_create(&decoded_contexts,
                                                 request->body,
                                                 cfl_sds_len(request->body),
                                                 &offset);
     }
+    else {
+        flb_plg_error(ctx->ins, "Unsupported content type %s", request->content_type);
+
+        return -1;
+    }
 
     if (result == CMT_DECODE_OPENTELEMETRY_SUCCESS) {
         cfl_list_foreach(iterator, &decoded_contexts) {
@@ -2205,6 +2217,10 @@ static int process_payload_metrics_ng(struct flb_opentelemetry *ctx,
 
         cmt_decode_opentelemetry_destroy(&decoded_contexts);
     }
+    else {
+        flb_plg_warn(ctx->ins, "non-success cmetrics opentelemetry decode result %d", result);
+        return -1;
+    }
 
     return 0;
 }
@@ -2221,6 +2237,12 @@ static int process_payload_traces_proto_ng(struct flb_opentelemetry *ctx,
 
     offset = 0;
 
+    if (request->content_type == NULL) {
+        flb_error("[otel] content type missing");
+
+        return -1;
+    }
+
     if (strcasecmp(request->content_type, "application/grpc") == 0) {
         if (cfl_sds_len(request->body) < 5) {
             return -1;
@@ -2231,17 +2253,26 @@ static int process_payload_traces_proto_ng(struct flb_opentelemetry *ctx,
                                                  cfl_sds_len(request->body) - 5,
                                                  &offset);
     }
-    else {
+    else if (strcasecmp(request->content_type, "application/x-protobuf") == 0 ||
+             strcasecmp(request->content_type, "application/json") == 0) {
         result = ctr_decode_opentelemetry_create(&decoded_context,
                                                 request->body,
                                                 cfl_sds_len(request->body),
                                                 &offset);
     }
+    else {
+        flb_plg_error(ctx->ins, "Unsupported content type %s", request->content_type);
+
+        return -1;
+    }
 
     if (result == 0) {
         result = flb_input_trace_append(ctx->ins, NULL, 0, decoded_context);
         ctr_decode_opentelemetry_destroy(decoded_context);
     }
+    else {
+        flb_plg_warn(ctx->ins, "non-success ctraces opentelemetry decode result %d", result);
+    }
 
     return result;
 }
@@ -2454,7 +2485,12 @@ int opentelemetry_prot_handle_ng(struct flb_http_request *request,
         send_export_service_response_ng(response, result, payload_type);
     }
     else {
-        send_response_ng(response, context->successful_response_code, NULL);
+        if (result == 0) {
+            send_response_ng(response, context->successful_response_code, NULL);
+        }
+        else {
+            send_response_ng(response, 400, "invalid request: deserialisation error\n");
+        }
     }
 
     return result;
diff --git a/plugins/in_prometheus_remote_write/prom_rw_prot.c b/plugins/in_prometheus_remote_write/prom_rw_prot.c
index 1ffc23fdc44..6c146a3c37f 100644
--- a/plugins/in_prometheus_remote_write/prom_rw_prot.c
+++ b/plugins/in_prometheus_remote_write/prom_rw_prot.c
@@ -79,7 +79,7 @@ static int send_response(struct flb_input_instance *in,
     }
     else if (http_status == 400) {
         flb_sds_printf(&out,
-                       "HTTP/1.1 400 Forbidden\r\n"
+                       "HTTP/1.1 400 Bad Request\r\n"
                        "Server: Fluent Bit v%s\r\n"
                        "Content-Length: %i\r\n\r\n%s",
                        FLB_VERSION_STR,
@@ -233,7 +233,7 @@ int prom_rw_prot_uncompress(struct mk_http_session *session,
 
 
 /*
- * Handle an incoming request. It perform extra checks over the request, if
+ * Handle an incoming request. It performs extra checks over the request, if
  * everything is OK, it enqueue the incoming payload.
  */
 int prom_rw_prot_handle(struct flb_prom_remote_write *ctx,
@@ -410,7 +410,7 @@ static int send_response_ng(struct flb_http_response *response,
         flb_http_response_set_message(response, "No Content");
     }
     else if (http_status == 400) {
-        flb_http_response_set_message(response, "Forbidden");
+        flb_http_response_set_message(response, "Bad Request");
     }
 
     if (message != NULL) {
diff --git a/plugins/in_splunk/splunk_prot.c b/plugins/in_splunk/splunk_prot.c
index 513ea41d340..f3994ddad41 100644
--- a/plugins/in_splunk/splunk_prot.c
+++ b/plugins/in_splunk/splunk_prot.c
@@ -84,7 +84,7 @@ static int send_response(struct splunk_conn *conn, int http_status, char *messag
     }
     else if (http_status == 400) {
         flb_sds_printf(&out,
-                       "HTTP/1.1 400 Forbidden\r\n"
+                       "HTTP/1.1 400 Bad Request\r\n"
                        "Server: Fluent Bit v%s\r\n"
                        "Content-Length: %i\r\n\r\n%s",
                        FLB_VERSION_STR,
@@ -568,7 +568,7 @@ static int process_hec_payload(struct flb_splunk *ctx, struct splunk_conn *conn,
         type = HTTP_CONTENT_TEXT;
     }
     else {
-        /* Not neccesary to specify content-type for Splunk HEC. */
+        /* Not necessary to specify content-type for Splunk HEC. */
         flb_plg_debug(ctx->ins, "Mark as unknown type for ingested payloads");
         type = HTTP_CONTENT_UNKNOWN;
     }
@@ -634,7 +634,7 @@ static int process_hec_raw_payload(struct flb_splunk *ctx, struct splunk_conn *c
     }
     else if (header->val.len != 10 ||
              strncasecmp(header->val.data, "text/plain", 10) != 0) {
-        /* Not neccesary to specify content-type for Splunk HEC. */
+        /* Not necessary to specify content-type for Splunk HEC. */
         flb_plg_debug(ctx->ins, "Mark as unknown type for ingested payloads");
     }
 
@@ -776,7 +776,7 @@ int splunk_prot_handle(struct flb_splunk *ctx, struct splunk_conn *conn,
     }
 
     if (request->method == MK_METHOD_GET) {
-        /* Handle health minotoring of splunk hec endpoint for load balancers */
+        /* Handle health monitoring of splunk hec endpoint for load balancers */
         if (strcasecmp(uri, "/services/collector/health") == 0) {
             send_json_message_response(conn, 200, "{\"text\":\"Success\",\"code\":200}");
         }
@@ -794,7 +794,7 @@ int splunk_prot_handle(struct flb_splunk *ctx, struct splunk_conn *conn,
      * authentication if provided splunk_token */
     ret = validate_auth_header(ctx, request);
     if (ret < 0){
-        send_response(conn, 401, "error: unauthroized\n");
+        send_response(conn, 401, "error: unauthorized\n");
         if (ret == SPLUNK_AUTH_MISSING_CRED) {
             flb_plg_warn(ctx->ins, "missing credentials in request headers");
         }
@@ -889,7 +889,7 @@ static int send_response_ng(struct flb_http_response *response,
         flb_http_response_set_message(response, "No Content");
     }
     else if (http_status == 400) {
-        flb_http_response_set_message(response, "Forbidden");
+        flb_http_response_set_message(response, "Bad Request");
     }
 
     if (message != NULL) {
@@ -919,7 +919,7 @@ static int send_json_message_response_ng(struct flb_http_response *response,
         flb_http_response_set_message(response, "No Content");
     }
     else if (http_status == 400) {
-        flb_http_response_set_message(response, "Forbidden");
+        flb_http_response_set_message(response, "Bad Request");
     }
 
     flb_http_response_set_header(response, 
@@ -993,7 +993,7 @@ static int process_hec_payload_ng(struct flb_http_request *request,
             type = HTTP_CONTENT_TEXT;
         }
         else {
-            /* Not neccesary to specify content-type for Splunk HEC. */
+            /* Not necessary to specify content-type for Splunk HEC. */
             flb_plg_debug(ctx->ins, "Mark as unknown type for ingested payloads");
         }
     }
@@ -1029,7 +1029,7 @@ static int process_hec_raw_payload_ng(struct flb_http_request *request,
         return -1;
     }
     else if (strcasecmp(request->content_type, "text/plain") != 0) {
-        /* Not neccesary to specify content-type for Splunk HEC. */
+        /* Not necessary to specify content-type for Splunk HEC. */
         flb_plg_debug(ctx->ins, "Mark as unknown type for ingested payloads");
     }
 
@@ -1072,7 +1072,7 @@ int splunk_prot_handle_ng(struct flb_http_request *request,
     }
 
     if (request->method == HTTP_METHOD_GET) {
-        /* Handle health minotoring of splunk hec endpoint for load balancers */
+        /* Handle health monitoring of splunk hec endpoint for load balancers */
         if (strcasecmp(request->path, "/services/collector/health") == 0) {
             send_json_message_response_ng(response, 200, "{\"text\":\"Success\",\"code\":200}");
         }
diff --git a/plugins/in_winevtlog/pack.c b/plugins/in_winevtlog/pack.c
index 18ee97e48d1..97dacce822e 100644
--- a/plugins/in_winevtlog/pack.c
+++ b/plugins/in_winevtlog/pack.c
@@ -261,20 +261,91 @@ static int pack_filetime(struct winevtlog_config *ctx, ULONGLONG filetime)
     return 0;
 }
 
-static int pack_sid(struct winevtlog_config *ctx, PSID sid)
+static int pack_sid(struct winevtlog_config *ctx, PSID sid, int extract_sid)
 {
+#define MAX_NAME 256
     size_t size;
     LPWSTR wide_sid = NULL;
+    DWORD len = MAX_NAME, err = ERROR_SUCCESS;
     int ret = -1;
+    SID_NAME_USE sid_type = SidTypeUnknown;
+    char account[MAX_NAME];
+    char domain[MAX_NAME];
+    PSID pSID = NULL;
+    DWORD result_len = 0;
+    flb_sds_t formatted = NULL;
 
     if (ConvertSidToStringSidW(sid, &wide_sid)) {
+        if (extract_sid == FLB_TRUE) {
+            if (!LookupAccountSidA(NULL, sid,
+                                   account, &len, domain,
+                                   &len, &sid_type)) {
+                err = GetLastError();
+                if (err == ERROR_NONE_MAPPED) {
+                    flb_plg_debug(ctx->ins, "AccountSid is not mapped. code: %u", err);
+
+                    goto not_mapped_error;
+                }
+                else {
+                    flb_plg_warn(ctx->ins, "LookupAccountSid Error %u", err);
+                }
+
+                goto error;
+            }
+
+            result_len = strlen(domain) + 1 + strlen(account) + 1;
+            formatted = flb_sds_create_size(result_len);
+            if (formatted == NULL) {
+                flb_plg_warn(ctx->ins, "create result buffer failed");
+
+                ret = -1;
+
+                goto error;
+            }
+
+            _snprintf_s(formatted, result_len, _TRUNCATE, "%s\\%s", domain, account);
+
+            if (size > 0) {
+                flb_log_event_encoder_append_body_cstring(ctx->log_encoder, formatted);
+
+                ret = 0;
+            }
+            else {
+                flb_plg_warn(ctx->ins, "format domain\\account failed");
+                flb_sds_destroy(formatted);
+
+                ret = -1;
+
+                goto error;
+            }
+
+            LocalFree(wide_sid);
+            flb_sds_destroy(formatted);
+
+            return ret;
+        }
+        else {
+            ret = pack_wstr(ctx, wide_sid);
+            LocalFree(wide_sid);
+
+            return ret;
+        }
+
+    not_mapped_error:
         ret = pack_wstr(ctx, wide_sid);
 
         LocalFree(wide_sid);
+
+        return ret;
+
+    error:
+        LocalFree(wide_sid);
+
         return ret;
     }
 
     return ret;
+#undef MAX_NAME
 }
 
 static void pack_string_inserts(struct winevtlog_config *ctx, PEVT_VARIANT values, DWORD count)
@@ -355,7 +426,7 @@ static void pack_string_inserts(struct winevtlog_config *ctx, PEVT_VARIANT value
             }
             break;
         case EvtVarTypeSid:
-            if (pack_sid(ctx, values[i].SidVal)) {
+            if (pack_sid(ctx, values[i].SidVal, FLB_FALSE)) {
                 pack_nullstr(ctx);
             }
             break;
@@ -601,7 +672,7 @@ void winevtlog_pack_event(PEVT_VARIANT system, WCHAR *message,
     /* UserID */
     ret = flb_log_event_encoder_append_body_cstring(ctx->log_encoder, "UserID");
 
-    if (pack_sid(ctx, system[EvtSystemUserID].SidVal)) {
+    if (pack_sid(ctx, system[EvtSystemUserID].SidVal, FLB_TRUE)) {
         pack_nullstr(ctx);
     }
 
diff --git a/plugins/in_winevtlog/winevtlog.c b/plugins/in_winevtlog/winevtlog.c
index 08af358df72..d5fc6fa42a2 100644
--- a/plugins/in_winevtlog/winevtlog.c
+++ b/plugins/in_winevtlog/winevtlog.c
@@ -289,25 +289,36 @@ DWORD render_system_event(EVT_HANDLE event, PEVT_VARIANT *system, unsigned int *
 PWSTR get_message(EVT_HANDLE metadata, EVT_HANDLE handle, unsigned int *message_size)
 {
     WCHAR* buffer = NULL;
+    WCHAR* previous_buffer = NULL;
     DWORD status = ERROR_SUCCESS;
-    DWORD buffer_size = 0;
+    DWORD buffer_size = 512;
     DWORD buffer_used = 0;
     LPVOID format_message_buffer;
     WCHAR* message = NULL;
     char *error_message = NULL;
 
+    buffer = flb_malloc(sizeof(WCHAR) * buffer_size);
+    if (!buffer) {
+        flb_error("failed to premalloc message buffer");
+
+        goto buffer_error;
+    }
+
     // Get the size of the buffer
     if (!EvtFormatMessage(metadata, handle, 0, 0, NULL,
                           EvtFormatMessageEvent, buffer_size, buffer, &buffer_used)) {
         status = GetLastError();
         if (ERROR_INSUFFICIENT_BUFFER == status) {
             buffer_size = buffer_used;
-            buffer = flb_malloc(sizeof(WCHAR) * buffer_size);
+            previous_buffer = buffer;
+            buffer = flb_realloc(previous_buffer, sizeof(WCHAR) * buffer_size);
             if (!buffer) {
                 flb_error("failed to malloc message buffer");
+                flb_free(previous_buffer);
 
-                goto cleanup;
+                goto buffer_error;
             }
+
             if (!EvtFormatMessage(metadata,
                                   handle,
                                   0xffffffff,
@@ -375,6 +386,8 @@ PWSTR get_message(EVT_HANDLE metadata, EVT_HANDLE handle, unsigned int *message_
         flb_free(buffer);
     }
 
+buffer_error:
+
     return message;
 }
 
@@ -415,15 +428,14 @@ PWSTR get_description(EVT_HANDLE handle, LANGID langID, unsigned int *message_si
     }
     values = (PEVT_VARIANT)buffer;
 
+    /* Metadata can be NULL because forwarded events do not have an
+     * associated publisher metadata. */
     metadata = EvtOpenPublisherMetadata(
             NULL, // TODO: Remote handle
             values[0].StringVal,
             NULL,
             MAKELCID(langID, SORT_DEFAULT),
             0);
-    if (metadata == NULL) {
-        goto cleanup;
-    }
 
     message = get_message(metadata, handle, message_size);
 
diff --git a/plugins/out_datadog/datadog.c b/plugins/out_datadog/datadog.c
index c92992f534e..57f3cb42cce 100644
--- a/plugins/out_datadog/datadog.c
+++ b/plugins/out_datadog/datadog.c
@@ -247,6 +247,14 @@ static int datadog_format(struct flb_config *config,
                                           ctx->dd_service, flb_sds_len(ctx->dd_service));
         }
 
+        /* dd_hostname */
+        if (ctx->dd_hostname != NULL) {
+            dd_msgpack_pack_key_value_str(&mp_pck,
+                                          FLB_DATADOG_DD_HOSTNAME_KEY,
+                                          sizeof(FLB_DATADOG_DD_HOSTNAME_KEY) -1,
+                                          ctx->dd_hostname, flb_sds_len(ctx->dd_hostname));
+        }
+
         /* Append initial object k/v */
         ind = 0;
         for (i = 0; i < map_size; i++) {
@@ -514,6 +522,14 @@ static struct flb_config_map config_map[] = {
      "The tags you want to assign to your logs in Datadog. If unset, Datadog "
      "will expect the tags in the `ddtags` attribute."
     },
+    {
+     FLB_CONFIG_MAP_STR, "dd_hostname", NULL,
+     0, FLB_TRUE, offsetof(struct flb_out_datadog, dd_hostname),
+     "The host that emitted logs should be associated with. If unset, Datadog "
+     "will expect the host to be set as `host`, `hostname`, or `syslog.hostname` "
+     "attributes. See Datadog Logs preprocessor documentation for up-to-date "
+     "of recognized attributes."
+    },
 
     {
      FLB_CONFIG_MAP_STR, "proxy", NULL,
diff --git a/plugins/out_datadog/datadog.h b/plugins/out_datadog/datadog.h
index 15856be399b..1b0714f2ecd 100644
--- a/plugins/out_datadog/datadog.h
+++ b/plugins/out_datadog/datadog.h
@@ -27,6 +27,7 @@
 #define FLB_DATADOG_DEFAULT_PORT      443
 #define FLB_DATADOG_DEFAULT_TIME_KEY  "timestamp"
 #define FLB_DATADOG_DEFAULT_TAG_KEY   "tagkey"
+#define FLB_DATADOG_DD_HOSTNAME_KEY   "hostname"
 #define FLB_DATADOG_DD_SOURCE_KEY     "ddsource"
 #define FLB_DATADOG_DD_SERVICE_KEY    "service"
 #define FLB_DATADOG_DD_TAGS_KEY       "ddtags"
@@ -65,6 +66,7 @@ struct flb_out_datadog {
     int nb_additional_entries;
     flb_sds_t dd_source;
     flb_sds_t dd_service;
+    flb_sds_t dd_hostname;
     flb_sds_t dd_tags;
     flb_sds_t dd_message_key;
 
diff --git a/plugins/out_loki/loki.c b/plugins/out_loki/loki.c
index f02b698f211..bcc89f37298 100644
--- a/plugins/out_loki/loki.c
+++ b/plugins/out_loki/loki.c
@@ -903,10 +903,12 @@ static struct flb_loki *loki_config_create(struct flb_output_instance *ins,
                                            struct flb_config *config)
 {
     int ret;
+    int tmp;
     int io_flags = 0;
     struct flb_loki *ctx;
     struct flb_upstream *upstream;
     char *compress;
+    char *drop_single_key;
 
     /* Create context */
     ctx = flb_calloc(1, sizeof(struct flb_loki));
@@ -962,6 +964,29 @@ static struct flb_loki *loki_config_create(struct flb_output_instance *ins,
         }
     }
 
+    /* Drop Single Key */
+    drop_single_key = flb_output_get_property("drop_single_key", ins);
+    ctx->out_drop_single_key = FLB_LOKI_DROP_SINGLE_KEY_OFF;
+    if (drop_single_key) {
+        if (strcasecmp(drop_single_key, "raw") == 0) {
+            ctx->out_drop_single_key = FLB_LOKI_DROP_SINGLE_KEY_ON | FLB_LOKI_DROP_SINGLE_KEY_RAW;
+        }
+        else {
+            tmp = flb_utils_bool(drop_single_key);
+            if (tmp == FLB_TRUE) {
+                ctx->out_drop_single_key = FLB_LOKI_DROP_SINGLE_KEY_ON;
+            }
+            else if (tmp == FLB_FALSE) {
+                ctx->out_drop_single_key = FLB_LOKI_DROP_SINGLE_KEY_OFF;
+            }
+            else {
+                flb_plg_error(ctx->ins, "invalid 'drop_single_key' value: %s",
+                              ctx->drop_single_key);
+                return NULL;
+            }
+        }
+    }
+
     /* Line Format */
     if (strcasecmp(ctx->line_format, "json") == 0) {
         ctx->out_line_format = FLB_LOKI_FMT_JSON;
@@ -1206,12 +1231,28 @@ static int pack_record(struct flb_loki *ctx,
     }
 
     /* Drop single key */
-    if (ctx->drop_single_key == FLB_TRUE && rec->type == MSGPACK_OBJECT_MAP && rec->via.map.size == 1) {
+    if (ctx->out_drop_single_key & FLB_LOKI_DROP_SINGLE_KEY_ON &&
+        rec->type == MSGPACK_OBJECT_MAP && rec->via.map.size == 1) {
+        val = rec->via.map.ptr[0].val;
+
         if (ctx->out_line_format == FLB_LOKI_FMT_JSON) {
-            rec = &rec->via.map.ptr[0].val;
-        } else if (ctx->out_line_format == FLB_LOKI_FMT_KV) {
-            val = rec->via.map.ptr[0].val;
+            if (val.type == MSGPACK_OBJECT_STR &&
+                ctx->out_drop_single_key & FLB_LOKI_DROP_SINGLE_KEY_RAW) {
+                msgpack_pack_str(mp_pck, val.via.str.size);
+                msgpack_pack_str_body(mp_pck, val.via.str.ptr, val.via.str.size);
+
+                msgpack_unpacked_destroy(&mp_buffer);
+                if (tmp_sbuf_data) {
+                    flb_free(tmp_sbuf_data);
+                }
 
+                return 0;
+            }
+            else {
+                rec = &val;
+            }
+        }
+        else if (ctx->out_line_format == FLB_LOKI_FMT_KV) {
             if (val.type == MSGPACK_OBJECT_STR) {
                 msgpack_pack_str(mp_pck, val.via.str.size);
                 msgpack_pack_str_body(mp_pck, val.via.str.ptr, val.via.str.size);
@@ -1774,10 +1815,11 @@ static struct flb_config_map config_map[] = {
     },
 
     {
-     FLB_CONFIG_MAP_BOOL, "drop_single_key", "false",
+     FLB_CONFIG_MAP_STR, "drop_single_key", NULL,
      0, FLB_TRUE, offsetof(struct flb_loki, drop_single_key),
      "If set to true and only a single key remains, the log line sent to Loki "
-     "will be the value of that key.",
+     "will be the value of that key. If set to 'raw' and the log line is "
+     "a string, the log line will be sent unquoted.",
     },
 
     {
diff --git a/plugins/out_loki/loki.h b/plugins/out_loki/loki.h
index 6f7a59f8d4b..fa3eed14d3d 100644
--- a/plugins/out_loki/loki.h
+++ b/plugins/out_loki/loki.h
@@ -41,6 +41,11 @@
 #define FLB_LOKI_FMT_JSON  0
 #define FLB_LOKI_FMT_KV    1
 
+/* Drop single key */
+#define FLB_LOKI_DROP_SINGLE_KEY_OFF (((uint64_t) 1) << 0)
+#define FLB_LOKI_DROP_SINGLE_KEY_ON  (((uint64_t) 1) << 1)
+#define FLB_LOKI_DROP_SINGLE_KEY_RAW (((uint64_t) 1) << 2)
+
 struct flb_loki_kv {
     int val_type;                       /* FLB_LOKI_KV_STR or FLB_LOKI_KV_RA */
     flb_sds_t key;                      /* string key */
@@ -54,8 +59,8 @@ struct flb_loki_kv {
 struct flb_loki {
     /* Public configuration properties */
     int auto_kubernetes_labels;
-    int drop_single_key;
 
+    flb_sds_t drop_single_key;
     flb_sds_t uri;
     flb_sds_t line_format;
     flb_sds_t tenant_id;
@@ -80,6 +85,7 @@ struct flb_loki {
     int tcp_port;
     char *tcp_host;
     int out_line_format;
+    int out_drop_single_key;
     int ra_used;                        /* number of record accessor label keys */
     struct flb_record_accessor *ra_k8s; /* kubernetes record accessor */
     struct mk_list labels_list;         /* list of flb_loki_kv nodes */
diff --git a/plugins/out_opentelemetry/opentelemetry_logs.c b/plugins/out_opentelemetry/opentelemetry_logs.c
index 94fb0dfe34c..d9dfcfbdd7b 100644
--- a/plugins/out_opentelemetry/opentelemetry_logs.c
+++ b/plugins/out_opentelemetry/opentelemetry_logs.c
@@ -528,8 +528,8 @@ static void free_resource_logs(Opentelemetry__Proto__Logs__V1__ResourceLogs **re
 
         if (resource_log->resource->attributes != NULL) {
             otlp_kvarray_destroy(resource_log->resource->attributes, resource_log->resource->n_attributes);
-            flb_free(resource_log->resource);
         }
+        flb_free(resource_log->resource);
 
         /* iterate scoipe logs */
         if (resource_log->n_scope_logs > 0) {
diff --git a/plugins/out_splunk/splunk.c b/plugins/out_splunk/splunk.c
index 4ec93aff477..a928f52843b 100644
--- a/plugins/out_splunk/splunk.c
+++ b/plugins/out_splunk/splunk.c
@@ -628,7 +628,6 @@ static void cb_splunk_flush(struct flb_event_chunk *event_chunk,
     flb_sds_t buf_data;
     size_t resp_size;
     size_t buf_size;
-    char *endpoint;
     struct flb_splunk *ctx = out_context;
     struct flb_connection *u_conn;
     struct flb_http_client *c;
@@ -687,16 +686,8 @@ static void cb_splunk_flush(struct flb_event_chunk *event_chunk,
         }
     }
 
-    /* Splunk URI endpoint */
-    if (ctx->splunk_send_raw) {
-        endpoint = FLB_SPLUNK_DEFAULT_URI_RAW;
-    }
-    else {
-        endpoint = FLB_SPLUNK_DEFAULT_URI_EVENT;
-    }
-
     /* Compose HTTP Client request */
-    c = flb_http_client(u_conn, FLB_HTTP_POST, endpoint,
+    c = flb_http_client(u_conn, FLB_HTTP_POST, FLB_SPLUNK_DEFAULT_ENDPOINT,
                         payload_buf, payload_size, NULL, 0, NULL, 0);
 
     /* HTTP Response buffer size, honor value set by the user */
diff --git a/plugins/out_splunk/splunk.h b/plugins/out_splunk/splunk.h
index 4c71a0ec356..f86d918327b 100644
--- a/plugins/out_splunk/splunk.h
+++ b/plugins/out_splunk/splunk.h
@@ -22,8 +22,7 @@
 
 #define FLB_SPLUNK_DEFAULT_HOST          "127.0.0.1"
 #define FLB_SPLUNK_DEFAULT_PORT          8088
-#define FLB_SPLUNK_DEFAULT_URI_RAW       "/services/collector/raw"
-#define FLB_SPLUNK_DEFAULT_URI_EVENT     "/services/collector/event"
+#define FLB_SPLUNK_DEFAULT_ENDPOINT      "/services/collector/event"
 #define FLB_SPLUNK_DEFAULT_TIME          "time"
 #define FLB_SPLUNK_DEFAULT_EVENT_HOST    "host"
 #define FLB_SPLUNK_DEFAULT_EVENT_SOURCE  "source"
diff --git a/plugins/processor_content_modifier/cm.c b/plugins/processor_content_modifier/cm.c
index 7af7f6e9002..4a2cf444793 100644
--- a/plugins/processor_content_modifier/cm.c
+++ b/plugins/processor_content_modifier/cm.c
@@ -100,15 +100,15 @@ static int cb_process_traces(struct flb_processor_instance *ins,
 
 static struct flb_config_map config_map[] = {
     {
-        FLB_CONFIG_MAP_STR, "action", NULL,
-        0, FLB_TRUE, offsetof(struct content_modifier_ctx, action_str),
-        "Action to perform over the content: insert, upsert, delete, rename or hash."
+        FLB_CONFIG_MAP_STR, "context", NULL,
+        0, FLB_TRUE, offsetof(struct content_modifier_ctx, context_str),
+        "Context where the action will be applied."
     },
 
     {
-        FLB_CONFIG_MAP_STR, "context", NULL,
-        0, FLB_TRUE, offsetof(struct content_modifier_ctx, context_str),
-        "Context to apply the action."
+        FLB_CONFIG_MAP_STR, "action", NULL,
+        0, FLB_TRUE, offsetof(struct content_modifier_ctx, action_str),
+        "Action to perform over the content: insert, upsert, delete, rename or hash."
     },
 
     {
diff --git a/plugins/processor_content_modifier/cm.h b/plugins/processor_content_modifier/cm.h
index 0fba1029c82..c6cae0b6b34 100644
--- a/plugins/processor_content_modifier/cm.h
+++ b/plugins/processor_content_modifier/cm.h
@@ -48,6 +48,11 @@ enum {
     CM_CONTEXT_LOG_METADATA,
     CM_CONTEXT_LOG_BODY,
 
+    CM_CONTEXT_OTEL_RESOURCE_ATTR,
+    CM_CONTEXT_OTEL_SCOPE_NAME,
+    CM_CONTEXT_OTEL_SCOPE_VERSION,
+    CM_CONTEXT_OTEL_SCOPE_ATTR,
+
     /* Metrics */
     CM_CONTEXT_METRIC_NAME,
     CM_CONTEXT_METRIC_DESCRIPTION,
diff --git a/plugins/processor_content_modifier/cm_config.c b/plugins/processor_content_modifier/cm_config.c
index cf46156eb3a..487977cb113 100644
--- a/plugins/processor_content_modifier/cm_config.c
+++ b/plugins/processor_content_modifier/cm_config.c
@@ -112,6 +112,92 @@ static int set_context(struct content_modifier_ctx *ctx)
                  strcasecmp(ctx->context_str, "record") == 0) {
             context = CM_CONTEXT_LOG_BODY;
         }
+        /*
+         * OpenTelemetry contexts
+         * ----------------------
+         */
+        else if (strcasecmp(ctx->context_str, "otel_resource_attributes") == 0) {
+            context = CM_CONTEXT_OTEL_RESOURCE_ATTR;
+        }
+        else if (strcasecmp(ctx->context_str, "otel_scope_name") == 0) {
+            /*
+             * scope name is restricted to specific actions, make sure the user
+             * cannot messed it up
+             *
+             *   action              allowed ?
+             *   -----------------------------
+             *   CM_ACTION_INSERT       Yes
+             *   CM_ACTION_UPSERT       Yes
+             *   CM_ACTION_DELETE       Yes
+             *   CM_ACTION_RENAME        No
+             *   CM_ACTION_HASH         Yes
+             *   CM_ACTION_EXTRACT       No
+             *   CM_ACTION_CONVERT       No
+             */
+
+            if (ctx->action_type == CM_ACTION_RENAME ||
+                ctx->action_type == CM_ACTION_EXTRACT ||
+                ctx->action_type == CM_ACTION_CONVERT) {
+                flb_plg_error(ctx->ins, "action '%s' is not allowed for context '%s'",
+                              ctx->action_str, ctx->context_str);
+                return -1;
+            }
+
+            /* check that 'name' is the key set */
+            if (!ctx->key) {
+                ctx->key = flb_sds_create("name");
+            }
+            else if (strcasecmp(ctx->key, "name") != 0) {
+                flb_plg_error(ctx->ins, "context '%s' requires the name of the key to be 'name', no '%s'",
+                              ctx->context_str, ctx->key);
+                return -1;
+            }
+
+            context = CM_CONTEXT_OTEL_SCOPE_NAME;
+        }
+        else if (strcasecmp(ctx->context_str, "otel_scope_version") == 0) {
+            /*
+             * scope version, same as the name, it's restricted to specific actions, make sure the user
+             * cannot messed it up
+             *
+             *   action              allowed ?
+             *   -----------------------------
+             *   CM_ACTION_INSERT       Yes
+             *   CM_ACTION_UPSERT       Yes
+             *   CM_ACTION_DELETE       Yes
+             *   CM_ACTION_RENAME        No
+             *   CM_ACTION_HASH         Yes
+             *   CM_ACTION_EXTRACT       No
+             *   CM_ACTION_CONVERT       No
+             */
+
+            if (ctx->action_type == CM_ACTION_RENAME ||
+                ctx->action_type == CM_ACTION_EXTRACT ||
+                ctx->action_type == CM_ACTION_CONVERT) {
+                flb_plg_error(ctx->ins, "action '%s' is not allowed for context '%s'",
+                              ctx->action_str, ctx->context_str);
+                return -1;
+            }
+
+            /* check that 'version' is the key set */
+            if (!ctx->key) {
+                ctx->key = flb_sds_create("version");
+            }
+            else if (strcasecmp(ctx->key, "version") != 0) {
+                flb_plg_error(ctx->ins, "context '%s' requires the name of the key to be 'version', no '%s'",
+                              ctx->context_str, ctx->key);
+                return -1;
+            }
+            context = CM_CONTEXT_OTEL_SCOPE_VERSION;
+        }
+        else if (strcasecmp(ctx->context_str, "otel_scope_attributes") == 0) {
+            context = CM_CONTEXT_OTEL_SCOPE_ATTR;
+        }
+        else if (strcasecmp(ctx->context_str, "otel_scope_name") == 0) {
+        }
+        else if (strcasecmp(ctx->context_str, "otel_scope_version") == 0) {
+            context = CM_CONTEXT_OTEL_SCOPE_VERSION;
+        }
         else {
             flb_plg_error(ctx->ins, "unknown logs context '%s'", ctx->context_str);
             return -1;
@@ -177,7 +263,7 @@ static int check_action_requirements(struct content_modifier_ctx *ctx)
         /* these only requires a key, already validated (useless code) */
     }
     else if (ctx->action_type == CM_ACTION_INSERT || ctx->action_type == CM_ACTION_UPSERT ||
-        ctx->action_type == CM_ACTION_RENAME) {
+             ctx->action_type == CM_ACTION_RENAME) {
 
         if (!ctx->value) {
             flb_plg_error(ctx->ins, "value is required for action '%s'", ctx->action_str);
diff --git a/plugins/processor_content_modifier/cm_logs.c b/plugins/processor_content_modifier/cm_logs.c
index ba0d51c75b1..0f20d124bad 100644
--- a/plugins/processor_content_modifier/cm_logs.c
+++ b/plugins/processor_content_modifier/cm_logs.c
@@ -404,7 +404,7 @@ static int run_action_insert(struct content_modifier_ctx *ctx,
     ret = cfl_kvlist_insert_string_s(kvlist, key, cfl_sds_len(key), value, cfl_sds_len(value),
                                      CFL_FALSE);
     if (ret != 0) {
-        printf("Failed to insert key: %s\n", key);
+        flb_plg_debug(ctx->ins, "[action: insert] failed to insert key: %s", key);
         return -1;
     }
     return 0;
@@ -451,7 +451,10 @@ static int run_action_delete(struct content_modifier_ctx *ctx,
         return 0;
     }
 
-    return -1;
+    flb_plg_debug(ctx->ins, "[action: delete] key '%s' not found", key);
+
+    /* if the kvpair was not found, it's ok, we return zero */
+    return 0;
 }
 
 static int run_action_rename(struct content_modifier_ctx *ctx,
@@ -465,7 +468,8 @@ static int run_action_rename(struct content_modifier_ctx *ctx,
     /* if the kv pair already exists, remove it from the list */
     kvpair = cfl_object_kvpair_get(obj, key);
     if (!kvpair) {
-        return -1;
+        flb_plg_debug(ctx->ins, "[action: rename] key '%s' not found", key);
+        return 0;
     }
 
     tmp = kvpair->key;
@@ -595,6 +599,134 @@ static int run_action_convert(struct content_modifier_ctx *ctx,
     return 0;
 }
 
+static struct cfl_variant *otel_get_or_create_attributes(struct cfl_kvlist *kvlist)
+{
+    int ret;
+    struct cfl_list *head;
+    struct cfl_list *tmp;
+    struct cfl_kvpair *kvpair;
+    struct cfl_variant *val;
+    struct cfl_kvlist *kvlist_tmp;
+
+    /* iterate resource to find the attributes field */
+    cfl_list_foreach_safe(head, tmp, &kvlist->list) {
+        kvpair = cfl_list_entry(head, struct cfl_kvpair, _head);
+        if (cfl_sds_len(kvpair->key) != 10) {
+            continue;
+        }
+
+        if (strncmp(kvpair->key, "attributes", 10) == 0) {
+            val = kvpair->val;
+            if (val->type != CFL_VARIANT_KVLIST) {
+                return NULL;
+            }
+
+            return val;
+        }
+    }
+
+    /* create an empty kvlist as the value of attributes */
+    kvlist_tmp = cfl_kvlist_create();
+    if (!kvlist_tmp) {
+        return NULL;
+    }
+
+    /* create the attributes kvpair */
+    ret = cfl_kvlist_insert_kvlist_s(kvlist, "attributes", 10, kvlist_tmp);
+    if (ret != 0) {
+        cfl_kvlist_destroy(kvlist_tmp);
+        return NULL;
+    }
+
+    /* get the last kvpair from the list */
+    kvpair = cfl_list_entry_last(&kvlist->list, struct cfl_kvpair, _head);
+    if (!kvpair) {
+        return NULL;
+    }
+
+    return kvpair->val;
+}
+
+
+static struct cfl_variant *otel_get_attributes(int context, struct flb_mp_chunk_record *record)
+{
+    int key_len;
+    const char *key_buf;
+    struct cfl_list *head;
+    struct cfl_object *obj = NULL;
+    struct cfl_variant *val;
+    struct cfl_kvlist *kvlist;
+    struct cfl_kvpair *kvpair;
+    struct cfl_variant *var_attr;
+
+    if (context == CM_CONTEXT_OTEL_RESOURCE_ATTR) {
+        key_buf = "resource";
+        key_len = 8;
+    }
+    else if (context == CM_CONTEXT_OTEL_SCOPE_ATTR) {
+        key_buf = "scope";
+        key_len = 5;
+    }
+    else {
+        return NULL;
+    }
+
+    obj = record->cobj_record;
+    kvlist = obj->variant->data.as_kvlist;
+    cfl_list_foreach(head, &kvlist->list) {
+        kvpair = cfl_list_entry(head, struct cfl_kvpair, _head);
+
+        if (cfl_sds_len(kvpair->key) != key_len) {
+            continue;
+        }
+
+        if (strncmp(kvpair->key, key_buf, key_len) == 0) {
+            val = kvpair->val;
+            if (val->type != CFL_VARIANT_KVLIST) {
+                return NULL;
+            }
+
+            var_attr = otel_get_or_create_attributes(val->data.as_kvlist);
+            if (!var_attr) {
+                return NULL;
+            }
+
+            return var_attr;
+        }
+    }
+
+    return NULL;
+}
+
+static struct cfl_variant *otel_get_scope(struct flb_mp_chunk_record *record)
+{
+    struct cfl_list *head;
+    struct cfl_object *obj;
+    struct cfl_variant *val;
+    struct cfl_kvlist *kvlist;
+    struct cfl_kvpair *kvpair;
+
+    obj = record->cobj_record;
+    kvlist = obj->variant->data.as_kvlist;
+    cfl_list_foreach(head, &kvlist->list) {
+        kvpair = cfl_list_entry(head, struct cfl_kvpair, _head);
+
+        if (cfl_sds_len(kvpair->key) != 5) {
+            continue;
+        }
+
+        if (strncmp(kvpair->key, "scope", 5) == 0) {
+            val = kvpair->val;
+            if (val->type != CFL_VARIANT_KVLIST) {
+                return NULL;
+            }
+
+            return val;
+        }
+    }
+
+    return NULL;
+}
 int cm_logs_process(struct flb_processor_instance *ins,
                     struct content_modifier_ctx *ctx,
                     struct flb_mp_chunk_cobj *chunk_cobj,
@@ -602,11 +734,23 @@ int cm_logs_process(struct flb_processor_instance *ins,
                     int tag_len)
 {
     int ret = -1;
+    int record_type;
     struct flb_mp_chunk_record *record;
     struct cfl_object *obj = NULL;
+    struct cfl_object obj_static;
+    struct cfl_variant *var;
 
     /* Iterate records */
     while ((ret = flb_mp_chunk_cobj_record_next(chunk_cobj, &record)) == FLB_MP_CHUNK_RECORD_OK) {
+        obj = NULL;
+
+        /* Retrieve information about the record type */
+        ret = flb_log_event_decoder_get_record_type(&record->event, &record_type);
+        if (ret != 0) {
+            flb_plg_error(ctx->ins, "record has invalid event type");
+            continue;
+        }
+
         /* retrieve the target cfl object */
         if (ctx->context_type == CM_CONTEXT_LOG_METADATA) {
             obj = record->cobj_metadata;
@@ -614,6 +758,41 @@ int cm_logs_process(struct flb_processor_instance *ins,
         else if (ctx->context_type == CM_CONTEXT_LOG_BODY) {
             obj = record->cobj_record;
         }
+        else if (ctx->context_type == CM_CONTEXT_OTEL_RESOURCE_ATTR &&
+                 record_type == FLB_LOG_EVENT_GROUP_START) {
+            var = otel_get_attributes(CM_CONTEXT_OTEL_RESOURCE_ATTR, record);
+            if (!var) {
+                continue;
+            }
+
+            obj_static.type = CFL_VARIANT_KVLIST;
+            obj_static.variant = var;
+            obj = &obj_static;
+        }
+        else if (ctx->context_type == CM_CONTEXT_OTEL_SCOPE_ATTR &&
+                 record_type == FLB_LOG_EVENT_GROUP_START) {
+
+            var = otel_get_attributes(CM_CONTEXT_OTEL_SCOPE_ATTR, record);
+            if (!var) {
+                continue;
+            }
+
+            obj_static.type = CFL_VARIANT_KVLIST;
+            obj_static.variant = var;
+            obj = &obj_static;
+        }
+        else if ((ctx->context_type == CM_CONTEXT_OTEL_SCOPE_NAME || ctx->context_type == CM_CONTEXT_OTEL_SCOPE_VERSION) &&
+                 record_type == FLB_LOG_EVENT_GROUP_START) {
+
+            var = otel_get_scope(record);
+            obj_static.type = CFL_VARIANT_KVLIST;
+            obj_static.variant = var;
+            obj = &obj_static;
+        }
+
+        if (!obj) {
+            continue;
+        }
 
         /* the operation on top of the data type is unsupported */
         if (obj->variant->type != CFL_VARIANT_KVLIST) {
diff --git a/plugins/processor_opentelemetry_envelope/CMakeLists.txt b/plugins/processor_opentelemetry_envelope/CMakeLists.txt
new file mode 100644
index 00000000000..e244060cffc
--- /dev/null
+++ b/plugins/processor_opentelemetry_envelope/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(src
+    otel_envelope.c)
+
+FLB_PLUGIN(processor_opentelemetry_envelope "${src}" "")
diff --git a/plugins/processor_opentelemetry_envelope/otel_envelope.c b/plugins/processor_opentelemetry_envelope/otel_envelope.c
new file mode 100644
index 00000000000..c83fbb8f328
--- /dev/null
+++ b/plugins/processor_opentelemetry_envelope/otel_envelope.c
@@ -0,0 +1,224 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+/*  Fluent Bit
+ *  ==========
+ *  Copyright (C) 2015-2024 The Fluent Bit Authors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+#include <fluent-bit/flb_processor_plugin.h>
+#include <cfl/cfl.h>
+
+/* Processor initialization */
+static int cb_init(struct flb_processor_instance *ins,
+                   void *source_plugin_instance,
+                   int source_plugin_type,
+                   struct flb_config *config)
+{
+    return FLB_PROCESSOR_SUCCESS;
+}
+
+/* Processor exit */
+static int cb_exit(struct flb_processor_instance *ins, void *data)
+{
+    return FLB_PROCESSOR_SUCCESS;
+}
+
+/* Create an group start with OTLP style-signature */
+static struct flb_mp_chunk_record *envelop_init(struct cfl_list *list, struct flb_mp_chunk_record *active_record)
+{
+    int ret;
+    struct cfl_kvlist *kvlist_meta = NULL;
+    struct cfl_kvlist *kvlist_record = NULL;
+    struct cfl_kvlist *kvlist_resource = NULL;
+    struct cfl_kvlist *kvlist_scope = NULL;
+    struct cfl_object *cobj_meta = NULL;
+    struct cfl_object *cobj_record = NULL;
+    struct flb_mp_chunk_record *record = NULL;
+    struct flb_time tm;
+
+    /* metadata */
+    kvlist_meta = cfl_kvlist_create();
+    if (!kvlist_meta) {
+        return NULL;
+    }
+
+    cfl_kvlist_insert_string(kvlist_meta, "schema", "otlp");
+    cfl_kvlist_insert_int64(kvlist_meta, "resource_id", 0);
+    cfl_kvlist_insert_int64(kvlist_meta, "scope_id", 0);
+
+    /* empty content */
+    kvlist_record = cfl_kvlist_create();
+    if (!kvlist_record) {
+        goto failure;
+    }
+
+    kvlist_resource = cfl_kvlist_create();
+    if (!kvlist_resource) {
+        goto failure;
+    }
+
+    kvlist_scope = cfl_kvlist_create();
+    if (!kvlist_scope) {
+        goto failure;
+    }
+
+    cfl_kvlist_insert_kvlist(kvlist_record, "resource", kvlist_resource);
+    cfl_kvlist_insert_kvlist(kvlist_record, "scope", kvlist_scope);
+
+    record = flb_mp_chunk_record_create(NULL);
+    if (!record) {
+        goto failure;
+    }
+
+    cobj_meta = cfl_object_create();
+    if (!cobj_meta) {
+        goto failure;
+    }
+    ret = cfl_object_set(cobj_meta, CFL_OBJECT_KVLIST, kvlist_meta);
+    if (ret != 0) {
+        goto failure;
+    }
+
+    cobj_record = cfl_object_create();
+    if (!cobj_record) {
+        goto failure;
+    }
+    ret = cfl_object_set(cobj_record, CFL_OBJECT_KVLIST, kvlist_record);
+    if (ret != 0) {
+        goto failure;
+    }
+
+    /* set the group flag in the timestamp field */
+    flb_time_set(&tm, FLB_LOG_EVENT_GROUP_START, 0);
+    flb_time_copy(&record->event.timestamp, &tm);
+
+    record->modified  = FLB_TRUE;
+    record->cobj_metadata = cobj_meta;
+    record->cobj_record = cobj_record;
+
+    /* add the envelop before the active record */
+    cfl_list_add_before(&record->_head, &active_record->_head, list);
+
+    return record;
+
+failure:
+    if (kvlist_meta) {
+        cfl_kvlist_destroy(kvlist_meta);
+    }
+    if (kvlist_record) {
+        cfl_kvlist_destroy(kvlist_record);
+    }
+    if (kvlist_resource) {
+        cfl_kvlist_destroy(kvlist_resource);
+    }
+    if (kvlist_scope) {
+        cfl_kvlist_destroy(kvlist_scope);
+    }
+    if (cobj_meta) {
+        cfl_object_destroy(cobj_meta);
+    }
+    if (cobj_record) {
+        cfl_object_destroy(cobj_record);
+    }
+    if (record) {
+        flb_mp_chunk_cobj_record_destroy(NULL, record);
+    }
+
+    return NULL;
+}
+
+/* Create an group end */
+static void envelop_end(struct cfl_list *list, struct flb_mp_chunk_record *active_record)
+{
+    struct flb_time tm;
+    struct flb_mp_chunk_record *record;
+
+    /* set the group flag in the timestamp field */
+    record = flb_mp_chunk_record_create(NULL);
+    if (!record) {
+        return;
+    }
+
+    flb_time_set(&tm, FLB_LOG_EVENT_GROUP_END, 0);
+    flb_time_copy(&record->event.timestamp, &tm);
+
+    record->modified  = FLB_TRUE;
+    record->cobj_metadata = NULL;
+    record->cobj_record = NULL;
+
+    /* add the envelop before the active record */
+    cfl_list_add_after(&record->_head, &active_record->_head, list);
+}
+
+
+#include <fluent-bit/flb_pack.h>
+
+/* Logs callback */
+static int cb_process_logs(struct flb_processor_instance *ins,
+                           void *chunk_data, const char *tag, int tag_len)
+{
+    int ret;
+    int record_type;
+    int grouped = FLB_FALSE;
+    struct flb_mp_chunk_record *prev_record;
+    struct flb_mp_chunk_record *record;
+    struct flb_mp_chunk_cobj *chunk_cobj = (struct flb_mp_chunk_cobj *) chunk_data;
+
+
+    /* Iterate records */
+    while (flb_mp_chunk_cobj_record_next(chunk_cobj, &record) == FLB_MP_CHUNK_RECORD_OK) {
+        prev_record = record;
+
+        /* get record type */
+        ret = flb_log_event_decoder_get_record_type(&record->event, &record_type);
+        if (ret != 0) {
+            flb_plg_error(ins, "record has invalid event type");
+            continue;
+        }
+
+        if (record_type == FLB_LOG_EVENT_NORMAL && grouped == FLB_FALSE) {
+            envelop_init(&chunk_cobj->records, record);
+            grouped = FLB_TRUE;
+        }
+        else if (record_type == FLB_LOG_EVENT_GROUP_START && grouped == FLB_TRUE) {
+            envelop_end(&chunk_cobj->records, record);
+            grouped = FLB_FALSE;
+        }
+    }
+
+    if (grouped == FLB_TRUE) {
+        envelop_end(&chunk_cobj->records, prev_record);
+    }
+
+    return FLB_PROCESSOR_SUCCESS;
+}
+
+static struct flb_config_map config_map[] = {
+    /* EOF */
+    {0}
+};
+
+struct flb_processor_plugin processor_opentelemetry_envelope_plugin = {
+    .name               = "opentelemetry_envelope",
+    .description        = "Package log records inside an OpenTelemetry Logs schema",
+    .cb_init            = cb_init,
+    .cb_process_logs    = cb_process_logs,
+    .cb_process_metrics = NULL,
+    .cb_process_traces  = NULL,
+    .cb_exit            = cb_exit,
+    .config_map         = config_map,
+    .flags              = 0,
+};
\ No newline at end of file
diff --git a/src/flb_downstream.c b/src/flb_downstream.c
index fa014a90242..10166dee501 100644
--- a/src/flb_downstream.c
+++ b/src/flb_downstream.c
@@ -60,6 +60,12 @@ struct flb_config_map downstream_net[] = {
      "disabled, the timeout is logged as a debug message"
     },
 
+    {
+     FLB_CONFIG_MAP_BOOL, "net.keepalive", "true",
+     0, FLB_TRUE, offsetof(struct flb_net_setup, keepalive),
+     "Enable or disable Keepalive support"
+    },
+
     /* EOF */
     {0}
 };
@@ -107,6 +113,9 @@ int flb_downstream_setup(struct flb_downstream *stream,
         return -1;
     }
 
+    /* map the net_setup config map coming from the caller */
+    stream->net_setup = net_setup;
+
     mk_list_init(&stream->busy_queue);
     mk_list_init(&stream->destroy_queue);
 
diff --git a/src/flb_http_common.c b/src/flb_http_common.c
index f68d893cbcd..23290f5ccf3 100644
--- a/src/flb_http_common.c
+++ b/src/flb_http_common.c
@@ -88,7 +88,7 @@ char *flb_http_request_get_header(struct flb_http_request *request,
     }
 
     result = flb_hash_table_get(request->headers,
-                                lowercase_name, 
+                                lowercase_name,
                                 strlen(lowercase_name),
                                 &value, &value_length);
 
@@ -103,7 +103,7 @@ char *flb_http_request_get_header(struct flb_http_request *request,
 
 int flb_http_request_set_header(struct flb_http_request *request,
                                 char *name, size_t name_length,
-                                char *value, size_t value_length) 
+                                char *value, size_t value_length)
 {
     char  *lowercase_name;
     int    result;
@@ -121,17 +121,17 @@ int flb_http_request_set_header(struct flb_http_request *request,
 
     if (value_length == 0) {
         if (value[0] == '\0') {
-            value_length = 1; 
+            value_length = 1;
         }
         else {
             value_length = strlen(value);
         }
     }
 
-    result = flb_hash_table_add(request->headers, 
-                                (const char *) lowercase_name, 
+    result = flb_hash_table_add(request->headers,
+                                (const char *) lowercase_name,
                                 name_length,
-                                (void *) value, 
+                                (void *) value,
                                 value_length);
 
     flb_free(lowercase_name);
@@ -156,7 +156,7 @@ int flb_http_request_unset_header(struct flb_http_request *request,
         return -1;
     }
 
-    result = flb_hash_table_del(request->headers, 
+    result = flb_hash_table_del(request->headers,
                                 (const char *) lowercase_name);
 
     flb_free(lowercase_name);
@@ -213,7 +213,7 @@ void flb_http_response_destroy(struct flb_http_response *response)
 }
 
 struct flb_http_response *flb_http_response_begin(
-                                struct flb_http_server_session *session, 
+                                struct flb_http_server_session *session,
                                 void *stream)
 {
     if (session->version == HTTP_PROTOCOL_HTTP2) {
@@ -226,17 +226,29 @@ struct flb_http_response *flb_http_response_begin(
 
 int flb_http_response_commit(struct flb_http_response *response)
 {
+    int len;
+    char tmp[64];
     struct flb_http_server_session *session;
 
+    session = (struct flb_http_server_session *) response->stream->parent;
+
     if (response->body == NULL) {
-        flb_http_response_set_header(response, 
-                                     "content-length", 
+        flb_http_response_set_header(response,
+                                     "content-length",
                                      strlen("content-length"),
-                                     "0", 
+                                     "0",
                                      1);
     }
-
-    session = (struct flb_http_server_session *) response->stream->parent;
+    else {
+        /* if the session is HTTP/1.x, always set the content-length header */
+        if (session->version < HTTP_PROTOCOL_HTTP2) {
+            len = snprintf(tmp, sizeof(tmp) - 1, "%zu", cfl_sds_len(response->body));
+            flb_http_response_set_header(response,
+                                         "content-length",
+                                         strlen("content-length"),
+                                         tmp, len);
+        }
+    }
 
     if (session->version == HTTP_PROTOCOL_HTTP2) {
         return flb_http2_response_commit(response);
@@ -245,7 +257,7 @@ int flb_http_response_commit(struct flb_http_response *response)
     return flb_http1_response_commit(response);
 }
 
-int flb_http_response_set_header(struct flb_http_response *response, 
+int flb_http_response_set_header(struct flb_http_response *response,
                              char *name, size_t name_length,
                              char *value, size_t value_length)
 {
@@ -257,7 +269,7 @@ int flb_http_response_set_header(struct flb_http_response *response,
 
     if (value_length == 0) {
         if (value[0] == '\0') {
-            value_length = 1; 
+            value_length = 1;
         }
         else {
             value_length = strlen(value);
@@ -267,18 +279,18 @@ int flb_http_response_set_header(struct flb_http_response *response,
     session = (struct flb_http_server_session *) response->stream->parent;
 
     if (session->version == HTTP_PROTOCOL_HTTP2) {
-        return flb_http2_response_set_header(response, 
-                                         name, name_length, 
+        return flb_http2_response_set_header(response,
+                                         name, name_length,
                                          value, value_length);
     }
     else {
-        return flb_http1_response_set_header(response, 
-                                         name, name_length, 
+        return flb_http1_response_set_header(response,
+                                         name, name_length,
                                          value, value_length);
     }
 }
 
-int flb_http_response_set_trailer_header(struct flb_http_response *response, 
+int flb_http_response_set_trailer_header(struct flb_http_response *response,
                                          char *name, size_t name_length,
                                          char *value, size_t value_length)
 {
@@ -291,7 +303,7 @@ int flb_http_response_set_trailer_header(struct flb_http_response *response,
 
     if (value_length == 0) {
         if (value[0] == '\0') {
-            value_length = 1; 
+            value_length = 1;
         }
         else {
             value_length = strlen(value);
@@ -305,10 +317,10 @@ int flb_http_response_set_trailer_header(struct flb_http_response *response,
         return -1;
     }
 
-    result = flb_hash_table_add(response->trailer_headers, 
-                                (const char *) lowercase_name, 
+    result = flb_hash_table_add(response->trailer_headers,
+                                (const char *) lowercase_name,
                                 name_length,
-                                (void *) value, 
+                                (void *) value,
                                 value_length);
 
     flb_free(lowercase_name);
@@ -320,7 +332,7 @@ int flb_http_response_set_trailer_header(struct flb_http_response *response,
     return 0;
 }
 
-int flb_http_response_set_status(struct flb_http_response *response, 
+int flb_http_response_set_status(struct flb_http_response *response,
                              int status)
 {
     struct flb_http_server_session *session;
@@ -336,7 +348,7 @@ int flb_http_response_set_status(struct flb_http_response *response,
     return flb_http1_response_set_status(response, status);
 }
 
-int flb_http_response_set_message(struct flb_http_response *response, 
+int flb_http_response_set_message(struct flb_http_response *response,
                                      char *message)
 {
     if (response->message != NULL) {
@@ -346,7 +358,7 @@ int flb_http_response_set_message(struct flb_http_response *response,
     }
 
     response->message = cfl_sds_create((const char *) message);
-    
+
     if (response->message == NULL) {
         return -1;
     }
@@ -354,7 +366,7 @@ int flb_http_response_set_message(struct flb_http_response *response,
     return 0;
 }
 
-int flb_http_response_set_body(struct flb_http_response *response, 
+int flb_http_response_set_body(struct flb_http_response *response,
                            unsigned char *body, size_t body_length)
 {
     struct flb_http_server_session *session;
@@ -362,7 +374,7 @@ int flb_http_response_set_body(struct flb_http_response *response,
     session = (struct flb_http_server_session *) response->stream->parent;
 
     response->body = cfl_sds_create_len((const char *) body, body_length);
-    
+
     if (session->version == HTTP_PROTOCOL_HTTP2) {
         return flb_http2_response_set_body(response, body, body_length);
     }
@@ -373,7 +385,7 @@ int flb_http_response_set_body(struct flb_http_response *response,
 /* HTTP STREAM */
 
 int flb_http_stream_init(struct flb_http_stream *stream,
-                     void *parent, 
+                     void *parent,
                      int32_t stream_id,
                      int role,
                      void *user_data)
@@ -405,7 +417,7 @@ int flb_http_stream_init(struct flb_http_stream *stream,
     return 0;
 }
 
-struct flb_http_stream *flb_http_stream_create(void *parent, 
+struct flb_http_stream *flb_http_stream_create(void *parent,
                                            int32_t stream_id,
                                            int role,
                                            void *user_data)
diff --git a/src/flb_input.c b/src/flb_input.c
index 7b614ccdb44..d3d8052f1b5 100644
--- a/src/flb_input.c
+++ b/src/flb_input.c
@@ -308,6 +308,7 @@ struct flb_input_instance *flb_input_new(struct flb_config *config,
         instance->tls                   = NULL;
         instance->tls_debug             = -1;
         instance->tls_verify            = FLB_TRUE;
+        instance->tls_verify_hostname   = FLB_FALSE;
         instance->tls_vhost             = NULL;
         instance->tls_ca_path           = NULL;
         instance->tls_ca_file           = NULL;
@@ -553,6 +554,10 @@ int flb_input_set_property(struct flb_input_instance *ins,
         ins->tls_verify = flb_utils_bool(tmp);
         flb_sds_destroy(tmp);
     }
+    else if (prop_key_check("tls.verify_hostname", k, len) == 0 && tmp) {
+        ins->tls_verify_hostname = flb_utils_bool(tmp);
+        flb_sds_destroy(tmp);
+    }
     else if (prop_key_check("tls.debug", k, len) == 0 && tmp) {
         ins->tls_debug = atoi(tmp);
         flb_sds_destroy(tmp);
@@ -1121,6 +1126,16 @@ int flb_input_instance_init(struct flb_input_instance *ins,
 
             return -1;
         }
+
+        if (ins->tls_verify_hostname == FLB_TRUE) {
+            ret = flb_tls_set_verify_hostname(ins->tls, ins->tls_verify_hostname);
+            if (ret == -1) {
+                flb_error("[input %s] error set up to verify hostname in TLS context",
+                          ins->name);
+
+                return -1;
+            }
+        }
     }
 
     struct flb_config_map *m;
diff --git a/src/flb_metrics.c b/src/flb_metrics.c
index 5ac4e6af2d2..5b50b138c39 100644
--- a/src/flb_metrics.c
+++ b/src/flb_metrics.c
@@ -78,6 +78,9 @@ struct flb_metrics *flb_metrics_create(const char *title)
 {
     int ret;
     struct flb_metrics *metrics;
+    size_t title_len = 0;
+    char *allocated_title = NULL;
+    size_t threshold = FLB_METRIC_LENGTH_LIMIT;
 
     /* Create a metrics parent context */
     metrics = flb_malloc(sizeof(struct flb_metrics));
@@ -87,9 +90,24 @@ struct flb_metrics *flb_metrics_create(const char *title)
     }
     metrics->count = 0;
 
+    title_len = snprintf(NULL, 0, "%s", title);
+
+    if (title_len > threshold) {
+        title_len = threshold;
+        flb_warn("[%s] title '%s' was truncated", __FUNCTION__, title);
+    }
+
+    allocated_title = flb_calloc(title_len + 1, sizeof(char));
+    if (allocated_title == NULL) {
+        flb_free(metrics);
+        return NULL;
+    }
+    metrics->title = allocated_title;
+
     /* Set metrics title */
     ret = flb_metrics_title(title, metrics);
     if (ret == -1) {
+        flb_free(metrics->title);
         flb_free(metrics);
         return NULL;
     }
@@ -102,16 +120,14 @@ struct flb_metrics *flb_metrics_create(const char *title)
 int flb_metrics_title(const char *title, struct flb_metrics *metrics)
 {
     int ret;
-    size_t size = sizeof(metrics->title) - 1;
+    size_t size = snprintf(NULL, 0, "%s", title);
 
     ret = snprintf(metrics->title, size, "%s", title);
     if (ret == -1) {
         flb_errno();
         return -1;
     }
-    else if (ret >= size){
-        flb_warn("[%s] title '%s' was truncated", __FUNCTION__, title);
-    }
+
     metrics->title_len = strlen(metrics->title);
     return 0;
 }
@@ -121,6 +137,7 @@ int flb_metrics_add(int id, const char *title, struct flb_metrics *metrics)
     int ret;
     struct flb_metric *m;
     size_t size;
+    size_t threshold = FLB_METRIC_LENGTH_LIMIT;
 
     /* Create context */
     m = flb_malloc(sizeof(struct flb_metric));
@@ -129,19 +146,27 @@ int flb_metrics_add(int id, const char *title, struct flb_metrics *metrics)
         return -1;
     }
     m->val = 0;
-    size = sizeof(m->title) - 1;
+    size = strlen(title);
+
+    if (size > threshold) {
+        size = threshold;
+        flb_warn("[%s] title '%s' was truncated", __FUNCTION__, title);
+    }
+
+    m->title = flb_calloc(size + 1, sizeof(char));
+    if (m->title == NULL) {
+        flb_free(m);
+        return -1;
+    }
 
     /* Write title */
     ret = snprintf(m->title, size, "%s", title);
     if (ret == -1) {
         flb_errno();
+        flb_free(m->title);
         flb_free(m);
         return -1;
     }
-    else if (ret >= size) {
-        flb_warn("[%s] title '%s' was truncated", __FUNCTION__, title);
-    }
-
     m->title_len = strlen(m->title);
 
     /* Assign an ID */
@@ -150,6 +175,7 @@ int flb_metrics_add(int id, const char *title, struct flb_metrics *metrics)
         if (id_exists(id, metrics) == FLB_TRUE) {
             flb_error("[metrics] id=%i already exists for metric '%s'",
                       id, metrics->title);
+            flb_free(m->title);
             flb_free(m);
             return -1;
         }
@@ -189,10 +215,12 @@ int flb_metrics_destroy(struct flb_metrics *metrics)
     mk_list_foreach_safe(head, tmp, &metrics->list) {
         m = mk_list_entry(head, struct flb_metric, _head);
         mk_list_del(&m->_head);
+        flb_free(m->title);
         flb_free(m);
         count++;
     }
 
+    flb_free(metrics->title);
     flb_free(metrics);
     return count;
 }
diff --git a/src/flb_mp.c b/src/flb_mp.c
index 5baf78839a3..6dc843d9a9d 100644
--- a/src/flb_mp.c
+++ b/src/flb_mp.c
@@ -1055,6 +1055,23 @@ struct flb_mp_chunk_cobj *flb_mp_chunk_cobj_create(struct flb_log_event_encoder
     return chunk_cobj;
 }
 
+static int generate_empty_msgpack_map(char **out_buf, size_t *out_size)
+{
+    msgpack_sbuffer mp_sbuf;
+    msgpack_packer mp_pck;
+
+    /* initialize msgpack buffer */
+    msgpack_sbuffer_init(&mp_sbuf);
+    msgpack_packer_init(&mp_pck, &mp_sbuf, msgpack_sbuffer_write);
+
+    msgpack_pack_map(&mp_pck, 0);
+
+    *out_buf = mp_sbuf.data;
+    *out_size = mp_sbuf.size;
+
+    return 0;
+}
+
 int flb_mp_chunk_cobj_encode(struct flb_mp_chunk_cobj *chunk_cobj, char **out_buf, size_t *out_size)
 {
     int ret;
@@ -1070,9 +1087,6 @@ int flb_mp_chunk_cobj_encode(struct flb_mp_chunk_cobj *chunk_cobj, char **out_bu
     /* Iterate all records */
     cfl_list_foreach(head, &chunk_cobj->records) {
         record = cfl_list_entry(head, struct flb_mp_chunk_record, _head);
-        if (record->modified == FLB_TRUE) {
-            continue;
-        }
 
         ret = flb_log_event_encoder_begin_record(chunk_cobj->log_encoder);
         if (ret == -1) {
@@ -1089,19 +1103,33 @@ int flb_mp_chunk_cobj_encode(struct flb_mp_chunk_cobj *chunk_cobj, char **out_bu
             if (ret == -1) {
                 return -1;
             }
-
-            ret = flb_log_event_encoder_set_metadata_from_raw_msgpack(chunk_cobj->log_encoder, mp_buf, mp_size);
-            if (ret != FLB_EVENT_ENCODER_SUCCESS) {
-                flb_free(mp_buf);
+        }
+        else {
+            ret = generate_empty_msgpack_map(&mp_buf, &mp_size);
+            if (ret == -1) {
                 return -1;
             }
-            flb_free(mp_buf);
         }
 
-        ret = flb_mp_cfl_to_msgpack(record->cobj_record, &mp_buf, &mp_size);
-        if (ret == -1) {
+        ret = flb_log_event_encoder_set_metadata_from_raw_msgpack(chunk_cobj->log_encoder, mp_buf, mp_size);
+        if (ret != FLB_EVENT_ENCODER_SUCCESS) {
+            flb_free(mp_buf);
             return -1;
         }
+        flb_free(mp_buf);
+
+        if (record->cobj_record) {
+            ret = flb_mp_cfl_to_msgpack(record->cobj_record, &mp_buf, &mp_size);
+            if (ret == -1) {
+                return -1;
+            }
+        }
+        else {
+            ret = generate_empty_msgpack_map(&mp_buf, &mp_size);
+            if (ret == -1) {
+                return -1;
+            }
+        }
 
         ret = flb_log_event_encoder_set_body_from_raw_msgpack(chunk_cobj->log_encoder, mp_buf, mp_size);
         if (ret != FLB_EVENT_ENCODER_SUCCESS) {
@@ -1229,8 +1257,7 @@ int flb_mp_chunk_cobj_record_destroy(struct flb_mp_chunk_cobj *chunk_cobj,
         return -1;
     }
 
-
-    if (chunk_cobj->record_pos) {
+    if (chunk_cobj && chunk_cobj->record_pos) {
         first = cfl_list_entry_first(&chunk_cobj->records, struct flb_mp_chunk_record, _head);
         last = cfl_list_entry_last(&chunk_cobj->records, struct flb_mp_chunk_record, _head);
 
diff --git a/src/flb_output.c b/src/flb_output.c
index 98143b4ac8b..1c7853f79f1 100644
--- a/src/flb_output.c
+++ b/src/flb_output.c
@@ -678,6 +678,7 @@ struct flb_output_instance *flb_output_new(struct flb_config *config,
     instance->tls                   = NULL;
     instance->tls_debug             = -1;
     instance->tls_verify            = FLB_TRUE;
+    instance->tls_verify_hostname   = FLB_FALSE;
     instance->tls_vhost             = NULL;
     instance->tls_ca_path           = NULL;
     instance->tls_ca_file           = NULL;
@@ -872,6 +873,10 @@ int flb_output_set_property(struct flb_output_instance *ins,
         ins->tls_verify = flb_utils_bool(tmp);
         flb_sds_destroy(tmp);
     }
+    else if (prop_key_check("tls.verify_hostname", k, len) == 0 && tmp) {
+        ins->tls_verify_hostname = flb_utils_bool(tmp);
+        flb_sds_destroy(tmp);
+    }
     else if (prop_key_check("tls.debug", k, len) == 0 && tmp) {
         ins->tls_debug = atoi(tmp);
         flb_sds_destroy(tmp);
@@ -1249,6 +1254,16 @@ int flb_output_init_all(struct flb_config *config)
                 flb_output_instance_destroy(ins);
                 return -1;
             }
+
+            if (ins->tls_verify_hostname == FLB_TRUE) {
+                ret = flb_tls_set_verify_hostname(ins->tls, ins->tls_verify_hostname);
+                if (ret == -1) {
+                    flb_error("[output %s] error set up to verify hostname in TLS context",
+                              ins->name);
+
+                    return -1;
+                }
+            }
         }
 #endif
         /*
diff --git a/src/flb_pack.c b/src/flb_pack.c
index 05754cfe72d..524277a20e3 100644
--- a/src/flb_pack.c
+++ b/src/flb_pack.c
@@ -476,8 +476,7 @@ static int pack_print_fluent_record(size_t cnt, msgpack_unpacked result)
     flb_time_pop_from_msgpack(&tms, &result, &obj);
     flb_metadata_pop_from_msgpack(&metadata, &result, &obj);
 
-    fprintf(stdout, "[%zd] [%"PRIu32".%09lu, ", cnt,
-            (uint32_t) tms.tm.tv_sec, tms.tm.tv_nsec);
+    fprintf(stdout, "[%zd] [%"PRId32".%09lu, ", cnt, (int32_t) tms.tm.tv_sec, tms.tm.tv_nsec);
 
     msgpack_object_print(stdout, *metadata);
 
diff --git a/src/flb_parser.c b/src/flb_parser.c
index dc78f076fda..8df7f56dfb5 100644
--- a/src/flb_parser.c
+++ b/src/flb_parser.c
@@ -152,6 +152,7 @@ struct flb_parser *flb_parser_create(const char *name, const char *format,
                                      const char *time_offset,
                                      int time_keep,
                                      int time_strict,
+                                     int time_system_timezone,
                                      int logfmt_no_bare_keys,
                                      struct flb_parser_types *types,
                                      int types_len,
@@ -312,8 +313,17 @@ struct flb_parser *flb_parser_create(const char *name, const char *format,
             p->time_frac_secs = (tmp + 2);
         }
 
-        /* Optional fixed timezone offset */
-        if (time_offset) {
+        /* 
+         * Fall back to the system timezone 
+         * if there is no zone parsed from the log.  
+         */
+        p->time_system_timezone = time_system_timezone;
+
+        /* 
+         * Optional fixed timezone offset, only applied if 
+         * not falling back to system timezone. 
+         */
+        if (!p->time_system_timezone && time_offset) {
             diff = 0;
             len = strlen(time_offset);
             ret = flb_parser_tzone_offset(time_offset, len, &diff);
@@ -487,6 +497,7 @@ static int parser_conf_file(const char *cfg, struct flb_cf *cf,
     int skip_empty;
     int time_keep;
     int time_strict;
+    int time_system_timezone;
     int logfmt_no_bare_keys;
     int types_len;
     struct mk_list *head;
@@ -561,6 +572,13 @@ static int parser_conf_file(const char *cfg, struct flb_cf *cf,
             flb_sds_destroy(tmp_str);
         }
 
+        time_system_timezone = FLB_FALSE;
+        tmp_str = get_parser_key(config, cf, s, "time_system_timezone");
+        if (tmp_str) {
+            time_system_timezone = flb_utils_bool(tmp_str);
+            flb_sds_destroy(tmp_str);
+        }
+
         /* time_offset (UTC offset) */
         time_offset = get_parser_key(config, cf, s, "time_offset");
 
@@ -587,7 +605,8 @@ static int parser_conf_file(const char *cfg, struct flb_cf *cf,
         /* Create the parser context */
         if (!flb_parser_create(name, format, regex, skip_empty,
                                time_fmt, time_key, time_offset, time_keep, time_strict,
-                               logfmt_no_bare_keys, types, types_len, decoders, config)) {
+                               time_system_timezone, logfmt_no_bare_keys, types, types_len, 
+                               decoders, config)) {
             goto fconf_error;
         }
 
diff --git a/src/flb_parser_json.c b/src/flb_parser_json.c
index d8552cd7233..1693f766606 100644
--- a/src/flb_parser_json.c
+++ b/src/flb_parser_json.c
@@ -207,7 +207,7 @@ int flb_parser_json_do(struct flb_parser *parser,
         skip = map_size;
     }
     else {
-        time_lookup = flb_parser_tm2time(&tm);
+        time_lookup = flb_parser_tm2time(&tm, parser->time_system_timezone);
     }
 
     /* Compose a new map without the time_key field */
diff --git a/src/flb_parser_logfmt.c b/src/flb_parser_logfmt.c
index 6d88cd6a0e7..12de008230a 100644
--- a/src/flb_parser_logfmt.c
+++ b/src/flb_parser_logfmt.c
@@ -166,7 +166,7 @@ static int logfmt_parser(struct flb_parser *parser,
                                   parser->name, parser->time_fmt_full);
                         return -1;
                     }
-                    *time_lookup = flb_parser_tm2time(&tm);
+                    *time_lookup = flb_parser_tm2time(&tm, parser->time_system_timezone);
                 }
                 time_found = FLB_TRUE;
             }
diff --git a/src/flb_parser_ltsv.c b/src/flb_parser_ltsv.c
index dae458c9a4a..297f528515f 100644
--- a/src/flb_parser_ltsv.c
+++ b/src/flb_parser_ltsv.c
@@ -139,7 +139,7 @@ static int ltsv_parser(struct flb_parser *parser,
                                  parser->name, parser->time_fmt_full);
                        return -1;
                     }
-                    *time_lookup = flb_parser_tm2time(&tm);
+                    *time_lookup = flb_parser_tm2time(&tm, parser->time_system_timezone);
                 }
                 time_found = FLB_TRUE;
             }
diff --git a/src/flb_parser_regex.c b/src/flb_parser_regex.c
index 7982c7d4a42..5dc4a965a75 100644
--- a/src/flb_parser_regex.c
+++ b/src/flb_parser_regex.c
@@ -87,7 +87,7 @@ static void cb_results(const char *name, const char *value,
             }
 
             pcb->time_frac = frac;
-            pcb->time_lookup = flb_parser_tm2time(&tm);
+            pcb->time_lookup = flb_parser_tm2time(&tm, parser->time_system_timezone);
 
             if (parser->time_keep == FLB_FALSE) {
                 pcb->num_skipped++;
diff --git a/src/flb_utils.c b/src/flb_utils.c
index 87637f1331d..2f445980d84 100644
--- a/src/flb_utils.c
+++ b/src/flb_utils.c
@@ -522,7 +522,7 @@ int64_t flb_utils_size_to_bytes(const char *size)
     int i;
     int len;
     int plen = 0;
-    int64_t val;
+    double val;
     char c;
     char tmp[3] = {0};
     int64_t KB = 1000;
@@ -538,7 +538,7 @@ int64_t flb_utils_size_to_bytes(const char *size)
     }
 
     len = strlen(size);
-    val = atoll(size);
+    val = atof(size);
 
     if (len == 0) {
         return -1;
@@ -554,7 +554,7 @@ int64_t flb_utils_size_to_bytes(const char *size)
     }
 
     if (plen == 0) {
-        return val;
+        return (int64_t)val;
     }
     else if (plen > 2) {
         return -1;
@@ -577,27 +577,27 @@ int64_t flb_utils_size_to_bytes(const char *size)
         {
             return -1;
         }
-        return (val * KB);
+        return (int64_t)(val * KB);
     }
     else if (tmp[0] == 'M') {
         /* set upper bound (2**64/MB)/2 to avoid overflows */
         if (val >= 9223372036854 || val <= -9223372036853) {
             return -1;
         }
-        return (val * MB);
+        return (int64_t)(val * MB);
     }
     else if (tmp[0] == 'G') {
         /* set upper bound (2**64/GB)/2 to avoid overflows */
         if (val >= 9223372036 || val <= -9223372035) {
             return -1;
         }
-        return (val * GB);
+        return (int64_t)(val * GB);
     }
     else {
         return -1;
     }
 
-    return val;
+    return (int64_t)val;
 }
 
 int64_t flb_utils_hex2int(char *hex, int len)
diff --git a/src/http_server/flb_http_server.c b/src/http_server/flb_http_server.c
index 302ded9be6a..d3969090aeb 100644
--- a/src/http_server/flb_http_server.c
+++ b/src/http_server/flb_http_server.c
@@ -56,7 +56,7 @@ int uncompress_gzip(char **output_buffer,
 
 /* COMMON */
 
-char *flb_http_server_convert_string_to_lowercase(char *input_buffer, 
+char *flb_http_server_convert_string_to_lowercase(char *input_buffer,
                                                   size_t length)
 {
     char  *output_buffer;
@@ -75,9 +75,9 @@ char *flb_http_server_convert_string_to_lowercase(char *input_buffer,
 }
 
 
-int flb_http_server_strncasecmp(const uint8_t *first_buffer, 
+int flb_http_server_strncasecmp(const uint8_t *first_buffer,
                                 size_t first_length,
-                                const char *second_buffer, 
+                                const char *second_buffer,
                                 size_t second_length)
 {
     const char *first_buffer_;
@@ -89,11 +89,11 @@ int flb_http_server_strncasecmp(const uint8_t *first_buffer,
     if (first_length == 0) {
         first_length = strlen(first_buffer_);
     }
-    
+
     if (second_length == 0) {
         second_length = strlen(second_buffer_);
     }
-    
+
     if (first_length < second_length) {
         return -1;
     }
@@ -123,8 +123,8 @@ static int flb_http_server_session_read(struct flb_http_server_session *session)
         return -1;
     }
 
-    result = (ssize_t) flb_http_server_session_ingest(session, 
-                                                      input_buffer, 
+    result = (ssize_t) flb_http_server_session_ingest(session,
+                                                      input_buffer,
                                                       result);
 
     if (result < 0) {
@@ -161,11 +161,11 @@ static int flb_http_server_session_write(struct flb_http_server_session *session
         }
 
         if (data_sent < data_length) {
-            memmove(session->outgoing_data, 
-                    &session->outgoing_data[data_sent], 
+            memmove(session->outgoing_data,
+                    &session->outgoing_data[data_sent],
                     data_length - data_sent);
 
-            cfl_sds_set_len(session->outgoing_data, 
+            cfl_sds_set_len(session->outgoing_data,
                             data_length - data_sent);
         }
         else {
@@ -204,7 +204,7 @@ static int flb_http_server_inflate_request_body(
     }
 
     content_encoding_header_value = flb_http_request_get_header(
-                                        request, 
+                                        request,
                                         "content-encoding");
 
     if (content_encoding_header_value == NULL) {
@@ -255,13 +255,13 @@ static int flb_http_server_inflate_request_body(
 
         request->body = inflated_body;
 
-        snprintf(new_content_length, 
-                 sizeof(new_content_length), 
+        snprintf(new_content_length,
+                 sizeof(new_content_length),
                  "%zu",
                  output_size);
 
         flb_http_request_unset_header(request, "content-encoding");
-        flb_http_request_set_header(request, 
+        flb_http_request_set_header(request,
                                     "content-length", strlen("content-length"),
                                     new_content_length, strlen(new_content_length));
 
@@ -274,13 +274,24 @@ static int flb_http_server_inflate_request_body(
 static int flb_http_server_should_connection_be_closed(
     struct flb_http_request *request)
 {
-    char                            *connection_header_value;
+    int keepalive = FLB_FALSE;
+    char *connection_header_value;
     struct flb_http_server_session  *parent_session;
     struct flb_http_server          *server;
+    struct flb_downstream *downstream;
 
     parent_session = (struct flb_http_server_session *) request->stream->parent;
 
     server = parent_session->parent;
+    downstream = server->downstream;
+
+     /*
+      * user config overrides any protocol defaults, this is set
+      * with the option 'net.keepalive: off`
+      */
+    if (!downstream->net_setup->keepalive) {
+        return FLB_TRUE;
+    }
 
     /* Version behaviors implemented in the following block :
      * HTTP/0.9 keep-alive is opt-in
@@ -290,27 +301,34 @@ static int flb_http_server_should_connection_be_closed(
      */
 
     if (request->protocol_version < HTTP_PROTOCOL_VERSION_20) {
-        if ((server->flags & FLB_HTTP_SERVER_FLAG_KEEPALIVE) == 0) {
-            return FLB_TRUE;
-        }
-        else {
-            connection_header_value = flb_http_request_get_header(request, 
-                                                                  "connection");
+        /* HTTP/2 always keeps the connection open */
+        return FLB_FALSE;
+    }
 
-            if (connection_header_value == NULL) {
-                if (request->protocol_version < HTTP_PROTOCOL_VERSION_11) {
-                    return FLB_TRUE;
-                }
-            }
-            else {
-                if (strcasecmp(connection_header_value, "keep-alive") != 0) {
-                    return FLB_TRUE;
-                }
-            }
-        }
+    /* Set the defaults per protocol version */
+    if (request->protocol_version == HTTP_PROTOCOL_VERSION_09) {
+        keepalive = FLB_FALSE;
+    }
+    else if (request->protocol_version == HTTP_PROTOCOL_VERSION_10) {
+        keepalive = FLB_FALSE;
+    }
+    else if (request->protocol_version == HTTP_PROTOCOL_VERSION_11) {
+        keepalive = FLB_TRUE;
+    }
+
+    /* Override protocol defaults by checking connection header */
+    connection_header_value = flb_http_request_get_header(request,
+                                                          "connection");
+    if (connection_header_value &&
+        strcasecmp(connection_header_value, "keep-alive") == 0) {
+        keepalive = FLB_TRUE;
+    }
+
+    if (keepalive) {
+        return FLB_FALSE;
     }
 
-    return FLB_FALSE;
+    return FLB_TRUE;
 }
 
 static int flb_http_server_client_activity_event_handler(void *data)
@@ -326,7 +344,7 @@ static int flb_http_server_client_activity_event_handler(void *data)
     struct flb_http_stream         *stream;
     int                             result;
     struct mk_event                *event;
-    
+
     connection = (struct flb_connection *) data;
 
     session = (struct flb_http_server_session *) connection->user_data;
@@ -347,8 +365,8 @@ static int flb_http_server_client_activity_event_handler(void *data)
 
     close_connection = FLB_FALSE;
 
-    cfl_list_foreach_safe(iterator, 
-                            backup_iterator, 
+    cfl_list_foreach_safe(iterator,
+                            backup_iterator,
                             &session->request_queue) {
         request = cfl_list_entry(iterator, struct flb_http_request, _head);
 
@@ -455,7 +473,7 @@ static int flb_http_server_client_connection_event_handler(void *data)
 
 /* HTTP SERVER */
 
-int flb_http_server_init(struct flb_http_server *session, 
+int flb_http_server_init(struct flb_http_server *session,
                          int protocol_version,
                          uint64_t flags,
                          flb_http_server_request_processor_callback
@@ -549,23 +567,23 @@ int flb_http_server_stop(struct flb_http_server *server)
         }
 
         mk_list_foreach_safe(iterator, iterator_backup, &server->clients) {
-            session = cfl_list_entry(iterator, 
-                                     struct flb_http_server_session, 
+            session = cfl_list_entry(iterator,
+                                     struct flb_http_server_session,
                                      _head);
-                                     
+
             flb_http_server_session_destroy(session);
         }
 
         server->status = HTTP_SERVER_STOPPED;
     }
-    
+
     return 0;
 }
 
 int flb_http_server_destroy(struct flb_http_server *server)
 {
     flb_http_server_stop(server);
-    
+
     if (server->downstream != NULL) {
         flb_downstream_destroy(server->downstream);
 
@@ -668,17 +686,17 @@ void flb_http_server_session_destroy(struct flb_http_server_session *session)
     }
 }
 
-int flb_http_server_session_ingest(struct flb_http_server_session *session, 
-                            unsigned char *buffer, 
+int flb_http_server_session_ingest(struct flb_http_server_session *session,
+                            unsigned char *buffer,
                             size_t length)
 {
     cfl_sds_t resized_buffer;
     int       result;
 
-    if (session->version == HTTP_PROTOCOL_AUTODETECT || 
+    if (session->version == HTTP_PROTOCOL_AUTODETECT ||
         session->version == HTTP_PROTOCOL_HTTP1) {
-        resized_buffer = cfl_sds_cat(session->incoming_data, 
-                                     (const char *) buffer, 
+        resized_buffer = cfl_sds_cat(session->incoming_data,
+                                     (const char *) buffer,
                                      length);
 
         if (resized_buffer == NULL) {
@@ -690,8 +708,8 @@ int flb_http_server_session_ingest(struct flb_http_server_session *session,
 
     if (session->version == HTTP_PROTOCOL_AUTODETECT) {
         if (cfl_sds_len(session->incoming_data) >= 24) {
-            if (strncmp(session->incoming_data, 
-                        "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n", 
+            if (strncmp(session->incoming_data,
+                        "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n",
                         24) == 0) {
                 session->version = HTTP_PROTOCOL_HTTP2;
             }
@@ -722,13 +740,13 @@ int flb_http_server_session_ingest(struct flb_http_server_session *session,
     }
 
     if (session->version == HTTP_PROTOCOL_HTTP1) {
-        return flb_http1_server_session_ingest(&session->http1, 
-                                               buffer, 
+        return flb_http1_server_session_ingest(&session->http1,
+                                               buffer,
                                                length);
     }
     else if (session->version == HTTP_PROTOCOL_HTTP2) {
-        return flb_http2_server_session_ingest(&session->http2, 
-                                               buffer, 
+        return flb_http2_server_session_ingest(&session->http2,
+                                               buffer,
                                                length);
     }
 
diff --git a/src/multiline/flb_ml_parser_cri.c b/src/multiline/flb_ml_parser_cri.c
index 1a4ac9bbc5a..e4bd6a0e0f3 100644
--- a/src/multiline/flb_ml_parser_cri.c
+++ b/src/multiline/flb_ml_parser_cri.c
@@ -40,6 +40,7 @@ static struct flb_parser *cri_parser_create(struct flb_config *config)
                           NULL,                    /* time offset */
                           FLB_TRUE,                /* time keep */
                           FLB_FALSE,               /* time strict */
+                          FLB_FALSE,               /* time system timezone */
                           FLB_FALSE,               /* no bare keys */
                           NULL,                    /* parser types */
                           0,                       /* types len */
diff --git a/src/multiline/flb_ml_parser_docker.c b/src/multiline/flb_ml_parser_docker.c
index 0573affab33..51550f3893e 100644
--- a/src/multiline/flb_ml_parser_docker.c
+++ b/src/multiline/flb_ml_parser_docker.c
@@ -35,6 +35,7 @@ static struct flb_parser *docker_parser_create(struct flb_config *config)
                           NULL,                   /* time offset */
                           FLB_TRUE,               /* time keep */
                           FLB_FALSE,              /* time strict */
+                          FLB_FALSE,              /* time system timezone */
                           FLB_FALSE,              /* no bare keys */
                           NULL,                   /* parser types */
                           0,                      /* types len */
diff --git a/src/tls/flb_tls.c b/src/tls/flb_tls.c
index 8510381a850..6377caec783 100644
--- a/src/tls/flb_tls.c
+++ b/src/tls/flb_tls.c
@@ -74,6 +74,12 @@ struct flb_config_map tls_configmap[] = {
      "Hostname to be used for TLS SNI extension"
     },
 
+    {
+     FLB_CONFIG_MAP_BOOL, "tls.verify_hostname", "off",
+     0, FLB_FALSE, 0,
+     "Enable or disable to verify hostname"
+    },
+
     /* EOF */
     {0}
 };
@@ -191,6 +197,7 @@ struct flb_tls *flb_tls_create(int mode,
     tls->verify = verify;
     tls->debug = debug;
     tls->mode = mode;
+    tls->verify_hostname = FLB_FALSE;
 
     if (vhost != NULL) {
         tls->vhost = flb_strdup(vhost);
@@ -231,6 +238,16 @@ int flb_tls_set_alpn(struct flb_tls *tls, const char *alpn)
     return 0;
 }
 
+int flb_tls_set_verify_hostname(struct flb_tls *tls, int verify_hostname)
+{
+    if (!tls) {
+        return -1;
+    }
+
+    tls->verify_hostname = !!verify_hostname;
+
+    return 0;
+}
 
 int flb_tls_net_read(struct flb_tls_session *session, void *buf, size_t len)
 {
diff --git a/src/tls/openssl.c b/src/tls/openssl.c
index e74ab65e20e..a594bc9578c 100644
--- a/src/tls/openssl.c
+++ b/src/tls/openssl.c
@@ -152,7 +152,7 @@ int tls_context_alpn_set(void *ctx_backend, const char *alpn)
     result = 0;
 
     if (alpn != NULL) {
-        wire_format_alpn = flb_calloc(strlen(alpn), 
+        wire_format_alpn = flb_calloc(strlen(alpn),
                                       sizeof(char) + 1);
 
         if (wire_format_alpn == NULL) {
@@ -163,15 +163,15 @@ int tls_context_alpn_set(void *ctx_backend, const char *alpn)
 
         if (alpn_working_copy == NULL) {
             flb_free(wire_format_alpn);
-            
+
             return -1;
         }
 
         wire_format_alpn_index = 1;
         alpn_token_context = NULL;
 
-        alpn_token = strtok_r(alpn_working_copy, 
-                              ",", 
+        alpn_token = strtok_r(alpn_working_copy,
+                              ",",
                               &alpn_token_context);
 
         while (alpn_token != NULL) {
@@ -183,8 +183,8 @@ int tls_context_alpn_set(void *ctx_backend, const char *alpn)
 
             wire_format_alpn_index += strlen(alpn_token) + 1;
 
-            alpn_token = strtok_r(NULL, 
-                                  ",", 
+            alpn_token = strtok_r(NULL,
+                                  ",",
                                   &alpn_token_context);
         }
 
@@ -220,8 +220,8 @@ static int tls_context_server_alpn_select_callback(SSL *ssl,
     if (ctx->alpn != NULL) {
         result = SSL_select_next_proto((unsigned char **) out,
                                        outlen,
-                                       &ctx->alpn[1], 
-                                       (unsigned int) ctx->alpn[0], 
+                                       &ctx->alpn[1],
+                                       (unsigned int) ctx->alpn[0],
                                        in,
                                        inlen);
 
@@ -235,7 +235,7 @@ static int tls_context_server_alpn_select_callback(SSL *ssl,
 
     return result;
 }
-      
+
 #ifdef _MSC_VER
 static int windows_load_system_certificates(struct tls_context *ctx)
 {
@@ -305,7 +305,7 @@ static int load_system_certificates(struct tls_context *ctx)
     }
     return 0;
 }
-  
+
 static void *tls_context_create(int verify,
                                 int debug,
                                 int mode,
@@ -369,8 +369,8 @@ static void *tls_context_create(int verify,
     pthread_mutex_init(&ctx->mutex, NULL);
 
     if (mode == FLB_TLS_SERVER_MODE) {
-        SSL_CTX_set_alpn_select_cb(ssl_ctx, 
-                                   tls_context_server_alpn_select_callback, 
+        SSL_CTX_set_alpn_select_cb(ssl_ctx,
+                                   tls_context_server_alpn_select_callback,
                                    ctx);
     }
 
@@ -578,6 +578,8 @@ static int tls_net_write(struct flb_tls_session *session,
                          const void *data, size_t len)
 {
     int ret;
+    int ssl_ret;
+    int err_code;
     char err_buf[256];
     size_t total = 0;
     struct tls_context *ctx;
@@ -601,18 +603,28 @@ static int tls_net_write(struct flb_tls_session *session,
                     len - total);
 
     if (ret <= 0) {
-        ret = SSL_get_error(backend_session->ssl, ret);
+        ssl_ret = SSL_get_error(backend_session->ssl, ret);
 
-        if (ret == SSL_ERROR_WANT_WRITE) {
+        if (ssl_ret == SSL_ERROR_WANT_WRITE) {
             ret = FLB_TLS_WANT_WRITE;
         }
-        else if (ret == SSL_ERROR_WANT_READ) {
+        else if (ssl_ret == SSL_ERROR_WANT_READ) {
             ret = FLB_TLS_WANT_READ;
         }
-        else if (ret == SSL_ERROR_SYSCALL) {
-            flb_errno();
-            ERR_error_string_n(ret, err_buf, sizeof(err_buf)-1);
-            flb_error("[tls] syscall error: %s", err_buf);
+        else if (ssl_ret == SSL_ERROR_SYSCALL) {
+            if (ERR_get_error() == 0) {
+                if (ret == 0) {
+                    flb_debug("[tls] connection closed");
+                }
+                else {
+                    flb_error("[tls] syscall error: %s", strerror(errno));
+                }
+            }
+            else {
+                err_code = ERR_get_error();
+                ERR_error_string_n(err_code, err_buf, sizeof(err_buf) - 1);
+                flb_error("[tls] syscall error: %s", err_buf);
+            }
 
             /* According to the documentation these are non-recoverable
              * errors so we don't need to screen them before saving them
@@ -624,9 +636,14 @@ static int tls_net_write(struct flb_tls_session *session,
             ret = -1;
         }
         else {
-            ERR_error_string_n(ret, err_buf, sizeof(err_buf)-1);
-            flb_error("[tls] error: %s", err_buf);
-
+            err_code = ERR_get_error();
+            if (err_code == 0) {
+                flb_error("[tls] unknown error");
+            }
+            else {
+                ERR_error_string_n(err_code, err_buf, sizeof(err_buf) - 1);
+                flb_error("[tls] error: %s", err_buf);
+            }
             ret = -1;
         }
     }
@@ -692,7 +709,8 @@ static int tls_net_handshake(struct flb_tls *tls,
         }
     }
 
-    if (tls->verify == FLB_TRUE) {
+    if (tls->verify == FLB_TRUE &&
+        tls->verify_hostname == FLB_TRUE) {
         if (vhost != NULL) {
             ret = setup_hostname_validation(session, vhost);
         }
diff --git a/tests/internal/fuzzers/engine_fuzzer.c b/tests/internal/fuzzers/engine_fuzzer.c
index 498b86a8fcc..5d7e9ab802b 100644
--- a/tests/internal/fuzzers/engine_fuzzer.c
+++ b/tests/internal/fuzzers/engine_fuzzer.c
@@ -143,7 +143,7 @@ int LLVMFuzzerInitialize(int *argc, char ***argv) {
 
     parser = flb_parser_create("timestamp", "regex", "^(?<time>.*)$", FLB_TRUE,
                                 "%s.%L", "time", NULL, MK_FALSE, 0, FLB_FALSE,
-                               NULL, 0, NULL, ctx->config);
+                               FLB_FALSE, NULL, 0, NULL, ctx->config);
     filter_ffd = flb_filter(ctx, (char *) "parser", NULL);
     int ret;
     ret = flb_filter_set(ctx, filter_ffd, "Match", "test",
diff --git a/tests/internal/fuzzers/parse_json_fuzzer.c b/tests/internal/fuzzers/parse_json_fuzzer.c
index dab8880d89c..b809436e7cb 100644
--- a/tests/internal/fuzzers/parse_json_fuzzer.c
+++ b/tests/internal/fuzzers/parse_json_fuzzer.c
@@ -51,7 +51,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size){
     }
 
     fuzz_parser = flb_parser_create("fuzzer", "json", NULL, FLB_TRUE, NULL,
-                                    NULL, NULL, MK_FALSE, MK_TRUE, FLB_FALSE,
+                                    NULL, NULL, MK_FALSE, MK_TRUE, FLB_FALSE, FLB_FALSE,
                                     NULL, 0, NULL, fuzz_config);
     if (fuzz_parser) {
         flb_parser_do(fuzz_parser, (char*)data, size,
diff --git a/tests/internal/fuzzers/parse_logfmt_fuzzer.c b/tests/internal/fuzzers/parse_logfmt_fuzzer.c
index c65a2adbcd5..b0d0d63deed 100644
--- a/tests/internal/fuzzers/parse_logfmt_fuzzer.c
+++ b/tests/internal/fuzzers/parse_logfmt_fuzzer.c
@@ -32,8 +32,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size){
     }
     fuzz_parser = flb_parser_create("fuzzer", "logfmt", NULL, FLB_TRUE,
                                     NULL, NULL, NULL, MK_FALSE,
-                                    MK_TRUE, FLB_FALSE, NULL, 0, NULL,
-                                    fuzz_config);
+                                    MK_TRUE, FLB_FALSE, FLB_FALSE, NULL, 0,
+                                    NULL, fuzz_config);
     if (fuzz_parser) {
         flb_parser_do(fuzz_parser, (char*)data, size,
                       &out_buf, &out_size, &out_time);
diff --git a/tests/internal/fuzzers/parse_ltsv_fuzzer.c b/tests/internal/fuzzers/parse_ltsv_fuzzer.c
index cb8bf95a58f..e170d39a297 100644
--- a/tests/internal/fuzzers/parse_ltsv_fuzzer.c
+++ b/tests/internal/fuzzers/parse_ltsv_fuzzer.c
@@ -19,8 +19,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size){
     fuzz_config = flb_config_init();
     fuzz_parser = flb_parser_create("fuzzer", "ltsv", NULL, FLB_TRUE,
                                     NULL, NULL, NULL, MK_FALSE, 
-                                    MK_TRUE, FLB_FALSE, NULL, 0, NULL,
-                                    fuzz_config);
+                                    MK_TRUE, FLB_FALSE, FLB_FALSE, NULL, 0,
+                                    NULL, fuzz_config);
     flb_parser_do(fuzz_parser, (char*)data, size,
                   &out_buf, &out_size, &out_time);
 
diff --git a/tests/internal/fuzzers/parser_fuzzer.c b/tests/internal/fuzzers/parser_fuzzer.c
index a035555166c..d99b91e6acf 100644
--- a/tests/internal/fuzzers/parser_fuzzer.c
+++ b/tests/internal/fuzzers/parser_fuzzer.c
@@ -154,7 +154,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
     /* now call into the parser */
     fuzz_parser = flb_parser_create("fuzzer", format, pregex, FLB_TRUE,
             time_fmt, time_key, time_offset, time_keep, 0, FLB_FALSE,
-            types, types_len, list, fuzz_config);
+            FLB_FALSE, types, types_len, list, fuzz_config);
 
     /* Second step is to use the random parser to parse random input */
     if (fuzz_parser != NULL) {
diff --git a/tests/internal/parser.c b/tests/internal/parser.c
index 6a560db716c..b7b4eab876b 100644
--- a/tests/internal/parser.c
+++ b/tests/internal/parser.c
@@ -231,7 +231,7 @@ void test_parser_time_lookup()
             continue;
         }
 
-        epoch = flb_parser_tm2time(&tm);
+        epoch = flb_parser_tm2time(&tm, FLB_FALSE);
         epoch -= year_diff;
         TEST_CHECK(t->epoch == epoch);
         TEST_CHECK(t->frac_seconds == ns);
diff --git a/tests/internal/parser_json.c b/tests/internal/parser_json.c
index 5a9b6eadbfe..f09f9675794 100644
--- a/tests/internal/parser_json.c
+++ b/tests/internal/parser_json.c
@@ -171,7 +171,7 @@ void test_basic()
     }
 
     parser = flb_parser_create("json", "json", NULL, FLB_FALSE, NULL, NULL, NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -223,7 +223,7 @@ void test_time_key()
     }
 
     parser = flb_parser_create("json", "json", NULL, FLB_FALSE, "%Y-%m-%dT%H:%M:%S.%L", "time", NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -284,7 +284,7 @@ void test_time_keep()
     }
 
     parser = flb_parser_create("json", "json", NULL, FLB_FALSE, "%Y-%m-%dT%H:%M:%S.%L", "time", NULL,
-                               FLB_TRUE /*time_keep */, FLB_FALSE, FLB_FALSE,
+                               FLB_TRUE /*time_keep */, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -365,7 +365,7 @@ void test_types_is_not_supported()
     types->type = FLB_PARSER_TYPE_HEX;
 
     parser = flb_parser_create("json", "json", NULL, FLB_FALSE, NULL, NULL, NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                types, 1, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -450,7 +450,7 @@ void test_decode_field_json()
     }
 
     parser = flb_parser_create("json", "json", NULL, FLB_FALSE, NULL, NULL, NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, decoder, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -505,7 +505,7 @@ void test_time_key_kept_if_parse_fails()
     }
 
     parser = flb_parser_create("json", "json", NULL, FLB_FALSE, time_format, "time", NULL,
-                               FLB_FALSE, FLB_TRUE, FLB_FALSE,
+                               FLB_FALSE, FLB_TRUE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
diff --git a/tests/internal/parser_logfmt.c b/tests/internal/parser_logfmt.c
index ea363c53ab2..3e644ee2d53 100644
--- a/tests/internal/parser_logfmt.c
+++ b/tests/internal/parser_logfmt.c
@@ -171,7 +171,7 @@ void test_basic()
     }
 
     parser = flb_parser_create("logfmt", "logfmt", NULL, FLB_FALSE, NULL, NULL, NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -223,7 +223,7 @@ void test_time_key()
     }
 
     parser = flb_parser_create("logfmt", "logfmt", NULL, FLB_FALSE, "%Y-%m-%dT%H:%M:%S.%L", "time", NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -284,7 +284,7 @@ void test_time_keep()
     }
 
     parser = flb_parser_create("logfmt", "logfmt", NULL, FLB_FALSE, "%Y-%m-%dT%H:%M:%S.%L", "time", NULL,
-                               FLB_TRUE /*time_keep */, FLB_FALSE, FLB_FALSE,
+                               FLB_TRUE /*time_keep */, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -361,7 +361,7 @@ void test_types()
     types->type = FLB_PARSER_TYPE_HEX;
 
     parser = flb_parser_create("logfmt", "logfmt", NULL, FLB_FALSE, NULL, NULL, NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                types, 1, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
diff --git a/tests/internal/parser_ltsv.c b/tests/internal/parser_ltsv.c
index 3f9170518aa..c4592c7f2ae 100644
--- a/tests/internal/parser_ltsv.c
+++ b/tests/internal/parser_ltsv.c
@@ -171,7 +171,7 @@ void test_basic()
     }
 
     parser = flb_parser_create("ltsv", "ltsv", NULL, FLB_FALSE, NULL, NULL, NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -223,7 +223,7 @@ void test_time_key()
     }
 
     parser = flb_parser_create("ltsv", "ltsv", NULL, FLB_FALSE, "%Y-%m-%dT%H:%M:%S.%L", "time", NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -284,7 +284,7 @@ void test_time_keep()
     }
 
     parser = flb_parser_create("ltsv", "ltsv", NULL, FLB_FALSE, "%Y-%m-%dT%H:%M:%S.%L", "time", NULL,
-                               FLB_TRUE /*time_keep */, FLB_FALSE, FLB_FALSE,
+                               FLB_TRUE /*time_keep */, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -361,7 +361,7 @@ void test_types()
     types->type = FLB_PARSER_TYPE_HEX;
 
     parser = flb_parser_create("ltsv", "ltsv", NULL, FLB_FALSE, NULL, NULL, NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                types, 1, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -446,7 +446,7 @@ void test_decode_field_json()
     }
 
     parser = flb_parser_create("ltsv", "ltsv", NULL, FLB_FALSE, NULL, NULL, NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, decoder, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
diff --git a/tests/internal/parser_regex.c b/tests/internal/parser_regex.c
index 2283231ce57..f919dd21587 100644
--- a/tests/internal/parser_regex.c
+++ b/tests/internal/parser_regex.c
@@ -172,7 +172,7 @@ void test_basic()
     }
 
     parser = flb_parser_create("regex", "regex", regex, FLB_FALSE, NULL, NULL, NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -225,7 +225,7 @@ void test_time_key()
     }
 
     parser = flb_parser_create("regex", "regex", regex, FLB_FALSE, "%Y-%m-%dT%H:%M:%S.%L", "time", NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -287,7 +287,7 @@ void test_time_keep()
     }
 
     parser = flb_parser_create("regex", "regex", regex, FLB_FALSE, "%Y-%m-%dT%H:%M:%S.%L", "time", NULL,
-                               FLB_TRUE /*time_keep */, FLB_FALSE, FLB_FALSE,
+                               FLB_TRUE /*time_keep */, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -365,7 +365,7 @@ void test_types()
     types->type = FLB_PARSER_TYPE_HEX;
 
     parser = flb_parser_create("regex", "regex", regex, FLB_FALSE, NULL, NULL, NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                types, 1, NULL, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
@@ -451,7 +451,7 @@ void test_decode_field_json()
     }
 
     parser = flb_parser_create("regex", "regex", regex, FLB_FALSE, NULL, NULL, NULL,
-                               FLB_FALSE, FLB_FALSE, FLB_FALSE,
+                               FLB_FALSE, FLB_FALSE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, decoder, config);
     if (!TEST_CHECK(parser != NULL)) {
         TEST_MSG("flb_parser_create failed");
diff --git a/tests/internal/utils.c b/tests/internal/utils.c
index beec9099ecc..bcb9053d86f 100644
--- a/tests/internal/utils.c
+++ b/tests/internal/utils.c
@@ -618,6 +618,42 @@ void test_flb_utils_get_machine_id()
     flb_free(id);
 }
 
+struct size_to_bytes_check {
+    char *size;      /* size in string    */
+    int64_t ret;     /* expected size     */
+};
+
+struct size_to_bytes_check size_to_bytes_checks[] = {
+    {"922337.63", 922337},
+    {"2K",2000},
+    {"5.7263K", 5726},
+    {"9223372036854775.23K", -1},
+    {"1M", 1000000},
+    {"1.1M", 1100000},
+    {"3.592M", 3592000},
+    {"52.752383M", 52752383},
+    {"9223372036854.42M", -1},
+    {"492.364G",492364000000},
+    {"1.2973G", 1297300000},
+    {"9223372036.78G", -1},
+};
+
+void test_size_to_bytes() 
+{
+    int i;
+    int size;
+    int64_t ret;
+    struct size_to_bytes_check *u;
+
+    size = sizeof(size_to_bytes_checks) / sizeof(struct size_to_bytes_check);
+    for (i = 0; i < size; i++) {
+        u = &size_to_bytes_checks[i];
+
+        ret = flb_utils_size_to_bytes(u->size);
+        TEST_CHECK(ret == u->ret);
+    }
+}
+
 TEST_LIST = {
     /* JSON maps iteration */
     { "url_split", test_url_split },
@@ -632,5 +668,6 @@ TEST_LIST = {
     { "test_flb_utils_split_quoted", test_flb_utils_split_quoted},
     { "test_flb_utils_split_quoted_errors", test_flb_utils_split_quoted_errors},
     { "test_flb_utils_get_machine_id", test_flb_utils_get_machine_id },
+    { "test_size_to_bytes", test_size_to_bytes },
     { 0 }
 };
diff --git a/tests/runtime/CMakeLists.txt b/tests/runtime/CMakeLists.txt
index f3e901b6b7f..9e5cc4670e4 100644
--- a/tests/runtime/CMakeLists.txt
+++ b/tests/runtime/CMakeLists.txt
@@ -57,6 +57,7 @@ if(FLB_OUT_LIB)
   FLB_RT_TEST(FLB_IN_TCP          "in_tcp.c")
   FLB_RT_TEST(FLB_IN_FORWARD       "in_forward.c")
   FLB_RT_TEST(FLB_IN_FLUENTBIT_METRICS "in_fluentbit_metrics.c")
+  FLB_RT_TEST(FLB_IN_KUBERNETES_EVENTS "in_kubernetes_events.c")
 endif()
 
 # Filter Plugins
diff --git a/tests/runtime/data/in_kubernetes_events/eventlist_v1_with_creationTimestamp.json b/tests/runtime/data/in_kubernetes_events/eventlist_v1_with_creationTimestamp.json
new file mode 100644
index 00000000000..8ac6fb1ad9e
--- /dev/null
+++ b/tests/runtime/data/in_kubernetes_events/eventlist_v1_with_creationTimestamp.json
@@ -0,0 +1,55 @@
+{
+    "kind": "EventList",
+    "apiVersion": "v1",
+    "metadata": {
+      "resourceVersion": "177157"
+    },
+    "items": [
+      {
+        "metadata": {
+          "name": "fluent-bit-78945dccd8-2g7qg.17a3c80ba0453aee",
+          "namespace": "default",
+          "uid": "6e3013d5-a79b-4dc4-b6c0-6b652302672e",
+          "resourceVersion": "176761",
+          "creationTimestamp": "2023-12-24T13:37:16Z",
+          "managedFields": [
+            {
+              "manager": "kube-scheduler",
+              "operation": "Update",
+              "apiVersion": "events.k8s.io/v1",
+              "time": "2023-12-24T13:37:16Z",
+              "fieldsType": "FieldsV1",
+              "fieldsV1": {
+                "f:action": {},
+                "f:eventTime": {},
+                "f:note": {},
+                "f:reason": {},
+                "f:regarding": {},
+                "f:reportingController": {},
+                "f:reportingInstance": {},
+                "f:type": {}
+              }
+            }
+          ]
+        },
+        "involvedObject": {
+          "kind": "Pod",
+          "namespace": "default",
+          "name": "fluent-bit-78945dccd8-2g7qg",
+          "uid": "ed7de8ff-61fb-40bb-9ecb-55a801a4cd89",
+          "apiVersion": "v1",
+          "resourceVersion": "176749"
+        },
+        "reason": "FailedScheduling",
+        "message": "0/1 nodes are available: 1 Insufficient cpu. preemption: 0/1 nodes are available: 1 No preemption victims found for incoming pod..",
+        "source": {},
+        "firstTimestamp": null,
+        "lastTimestamp": null,
+        "type": "Warning",
+        "eventTime": "2023-12-24T13:37:16.335172Z",
+        "action": "Scheduling",
+        "reportingComponent": "default-scheduler",
+        "reportingInstance": "default-scheduler-minikube"
+      }
+    ]
+}
diff --git a/tests/runtime/data/in_kubernetes_events/eventlist_v1_with_creationTimestamp.out b/tests/runtime/data/in_kubernetes_events/eventlist_v1_with_creationTimestamp.out
new file mode 100644
index 00000000000..0ee4783201a
--- /dev/null
+++ b/tests/runtime/data/in_kubernetes_events/eventlist_v1_with_creationTimestamp.out
@@ -0,0 +1 @@
+[1703425036.000000,{"metadata":{"name":"fluent-bit-78945dccd8-2g7qg.17a3c80ba0453aee","namespace":"default","uid":"6e3013d5-a79b-4dc4-b6c0-6b652302672e","resourceVersion":"176761","creationTimestamp":"2023-12-24T13:37:16Z","managedFields":[{"manager":"kube-scheduler","operation":"Update","apiVersion":"events.k8s.io/v1","time":"2023-12-24T13:37:16Z","fieldsType":"FieldsV1","fieldsV1":{"f:action":{},"f:eventTime":{},"f:note":{},"f:reason":{},"f:regarding":{},"f:reportingController":{},"f:reportingInstance":{},"f:type":{}}}]},"involvedObject":{"kind":"Pod","namespace":"default","name":"fluent-bit-78945dccd8-2g7qg","uid":"ed7de8ff-61fb-40bb-9ecb-55a801a4cd89","apiVersion":"v1","resourceVersion":"176749"},"reason":"FailedScheduling","message":"0/1 nodes are available: 1 Insufficient cpu. preemption: 0/1 nodes are available: 1 No preemption victims found for incoming pod..","source":{},"firstTimestamp":null,"lastTimestamp":null,"type":"Warning","eventTime":"2023-12-24T13:37:16.335172Z","action":"Scheduling","reportingComponent":"default-scheduler","reportingInstance":"default-scheduler-minikube"}]
\ No newline at end of file
diff --git a/tests/runtime/data/in_kubernetes_events/eventlist_v1_with_lastTimestamp.json b/tests/runtime/data/in_kubernetes_events/eventlist_v1_with_lastTimestamp.json
new file mode 100644
index 00000000000..8c0f9b6c5c1
--- /dev/null
+++ b/tests/runtime/data/in_kubernetes_events/eventlist_v1_with_lastTimestamp.json
@@ -0,0 +1,55 @@
+{
+    "kind": "EventList",
+    "apiVersion": "v1",
+    "metadata": {
+      "resourceVersion": "177157"
+    },
+    "items": [
+      {
+        "metadata": {
+          "name": ".17a3ba8b4aa36c81",
+          "namespace": "default",
+          "uid": "ec5546b7-f1b9-4e61-a90c-a1f3b611edbc",
+          "resourceVersion": "174688",
+          "creationTimestamp": "2023-12-24T09:30:07Z",
+          "managedFields": [
+            {
+              "manager": "storage-provisioner",
+              "operation": "Update",
+              "apiVersion": "v1",
+              "time": "2023-12-24T09:30:07Z",
+              "fieldsType": "FieldsV1",
+              "fieldsV1": {
+                "f:count": {},
+                "f:firstTimestamp": {},
+                "f:involvedObject": {},
+                "f:lastTimestamp": {},
+                "f:message": {},
+                "f:reason": {},
+                "f:source": {
+                  "f:component": {}
+                },
+                "f:type": {}
+              }
+            }
+          ]
+        },
+        "involvedObject": {
+          "kind": "Endpoints",
+          "apiVersion": "v1"
+        },
+        "reason": "LeaderElection",
+        "message": "minikube_31f5cdfb-29b0-4f84-9f9c-585088e9235f stopped leading",
+        "source": {
+          "component": "k8s.io/minikube-hostpath_minikube_31f5cdfb-29b0-4f84-9f9c-585088e9235f"
+        },
+        "firstTimestamp": "2023-12-24T09:29:51Z",
+        "lastTimestamp": "2023-12-24T09:29:51Z",
+        "count": 1,
+        "type": "Normal",
+        "eventTime": null,
+        "reportingComponent": "",
+        "reportingInstance": ""
+      }
+    ]
+}
diff --git a/tests/runtime/data/in_kubernetes_events/eventlist_v1_with_lastTimestamp.out b/tests/runtime/data/in_kubernetes_events/eventlist_v1_with_lastTimestamp.out
new file mode 100644
index 00000000000..35ff686ed31
--- /dev/null
+++ b/tests/runtime/data/in_kubernetes_events/eventlist_v1_with_lastTimestamp.out
@@ -0,0 +1 @@
+[1703410191.000000,{"metadata":{"name":".17a3ba8b4aa36c81","namespace":"default","uid":"ec5546b7-f1b9-4e61-a90c-a1f3b611edbc","resourceVersion":"174688","creationTimestamp":"2023-12-24T09:30:07Z","managedFields":[{"manager":"storage-provisioner","operation":"Update","apiVersion":"v1","time":"2023-12-24T09:30:07Z","fieldsType":"FieldsV1","fieldsV1":{"f:count":{},"f:firstTimestamp":{},"f:involvedObject":{},"f:lastTimestamp":{},"f:message":{},"f:reason":{},"f:source":{"f:component":{}},"f:type":{}}}]},"involvedObject":{"kind":"Endpoints","apiVersion":"v1"},"reason":"LeaderElection","message":"minikube_31f5cdfb-29b0-4f84-9f9c-585088e9235f stopped leading","source":{"component":"k8s.io/minikube-hostpath_minikube_31f5cdfb-29b0-4f84-9f9c-585088e9235f"},"firstTimestamp":"2023-12-24T09:29:51Z","lastTimestamp":"2023-12-24T09:29:51Z","count":1,"type":"Normal","eventTime":null,"reportingComponent":"","reportingInstance":""}]
\ No newline at end of file
diff --git a/tests/runtime/data/in_kubernetes_events/token b/tests/runtime/data/in_kubernetes_events/token
new file mode 100644
index 00000000000..e6eca93f66e
--- /dev/null
+++ b/tests/runtime/data/in_kubernetes_events/token
@@ -0,0 +1 @@
+fakeTokenFile
diff --git a/tests/runtime/filter_parser.c b/tests/runtime/filter_parser.c
index c31fbcf840b..539c163a41e 100644
--- a/tests/runtime/filter_parser.c
+++ b/tests/runtime/filter_parser.c
@@ -108,7 +108,7 @@ void flb_test_filter_parser_extract_fields()
     /* Parser */
     parser = flb_parser_create("dummy_test", "regex", "^(?<INT>[^ ]+) (?<FLOAT>[^ ]+) (?<BOOL>[^ ]+) (?<STRING>.+)$",
                                FLB_TRUE,
-                               NULL, NULL, NULL, MK_FALSE, MK_TRUE, FLB_FALSE, NULL, 0,
+                               NULL, NULL, NULL, MK_FALSE, MK_TRUE, FLB_FALSE, FLB_FALSE, NULL, 0,
                                NULL, ctx->config);
     TEST_CHECK(parser != NULL);
 
@@ -195,7 +195,7 @@ void flb_test_filter_parser_reserve_data_off()
     /* Parser */
     parser = flb_parser_create("dummy_test", "regex", "^(?<INT>[^ ]+) (?<FLOAT>[^ ]+) (?<BOOL>[^ ]+) (?<STRING>.+)$",
                                FLB_TRUE,
-                               NULL, NULL, NULL, MK_FALSE, MK_TRUE, FLB_FALSE, NULL, 0,
+                               NULL, NULL, NULL, MK_FALSE, MK_TRUE, FLB_FALSE, FLB_FALSE, NULL, 0,
                                NULL, ctx->config);
     TEST_CHECK(parser != NULL);
 
@@ -273,7 +273,7 @@ void flb_test_filter_parser_handle_time_key()
     parser = flb_parser_create("timestamp", "regex", "^(?<time>.*)$", FLB_TRUE,
                                "%Y-%m-%dT%H:%M:%S.%L",
                                "time",
-                               NULL, MK_FALSE, MK_TRUE, FLB_FALSE,
+                               NULL, MK_FALSE, MK_TRUE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, ctx->config);
     TEST_CHECK(parser != NULL);
 
@@ -351,7 +351,7 @@ void flb_test_filter_parser_handle_time_key_with_fractional_timestamp()
     parser = flb_parser_create("timestamp", "regex", "^(?<time>.*)$", FLB_TRUE,
                                "%s.%L",
                                "time",
-                               NULL, MK_FALSE, MK_TRUE, FLB_FALSE,
+                               NULL, MK_FALSE, MK_TRUE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, ctx->config);
     TEST_CHECK(parser != NULL);
 
@@ -439,6 +439,7 @@ void flb_test_filter_parser_handle_time_key_with_time_zone()
                                NULL, // time_offset
                                MK_FALSE, // time_keep
                                MK_TRUE, // time_strict
+                               FLB_FALSE, // time_system_timezone
                                MK_FALSE, // logfmt_no_bare_keys
                                NULL, // types
                                0, // types_len
@@ -491,6 +492,133 @@ void flb_test_filter_parser_handle_time_key_with_time_zone()
     flb_destroy(ctx);
 }
 
+void test_parser_timestamp_timezone(char *tz,
+                                     char *time_fmt, 
+                                     char *timestamp, 
+                                     char *expected_epoch,
+                                     int use_system_timezone) 
+{
+    int ret;
+    int bytes;
+    char *output, *original_tz;
+    char p[256];
+    char expected[12];
+    flb_ctx_t *ctx;
+    int in_ffd;
+    int out_ffd;
+    int filter_ffd;
+    struct flb_parser *parser;
+
+    struct flb_lib_out_cb cb;
+    cb.cb   = callback_test;
+    cb.data = NULL;
+
+    clear_output();
+
+    ctx = flb_create();
+
+    /* Configure service */
+    flb_service_set(ctx, "Flush", FLUSH_INTERVAL, "Grace", "1", "Log_Level", "debug", NULL);
+
+    /* Input */
+    in_ffd = flb_input(ctx, (char *) "lib", NULL);
+    TEST_CHECK(in_ffd >= 0);
+    flb_input_set(ctx, in_ffd,
+                  "Tag", "test",
+                  NULL);
+
+    /* Parser */
+    parser = flb_parser_create("timestamp", // name
+                               "regex", // format
+                               "^(?<time>.*)$", // regex
+                               FLB_TRUE, // skip_empty
+                               time_fmt, // time_fmt
+                               "time", // time_key
+                               NULL, // time_offset
+                               MK_FALSE, // time_keep
+                               MK_TRUE, // time_strict
+                               use_system_timezone, // time_system_timezone
+                               MK_FALSE, // logfmt_no_bare_keys
+                               NULL, // types
+                               0, // types_len
+                               NULL, // decoders
+                               ctx->config); // config
+    TEST_CHECK(parser != NULL);
+
+    /* Filter */
+    filter_ffd = flb_filter(ctx, (char *) "parser", NULL);
+    TEST_CHECK(filter_ffd >= 0);
+    ret = flb_filter_set(ctx, filter_ffd,
+                         "Match", "test",
+                         "Key_Name", "@timestamp",
+                         "Parser", "timestamp",
+                         "Reserve_Data", "On",
+                         NULL);
+    TEST_CHECK(ret == 0);
+
+    /* Output */
+    out_ffd = flb_output(ctx, (char *) "lib", &cb);
+    TEST_CHECK(out_ffd >= 0);
+    flb_output_set(ctx, out_ffd,
+                   "Match", "*",
+                   "format", "json",
+                   NULL);
+
+    /* Temporarily set the system timezone for this test */
+    if (tz) {
+        original_tz = getenv("TZ");
+        ret = setenv("TZ", tz, 1);
+        TEST_ASSERT(ret == 0);
+    }
+
+    /* Start the engine */
+    ret = flb_start(ctx);
+    TEST_CHECK(ret == 0);
+    if (ret != 0) {
+        flb_destroy(ctx);
+        return;
+    }
+
+    /* Ingest data. */
+    snprintf(p, 256, "[1448403340, {\"@timestamp\":\"%s\", \"message\":\"This is an example\"}]", timestamp);
+    bytes = flb_lib_push(ctx, in_ffd, p, strlen(p));
+    TEST_CHECK(bytes == strlen(p));
+
+    wait_with_timeout(2000, &output); /* waiting flush and ensuring data flush */
+    TEST_CHECK_(output != NULL, "Expected output to not be NULL");
+    if (output != NULL) {
+        snprintf(expected, 12, "[%s", expected_epoch);
+        TEST_CHECK_(strstr(output, expected) != NULL, "Expected output to contain '%s', got '%s'", expected, output);
+    }
+
+    /* Reset original timezone */
+    if (original_tz) {
+        ret = setenv("TZ", original_tz, 1);
+        TEST_CHECK(ret == 0);
+    }
+
+    flb_stop(ctx);
+    flb_destroy(ctx);
+}
+
+void flb_test_filter_parser_use_system_timezone()
+{
+    test_parser_timestamp_timezone("EST5EDT", /* char *tz */
+                                   "%Y-%m-%d:%H:%M:%S", /* char *time_fmt */ 
+                                   "2023-10-17:05:00:00", /* char *timestamp */
+                                   "1697536800", /* char *expected_epoch */
+                                   FLB_TRUE); /* int use_system_timezone */
+}
+
+void flb_test_filter_parser_use_system_timezone_zone_in_timestamp()
+{
+    test_parser_timestamp_timezone("EST5EDT", /* char *tz */
+                                   "%Y-%m-%d:%H:%M:%S%z", /* char *time_fmt */ 
+                                   "2023-10-17:05:00:00-0700", /* char *timestamp */
+                                   "1697536800", /* char *expected_epoch */
+                                   FLB_TRUE); /* int use_system_timezone */
+}
+
 void flb_test_filter_parser_ignore_malformed_time()
 {
     int ret;
@@ -524,7 +652,7 @@ void flb_test_filter_parser_ignore_malformed_time()
     parser = flb_parser_create("timestamp", "regex",
                                "^(?<time>.*)$", FLB_TRUE,
                                "%Y-%m-%dT%H:%M:%S.%L", "time",
-                               NULL, FLB_FALSE, MK_TRUE, FLB_FALSE,
+                               NULL, FLB_FALSE, MK_TRUE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, ctx->config);
     TEST_CHECK(parser != NULL);
 
@@ -602,7 +730,7 @@ void flb_test_filter_parser_preserve_original_field()
     /* Parser */
     parser = flb_parser_create("dummy_test", "regex", "^(?<INT>[^ ]+) (?<FLOAT>[^ ]+) (?<BOOL>[^ ]+) (?<STRING>.+)$",
                                FLB_TRUE,
-                               NULL, NULL, NULL, MK_FALSE, MK_TRUE, FLB_FALSE, NULL, 0,
+                               NULL, NULL, NULL, MK_FALSE, MK_TRUE, FLB_FALSE, FLB_FALSE, NULL, 0,
                                NULL, ctx->config);
     TEST_CHECK(parser != NULL);
 
@@ -687,13 +815,13 @@ void flb_test_filter_parser_first_matched_when_mutilple_parser()
     /* Parser */
     parser = flb_parser_create("one", "regex", "^(?<one>.+?)$",
                                FLB_TRUE,
-                               NULL, NULL, NULL, MK_FALSE, MK_TRUE, FLB_FALSE,
+                               NULL, NULL, NULL, MK_FALSE, MK_TRUE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, ctx->config);
     TEST_CHECK(parser != NULL);
 
     parser = flb_parser_create("two", "regex", "^(?<two>.+?)$",
                                FLB_TRUE,
-                               NULL, NULL, NULL, MK_FALSE, MK_TRUE, FLB_FALSE,
+                               NULL, NULL, NULL, MK_FALSE, MK_TRUE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, ctx->config);
     TEST_CHECK(parser != NULL);
 
@@ -774,7 +902,7 @@ void flb_test_filter_parser_skip_empty_values_false()
     /* Parser */
     parser = flb_parser_create("one", "regex", "^(?<one>.+?)$",
                                FLB_FALSE,
-                               NULL, NULL, NULL, MK_FALSE, MK_TRUE, FLB_FALSE,
+                               NULL, NULL, NULL, MK_FALSE, MK_TRUE, FLB_FALSE, FLB_FALSE,
                                NULL, 0, NULL, ctx->config);
     TEST_CHECK(parser != NULL);
 
@@ -818,12 +946,13 @@ void flb_test_filter_parser_skip_empty_values_false()
     flb_destroy(ctx);
 }
 
-
 TEST_LIST = {
     {"filter_parser_extract_fields", flb_test_filter_parser_extract_fields },
     {"filter_parser_reserve_data_off", flb_test_filter_parser_reserve_data_off },
     {"filter_parser_handle_time_key", flb_test_filter_parser_handle_time_key },
     {"filter_parser_handle_time_key_with_time_zone", flb_test_filter_parser_handle_time_key_with_time_zone },
+    {"filter_parser_use_system_timezone", flb_test_filter_parser_use_system_timezone },
+    {"filter_parser_use_system_timezone_zone_in_timestamp",flb_test_filter_parser_use_system_timezone_zone_in_timestamp },
     {"filter_parser_ignore_malformed_time", flb_test_filter_parser_ignore_malformed_time },
     {"filter_parser_preserve_original_field", flb_test_filter_parser_preserve_original_field },
     {"filter_parser_first_matched_when_multiple_parser", flb_test_filter_parser_first_matched_when_mutilple_parser },
diff --git a/tests/runtime/in_kubernetes_events.c b/tests/runtime/in_kubernetes_events.c
new file mode 100644
index 00000000000..de054fac2c7
--- /dev/null
+++ b/tests/runtime/in_kubernetes_events.c
@@ -0,0 +1,356 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+/*  Fluent Bit
+ *  ==========
+ *  Copyright (C) 2019-2022 The Fluent Bit Authors
+ *  Copyright (C) 2015-2018 Treasure Data Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <stdlib.h>
+#include <fluent-bit.h>
+#include <fluent-bit/flb_compat.h>
+#include <fluent-bit/flb_time.h>
+#include <fluent-bit/flb_pack.h>
+#include <fluent-bit/flb_downstream.h>
+#include <monkey/mk_core.h>
+#include <monkey/mk_lib.h>
+
+#include "flb_tests_runtime.h"
+
+#define JSON_CONTENT_TYPE "application/json"
+
+#define KUBE_API_HOST "127.0.0.1"
+#define KUBE_API_PORT 8449
+
+#define V1_EVENTS   "/v1/api/events"
+#define IN_KUBERNETES_EVENTS_DATA_PATH FLB_TESTS_DATA_PATH "/data/in_kubernetes_events"
+#define KUBE_TOKEN_FILE FLB_TESTS_DATA_PATH "/data/in_kubernetes_events/token"
+
+struct test_ctx {
+    flb_ctx_t *flb;    /* Fluent Bit library context */
+    int i_ffd;         /* Input fd  */
+    int f_ffd;         /* Filter fd (unused) */
+    int o_ffd;         /* Output fd */
+
+};
+
+struct test_k8s_server_ctx {
+    mk_ctx_t *ctx;             /* Monkey HTTP Context */
+    int vid;                   /* Virtual Host ID     */
+    int mq_id;                 /* Message Queue ID    */
+    struct mk_event_loop  *evl;
+    char json_input_file[1024];
+};
+
+
+pthread_mutex_t result_mutex = PTHREAD_MUTEX_INITIALIZER;
+int num_output = 0;
+static int get_output_num()
+{
+    int ret;
+    pthread_mutex_lock(&result_mutex);
+    ret = num_output;
+    pthread_mutex_unlock(&result_mutex);
+
+    return ret;
+}
+
+static void set_output_num(int num)
+{
+    pthread_mutex_lock(&result_mutex);
+    num_output = num;
+    pthread_mutex_unlock(&result_mutex);
+}
+
+static void clear_output_num()
+{
+    set_output_num(0);
+}
+
+static flb_sds_t read_file(const char *filename)
+{
+    int fd = -1;
+    struct stat sb;
+    int ret;
+    flb_sds_t payload = NULL;
+
+    fd = open(filename, O_RDONLY, 0);
+    if (fd != -1) {
+        if (fstat(fd, &sb) == 0) {
+            payload = flb_sds_create_size(sb.st_size+1);
+            if (!payload) {
+                flb_errno();
+            }
+            else {
+                ret = read(fd, payload, sb.st_size);
+                if (ret != sb.st_size) {
+                    flb_error("Problem reading file: %s", filename);
+                }
+                payload[sb.st_size] = '\0';
+            }
+        }
+        close(fd);
+    } else {
+        flb_error("Unable to open test file: %s", filename);
+    }
+
+    return payload;
+}
+
+/* Callback to check expected results */
+static int cb_check_result_json(void *record, size_t size, void *data)
+{
+    char *p;
+    flb_sds_t expected;
+    char *result;
+    int num = get_output_num();
+    const char *filename;
+    char full_filename[1024];
+
+    set_output_num(num+1);
+
+    filename = (const char *) data;
+    result = (char *) record;
+
+    sprintf(full_filename, "%s/%s.out", IN_KUBERNETES_EVENTS_DATA_PATH, filename);
+    expected = read_file(full_filename);
+
+    p = strstr(result, expected);
+    TEST_CHECK(p != NULL);
+
+    if (p == NULL) {
+        flb_error("Expected to find: '%s' in result '%s'",
+                  expected, result);
+    }
+
+    flb_free(record);
+    if (expected) {
+        flb_sds_destroy(expected);
+    }
+    return 0;
+}
+
+static void cb_root(mk_request_t *request, void *data)
+{
+    flb_sds_t payload;
+    struct test_k8s_server_ctx *server = data;
+    payload = read_file(server->json_input_file);
+
+    if (request->query_string.data && strstr(request->query_string.data, "watch=1") != NULL) {
+        // NOTE/TODO: stream via watch not currently supported, this should become 200 status
+        // and chunked response when we do support it
+        mk_http_status(request, 500);
+        mk_http_done(request);
+    }
+    else {
+        mk_http_status(request, 200);
+        mk_http_header(request, "Content-Type", 12, JSON_CONTENT_TYPE, 16);
+        mk_http_send(request, payload, strlen(payload), NULL);
+        mk_http_done(request);
+    }
+
+    if (payload) {
+        flb_sds_destroy(payload);
+    }
+}
+
+struct test_k8s_server_ctx *initialize_mock_k8s_api(const char* filename) 
+{
+    int vid;
+    char tmp[32];
+    struct test_k8s_server_ctx *server;
+
+    server = flb_calloc(1, sizeof(struct test_k8s_server_ctx));
+    if (!server) {
+        flb_errno();
+        return NULL;
+    }
+
+    sprintf(server->json_input_file, "%s/%s.json",
+                   IN_KUBERNETES_EVENTS_DATA_PATH, filename);
+
+    /* Create HTTP server context */
+    server->ctx = mk_create();
+    if (!server->ctx) {
+        flb_error("[http_server] could not create context");
+        flb_free(server);
+        return NULL;
+    }
+
+    /* Compose listen address */
+    snprintf(tmp, sizeof(tmp) -1, "%s:%d", KUBE_API_HOST, KUBE_API_PORT);
+    mk_config_set(server->ctx, "Listen", tmp, NULL);
+    vid = mk_vhost_create(server->ctx, NULL);
+    server->vid = vid;
+
+    /* Setup virtual host */
+    mk_vhost_set(server->ctx, vid, "Name", "kubernetes-api", NULL);
+
+    /* Root */
+    mk_vhost_handler(server->ctx, vid, "/", cb_root, server);
+
+    mk_start(server->ctx);
+
+    return server;
+}
+
+static struct test_ctx *test_ctx_create(struct flb_lib_out_cb *data)
+{
+    int i_ffd;
+    int o_ffd;
+    struct test_ctx *ctx = NULL;
+    char kube_url[512] = {0};
+
+
+    ctx = flb_calloc(1, sizeof(struct test_ctx));
+    if (!TEST_CHECK(ctx != NULL)) {
+        TEST_MSG("flb_calloc failed");
+        flb_errno();
+        return NULL;
+    }
+
+    /* Service config */
+    ctx->flb = flb_create();
+    flb_service_set(ctx->flb,
+                    "Flush", "0.200000000",
+                    "Grace", "3",
+                    "Log_Level", "debug",
+                    NULL);
+
+    /* Input */
+    i_ffd = flb_input(ctx->flb, (char *) "kubernetes_events", NULL);
+    TEST_CHECK(i_ffd >= 0);
+    ctx->i_ffd = i_ffd;
+
+    sprintf(kube_url, "http://%s:%d", KUBE_API_HOST, KUBE_API_PORT);
+    TEST_CHECK(flb_input_set(ctx->flb, i_ffd, 
+              "kube_url", kube_url,
+              "kube_token_file", KUBE_TOKEN_FILE,
+              "kube_retention_time", "365000d",
+              "tls", "off",
+              "interval_sec", "1",
+              "interval_nsec", "0",
+              NULL) == 0);
+
+    /* Output */
+    o_ffd = flb_output(ctx->flb, (char *) "lib", (void *) data);
+    ctx->o_ffd = o_ffd;
+
+    flb_output_set(ctx->flb, ctx->o_ffd,
+                         "match", "*",
+                         "format", "json",
+                         NULL);
+
+    return ctx;
+}
+
+static void test_ctx_destroy(struct test_ctx *ctx)
+{
+    TEST_CHECK(ctx != NULL);
+
+    flb_stop(ctx->flb);
+    flb_destroy(ctx->flb);
+    flb_free(ctx);
+
+}
+
+static void mock_k8s_api_destroy(struct test_k8s_server_ctx* server)
+{
+    TEST_CHECK(server != NULL);
+    mk_stop(server->ctx);
+    mk_destroy(server->ctx);
+    flb_free(server);
+}
+
+void flb_test_events_v1_with_lastTimestamp()
+{
+    struct flb_lib_out_cb cb_data;
+    struct test_ctx *ctx;
+    int ret;
+    int num;
+    const char *filename = "eventlist_v1_with_lastTimestamp";
+
+    clear_output_num();
+
+    cb_data.cb = cb_check_result_json;
+    cb_data.data = (void *)filename;
+
+    ctx = test_ctx_create(&cb_data);
+    if (!TEST_CHECK(ctx != NULL)) {
+        TEST_MSG("test_ctx_create failed");
+        exit(EXIT_FAILURE);
+    }
+
+    struct test_k8s_server_ctx* k8s_server = initialize_mock_k8s_api(
+        filename
+    );
+
+    ret = flb_start(ctx->flb);
+    TEST_CHECK(ret == 0);
+
+    // waiting to flush 
+    flb_time_msleep(1500);
+
+    num = get_output_num();
+    if (!TEST_CHECK(num > 0))  {
+        TEST_MSG("no outputs");
+    }
+    mock_k8s_api_destroy(k8s_server);
+    test_ctx_destroy(ctx);
+}
+
+void flb_test_events_v1_with_creationTimestamp()
+{
+    struct flb_lib_out_cb cb_data;
+    struct test_ctx *ctx;
+    int ret;
+    int num;
+    const char *filename = "eventlist_v1_with_creationTimestamp";
+
+    clear_output_num();
+
+    cb_data.cb = cb_check_result_json;
+    cb_data.data = (void *)filename;
+
+    ctx = test_ctx_create(&cb_data);
+    if (!TEST_CHECK(ctx != NULL)) {
+        TEST_MSG("test_ctx_create failed");
+        exit(EXIT_FAILURE);
+    }
+
+    struct test_k8s_server_ctx* k8s_server = initialize_mock_k8s_api(
+        filename
+    );
+
+    ret = flb_start(ctx->flb);
+    TEST_CHECK(ret == 0);
+
+    // waiting to flush 
+    flb_time_msleep(1500);
+
+    num = get_output_num();
+    if (!TEST_CHECK(num > 0))  {
+        TEST_MSG("no outputs");
+    }
+    mock_k8s_api_destroy(k8s_server);
+    test_ctx_destroy(ctx);
+}
+
+TEST_LIST = {
+    {"events_v1_with_lastTimestamp", flb_test_events_v1_with_lastTimestamp},
+    {"events_v1_with_creationTimestamp", flb_test_events_v1_with_creationTimestamp},
+    {NULL, NULL}
+};
+
diff --git a/tests/runtime/out_loki.c b/tests/runtime/out_loki.c
index 48805d2c829..7cef907b5de 100644
--- a/tests/runtime/out_loki.c
+++ b/tests/runtime/out_loki.c
@@ -285,6 +285,182 @@ void flb_test_line_format()
     flb_destroy(ctx);
 }
 
+static void cb_check_drop_single_key_off(void *ctx, int ffd,
+                                         int res_ret, void *res_data, size_t res_size,
+                                         void *data)
+{
+    char *p;
+    flb_sds_t out_js = res_data;
+    char *index_line = "{\\\"key\\\":\\\"value\\\"}";
+
+    p = strstr(out_js, index_line);
+    if (!TEST_CHECK(p != NULL)) {
+      TEST_MSG("Given:%s", out_js);
+    }
+
+    flb_sds_destroy(out_js);
+}
+
+void flb_test_drop_single_key_off()
+{
+    int ret;
+    int size = sizeof(JSON_BASIC) - 1;
+    flb_ctx_t *ctx;
+    int in_ffd;
+    int out_ffd;
+
+    /* Create context, flush every second (some checks omitted here) */
+    ctx = flb_create();
+    flb_service_set(ctx, "flush", "1", "grace", "1",
+                    "log_level", "error",
+                    NULL);
+
+    /* Lib input mode */
+    in_ffd = flb_input(ctx, (char *) "lib", NULL);
+    flb_input_set(ctx, in_ffd, "tag", "test", NULL);
+
+    /* Loki output */
+    out_ffd = flb_output(ctx, (char *) "loki", NULL);
+    flb_output_set(ctx, out_ffd,
+                   "match", "test",
+                   "drop_single_key", "off",
+                   NULL);
+
+    /* Enable test mode */
+    ret = flb_output_set_test(ctx, out_ffd, "formatter",
+                              cb_check_drop_single_key_off,
+                              NULL, NULL);
+
+    /* Start */
+    ret = flb_start(ctx);
+    TEST_CHECK(ret == 0);
+
+    /* Ingest data sample */
+    ret = flb_lib_push(ctx, in_ffd, (char *) JSON_BASIC, size);
+    TEST_CHECK(ret >= 0);
+
+    sleep(2);
+    flb_stop(ctx);
+    flb_destroy(ctx);
+}
+
+static void cb_check_drop_single_key_on(void *ctx, int ffd,
+                                         int res_ret, void *res_data, size_t res_size,
+                                         void *data)
+{
+    char *p;
+    flb_sds_t out_js = res_data;
+    char *index_line = "\\\"value\\\"";
+
+    p = strstr(out_js, index_line);
+    if (!TEST_CHECK(p != NULL)) {
+      TEST_MSG("Given:%s", out_js);
+    }
+
+    flb_sds_destroy(out_js);
+}
+
+void flb_test_drop_single_key_on()
+{
+    int ret;
+    int size = sizeof(JSON_BASIC) - 1;
+    flb_ctx_t *ctx;
+    int in_ffd;
+    int out_ffd;
+
+    /* Create context, flush every second (some checks omitted here) */
+    ctx = flb_create();
+    flb_service_set(ctx, "flush", "1", "grace", "1",
+                    "log_level", "error",
+                    NULL);
+
+    /* Lib input mode */
+    in_ffd = flb_input(ctx, (char *) "lib", NULL);
+    flb_input_set(ctx, in_ffd, "tag", "test", NULL);
+
+    /* Loki output */
+    out_ffd = flb_output(ctx, (char *) "loki", NULL);
+    flb_output_set(ctx, out_ffd,
+                   "match", "test",
+                   "drop_single_key", "on",
+                   NULL);
+
+    /* Enable test mode */
+    ret = flb_output_set_test(ctx, out_ffd, "formatter",
+                              cb_check_drop_single_key_on,
+                              NULL, NULL);
+
+    /* Start */
+    ret = flb_start(ctx);
+    TEST_CHECK(ret == 0);
+
+    /* Ingest data sample */
+    ret = flb_lib_push(ctx, in_ffd, (char *) JSON_BASIC, size);
+    TEST_CHECK(ret >= 0);
+
+    sleep(2);
+    flb_stop(ctx);
+    flb_destroy(ctx);
+}
+
+static void cb_check_drop_single_key_raw(void *ctx, int ffd,
+                                         int res_ret, void *res_data, size_t res_size,
+                                         void *data)
+{
+    char *p;
+    flb_sds_t out_js = res_data;
+    char *index_line = "\"value\"";
+
+    p = strstr(out_js, index_line);
+    if (!TEST_CHECK(p != NULL)) {
+      TEST_MSG("Given:%s", out_js);
+    }
+
+    flb_sds_destroy(out_js);
+}
+
+void flb_test_drop_single_key_raw()
+{
+    int ret;
+    int size = sizeof(JSON_BASIC) - 1;
+    flb_ctx_t *ctx;
+    int in_ffd;
+    int out_ffd;
+
+    /* Create context, flush every second (some checks omitted here) */
+    ctx = flb_create();
+    flb_service_set(ctx, "flush", "1", "grace", "1",
+                    "log_level", "error",
+                    NULL);
+
+    /* Lib input mode */
+    in_ffd = flb_input(ctx, (char *) "lib", NULL);
+    flb_input_set(ctx, in_ffd, "tag", "test", NULL);
+
+    /* Loki output */
+    out_ffd = flb_output(ctx, (char *) "loki", NULL);
+    flb_output_set(ctx, out_ffd,
+                   "match", "test",
+                   "drop_single_key", "raw",
+                   NULL);
+
+    /* Enable test mode */
+    ret = flb_output_set_test(ctx, out_ffd, "formatter",
+                              cb_check_drop_single_key_raw,
+                              NULL, NULL);
+
+    /* Start */
+    ret = flb_start(ctx);
+    TEST_CHECK(ret == 0);
+
+    /* Ingest data sample */
+    ret = flb_lib_push(ctx, in_ffd, (char *) JSON_BASIC, size);
+    TEST_CHECK(ret >= 0);
+
+    sleep(2);
+    flb_stop(ctx);
+    flb_destroy(ctx);
+}
 
 static void cb_check_line_format_remove_keys(void *ctx, int ffd,
                                              int res_ret, void *res_data,
@@ -611,13 +787,16 @@ void flb_test_float_value()
 /* Test list */
 TEST_LIST = {
     {"remove_keys_remove_map" , flb_test_remove_map},
-    {"labels_ra"        , flb_test_labels_ra },
-    {"remove_keys"      , flb_test_remove_keys },
-    {"basic"            , flb_test_basic },
-    {"labels"           , flb_test_labels },
-    {"label_keys"       , flb_test_label_keys },
-    {"line_format"      , flb_test_line_format },
-    {"label_map_path"   , flb_test_label_map_path},
-    {"float_value"      , flb_test_float_value},
+    {"labels_ra"              , flb_test_labels_ra },
+    {"remove_keys"            , flb_test_remove_keys },
+    {"basic"                  , flb_test_basic },
+    {"labels"                 , flb_test_labels },
+    {"label_keys"             , flb_test_label_keys },
+    {"line_format"            , flb_test_line_format },
+    {"drop_single_key_off"    , flb_test_drop_single_key_off },
+    {"drop_single_key_on"     , flb_test_drop_single_key_on },
+    {"drop_single_key_raw"    , flb_test_drop_single_key_raw },
+    {"label_map_path"         , flb_test_label_map_path},
+    {"float_value"            , flb_test_float_value},
     {NULL, NULL}
 };