Merged with the default branch.

Author: thresheek

.gitattributes

@@ -0,0 +1,2 @@
+*.c	diff=cpp
+*.h	diff=cpp

.hgtags

@@ -63,4 +63,6 @@ aa207ced9712132040e6153ceccdaf04c112d02c 1.25.0-1
 069c16dd4ed34d49584028b25f5cba4a4a2eded6 1.26.1-1
 8a9055cbe4ffd450fac4d7a849c00e0db5485ad3 1.27.0
 e7df1cfec95945265a33f7085fbd313b4dd207fd 1.27.0-1
+ea073fb3cb75abfb4be5dc12402de73e0c20da60 1.28.0
 16e01c5fead470d8f630613b973a50a33fd0d0f2 1.28.0-1
+37cac7fec92e5656d8a03a8594ade131c3391f45 1.29.0

.mailmap

@@ -0,0 +1,2 @@
+<[email protected]> <[email protected]>
+<[email protected]> <[email protected]>

CHANGES

@@ -1,4 +1,44 @@
 
+Changes with Unit 1.29.0                                         15 Dec 2022
+
+    *) Change: removed $uri auto-append for "share" when loading
+       configuration.
+
+    *) Change: prefer system crypto policy instead of hardcoding a default.
+
+    *) Feature: njs support with the basic syntax of JS template literals.
+
+    *) Feature: support per-application cgroups on Linux.
+
+    *) Feature: the $request_time variable contains the request processing
+       time.
+
+    *) Feature: "prefix" option in Python applications to set WSGI
+       "SCRIPT_NAME" and ASGI root-path variables.
+
+    *) Feature: compatibility with Python 3.11.
+
+    *) Feature: compatibility with OpenSSL 3.
+
+    *) Feature: compatibility with PHP 8.2.
+
+    *) Feature: compatibility with Node.js 19.0.
+
+    *) Feature: Ruby Rack v3 support.
+
+    *) Bugfix: fix error in connection statistics when using proxy.
+
+    *) Bugfix: fix HTTP cookie parsing when the value contains an equals
+       sign.
+
+    *) Bugfix: PHP directory URLs without a trailing '/' would give a 503
+       error (fixed with a 301 re-direct).
+
+    *) Bugfix: missing error checks in the C API.
+
+    *) Bugfix: report the regex status in configure summary.
+
+
 Changes with Unit 1.28.0                                         13 Sep 2022
 
     *) Change: increased the applications' startup timeout.

README.md

@@ -50,8 +50,9 @@ For a description of image tags, see the
 ### Amazon Linux, Fedora, RedHat
 
 ``` console
-$ curl -sL 'https://unit.nginx.org/_downloads/setup-unit.sh' | sudo -E bash
-# yum install unit
+$ wget https://raw.githubusercontent.com/nginx/unit/master/tools/setup-unit && chmod +x setup-unit
+# ./setup-unit repo-config && yum install unit
+# ./setup-unit welcome
 ```
 
 For details and available language packages, see the
@@ -61,8 +62,9 @@ For details and available language packages, see the
 ### Debian, Ubuntu
 
 ``` console
-$ curl -sL 'https://unit.nginx.org/_downloads/setup-unit.sh' | sudo -E bash
-# apt install unit
+$ wget https://raw.githubusercontent.com/nginx/unit/master/tools/setup-unit && chmod +x setup-unit
+# ./setup-unit repo-config && apt install unit
+# ./setup-unit welcome
 ```
 
 For details and available language packages, see the
@@ -91,7 +93,7 @@ application object. Let's store our first config snippet in a file called
 
 Saving it as a file isn't necessary, but can come in handy with larger objects.
 
-Now, `PUT` it into the `config/applications` section of Unit's control API,
+Now, `PUT` it into the `/config/applications` section of Unit's control API,
 usually available by default via a Unix domain socket:
 
 ``` console
@@ -105,7 +107,7 @@ usually available by default via a Unix domain socket:
 }
 ```
 
