Mercurial > hg > nginx

comparison auto/modules @ 3581:17995396463d stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Igor Sysoev <igor@sysoev.ru>
date Mon, 07 Jun 2010 09:54:19 +0000
parents 0ecc8d7c77b1
children
comparison
equal deleted inserted replaced
3580:667c22171519 3581:17995396463d
99 # ngx_http_header_filter 99 # ngx_http_header_filter
100 # ngx_http_chunked_filter 100 # ngx_http_chunked_filter
101 # ngx_http_range_header_filter 101 # ngx_http_range_header_filter
102 # ngx_http_gzip_filter 102 # ngx_http_gzip_filter
103 # ngx_http_postpone_filter 103 # ngx_http_postpone_filter
104 # ngx_http_ssi_filter
104 # ngx_http_charset_filter 105 # ngx_http_charset_filter
105 # ngx_http_ssi_filter
106 # ngx_http_xslt_filter 106 # ngx_http_xslt_filter
107 # ngx_http_image_filter_filter 107 # ngx_http_image_filter_filter
108 # ngx_http_sub_filter 108 # ngx_http_sub_filter
109 # ngx_http_addition_filter 109 # ngx_http_addition_filter
110 # ngx_http_userid_filter 110 # ngx_http_userid_filter
128 if [ $HTTP_POSTPONE = YES ]; then 128 if [ $HTTP_POSTPONE = YES ]; then
129 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE" 129 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE"
130 HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS" 130 HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS"
131 fi 131 fi
132 132
133 if [ $HTTP_CHARSET = YES ]; then
134 have=NGX_HTTP_CHARSET . auto/have
135 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE"
136 HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS"
137 fi
138
139 if [ $HTTP_SSI = YES ]; then 133 if [ $HTTP_SSI = YES ]; then
140 have=NGX_HTTP_SSI . auto/have 134 have=NGX_HTTP_SSI . auto/have
141 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SSI_FILTER_MODULE" 135 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SSI_FILTER_MODULE"
142 HTTP_DEPS="$HTTP_DEPS $HTTP_SSI_DEPS" 136 HTTP_DEPS="$HTTP_DEPS $HTTP_SSI_DEPS"
143 HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS" 137 HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS"
138 fi
139
140 if [ $HTTP_CHARSET = YES ]; then
141 have=NGX_HTTP_CHARSET . auto/have
142 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE"
143 HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS"
144 fi 144 fi
145 145
146 if [ $HTTP_XSLT = YES ]; then 146 if [ $HTTP_XSLT = YES ]; then
147 USE_LIBXSLT=YES 147 USE_LIBXSLT=YES
148 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_XSLT_FILTER_MODULE" 148 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_XSLT_FILTER_MODULE"