comparison auto/lib/pcre/conf @ 376:d13234035cad NGINX_0_6_32

nginx 0.6.32 *) Change: the "none" parameter in the "ssl_session_cache" directive; now this is default parameter. Thanks to Rob Mueller. *) Change: now the 0x00-0x1F, '"' and '\' characters are escaped as \xXX in an access_log. Thanks to Maxim Dounin. *) Change: now nginx allows several "Host" request header line. *) Feature: the "modified" flag in the "expires" directive. *) Feature: the $uid_got and $uid_set variables may be used at any request processing stage. *) Feature: the $hostname variable. Thanks to Andrei Nigmatulin. *) Feature: DESTDIR support. Thanks to Todd A. Fisher and Andras Voroskoi. *) Bugfix: if sub_filter and SSI were used together, then responses might were transferred incorrectly. *) Bugfix: large SSI inclusions might be truncated. *) Bugfix: the "proxy_pass" directive did not work with the HTTPS protocol; the bug had appeared in 0.6.9. *) Bugfix: worker processes might not catch reconfiguration and log rotation signals. *) Bugfix: nginx could not be built on latest Fedora 9 Linux. Thanks to Roxis. *) Bugfix: a segmentation fault might occur in worker process on Linux, if keepalive was enabled.
author Igor Sysoev <http://sysoev.ru>
date Mon, 07 Jul 2008 00:00:00 +0400
parents 1c519aff5c0c
children
comparison
equal deleted inserted replaced
375:52f3c9c7eff0 376:d13234035cad
82 esac 82 esac
83 83
84 else 84 else
85 85
86 if [ "$NGX_PLATFORM" != win32 ]; then 86 if [ "$NGX_PLATFORM" != win32 ]; then
87
87 PCRE=NO 88 PCRE=NO
88 89
89 ngx_feature="PCRE library" 90 ngx_feature="PCRE library"
90 ngx_feature_name="NGX_PCRE" 91 ngx_feature_name="NGX_PCRE"
91 ngx_feature_run=no 92 ngx_feature_run=no
93 ngx_feature_path= 94 ngx_feature_path=
94 ngx_feature_libs="-lpcre" 95 ngx_feature_libs="-lpcre"
95 ngx_feature_test="pcre *re; re = pcre_compile(NULL, 0, NULL, 0, NULL)" 96 ngx_feature_test="pcre *re; re = pcre_compile(NULL, 0, NULL, 0, NULL)"
96 . auto/feature 97 . auto/feature
97 98
98 if [ $ngx_found = yes ]; then 99 if [ $ngx_found = no ]; then
99 CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
100 CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
101 CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
102 PCRE=YES
103 ngx_found=no
104 100
105 else
106 # FreeBSD port 101 # FreeBSD port
107 102
108 ngx_feature="PCRE library in /usr/local/" 103 ngx_feature="PCRE library in /usr/local/"
109 ngx_feature_name="NGX_PCRE"
110 ngx_feature_run=no
111 ngx_feature_incs="#include <pcre.h>"
112 ngx_feature_path="/usr/local/include" 104 ngx_feature_path="/usr/local/include"
113 105
114 if [ $NGX_RPATH = YES ]; then 106 if [ $NGX_RPATH = YES ]; then
115 ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lpcre" 107 ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lpcre"
116 else 108 else
117 ngx_feature_libs="-L/usr/local/lib -lpcre" 109 ngx_feature_libs="-L/usr/local/lib -lpcre"
118 fi 110 fi
119 111
120 ngx_feature_test="pcre *re; 112 . auto/feature
121 re = pcre_compile(NULL, 0, NULL, 0, NULL)" 113 fi
114
115 if [ $ngx_found = no ]; then
116
117 # Linux package
118
119 ngx_feature="PCRE library in /usr/include/pcre/"
120 ngx_feature_path="/usr/include/pcre"
121 ngx_feature_libs="-lpcre"
122
123 . auto/feature
124 fi
125
126 if [ $ngx_found = no ]; then
127
128 # NetBSD port
129
130 ngx_feature="PCRE library in /usr/pkg/"
131 ngx_feature_path="/usr/pkg/include"
132
133 if [ $NGX_RPATH = YES ]; then
134 ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lpcre"
135 else
136 ngx_feature_libs="-L/usr/pkg/lib -lpcre"
137 fi
138
139 . auto/feature
140 fi
141
142 if [ $ngx_found = no ]; then
143
144 # MacPorts
145
146 ngx_feature="PCRE library in /opt/local/"
147 ngx_feature_path="/opt/local/include"
148
149 if [ $NGX_RPATH = YES ]; then
150 ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lpcre"
151 else
152 ngx_feature_libs="-L/opt/local/lib -lpcre"
153 fi
154
122 . auto/feature 155 . auto/feature
123 fi 156 fi
124 157
125 if [ $ngx_found = yes ]; then 158 if [ $ngx_found = yes ]; then
126 CORE_DEPS="$CORE_DEPS $REGEX_DEPS" 159 CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
127 CORE_SRCS="$CORE_SRCS $REGEX_SRCS" 160 CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
128 CORE_INCS="$CORE_INCS $ngx_feature_path" 161 CORE_INCS="$CORE_INCS $ngx_feature_path"
129 CORE_LIBS="$CORE_LIBS $ngx_feature_libs" 162 CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
130 PCRE=YES 163 PCRE=YES
131 ngx_found=no
132
133 else
134 # Linux package
135
136 if [ $PCRE = NO ]; then
137
138 ngx_feature="PCRE library in /usr/include/pcre/"
139 ngx_feature_name="NGX_PCRE"
140 ngx_feature_run=no
141 ngx_feature_incs="#include <pcre.h>"
142 ngx_feature_path="/usr/include/pcre"
143 ngx_feature_libs="-lpcre"
144 ngx_feature_test="pcre *re;
145 re = pcre_compile(NULL, 0, NULL, 0, NULL)"
146 . auto/feature
147 fi
148 fi
149
150 if [ $ngx_found = yes ]; then
151 CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
152 CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
153 CORE_INCS="$CORE_INCS $ngx_feature_path"
154 CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
155 PCRE=YES
156 ngx_found=no
157
158 else
159 # NetBSD port
160
161 if [ $PCRE = NO ]; then
162
163 ngx_feature="PCRE library in /usr/pkg/"
164 ngx_feature_name="NGX_PCRE"
165 ngx_feature_run=no
166 ngx_feature_incs="#include <pcre.h>"
167 ngx_feature_path="/usr/pkg/include"
168
169 if [ $NGX_RPATH = YES ]; then
170 ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lpcre"
171 else
172 ngx_feature_libs="-L/usr/pkg/lib -lpcre"
173 fi
174
175 ngx_feature_test="pcre *re;
176 re = pcre_compile(NULL, 0, NULL, 0, NULL)"
177 . auto/feature
178 fi
179 fi
180
181 if [ $ngx_found = yes ]; then
182 CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
183 CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
184 CORE_INCS="$CORE_INCS $ngx_feature_path"
185 CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
186 PCRE=YES
187 ngx_found=no
188
189 else
190 # MacPorts
191
192 if [ $PCRE = NO ]; then
193
194 ngx_feature="PCRE library in /opt/local/"
195 ngx_feature_name="NGX_PCRE"
196 ngx_feature_run=no
197 ngx_feature_incs="#include <pcre.h>"
198 ngx_feature_path="/opt/local/include"
199
200 if [ $NGX_RPATH = YES ]; then
201 ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lpcre"
202 else
203 ngx_feature_libs="-L/opt/local/lib -lpcre"
204 fi
205
206 ngx_feature_test="pcre *re;
207 re = pcre_compile(NULL, 0, NULL, 0, NULL)"
208 . auto/feature
209 fi
210 fi
211
212 if [ $ngx_found = yes ]; then
213 CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
214 CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
215 CORE_INCS="$CORE_INCS $ngx_feature_path"
216 CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
217 PCRE=YES
218 ngx_found=no
219 fi 164 fi
220 165
221 fi 166 fi
222 fi 167 fi