-Next, reference the app from a listener object in the `config/listeners`
+Next, reference the app from a listener object in the `/config/listeners`
 section of the API.  This time, we pass the config snippet straight from the
 command line:
 

SECURITY.txt

@@ -0,0 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+#
+# Please report security issues as below, specifically
+# mentioning NGINX Unit in the subject.
+#
+Canonical: https://unit.nginx.org/.well-known/security.txt
+Contact: mailto:[email protected]
+Encryption: https://nginx.org/keys/maxim.key
+Encryption: https://nginx.org/keys/sb.key
+Encryption: https://nginx.org/keys/thresh.key
+Expires: 2024-01-01T00:00:00.000Z
+Policy: https://www.first.org/cvss/v3.1/specification-document
+Preferred-Languages: en
+
+-----BEGIN PGP SIGNATURE-----
+
+iQHEBAEBCAAuFiEEE8gqY7YDV2FW4wpOoOqYG2aw2WcFAmN7X/UQHGsucGF2bG92
+QGY1LmNvbQAKCRCg6pgbZrDZZ4wFDADIZz5UwVUaxQ6mAfi+3Gs28NLXQp5kBILJ
+PC9Rhjlksufbby5yd4lh+JMZ8U2YRQ8OWne6Kl0NvZHDcP2OyBOdiBUXvnE+ZcNz
+ujT3JMk15l1FxKbIitUzwZ+QcXOKTqsoavPs5hrGrrJNQWLhqAH8uESDdI7AUM5R
+BOQ9Z6ENw3rgEtrtMNMdwt+pt2/+1cuu/4PuIuFhjYyCuS7i7tyFtbkc9BTlx03I
+99g9bqKltWAvxGrMi+xfFVOnTgWp0b+oKsN8jgQji1zNMSx7UmrFq8uSpNV3eR5t
+a4iVZQsIRUVVSYh8VkZagtbiw4WXaEnbwUgxj/4K2rNvkn5jFk+NkzSALN8/7ocp
+U5R5ctku511bJiwFSUkTx8nkd58bzqqQ0EHr/3uTmfXSTTZYdUXuXXCSMzuUBEOi
+y9n+2JFRdlEXxqwhszJxAXhs6VH2su0laX2UOMMnw6X2GFF3CU4PK0qoalWLSh47
+6aiL99zgqrq0IFibRTXCo1a3RPqiYB0=
+=GiB/
+-----END PGP SIGNATURE-----

auto/atomic

@@ -10,7 +10,7 @@ nxt_feature_name=NXT_HAVE_GCC_ATOMIC
 nxt_feature_run=yes
 nxt_feature_incs=
 nxt_feature_libs=
-nxt_feature_test="int main() {
+nxt_feature_test="int main(void) {
                       long  n = 0;
 
                       if (!__sync_bool_compare_and_swap(&n, 0, 3))
@@ -44,7 +44,7 @@ if [ $nxt_found = no ]; then
     nxt_feature_libs=
     nxt_feature_test="#include <atomic.h>
 
