From: Sergey Kandaurov <pluknet@nginx.com>
Date: Wed, 29 Dec 2021 12:17:26 +0000 (+0300)
Subject: Merged with the default branch.
X-Git-Tag: release-1.25.0~4^2~153
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/postgres_fdw.c?a=commitdiff_plain;h=f3363a8dbe29b3159881e259b2690c78757c946f;p=nginx.git

Merged with the default branch.
---

f3363a8dbe29b3159881e259b2690c78757c946f
diff --cc auto/options
index d9873f462,48f3a1a42..ced563806
--- a/auto/options
+++ b/auto/options
@@@ -150,9 -146,9 +150,10 @@@ PCRE=NON
  PCRE_OPT=
  PCRE_CONF_OPT=
  PCRE_JIT=NO
+ PCRE2=YES
  
  USE_OPENSSL=NO
 +USE_OPENSSL_QUIC=NO
  OPENSSL=NONE
  
  USE_ZLIB=NO