Skip to content
This repository was archived by the owner on Oct 8, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci-dev-distro-compiler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ jobs:
- name: configure unit CC=${{ matrix.compiler }}
run: |
if [ "${{ matrix.compiler }}" = "clang" ]; then
./configure --openssl --otel --zlib --zstd --brotli --cc=clang
./configure --openssl --otel --zlib --zstd --brotli --tests --cc=clang
else
./configure --openssl --otel --zlib --zstd --brotli
./configure --openssl --otel --zlib --zstd --brotli --tests
fi

- name: make unit
Expand Down Expand Up @@ -142,9 +142,9 @@ jobs:
- name: configure unit CC=${{ matrix.compiler }}
run: |
if [ "${{ matrix.compiler }}" = "clang" ]; then
./configure --openssl --otel --zlib --zstd --brotli --cc=clang
./configure --openssl --otel --zlib --zstd --brotli --tests --cc=clang
else
./configure --openssl --otel --zlib --zstd --brotli
./configure --openssl --otel --zlib --zstd --brotli --tests
fi

- name: make unit
Expand Down
2 changes: 1 addition & 1 deletion auto/modules/java
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ cat << END > $NXT_JAVA_JARS
static const char *nxt_java_system_jars[] = {
END

NXT_TOMCAT_VERSION=9.0.108
NXT_TOMCAT_VERSION=9.0.110

NXT_JAR_VERSION=$NXT_TOMCAT_VERSION

Expand Down
9 changes: 9 additions & 0 deletions auto/modules/java_jar.sha512
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,20 @@ ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b
5f2b1efe5f6279ed9c3a25d8c3a6413b195a6957500752cb7b59fc8e8bc43d01eeb2e97b619bfb74ff5ec96cd8893ba1d9d372f8a226ff197d3b452febafa146 jetty-server-9.4.58.v20250814.jar
c4505826e68be8d8736eba5cd29fd86ada455ee5765f8d46d33085b788eb3295023b167354178441e80c97edde9f988f89bf3959c59ef8aada56e5d863673021 jetty-util-9.4.58.v20250814.jar
65cfee9beb10eb9831af55f039d8084dcd500a9718f4c753acf99fb52d4ab8b1bd70c8a6807a4cae7096466ea344c79d366c4b115d8b1e641bc6c86e49e2c8c3 tomcat-api-9.0.108.jar
b1970b9af36882c351fc0913ca39d33e184dd97274a36d6856a9a52f930ea0e9f3aa04758905ee7b416526322fe06e846c7f041fcbbeb561be82cc0a30bed647 tomcat-api-9.0.110.jar
772f68efbd68d010eb72d043c115364d65083c9a95887df79bf26feed6aa332348424ec3fbab9155dab508c11a40a31f1d1aea1205d04a180b0619497628ed32 tomcat-el-api-9.0.108.jar
1957abb8d4bf8e51d98a9a4064b157d00d26d0b8fd9513669745c3e61645d9dcc07a570305bd22ca1f0d1685efb8e652b17aa2e6a30cac8f136fda9e15f1baf7 tomcat-el-api-9.0.110.jar
fee3afbb966efdbe49347f1942a3ba5aa275e7193de6a14a0355f49a8138b255f4123189435613976e18c55cb37f4f53e5bc8dd1b9cc178551b4fb0978e545a4 tomcat-jasper-9.0.108.jar
e482fd98ce80176b106a726e2d54506a40a9add016549b35f1f5faff4a95a3a14e5f2ca471ad458a0907064c983693c48a1146650bd1144b1f2b624f37b11d02 tomcat-jasper-9.0.110.jar
93c6ac9876599a1a7c7dfc09458edcc109de0748db77514b765132814d80621a4bca431378acc916306e928119cea1157288ff81f8d88fd1661366aded8213b2 tomcat-jasper-el-9.0.108.jar
d461d63ecaa824298bc72983297bd1f0b108d20c182675dcdd44090a5390cc8889c7a50e50d03d7367939cfc77a33128372ddd6907387ee6d84789e457aa9af7 tomcat-jasper-el-9.0.110.jar
c3bef13c90043fa179c3b7ab599c7ab227e5bf28132f314049222096a1af80b34fc28737f40973c0dc4f10f5899da524fefafc5a97981b0f18e87062a5041766 tomcat-jsp-api-9.0.108.jar
8ab91979e09581009d1fa26b2a99dae59454791095015d818a6db44fe383935a1758d705c405fe7de3633561546d6a6417005d7f9a4e6cb96a818520bf67659b tomcat-jsp-api-9.0.110.jar
3ea930f5da6f2e4ba90208ef4cede22decf737aad252f9c74dcf4ffaa7351ab52e153b31f41fe64fc0c7a1bae626e1e1da2de679975583740975cce4391c67d9 tomcat-juli-9.0.108.jar
313900c4b8c65e232da9431f7b1e2745c81d2a6ece7be06d5bc51da3b5c321afc0080959b48e47a84f99558ecfbbbc642685cb171d2bac85c86d0cb50cfdc103 tomcat-juli-9.0.110.jar
a1e93a66ffe517baa37878d085b18537c18284c8ddf3872d9b4c2ef0d6579c68f0eac57d5d15303cde485b3286bafd20e1b03136e9c86712002a31edd6081052 tomcat-servlet-api-9.0.108.jar
6cce38b6e786538ce09d0098bc75923cea9a08b726dfcdac66625c8d4b103c4d546a037351008d95be026c4ceb99e7db1ee9d605bb5e13a78eff0431e8f7e03c tomcat-servlet-api-9.0.110.jar
cfcabcd79c56f33415b8f4095ac894c0dfa5f392fd272e2e66d61d67051b1eac026740dd21657179a651fa0eeb2f39351781771b0e38799ab1fdf277ebda9883 tomcat-util-9.0.108.jar
f1d183cf8568cab72dcb72dbe052656b448f95c546288237c8548577e51e975dfb371e8152557d4b094ed98035a1bfc5de6edbeca09e5751ca56c9677ae792e5 tomcat-util-9.0.110.jar
0cd88e452ead14c89cd9c70b965795f5793355bc61a0cbf58355585afedcc8a24cb62968da757e253ef1b119021a543aea0058cf9fd5ab152bc185e338c3d15f tomcat-util-scan-9.0.108.jar
0059c8f5bb338d4e4492f15537c9ec9cb337472c878d46b32dbc5811fe517f35917358a23777b2e2eea7f6c9b5c21d07532ddc25f9a82defd73c3c1e11800ada tomcat-util-scan-9.0.110.jar
2 changes: 1 addition & 1 deletion src/test/nxt_http_parse_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ typedef struct {
nxt_str_t method;
nxt_str_t target;
nxt_str_t args;
u_char version[8];
u_char version[8] NXT_NONSTRING;

/* target with "/." */
unsigned complex_target:1;
Expand Down
2 changes: 1 addition & 1 deletion src/test/nxt_utf8_file_name_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ nxt_utf8_file_name_test(nxt_thread_t *thr)
nxt_file_t uc_file, lc_file;
const u_char *pp;
nxt_file_name_t uc_name[10], lc_name[10];
static const u_char utf8[4] = "UTF8";
static const u_char utf8[4] NXT_NONSTRING = "UTF8";

nxt_thread_time_update(thr);

Expand Down
2 changes: 1 addition & 1 deletion test/unit/applications/lang/java.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def prepare_env(self, script):
os.makedirs(classes_path)

classpath = (
f'{option.current_dir}/build/tomcat-servlet-api-9.0.108.jar'
f'{option.current_dir}/build/tomcat-servlet-api-9.0.110.jar'
)

ws_jars = glob.glob(
Expand Down
Loading