-                      int main() {
+                      int main(void) {
                           ulong_t  n = 0;
 
                           if (atomic_cas_ulong(&n, 0, 3) != 0)
@@ -70,7 +70,7 @@ fi
 if [ $nxt_found = no ]; then
 
     if [ $NXT_64BIT = 1 ]; then
-        nxt_feature_test="int main() {
+        nxt_feature_test="int main(void) {
                               long  n = 0;
                               long  o = 0;
 
@@ -87,7 +87,7 @@ if [ $nxt_found = no ]; then
                               return 0;
                           }"
     else
-        nxt_feature_test="int main() {
+        nxt_feature_test="int main(void) {
                               int  n = 0;
                               int  o = 0;
 

auto/capability

@@ -10,7 +10,7 @@ nxt_feature_test="#include <linux/capability.h>
                   #include <unistd.h>
                   #include <sys/syscall.h>
 
-                  int main() {
+                  int main(void) {
                       struct __user_cap_header_struct hdr;
                       hdr.version = _LINUX_CAPABILITY_VERSION;
                       syscall(SYS_capget, &hdr, 0);

auto/cgroup

@@ -0,0 +1,22 @@
+# Copyright (C) Andrew Clayton
+# Copyright (C) F5, Inc.
+
+NXT_HAVE_CGROUP=NO
+
+if [ -f "/proc/mounts" ]; then
+    CGROUP=$(grep cgroup2 /proc/mounts | head -n 1 | cut -d " " -f 2)
+
+    if [ "$CGROUP" ]; then
+        NXT_HAVE_CGROUP=YES
+
+        cat << END >> $NXT_AUTO_CONFIG_H
+
+#ifndef NXT_HAVE_CGROUP
+#define NXT_HAVE_CGROUP  1
+#define NXT_CGROUP_ROOT  "$CGROUP"
+#endif
+
+END
+
+    fi
+fi

auto/clang

@@ -14,7 +14,7 @@ nxt_feature_libs=
 nxt_feature_test="#include <stdio.h>
                   #define set(dummy, ...)  sprintf(__VA_ARGS__)
 
-                  int main() {
+                  int main(void) {
                       char  buf[4];
 
                       buf[0] = '0';
@@ -37,7 +37,7 @@ if [ $nxt_found = no ]; then
     nxt_feature_test="#include <stdio.h>
                       #define set(dummy, args...)  sprintf(args)
 
-                      int main() {
+                      int main(void) {
                           char  buf[4];
 
                           buf[0] = '0';
@@ -70,7 +70,7 @@ nxt_feature_name=NXT_HAVE_BUILTIN_UNREACHABLE
 nxt_feature_run=no
 nxt_feature_incs=
 nxt_feature_libs=
-nxt_feature_test="int main() {
+nxt_feature_test="int main(void) {
                       __builtin_unreachable();
                   }"
 . auto/feature
@@ -81,7 +81,7 @@ nxt_feature_name=NXT_HAVE_BUILTIN_PREFETCH
 nxt_feature_run=no
 nxt_feature_incs=
 nxt_feature_libs=
-nxt_feature_test="int main() {
+nxt_feature_test="int main(void) {
                       __builtin_prefetch(0);
                       return 0;
                   }"
@@ -93,7 +93,7 @@ nxt_feature_name=NXT_HAVE_BUILTIN_CLZ
 nxt_feature_run=
 nxt_feature_incs=
 nxt_feature_libs=
-nxt_feature_test="int main() {
+nxt_feature_test="int main(void) {
                       if (__builtin_clz(1) == 31)
                           return 0;
                       return 1;
@@ -106,7 +106,7 @@ nxt_feature_name=NXT_HAVE_BUILTIN_POPCOUNT
 nxt_feature_run=
 nxt_feature_incs=
 nxt_feature_libs=
-nxt_feature_test="int main() {
+nxt_feature_test="int main(void) {
                       if (__builtin_popcount(5) == 2)
                           return 0;
                       return 1;
@@ -121,7 +121,7 @@ nxt_feature_incs=
 nxt_feature_libs=
 nxt_feature_test="int n __attribute__ ((visibility(\"default\")));
 
-                  int main() {
+                  int main(void) {
                       return 1;
                   }"
 . auto/feature
@@ -134,7 +134,7 @@ nxt_feature_incs=
 nxt_feature_libs=
 nxt_feature_test="int n __attribute__ ((aligned(64)));
 
-                  int main() {
+                  int main(void) {
                       return 1;
                   }"
 . auto/feature
@@ -153,7 +153,7 @@ nxt_feature_test="#include <stdlib.h>
                       return malloc(1);
                   }
 
-                  int main() {
+                  int main(void) {
                       if (f() != NULL) {
                           return 1;
                       }
@@ -172,7 +172,7 @@ nxt_feature_test="struct s {
                       int i;
                   } __attribute__ ((__packed__));
 
-                  int main() {
+                  int main(void) {
                       return 1;
                   }"
 . auto/feature