diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 14:01:24 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 14:01:24 +0000 |
| commit | 393300584e0fcd36356da7b7198e3f43afd97240 (patch) | |
| tree | 1e1ddfb66016aca7b9b2f0ea7f98fc52cb694d56 /auto | |
| parent | ab00f267591c88b2c46d2e3c1e9dfd8f92765c6a (diff) | |
| download | nginx-393300584e0fcd36356da7b7198e3f43afd97240.tar.gz nginx-393300584e0fcd36356da7b7198e3f43afd97240.tar.bz2 | |
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
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/install | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/auto/install b/auto/install index f876891f8..815fcb335 100644 --- a/auto/install +++ b/auto/install @@ -101,6 +101,10 @@ install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \ cp conf/fastcgi_params \ '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default' + test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf' \ + || cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX' + cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf.default' + test -f '\$(DESTDIR)$NGX_CONF_PATH' \ || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH' cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default' |