Mercurial > hg > nginx-vendor-1-0
annotate auto/lib/zlib/make @ 644:ad25218fd14b NGINX_1_0_12
nginx 1.0.12
*) Feature: the "TLSv1.1" and "TLSv1.2" parameters of the
"ssl_protocols" directive.
*) Feature: the "if" SSI command supports captures in regular
expressions.
*) Bugfix: the "if" SSI command did not work inside the "block" command.
*) Bugfix: in AIO error handling on FreeBSD.
*) Bugfix: in the OpenSSL library initialization.
*) Bugfix: the "worker_cpu_affinity" directive might not work.
*) Bugfix: the "limit_conn_log_level" and "limit_req_log_level"
directives might not work.
*) Bugfix: the "read_ahead" directive might not work combined with
"try_files" and "open_file_cache".
*) Bugfix: the "proxy_cache_use_stale" directive with "error" parameter
did not return answer from cache if there were no live upstreams.
*) Bugfix: a segmentation fault might occur in a worker process if small
time was used in the "inactive" parameter of the "proxy_cache_path"
directive.
*) Bugfix: responses from cache might hang.
*) Bugfix: in error handling while connecting to a backend.
Thanks to Piotr Sikora.
*) Bugfix: in the "epoll" event method.
Thanks to Yichun Zhang.
*) Bugfix: the $sent_http_cache_control variable might contain a wrong
value if the "expires" directive was used.
Thanks to Yichun Zhang.
*) 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: nginx could not be built on Solaris; the bug had appeared in
1.0.11.
*) Bugfix: in the ngx_http_scgi_module.
*) Bugfix: in the ngx_http_mp4_module.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 06 Feb 2012 00:00:00 +0400 |
parents | be4f34123024 |
children |
rev | line source |
---|---|
0 | 1 |
2 # Copyright (C) Igor Sysoev | |
644 | 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 |