Merged with the default branch.

Author: thresheek

.hgtags

@@ -67,4 +67,6 @@ ea073fb3cb75abfb4be5dc12402de73e0c20da60 1.28.0
 16e01c5fead470d8f630613b973a50a33fd0d0f2 1.28.0-1
 37cac7fec92e5656d8a03a8594ade131c3391f45 1.29.0
 2927b72847d44913233fa303438a14ec313d860e 1.29.0-1
+fa0227b7f62691a186d752ace475868de49e9fce 1.29.1
 e7b7f2bb04e8c6f4cbe6374fd6960d4465654215 1.29.1-1
+2692a5823c403a4e209681943e32a4907317d14b 1.30.0

CHANGES

@@ -1,4 +1,32 @@
 
+Changes with Unit 1.30.0                                         10 May 2023
+
+    *) Change: remove Unix domain listen sockets upon reconfiguration.
+
+    *) Feature: basic URI rewrite support.
+
+    *) Feature: NJS loadable modules support.
+
+    *) Feature: per-application logging.
+
+    *) Feature: conditional logging of route selection.
+
+    *) Feature: support the keys API on the request objects in NJS.
+
+    *) Feature: default values for 'make install' pathnames such as prefix;
+       this allows to './configure && make && sudo make install'.
+
+    *) Feature: "server_version" setting to omit the version token from
+       "Server" header field.
+
+    *) Bugfix: request header field values could be corrupted in some cases;
+       the bug had appeared in 1.29.0.
+
+    *) Bugfix: PHP error handling (added missing 403 and 404 errors).
+
+    *) Bugfix: Perl applications crash on second responder call.
+
+
 Changes with Unit 1.29.1                                         28 Feb 2023
 
     *) Bugfix: stop creating world-writeable directories.

CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the moderation team at nginx-oss-community@f5.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4,
+available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>
+
+For answers to common questions about this code of conduct, see
+<https://www.contributor-covenant.org/faq>

README.md

@@ -5,19 +5,17 @@
 ![NGINX Unit Logo](docs/unitlogo.svg)
 
 NGINX Unit is a lightweight and versatile open-source server that has
-three core capabilities:
+two primary capabilities:
 
-- it is an HTTP reverse proxy,
-- a web server for static media assets,
-- and an application server that runs code in seven languages.
+- serves static media assets,
+- runs application code in seven languages.
 
-We are building a universal tool that compresses several layers of the modern
-application stack into a potent, coherent solution with a focus on performance,
-low latency, and scalability. It is intended as a building block for any web
-architecture regardless of its complexity, from enterprise-scale deployments to
-your pet's homepage.
+Unit compresses several layers of the modern application stack into a potent,
+coherent solution with a focus on performance, low latency, and scalability. It
+is intended as a universal building block for any web architecture regardless
+of its complexity, from enterprise-scale deployments to your pet's homepage.
 
-Unit's native RESTful JSON API enables dynamic updates with zero interruptions
+Its native RESTful JSON API enables dynamic updates with zero interruptions
 and flexible configuration, while its out-of-the-box productivity reliably
 scales to production-grade workloads. We achieve that with a complex,
 asynchronous, multithreading architecture comprising multiple processes to
@@ -162,7 +160,7 @@ For full details of configuration management, see the
 ## Community
 
 - The go-to place to start asking questions and share your thoughts is
-  our [Slack channel](https://nginxcommunity.slack.com/).
+  our [Slack channel](https://community.nginx.org/joinslack).
 
 - Our [GitHub issues page](https://github.com/nginx/unit/issues) offers
   space for a more technical discussion at your own pace.

auto/echo/build

@@ -5,15 +5,15 @@
 
 $echo 'building an "echo" program'
 
-rm -f $NXT_BUILD_DIR/echo
+rm -f $NXT_BUILD_DIR/bin/echo
 
-nxt_echo_test="$CC -o $NXT_BUILD_DIR/echo -O $NXT_CC_OPT
+nxt_echo_test="$CC -o $NXT_BUILD_DIR/bin/echo -O $NXT_CC_OPT
                auto/echo/echo.c $NXT_LD_OPT"
 
 # "|| true" is to bypass "set -e" setting.
 nxt_echo_err=`$nxt_echo_test 2>&1 || true`
 
-if [ ! -x $NXT_BUILD_DIR/echo ]; then
+if [ ! -x $NXT_BUILD_DIR/bin/echo ]; then
     $echo
     $echo $0: error: cannot build an \"echo\" program:
     $echo
@@ -24,4 +24,4 @@ if [ ! -x $NXT_BUILD_DIR/echo ]; then
     exit 1
 fi
 
-echo=$NXT_BUILD_DIR/echo
+echo=$NXT_BUILD_DIR/bin/echo

auto/help

@@ -11,23 +11,31 @@ cat << END
   --cc-opt=OPTIONS     set additional C compiler options
   --ld-opt=OPTIONS     set additional linker options
 
-  --prefix=DIRECTORY   set prefix for relative pathnames, default: none
-  --bindir=DIRECTORY   set user executables directory name
-                       default: "$NXT_BINDIR"
-  --sbindir=DIRECTORY  set system admin executables directory name
-                       default: "$NXT_SBINDIR"
-  --libdir=DIRECTORY   set library directory name, default: "$NXT_LIBDIR"
-  --incdir=DIRECTORY   set includes directory name, default: "$NXT_INCDIR"
-  --mandir=DIRECTORY   set man pages directory name, default: "$NXT_MANDIR"
-  --modules=DIRECTORY  set modules directory name, default: "$NXT_MODULES"
-  --state=DIRECTORY    set state directory name, default: "$NXT_STATE"
-  --tmp=DIRECTORY      set tmp directory name, default: "$NXT_TMP"
-
-  --pid=FILE           set pid filename, default: "$NXT_PID"
-  --log=FILE           set log filename, default: "$NXT_LOG"
+  --prefix=DIR         default: "/usr/local"
+  --exec-prefix=DIR    default: "\$prefix"
+  --bindir=DIR         default: "\$exec_prefix/bin"
+  --sbindir=DIR        default: "\$exec_prefix/sbin"
+  --includedir=DIR     default: "\$prefix/include"
+  --libdir=DIR         default: "\$exec_prefix/lib"
+  --modulesdir=DIR     default: "\$libdir/unit/modules"
+  --datarootdir=DIR    default: "\$prefix/share"
+  --mandir=DIR         default: "\$datarootdir/man"
+  --localstatedir=DIR  default: "\$prefix/var"
+  --statedir=DIR       default: "\$localstatedir/lib/unit"
+  --runstatedir=DIR    default: "\$localstatedir/run/unit"
+  --logdir=DIR         default: "\$localstatedir/log/unit"
+  --tmpdir=DIR         default: "/tmp"
+
+  --incdir=DIR         [deprecated] synonym for --includedir
+  --modules=DIR        [deprecated] synonym for --modulesdir
+  --state=DIR          [deprecated] synonym for --statedir
+  --tmp=DIR            [deprecated] synonym for --tmpdir
+
+  --pid=FILE           set pid filename, default: "\$runstatedir/unit.pid"
+  --log=FILE           set log filename, default: "\$logdir/unit.log"
 
   --control=ADDRESS    set address of control API socket
-                       default: "$NXT_CONTROL"
+                       default: "unix:\$runstatedir/control.unit.sock"
 
   --user=USER          set non-privileged processes to run as specified user
                        default: "$NXT_USER"