Mercurial > hg > nginx-vendor-current
comparison auto/lib/pcre/conf @ 656:9d21dad0b5a1 NGINX_1_1_12
nginx 1.1.12
*) Change: a "proxy_pass" directive without URI part now uses changed
URI after redirection with the "error_page" directive;
Thanks to Lanshun Zhou.
*) Feature: the "proxy/fastcgi/scgi/uwsgi_cache_lock",
"proxy/fastcgi/scgi/uwsgi_cache_lock_timeout" directives.
*) Feature: the "pcre_jit" directive.
*) Feature: the "if" SSI command supports captures in regular
expressions.
*) Bugfix: the "if" SSI command did not work inside the "block" command.
*) Bugfix: the "limit_conn_log_level" and "limit_req_log_level"
directives might not work.
*) Bugfix: the "limit_rate" directive did not allow to use full
throughput, even if limit value was very high.
*) Bugfix: the "sendfile_max_chunk" directive did not work, if the
"limit_rate" directive was used.
*) Bugfix: a "proxy_pass" directive without URI part always used
original request URI if variables were used.
*) Bugfix: a "proxy_pass" directive without URI part might use original
request after redirection with the "try_files" directive;
Thanks to Lanshun Zhou.
*) Bugfix: in the ngx_http_scgi_module.
*) Bugfix: in the ngx_http_mp4_module.
*) Bugfix: nginx could not be built on Solaris; the bug had appeared in
1.1.9.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 26 Dec 2011 00:00:00 +0400 |
parents | 53f5f04a64b8 |
children | 5a4401b9551b |
comparison
equal
deleted
inserted
replaced
655:189afff6503f | 656:9d21dad0b5a1 |
---|---|
2 # Copyright (C) Igor Sysoev | 2 # Copyright (C) Igor Sysoev |
3 | 3 |
4 | 4 |
5 if [ $PCRE != NONE ]; then | 5 if [ $PCRE != NONE ]; then |
6 CORE_INCS="$CORE_INCS $PCRE" | 6 CORE_INCS="$CORE_INCS $PCRE" |
7 CORE_DEPS="$CORE_DEPS $REGEX_DEPS" | |
8 CORE_SRCS="$CORE_SRCS $REGEX_SRCS" | |
9 | 7 |
10 case "$NGX_CC_NAME" in | 8 case "$NGX_CC_NAME" in |
11 | 9 |
12 msvc* | owc* | bcc) | 10 msvc* | owc* | bcc) |
13 have=NGX_PCRE . auto/have | 11 have=NGX_PCRE . auto/have |
78 LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" | 76 LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" |
79 CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a" | 77 CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a" |
80 ;; | 78 ;; |
81 | 79 |
82 esac | 80 esac |
81 | |
82 | |
83 if [ $PCRE_JIT = YES ]; then | |
84 have=NGX_HAVE_PCRE_JIT . auto/have | |
85 PCRE_CONF_OPT="$PCRE_CONF_OPT --enable-jit" | |
86 fi | |
83 | 87 |
84 else | 88 else |
85 | 89 |
86 if [ "$NGX_PLATFORM" != win32 ]; then | 90 if [ "$NGX_PLATFORM" != win32 ]; then |
87 | 91 |
154 | 158 |
155 . auto/feature | 159 . auto/feature |
156 fi | 160 fi |
157 | 161 |
158 if [ $ngx_found = yes ]; then | 162 if [ $ngx_found = yes ]; then |
159 CORE_DEPS="$CORE_DEPS $REGEX_DEPS" | |
160 CORE_SRCS="$CORE_SRCS $REGEX_SRCS" | |
161 CORE_INCS="$CORE_INCS $ngx_feature_path" | 163 CORE_INCS="$CORE_INCS $ngx_feature_path" |
162 CORE_LIBS="$CORE_LIBS $ngx_feature_libs" | 164 CORE_LIBS="$CORE_LIBS $ngx_feature_libs" |
163 PCRE=YES | 165 PCRE=YES |
166 fi | |
167 | |
168 if [ $PCRE == YES ]; then | |
169 ngx_feature="PCRE JIT support" | |
170 ngx_feature_name="NGX_HAVE_PCRE_JIT" | |
171 ngx_feature_test="int jit = 0; | |
172 pcre_config(PCRE_CONFIG_JIT, &jit); | |
173 if (jit != 1) return 1;" | |
174 . auto/feature | |
175 | |
176 if [ $ngx_found = yes ]; then | |
177 PCRE_JIT=YES | |
178 fi | |
164 fi | 179 fi |
165 fi | 180 fi |
166 | 181 |
167 if [ $PCRE != YES ]; then | 182 if [ $PCRE != YES ]; then |
168 cat << END | 183 cat << END |