nginx: auto/install annotate

annotate auto/install @ 7746:88eca63261c3

gRPC: RST_STREAM(NO_ERROR) handling after "trailer only" responses. Similarly to the problem fixed in 2096b21fcd10 (ticket #1792), when a "trailer only" gRPC response (that is, a response with the END_STREAM flag in the HEADERS frame) was immediately followed by RST_STREAM(NO_ERROR) in the data preread along with the response header, RST_STREAM wasn't properly skipped and caused "upstream rejected request with error 0" errors. Observed with "unknown service" gRPC errors returned by grpc-go. Fix is to set ctx->done if we are going to parse additional data, so the RST_STREAM(NO_ERROR) is properly skipped. Additionally, now ngx_http_grpc_filter() will complain about frames sent for closed stream if there are any.

author	Pavel Pautov <p.pautov@f5.com>
date	Wed, 18 Nov 2020 18:41:16 -0800
parents	1cbd7f87c6ed
children	549b13cd793b

rev	line source
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 440 diff changeset	1
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 440 diff changeset	2 # Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 4376 diff changeset	3 # Copyright (C) Nginx, Inc.
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 440 diff changeset	4
440 f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	5
6419 39a806ccf21e Dynamic modules: perl. Ruslan Ermilov <ru@nginx.com> parents: 6418 diff changeset	6 if [ $USE_PERL != NO ]; then
599 869b6444d234 nginx-0.3.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 495 diff changeset	7
869b6444d234 nginx-0.3.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 495 diff changeset	8 cat << END >> $NGX_MAKEFILE
869b6444d234 nginx-0.3.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 495 diff changeset	9
869b6444d234 nginx-0.3.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 495 diff changeset	10 install_perl_modules:
4841 95ce3172493e Configure: fixed make macros to use parentheses instead of braces. Maxim Dounin <mdounin@mdounin.ru> parents: 4740 diff changeset	11 cd $NGX_OBJS/src/http/modules/perl && \$(MAKE) install
599 869b6444d234 nginx-0.3.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 495 diff changeset	12 END
869b6444d234 nginx-0.3.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 495 diff changeset	13
869b6444d234 nginx-0.3.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 495 diff changeset	14 NGX_INSTALL_PERL_MODULES=install_perl_modules
869b6444d234 nginx-0.3.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 495 diff changeset	15
869b6444d234 nginx-0.3.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 495 diff changeset	16 fi
869b6444d234 nginx-0.3.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 495 diff changeset	17
869b6444d234 nginx-0.3.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 495 diff changeset	18
2758 77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	19 case ".$NGX_SBIN_PATH" in
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	20 ./*)
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	21 ;;
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	22
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	23 *)
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	24 NGX_SBIN_PATH=$NGX_PREFIX/$NGX_SBIN_PATH
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	25 ;;
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	26 esac
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	27
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	28
6383 85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	29 case ".$NGX_MODULES_PATH" in
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	30 ./*)
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	31 ;;
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	32
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	33 *)
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	34 NGX_MODULES_PATH=$NGX_PREFIX/$NGX_MODULES_PATH
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	35 ;;
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	36 esac
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	37
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	38 NGX_MODULES_PATH=`dirname $NGX_MODULES_PATH/.`
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	39
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	40
2758 77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	41 case ".$NGX_CONF_PATH" in
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	42 ./*)
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	43 ;;
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	44
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	45 *)
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	46 NGX_CONF_PATH=$NGX_PREFIX/$NGX_CONF_PATH
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	47 ;;
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	48 esac
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	49
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	50
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	51 NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH`
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	52
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	53
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	54 case ".$NGX_PID_PATH" in
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	55 ./*)
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	56 ;;
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	57
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	58 *)
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	59 NGX_PID_PATH=$NGX_PREFIX/$NGX_PID_PATH
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	60 ;;
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	61 esac
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	62
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	63
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	64 case ".$NGX_ERROR_LOG_PATH" in
4199 874a2f505e2a Fixed configuration summary and manpage contents for the special Ruslan Ermilov <ru@nginx.com> parents: 4007 diff changeset	65 ./* \| .)
2758 77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	66 ;;
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	67
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	68 *)
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	69 NGX_ERROR_LOG_PATH=$NGX_PREFIX/$NGX_ERROR_LOG_PATH
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	70 ;;
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	71 esac
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	72
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	73
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	74 case ".$NGX_HTTP_LOG_PATH" in
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	75 ./*)
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	76 ;;
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	77
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	78 *)
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	79 NGX_HTTP_LOG_PATH=$NGX_PREFIX/$NGX_HTTP_LOG_PATH
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	80 ;;
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	81 esac
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	82
77264e0157ad -p and --prefix= Igor Sysoev <igor@sysoev.ru> parents: 2009 diff changeset	83
4376 9346356e433d configure on Solaris fixed Sergey Budnevitch <sb@waeme.net> parents: 4303 diff changeset	84 if test -f man/nginx.8 ; then
4303 b375a7f0d51a Made it possible to build/install from the SVN checkout. Ruslan Ermilov <ru@nginx.com> parents: 4199 diff changeset	85 NGX_MAN=man/nginx.8
b375a7f0d51a Made it possible to build/install from the SVN checkout. Ruslan Ermilov <ru@nginx.com> parents: 4199 diff changeset	86 else
b375a7f0d51a Made it possible to build/install from the SVN checkout. Ruslan Ermilov <ru@nginx.com> parents: 4199 diff changeset	87 NGX_MAN=docs/man/nginx.8
b375a7f0d51a Made it possible to build/install from the SVN checkout. Ruslan Ermilov <ru@nginx.com> parents: 4199 diff changeset	88 fi
b375a7f0d51a Made it possible to build/install from the SVN checkout. Ruslan Ermilov <ru@nginx.com> parents: 4199 diff changeset	89
b375a7f0d51a Made it possible to build/install from the SVN checkout. Ruslan Ermilov <ru@nginx.com> parents: 4199 diff changeset	90 if test -d html ; then
b375a7f0d51a Made it possible to build/install from the SVN checkout. Ruslan Ermilov <ru@nginx.com> parents: 4199 diff changeset	91 NGX_HTML=html
b375a7f0d51a Made it possible to build/install from the SVN checkout. Ruslan Ermilov <ru@nginx.com> parents: 4199 diff changeset	92 else
b375a7f0d51a Made it possible to build/install from the SVN checkout. Ruslan Ermilov <ru@nginx.com> parents: 4199 diff changeset	93 NGX_HTML=docs/html
b375a7f0d51a Made it possible to build/install from the SVN checkout. Ruslan Ermilov <ru@nginx.com> parents: 4199 diff changeset	94 fi
b375a7f0d51a Made it possible to build/install from the SVN checkout. Ruslan Ermilov <ru@nginx.com> parents: 4199 diff changeset	95
469 2ff194b74f1e nginx-0.1.9-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	96 cat << END >> $NGX_MAKEFILE
467 bbd6b0b4a2b1 nginx-0.1.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	97
4007 7e3c557c2604 Rebuild manpage only if needed. Maxim Dounin <mdounin@mdounin.ru> parents: 3801 diff changeset	98 manpage: $NGX_OBJS/nginx.8
7e3c557c2604 Rebuild manpage only if needed. Maxim Dounin <mdounin@mdounin.ru> parents: 3801 diff changeset	99
4303 b375a7f0d51a Made it possible to build/install from the SVN checkout. Ruslan Ermilov <ru@nginx.com> parents: 4199 diff changeset	100 $NGX_OBJS/nginx.8: $NGX_MAN $NGX_AUTO_CONFIG_H
3788 b50daa26aa22 add nginx.8 man page Igor Sysoev <igor@sysoev.ru> parents: 3637 diff changeset	101 sed -e "s\|%%PREFIX%%\|$NGX_PREFIX\|" \\
b50daa26aa22 add nginx.8 man page Igor Sysoev <igor@sysoev.ru> parents: 3637 diff changeset	102 -e "s\|%%PID_PATH%%\|$NGX_PID_PATH\|" \\
b50daa26aa22 add nginx.8 man page Igor Sysoev <igor@sysoev.ru> parents: 3637 diff changeset	103 -e "s\|%%CONF_PATH%%\|$NGX_CONF_PATH\|" \\
4199 874a2f505e2a Fixed configuration summary and manpage contents for the special Ruslan Ermilov <ru@nginx.com> parents: 4007 diff changeset	104 -e "s\|%%ERROR_LOG_PATH%%\|${NGX_ERROR_LOG_PATH:-stderr}\|" \\
4303 b375a7f0d51a Made it possible to build/install from the SVN checkout. Ruslan Ermilov <ru@nginx.com> parents: 4199 diff changeset	105 < $NGX_MAN > \$@
3788 b50daa26aa22 add nginx.8 man page Igor Sysoev <igor@sysoev.ru> parents: 3637 diff changeset	106
6408 cfc3cfa434ec Configure: added "build" target. Maxim Dounin <mdounin@mdounin.ru> parents: 6383 diff changeset	107 install: build $NGX_INSTALL_PERL_MODULES
2009 df5ae577fab5 DESTDIR support Igor Sysoev <igor@sysoev.ru> parents: 1362 diff changeset	108 test -d '\$(DESTDIR)$NGX_PREFIX' \|\| mkdir -p '\$(DESTDIR)$NGX_PREFIX'
440 f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	109
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	110 test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \\
2009 df5ae577fab5 DESTDIR support Igor Sysoev <igor@sysoev.ru> parents: 1362 diff changeset	111 \|\| mkdir -p '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`'
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	112 test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' \\
1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	113 \|\| mv '\$(DESTDIR)$NGX_SBIN_PATH' \\
2009 df5ae577fab5 DESTDIR support Igor Sysoev <igor@sysoev.ru> parents: 1362 diff changeset	114 '\$(DESTDIR)$NGX_SBIN_PATH.old'
df5ae577fab5 DESTDIR support Igor Sysoev <igor@sysoev.ru> parents: 1362 diff changeset	115 cp $NGX_OBJS/nginx '\$(DESTDIR)$NGX_SBIN_PATH'
440 f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	116
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	117 test -d '\$(DESTDIR)$NGX_CONF_PREFIX' \\
2009 df5ae577fab5 DESTDIR support Igor Sysoev <igor@sysoev.ru> parents: 1362 diff changeset	118 \|\| mkdir -p '\$(DESTDIR)$NGX_CONF_PREFIX'
440 f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	119
2009 df5ae577fab5 DESTDIR support Igor Sysoev <igor@sysoev.ru> parents: 1362 diff changeset	120 cp conf/koi-win '\$(DESTDIR)$NGX_CONF_PREFIX'
df5ae577fab5 DESTDIR support Igor Sysoev <igor@sysoev.ru> parents: 1362 diff changeset	121 cp conf/koi-utf '\$(DESTDIR)$NGX_CONF_PREFIX'
df5ae577fab5 DESTDIR support Igor Sysoev <igor@sysoev.ru> parents: 1362 diff changeset	122 cp conf/win-utf '\$(DESTDIR)$NGX_CONF_PREFIX'
440 f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	123
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	124 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types' \\
2009 df5ae577fab5 DESTDIR support Igor Sysoev <igor@sysoev.ru> parents: 1362 diff changeset	125 \|\| cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX'
df5ae577fab5 DESTDIR support Igor Sysoev <igor@sysoev.ru> parents: 1362 diff changeset	126 cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types.default'
440 f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	127
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	128 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \\
2009 df5ae577fab5 DESTDIR support Igor Sysoev <igor@sysoev.ru> parents: 1362 diff changeset	129 \|\| cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	130 cp conf/fastcgi_params \\
2009 df5ae577fab5 DESTDIR support Igor Sysoev <igor@sysoev.ru> parents: 1362 diff changeset	131 '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
1352 e958b3cab51a --sysconfdir=DIR Igor Sysoev <igor@sysoev.ru> parents: 657 diff changeset	132
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	133 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf' \\
3383 5aeaf8490578 add conf/fastcgi.conf Igor Sysoev <igor@sysoev.ru> parents: 3262 diff changeset	134 \|\| cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
5aeaf8490578 add conf/fastcgi.conf Igor Sysoev <igor@sysoev.ru> parents: 3262 diff changeset	135 cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf.default'
5aeaf8490578 add conf/fastcgi.conf Igor Sysoev <igor@sysoev.ru> parents: 3262 diff changeset	136
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	137 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params' \\
3609 0ae39a108291 install uwsgi_params Igor Sysoev <igor@sysoev.ru> parents: 3383 diff changeset	138 \|\| cp conf/uwsgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	139 cp conf/uwsgi_params \\
3609 0ae39a108291 install uwsgi_params Igor Sysoev <igor@sysoev.ru> parents: 3383 diff changeset	140 '\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params.default'
0ae39a108291 install uwsgi_params Igor Sysoev <igor@sysoev.ru> parents: 3383 diff changeset	141
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	142 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params' \\
3637 d656caa72ec9 ngx_http_scgi_module Igor Sysoev <igor@sysoev.ru> parents: 3609 diff changeset	143 \|\| cp conf/scgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	144 cp conf/scgi_params \\
3637 d656caa72ec9 ngx_http_scgi_module Igor Sysoev <igor@sysoev.ru> parents: 3609 diff changeset	145 '\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params.default'
d656caa72ec9 ngx_http_scgi_module Igor Sysoev <igor@sysoev.ru> parents: 3609 diff changeset	146
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	147 test -f '\$(DESTDIR)$NGX_CONF_PATH' \\
2982 fe23e95ba993 name of file specified in --conf-path was not honored during installation Igor Sysoev <igor@sysoev.ru> parents: 2850 diff changeset	148 \|\| cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
2009 df5ae577fab5 DESTDIR support Igor Sysoev <igor@sysoev.ru> parents: 1362 diff changeset	149 cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
440 f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	150
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	151 test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \\
2009 df5ae577fab5 DESTDIR support Igor Sysoev <igor@sysoev.ru> parents: 1362 diff changeset	152 \|\| mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`'
440 f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	153
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	154 test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' \\
1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	155 \|\| mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
440 f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	156
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	157 test -d '\$(DESTDIR)$NGX_PREFIX/html' \\
4303 b375a7f0d51a Made it possible to build/install from the SVN checkout. Ruslan Ermilov <ru@nginx.com> parents: 4199 diff changeset	158 \|\| cp -R $NGX_HTML '\$(DESTDIR)$NGX_PREFIX'
440 f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	159 END
f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	160
f390d1775430 nginx-0.1.0-2004-09-27-20:03:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	161
4199 874a2f505e2a Fixed configuration summary and manpage contents for the special Ruslan Ermilov <ru@nginx.com> parents: 4007 diff changeset	162 if test -n "$NGX_ERROR_LOG_PATH"; then
469 2ff194b74f1e nginx-0.1.9-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	163 cat << END >> $NGX_MAKEFILE
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 440 diff changeset	164
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	165 test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' \\
1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	166 \|\| mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`'
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 440 diff changeset	167 END
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 440 diff changeset	168
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 440 diff changeset	169 fi
2850 4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	170
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	171
6425 05c894a598ea Dynamic modules: do not overwrite old modules on install. Maxim Dounin <mdounin@mdounin.ru> parents: 6419 diff changeset	172 if test -n "$DYNAMIC_MODULES"; then
6383 85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	173 cat << END >> $NGX_MAKEFILE
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	174
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	175 test -d '\$(DESTDIR)$NGX_MODULES_PATH' \\
6383 85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	176 \|\| mkdir -p '\$(DESTDIR)$NGX_MODULES_PATH'
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	177 END
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	178
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	179 fi
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	180
85dea406e18f Dynamic modules. Maxim Dounin <mdounin@mdounin.ru> parents: 6176 diff changeset	181
6425 05c894a598ea Dynamic modules: do not overwrite old modules on install. Maxim Dounin <mdounin@mdounin.ru> parents: 6419 diff changeset	182 for ngx_module in $DYNAMIC_MODULES
05c894a598ea Dynamic modules: do not overwrite old modules on install. Maxim Dounin <mdounin@mdounin.ru> parents: 6419 diff changeset	183 do
05c894a598ea Dynamic modules: do not overwrite old modules on install. Maxim Dounin <mdounin@mdounin.ru> parents: 6419 diff changeset	184 ngx_module=$ngx_module$ngx_modext
05c894a598ea Dynamic modules: do not overwrite old modules on install. Maxim Dounin <mdounin@mdounin.ru> parents: 6419 diff changeset	185
05c894a598ea Dynamic modules: do not overwrite old modules on install. Maxim Dounin <mdounin@mdounin.ru> parents: 6419 diff changeset	186 cat << END >> $NGX_MAKEFILE
05c894a598ea Dynamic modules: do not overwrite old modules on install. Maxim Dounin <mdounin@mdounin.ru> parents: 6419 diff changeset	187
6426 1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	188 test ! -f '\$(DESTDIR)$NGX_MODULES_PATH/$ngx_module' \\
1cbd7f87c6ed Configure: style. Ruslan Ermilov <ru@nginx.com> parents: 6425 diff changeset	189 \|\| mv '\$(DESTDIR)$NGX_MODULES_PATH/$ngx_module' \\
6425 05c894a598ea Dynamic modules: do not overwrite old modules on install. Maxim Dounin <mdounin@mdounin.ru> parents: 6419 diff changeset	190 '\$(DESTDIR)$NGX_MODULES_PATH/$ngx_module.old'
05c894a598ea Dynamic modules: do not overwrite old modules on install. Maxim Dounin <mdounin@mdounin.ru> parents: 6419 diff changeset	191 cp $NGX_OBJS/$ngx_module '\$(DESTDIR)$NGX_MODULES_PATH/$ngx_module'
05c894a598ea Dynamic modules: do not overwrite old modules on install. Maxim Dounin <mdounin@mdounin.ru> parents: 6419 diff changeset	192 END
05c894a598ea Dynamic modules: do not overwrite old modules on install. Maxim Dounin <mdounin@mdounin.ru> parents: 6419 diff changeset	193
05c894a598ea Dynamic modules: do not overwrite old modules on install. Maxim Dounin <mdounin@mdounin.ru> parents: 6419 diff changeset	194 done
05c894a598ea Dynamic modules: do not overwrite old modules on install. Maxim Dounin <mdounin@mdounin.ru> parents: 6419 diff changeset	195
05c894a598ea Dynamic modules: do not overwrite old modules on install. Maxim Dounin <mdounin@mdounin.ru> parents: 6419 diff changeset	196
2850 4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	197 # create Makefile
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	198
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	199 cat << END >> Makefile
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	200
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	201 build:
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	202 \$(MAKE) -f $NGX_MAKEFILE
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	203
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	204 install:
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	205 \$(MAKE) -f $NGX_MAKEFILE install
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	206
6418 8e6f34342eb6 Dynamic modules: expose the "modules" target. Ruslan Ermilov <ru@nginx.com> parents: 6408 diff changeset	207 modules:
8e6f34342eb6 Dynamic modules: expose the "modules" target. Ruslan Ermilov <ru@nginx.com> parents: 6408 diff changeset	208 \$(MAKE) -f $NGX_MAKEFILE modules
8e6f34342eb6 Dynamic modules: expose the "modules" target. Ruslan Ermilov <ru@nginx.com> parents: 6408 diff changeset	209
2850 4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	210 upgrade:
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	211 $NGX_SBIN_PATH -t
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	212
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	213 kill -USR2 \`cat $NGX_PID_PATH\`
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	214 sleep 1
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	215 test -f $NGX_PID_PATH.oldbin
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	216
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	217 kill -QUIT \`cat $NGX_PID_PATH.oldbin\`
4e05bd832e56 fix "make upgrade" broken in r2759 Igor Sysoev <igor@sysoev.ru> parents: 2758 diff changeset	218 END

Mercurial > hg > nginx

annotate auto/install @ 7746:88eca63261c3