diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 09:54:19 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 09:54:19 +0000 |
| commit | 90b8db32242fb32d130c2268c6f26de316a44f25 (patch) | |
| tree | 16b2e3f98632b2483b1b4f52db03ae123a9e2aa4 /auto | |
| parent | 149578df888a43b592c5efc4fb2e0441dbd5a9ff (diff) | |
| download | nginx-90b8db32242fb32d130c2268c6f26de316a44f25.tar.gz nginx-90b8db32242fb32d130c2268c6f26de316a44f25.tar.bz2 | |
merge r3454, r3455, r3486, r3496, r3519, r3523:
SSI fixes:
*) use content type of the parent request in SSI stub block output
instead of default one
*) SSI %s timefmt has no timezone offset
*) change ngx_http_ssi_filter and ngx_http_charset_filter order
*) do not store an encoded variable value as a new cached variable value
*) fix SSI include stub for valid empty responses
*) allow to use $uid_got in SSI and perl module
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/modules | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/auto/modules b/auto/modules index 01951c738..d19eda1db 100644 --- a/auto/modules +++ b/auto/modules @@ -101,8 +101,8 @@ fi # ngx_http_range_header_filter # ngx_http_gzip_filter # ngx_http_postpone_filter -# ngx_http_charset_filter # ngx_http_ssi_filter +# ngx_http_charset_filter # ngx_http_xslt_filter # ngx_http_image_filter_filter # ngx_http_sub_filter @@ -130,12 +130,6 @@ if [ $HTTP_POSTPONE = YES ]; then HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS" fi -if [ $HTTP_CHARSET = YES ]; then - have=NGX_HTTP_CHARSET . auto/have - HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE" - HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS" -fi - if [ $HTTP_SSI = YES ]; then have=NGX_HTTP_SSI . auto/have HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SSI_FILTER_MODULE" @@ -143,6 +137,12 @@ if [ $HTTP_SSI = YES ]; then HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS" fi +if [ $HTTP_CHARSET = YES ]; then + have=NGX_HTTP_CHARSET . auto/have + HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE" + HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS" +fi + if [ $HTTP_XSLT = YES ]; then USE_LIBXSLT=YES HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_XSLT_FILTER_MODULE" |