Merged with the default branch.

6 files changed, 35 insertions, 31 deletions

diff --git a/auto/modules/java b/auto/modules/java
index e8137217..bdf17022 100644
--- a/auto/modules/java
+++ b/auto/modules/java
@@ -191,7 +191,7 @@ nxt_feature_libs="${NXT_JAVA_LDFLAGS}"
 nxt_feature_test="
     #include <jni.h>
 
-    int main() {
+    int main(void) {
         JNI_CreateJavaVM(NULL, NULL, NULL);
         return 0;
     }"
@@ -238,7 +238,7 @@ cat << END > $NXT_JAVA_JARS
 static const char *nxt_java_system_jars[] = {
 END
 
-NXT_TOMCAT_VERSION=9.0.52
+NXT_TOMCAT_VERSION=9.0.70
 
 NXT_JAR_VERSION=$NXT_TOMCAT_VERSION
 
@@ -284,7 +284,7 @@ static const char *nxt_java_unit_jars[] = {
     "$NXT_UNIT_JAR",
 END
 
-NXT_JAR_VERSION=9.4.43.v20210629
+NXT_JAR_VERSION=9.4.49.v20220914
 NXT_JAR_NAMESPACE=org/eclipse/jetty/
 
 NXT_JAR_NAME=jetty-util
@@ -297,7 +297,7 @@ NXT_JAR_NAME=jetty-http
 . auto/modules/java_get_jar
 
 NXT_JAR_NAME=classgraph
-NXT_JAR_VERSION=4.8.112
+NXT_JAR_VERSION=4.8.151
 NXT_JAR_NAMESPACE=io/github/classgraph/
 . auto/modules/java_get_jar
 
diff --git a/auto/modules/java_jar.sha512 b/auto/modules/java_jar.sha512
index 5289081c..d3e9016c 100644
--- a/auto/modules/java_jar.sha512
+++ b/auto/modules/java_jar.sha512
@@ -1,14 +1,14 @@
-e7ad5ee436f6befaddcdd1046022a2e30444a435d9419a33f8316f66e794cf710809dbcf7e408a087f434cd9cb724682965b5e4098e34803569241eb44288322  classgraph-4.8.112.jar
+4b47eabc83f3f672a7e91af6ae97bbdbc6f01ed7149540cb06b0f530f45a95d025cc7807a6640982d23d2da50bd973ad788a4c8fdfa025da7cf93c560abbe61e  classgraph-4.8.151.jar
 ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b96eaa8826647f1d5323e185018fe33a64c402d69c73c9158  ecj-3.26.0.jar
-a3ce1a5a41c9791ece4cbbf049ec4add1ec41330743d6757daea520f8b329299f5dd274f9e5741ba41fe49510f203efd19540d2404390eca53421132f5f46d4b  jetty-http-9.4.43.v20210629.jar
-61a14e97baac9962bd68ece24f8b967eec8e32edfebfa27c6a13996a86650d82f8977bf1aa582fc9706a1b028cb3cec0057c97628235dfc130061939845229e6  jetty-server-9.4.43.v20210629.jar
-304fcdba2bdbf37e8f2ea69a3f5fbdffdfefd98d80fa78883b1dca1129a4907cef63eb2fa7c83eef359022a3b6a2f3ff742d8d23075c83d049ac01f1402e97f8  jetty-util-9.4.43.v20210629.jar
-f14ac948559c0b6e20f6d84e5177fea46ea1321a7a401f280ee9323f3a07e70e141d2b12c8c466c446efb55a58743af931b0584f56494f17311cab511bcd214a  tomcat-api-9.0.52.jar
-a5ca293732267854a296ccc79b25051acf76fa8dea6118d43aa2e95b6d1951dfaffb941430b5080d7ab62d82d2c82c9385baf99e3c4a2bb6bf4a04372149169d  tomcat-el-api-9.0.52.jar
-8660e11dd0f994de43b19ba251a789dc3194a6b82d674085fed510200c789b402b27ab97bcecfec0720f563bb0dd18c2631cd8bb5c35e604c1460d7357492123  tomcat-jasper-9.0.52.jar
-5b0b3e0edb47e3c4269736542d66d6fc099a74965fdcd5d3a6382db3f75bec7329e81f0719aaafccd318a058ec8fbba113a6ae9234ca94a00c8c39e5c8885568  tomcat-jasper-el-9.0.52.jar
-a4368d1073d79a4f8a1cb8967a5e39af87723a17b2d94466554e8e4d3e8bb2dec3ee37db9f606e0c775dd4028604d4e87921f0dda764c8ef138aa50acf03d549  tomcat-jsp-api-9.0.52.jar
-8687e108489996226a83e8310c73a2a176fac9ce365a7bd3fc23955fe968c3858a24c047cb5c7fbd1f3a890c893dcdf55e88180eefe61b98c1a3bf4e316fb07e  tomcat-juli-9.0.52.jar
-f9929f433e2b2f93897a87d117af2519e44020b44e3a475dfc81662b08d08e010b14a3dd6df2d4800196cdba7cbb8db2b879341c5a0ef1d11e5abe63d872bc34  tomcat-servlet-api-9.0.52.jar
-c21ccf969378f2cad0ead32451c2527ea944207b5a894b642ee554042fe87eb0ce647aacbf8a51d12b4ecf2bf13e9380da78d8f7792486909daba72e8d0f83f2  tomcat-util-9.0.52.jar
-14b4eb31c124d22c7ea7f05808cd6a46076f9d72648afd76e2d11924874117266771a455686d704225d2eff94656f024293140a3259b108857fa6b8b218ddd63  tomcat-util-scan-9.0.52.jar
+82c6985f0d7c76459bf0638fdc24f3692a11804a95845b1a45203dfcc1205ab7bf67934f6babf7eb2f2b87d637a8fcbd87eae297e4403511bf73f359b1957e09  jetty-http-9.4.49.v20220914.jar
+2f199729ad9b46fda968b4bfafd657971fc9d90371852f8ad7afdae6d5752d2b84648734eabb6ffbf084800253d1da97d4bb9ad60f799ee6ae38a80c2d881fc4  jetty-server-9.4.49.v20220914.jar
+e207d93ef5bc98ad2b1a43393231bdacfb3ab642b6197a8b72d819f8ad30357c4daa0a76a0459340563fcdee0fdfc111e719a2db5be778d6b1e10f1ccbe77fc9  jetty-util-9.4.49.v20220914.jar
+a2cd93ccaa58191475df9aa40a11c8b3f14f77e78b6b2dc9e5fbebf07297e318d60c5cc5aca37e61bd748456b01491a0e6702b9e4d3ec3ef43d9b1a93f9b733e  tomcat-api-9.0.70.jar
+4b2b33f6bdcb3fbff6de7da6f7558e4a21335c5c08dbc2adba1be90ddcaa4be1ba053d9021a4891edef975759a562b46a58da6c5acc2209ae8b942e4058b7022  tomcat-el-api-9.0.70.jar
+7ee837f218220022bf2543e4b3191c0a948c7f8bbd4f2e7202cc29196e5f4a8264aee027bc3521b79775b1ab0b3f8a4bef8982be9c0b2c5f95b77f36d5e5930f  tomcat-jasper-9.0.70.jar
+f92cdddd3aae8d1b0b861afc67344fc6544c413d78e2e810f804632e68a3667b2b1929ac4995b582af03774ad024632e820143cd53273e06a796484ce2f0a73e  tomcat-jasper-el-9.0.70.jar
+5ec6985740e7a5873f56430b1f0fd6e55a625fac8f5618d846072117f5ed8ccc69665fd6ebde40381099cf42ab9525f5da3cd16dd0b50a267734bfdf7f2e168d  tomcat-jsp-api-9.0.70.jar
+33cf08f10bad572c9e7085b3ba8e91b38a293f8838a39483b01d07d9c1b9d0e67492343e0523da24af47782ec4a5d639db49679d951ccbe1da9d1309346cc693  tomcat-juli-9.0.70.jar
+0c8ee46dc49828720cd431e4e6bcb2a9d7409b3bae3d3427640b159985a27de22181151c8fa15a1f44f607730977c4ae2512c63a19c070b92e38438ad0ba8138  tomcat-servlet-api-9.0.70.jar
+e882c47acdb9e5612a0810503cb8900570b68aec5dd33dd6439884b15723a67cbf982c9cf546e7cd6d67b731df3d64ec5347500ab8a987d7cb1e11a74f819325  tomcat-util-9.0.70.jar
+0a562e8a40e406966ae2be5587dcad0ceae3143b03ef9b9f7dd77c6a2db522c31ed82b9c38b4464f9f80c1d8ca418ce6a09f9fecb3e0209a962da01e2f9bd626  tomcat-util-scan-9.0.70.jar
diff --git a/auto/modules/perl b/auto/modules/perl
index e9d7e109..2daebd0d 100644
--- a/auto/modules/perl
+++ b/auto/modules/perl
@@ -79,7 +79,7 @@ if /bin/sh -c "$NXT_PERL -MConfig -e 'print \"Perl version: \",
 
         static PerlInterpreter *my_perl;
 
-        int main() {
+        int main(void) {
             char argv[] = \"\\0-e\\00\";
             char *embedding[] = { &argv[0], &argv[1], &argv[4] };
 
@@ -124,7 +124,7 @@ nxt_feature_test="
     #include <EXTERN.h>
     #include <perl.h>
 
-    int main() {
+    int main(void) {
         printf(\"%s\", PERL_VERSION_STRING);
         return 0;
     }"
diff --git a/auto/modules/php b/auto/modules/php
index e92a67cd..f0ecb709 100644
--- a/auto/modules/php
+++ b/auto/modules/php
@@ -131,7 +131,7 @@ nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}"
 nxt_feature_test="
     #include <php.h>
 
-    int main() {
+    int main(void) {
         printf(\"%s\", PHP_VERSION);
         return 0;
     }"
@@ -148,8 +148,12 @@ nxt_feature_test="
     #include <php.h>
     #include <php_main.h>
 
-    int main() {
+    int main(void) {
+    #if (PHP_VERSION_ID < 80200)
         php_module_startup(NULL, NULL, 0);
+    #else
+        php_module_startup(NULL, NULL);
+    #endif
         return 0;
     }"
 
@@ -172,7 +176,7 @@ nxt_feature_test="
     #include <php.h>
     #include <php_main.h>
 
-    int main() {
+    int main(void) {
         #ifndef ZTS
         #error ZTS is not defined.
         #endif
@@ -193,7 +197,7 @@ nxt_feature_test="
     #include <php.h>
     #include <php_main.h>
 
-    int main() {
+    int main(void) {
         zend_signal_startup();
         return 0;
     }"
diff --git a/auto/modules/python b/auto/modules/python
index 9be6b370..480ae1da 100644
--- a/auto/modules/python
+++ b/auto/modules/python
@@ -86,7 +86,7 @@ if /bin/sh -c "$NXT_PYTHON_CONFIG --prefix" >> $NXT_AUTOCONF_ERR 2>&1; then
     nxt_feature_test="
         #include <Python.h>
 
-        int main() {
+        int main(void) {
             Py_Initialize();
             return 0;
         }"
@@ -114,7 +114,7 @@ nxt_feature_test="
     #include <Python.h>
     #include <stdio.h>
 
-    int main() {
+    int main(void) {
         printf(\"%s\", PY_VERSION);
         return 0;
     }"
diff --git a/auto/modules/ruby b/auto/modules/ruby
index dbedfd72..608193a6 100644
--- a/auto/modules/ruby
+++ b/auto/modules/ruby
@@ -101,12 +101,12 @@ if /bin/sh -c "$NXT_RUBY -v" >> $NXT_AUTOCONF_ERR 2>&1; then
     nxt_feature="Ruby library"
     nxt_feature_name=""
     nxt_feature_run=value
-    nxt_feature_incs="${NXT_RUBY_INCPATH}"
+    nxt_feature_incs="${NXT_RUBY_INCPATH} ${NXT_RUBY_CFLAGS}"
     nxt_feature_libs="${NXT_RUBY_LIBS}"
     nxt_feature_test="
         #include <ruby.h>
 
-        int main() {
+        int main(void) {
             static const char *argv[3] = {
                 \"NGINX_Unit\", \"-rrbconfig\",
                 \"-eprint RbConfig::CONFIG['libdir']\"
@@ -125,12 +125,12 @@ if /bin/sh -c "$NXT_RUBY -v" >> $NXT_AUTOCONF_ERR 2>&1; then
         nxt_feature="Ruby library in $NXT_RUBY_LIBPATH"
         nxt_feature_name=""
         nxt_feature_run=no
-        nxt_feature_incs="${NXT_RUBY_INCPATH}"
+        nxt_feature_incs="${NXT_RUBY_INCPATH} ${NXT_RUBY_CFLAGS}"
         nxt_feature_libs="${NXT_RUBY_LIBS}"
         nxt_feature_test="
             #include <ruby.h>
 
-            int main() {
+            int main(void) {
                 ruby_init();
                 return ruby_cleanup(0);
             }"
@@ -153,13 +153,13 @@ fi
 nxt_feature="Ruby version"
 nxt_feature_name=""
 nxt_feature_run=value
-nxt_feature_incs="${NXT_RUBY_INCPATH}"
+nxt_feature_incs="${NXT_RUBY_INCPATH} ${NXT_RUBY_CFLAGS}"
 nxt_feature_libs="${NXT_RUBY_LIBS}"
 nxt_feature_test="
     #include <ruby.h>
     #include <ruby/version.h>
 
-    int main() {
+    int main(void) {
         printf(\"%s\", ruby_version);
         return 0;
     }"