mirror of
https://github.com/nginx/nginx.git
synced 2024-12-05 06:19:01 +08:00
31eb8c015d
*) The pid-file names used during online upgrade was changed and now is not required a manual rename operation. The old master process adds the ".oldbin" suffix to its pid-file and executes a new binary file. The new master process creates usual pid-file without the ".newbin" suffix. If the master process exits, then old master process renames back its pid-file with the ".oldbin" suffix to the pid-file without suffix. *) Change: the "worker_connections" directive, new name of the "connections" directive; now the directive specifies maximum number of connections, but not maximum socket descriptor number. *) Feature: SSL supports the session cache inside one worker process. *) Feature: the "satisfy_any" directive. *) Change: the ngx_http_access_module and ngx_http_auth_basic_module do not run for subrequests. *) Feature: the "worker_rlimit_nofile" and "worker_rlimit_sigpending" directives. *) Bugfix: if all backend using in load-balancing failed after one error, then nginx did not try do connect to them during 60 seconds. *) Bugfix: in IMAP/POP3 command argument parsing. Thanks to Rob Mueller. *) Bugfix: errors while using SSL in IMAP/POP3 proxy. *) Bugfix: errors while using SSI and gzipping. *) Bugfix: the "Expires" and "Cache-Control" header lines were omitted from the 304 responses. Thanks to Alexandr Kukushkin.
70 lines
1.1 KiB
Plaintext
70 lines
1.1 KiB
Plaintext
|
|
# Copyright (C) Igor Sysoev
|
|
|
|
|
|
NGX_MAKEFILE=$NGX_OBJS/Makefile
|
|
NGX_MODULES_C=$NGX_OBJS/ngx_modules.c
|
|
|
|
NGX_AUTO_HEADERS_H=$NGX_OBJS/ngx_auto_headers.h
|
|
NGX_AUTO_CONFIG_H=$NGX_OBJS/ngx_auto_config.h
|
|
|
|
NGX_AUTOTEST=$NGX_OBJS/autotest
|
|
NGX_AUTOCONF_ERR=$NGX_OBJS/autoconf.err
|
|
|
|
# STUBs
|
|
NGX_ERR=$NGX_OBJS/autoconf.err
|
|
MAKEFILE=$NGX_OBJS/Makefile
|
|
|
|
|
|
NGX_PCH=
|
|
NGX_USE_PCH=
|
|
|
|
|
|
# check the echo's "-n" option and "\c" capability
|
|
|
|
if echo "test\c" | grep c >/dev/null; then
|
|
|
|
if echo -n test | grep n >/dev/null; then
|
|
ngx_n=
|
|
ngx_c=
|
|
|
|
else
|
|
ngx_n=-n
|
|
ngx_c=
|
|
fi
|
|
|
|
else
|
|
ngx_n=
|
|
ngx_c='\c'
|
|
fi
|
|
|
|
|
|
# create Makefile
|
|
|
|
cat << END > Makefile
|
|
|
|
build:
|
|
\$(MAKE) -f $NGX_MAKEFILE
|
|
|
|
install:
|
|
\$(MAKE) -f $NGX_MAKEFILE install
|
|
|
|
clean:
|
|
rm -rf Makefile $NGX_OBJS
|
|
|
|
upgrade:
|
|
$NGX_SBIN_PATH -t
|
|
|
|
# upgrade compatibility from 0.1.x to 0.2.x
|
|
cp $NGX_PID_PATH $NGX_PID_PATH.oldbin
|
|
|
|
kill -USR2 \`cat $NGX_PID_PATH\`
|
|
sleep 1
|
|
test -f $NGX_PID_PATH.oldbin
|
|
|
|
# upgrade compatibility from 0.1.x to 0.2.x
|
|
cp $NGX_PID_PATH $NGX_PID_PATH.newbin
|
|
|
|
kill -WINCH \`cat $NGX_PID_PATH.oldbin\`
|
|
END
|