Mercurial > hg > nginx-vendor-current
annotate auto/lib/zlib/conf @ 694:88a1b4797f2e NGINX_1_3_10
nginx 1.3.10
*) Change: domain names specified in configuration file are now resolved
to IPv6 addresses as well as IPv4 ones.
*) Change: now if the "include" directive with mask is used on Unix
systems, included files are sorted in alphabetical order.
*) Change: the "add_header" directive adds headers to 201 responses.
*) Feature: the "geo" directive now supports IPv6 addresses in CIDR
notation.
*) Feature: the "flush" and "gzip" parameters of the "access_log"
directive.
*) Feature: variables support in the "auth_basic" directive.
*) Bugfix: nginx could not be built with the ngx_http_perl_module in
some cases.
*) Bugfix: a segmentation fault might occur in a worker process if the
ngx_http_xslt_module was used.
*) Bugfix: nginx could not be built on MacOSX in some cases.
Thanks to Piotr Sikora.
*) Bugfix: the "limit_rate" directive with high rates might result in
truncated responses on 32-bit platforms.
Thanks to Alexey Antropov.
*) Bugfix: a segmentation fault might occur in a worker process if the
"if" directive was used.
Thanks to Piotr Sikora.
*) Bugfix: a "100 Continue" response was issued with "413 Request Entity
Too Large" responses.
*) Bugfix: the "image_filter", "image_filter_jpeg_quality" and
"image_filter_sharpen" directives might be inherited incorrectly.
Thanks to Ian Babrou.
*) Bugfix: "crypt_r() failed" errors might appear if the "auth_basic"
directive was used on Linux.
*) Bugfix: in backup servers handling.
Thanks to Thomas Chen.
*) Bugfix: proxied HEAD requests might return incorrect response if the
"gzip" directive was used.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 25 Dec 2012 00:00:00 +0400 |
parents | d0f7a625f27c |
children |
rev | line source |
---|---|
0 | 1 |
2 # Copyright (C) Igor Sysoev | |
660 | 3 # Copyright (C) Nginx, Inc. |
0 | 4 |
5 | |
6 if [ $ZLIB != NONE ]; then | |
7 CORE_INCS="$CORE_INCS $ZLIB" | |
8 | |
4 | 9 case "$NGX_CC_NAME" in |
0 | 10 |
10 | 11 msvc* | owc* | bcc) |
694 | 12 have=NGX_ZLIB . auto/have |
0 | 13 LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib" |
14 CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib" | |
15 ;; | |
16 | |
10 | 17 icc*) |
694 | 18 have=NGX_ZLIB . auto/have |
0 | 19 LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" |
20 | |
21 # to allow -ipo optimization we link with the *.o but not library | |
22 CORE_LIBS="$CORE_LIBS $ZLIB/adler32.o" | |
23 CORE_LIBS="$CORE_LIBS $ZLIB/crc32.o" | |
24 CORE_LIBS="$CORE_LIBS $ZLIB/deflate.o" | |
25 CORE_LIBS="$CORE_LIBS $ZLIB/trees.o" | |
26 CORE_LIBS="$CORE_LIBS $ZLIB/zutil.o" | |
42 | 27 CORE_LIBS="$CORE_LIBS $ZLIB/compress.o" |
0 | 28 |
29 if [ $ZLIB_ASM != NO ]; then | |
30 CORE_LIBS="$CORE_LIBS $ZLIB/match.o" | |
31 fi | |
32 ;; | |
33 | |
34 *) | |
694 | 35 have=NGX_ZLIB . auto/have |
0 | 36 LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" |
37 CORE_LIBS="$CORE_LIBS $ZLIB/libz.a" | |
38 #CORE_LIBS="$CORE_LIBS -L $ZLIB -lz" | |
39 ;; | |
40 | |
41 esac | |
42 | |
43 else | |
44 | |
42 | 45 if [ "$NGX_PLATFORM" != win32 ]; then |
4 | 46 ZLIB=NO |
0 | 47 |
48 # FreeBSD, Solaris, Linux | |
49 | |
4 | 50 ngx_feature="zlib library" |
694 | 51 ngx_feature_name="NGX_ZLIB" |
4 | 52 ngx_feature_run=no |
53 ngx_feature_incs="#include <zlib.h>" | |
258 | 54 ngx_feature_path= |
4 | 55 ngx_feature_libs="-lz" |
56 ngx_feature_test="z_stream z; deflate(&z, Z_NO_FLUSH)" | |
57 . auto/feature | |
0 | 58 |
59 | |
60 if [ $ngx_found = yes ]; then | |
4 | 61 CORE_LIBS="$CORE_LIBS $ngx_feature_libs" |
0 | 62 ZLIB=YES |
4 | 63 ngx_found=no |
586 | 64 fi |
65 fi | |
496 | 66 |
586 | 67 if [ $ZLIB != YES ]; then |
496 | 68 cat << END |
69 | |
70 $0: error: the HTTP gzip module requires the zlib library. | |
71 You can either disable the module by using --without-http_gzip_module | |
72 option, or install the zlib library into the system, or build the zlib library | |
73 statically from the source with nginx by using --with-zlib=<path> option. | |
74 | |
75 END | |
586 | 76 exit 1 |
0 | 77 fi |
78 | |
79 fi |