Mercurial > hg > nginx

comparison auto/install @ 3425:0189a8f4c7c3 stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge r2990, r3324, r3384, r3419: various proxy/FastCGI fixes: *) do auto redirect for proxy_pass/fastcgi_pass with variables *) allow "proxy_pass http://$backend" without URI part *) add conf/fastcgi.conf *) delete u->cleanup mark, this fixes large values in $upstream_response_time, the bug had been introduced in r3246
author Igor Sysoev <igor@sysoev.ru>
date Mon, 01 Feb 2010 14:01:24 +0000
parents e326a69cabc9
children
comparison
equal deleted inserted replaced
3424:c6ecb3fe577b 3425:0189a8f4c7c3
99 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \ 99 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \
100 || cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX' 100 || cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
101 cp conf/fastcgi_params \ 101 cp conf/fastcgi_params \
102 '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default' 102 '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
103 103
104 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf' \
105 || cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
106 cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf.default'
107
104 test -f '\$(DESTDIR)$NGX_CONF_PATH' \ 108 test -f '\$(DESTDIR)$NGX_CONF_PATH' \
105 || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH' 109 || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
106 cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default' 110 cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
107 111
108 test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \ 112 test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \