Mercurial > hg > nginx-vendor-current
annotate auto/lib/zlib/make @ 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 | |
16 | 6 case "$NGX_CC_NAME" in |
0 | 7 |
16 | 8 msvc*) |
9 ngx_makefile=makefile.msvc | |
52 | 10 ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC" |
492 | 11 ngx_zlib="ZLIB=\"$ZLIB\"" |
0 | 12 |
13 ;; | |
14 | |
16 | 15 owc*) |
16 ngx_makefile=makefile.owc | |
52 | 17 ngx_opt="CPU_OPT=\"$CPU_OPT\"" |
492 | 18 ngx_zlib=`echo ZLIB=\"$ZLIB\" | sed -e "s/\//$ngx_regex_dirsep/g"` |
0 | 19 ;; |
20 | |
16 | 21 bcc) |
22 ngx_makefile=makefile.bcc | |
52 | 23 ngx_opt="-DCPU_OPT=\"$CPU_OPT\"" |
492 | 24 ngx_zlib=`echo \-DZLIB=\"$ZLIB\" | sed -e "s/\//$ngx_regex_dirsep/g"` |
0 | 25 ;; |
26 | |
27 esac | |
28 | |
29 | |
30 done=NO | |
31 | |
32 | |
42 | 33 case "$NGX_PLATFORM" in |
0 | 34 |
35 win32) | |
16 | 36 cat << END >> $NGX_MAKEFILE |
0 | 37 |
16 | 38 `echo "$ZLIB/zlib.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` |
492 | 39 \$(MAKE) -f auto/lib/zlib/$ngx_makefile $ngx_opt $ngx_zlib |
16 | 40 |
41 END | |
0 | 42 |
43 done=YES | |
44 ;; | |
45 | |
46 # FreeBSD: i386 | |
47 # Linux: i686 | |
48 | |
49 *:i386 | *:i686) | |
50 case $ZLIB_ASM in | |
51 pentium) | |
16 | 52 |
53 cat << END >> $NGX_MAKEFILE | |
54 | |
55 $ZLIB/libz.a: $NGX_MAKEFILE | |
56 cd $ZLIB \\ | |
566 | 57 && \$(MAKE) distclean \\ |
16 | 58 && cp contrib/asm586/match.S . \\ |
59 && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\ | |
60 ./configure \\ | |
61 && \$(MAKE) OBJA=match.o libz.a | |
62 | |
63 END | |
0 | 64 |
65 done=YES | |
66 ;; | |
67 | |
68 pentiumpro) | |
16 | 69 |
70 cat << END >> $NGX_MAKEFILE | |
71 | |
72 $ZLIB/libz.a: $NGX_MAKEFILE | |
73 cd $ZLIB \\ | |
566 | 74 && \$(MAKE) distclean \\ |
16 | 75 && cp contrib/asm686/match.S . \\ |
76 && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\ | |
77 ./configure \\ | |
78 && \$(MAKE) OBJA=match.o libz.a | |
79 | |
80 END | |
0 | 81 |
82 done=YES | |
83 ;; | |
84 | |
85 NO) | |
86 ;; | |
87 | |
88 *) | |
89 echo "$0: error: invalid --with-zlib-asm=$ZLIB_ASM option." | |
90 echo "The valid values are \"pentium\" and \"pentiumpro\" only". | |
91 echo | |
92 | |
93 exit 1; | |
94 ;; | |
95 esac | |
96 ;; | |
97 | |
98 esac | |
99 | |
100 | |
101 if [ $done = NO ]; then | |
16 | 102 |
103 cat << END >> $NGX_MAKEFILE | |
104 | |
105 $ZLIB/libz.a: $NGX_MAKEFILE | |
106 cd $ZLIB \\ | |
566 | 107 && \$(MAKE) distclean \\ |
16 | 108 && CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\ |
109 ./configure \\ | |
110 && \$(MAKE) libz.a | |
111 | |
112 END | |
113 | |
0 | 114 fi |