Mercurial > hg > nginx

annotate auto/module @ 6640:e78eca6bfaf0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HTTP/2: fixed send timer handling. Checking for return value of c->send_chain() isn't sufficient since there are data can be left in the SSL buffer. Now the wew->ready flag is used instead. In particular, this fixed a connection leak in cases when all streams were closed, but there's still some data to be sent in the SSL buffer and the client forgot about the connection.
author Valentin Bartenev <vbart@nginx.com>
date Tue, 19 Jul 2016 20:31:09 +0300
parents 9eefb38f0005
children 2c7a2d75938a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6382
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
1
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
2 # Copyright (C) Ruslan Ermilov
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
3 # Copyright (C) Nginx, Inc.
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
4
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
5
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
6 case $ngx_module_type in
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
7 HTTP_*) ngx_var=HTTP ;;
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
8 *) ngx_var=$ngx_module_type ;;
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
9 esac
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
10
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
11
6383
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
12 if [ "$ngx_module_link" = DYNAMIC ]; then
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
13
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
14 for ngx_module in $ngx_module_name; do
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
15 # extract the first name
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
16 break
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
17 done
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
18
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
19 DYNAMIC_MODULES="$DYNAMIC_MODULES $ngx_module"
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
20 eval ${ngx_module}_SRCS=\"$ngx_module_srcs\"
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
21
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
22 eval ${ngx_module}_MODULES=\"$ngx_module_name\"
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
23
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
24 if [ -z "$ngx_module_order" -a \
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
25 \( "$ngx_module_type" = "HTTP_FILTER" \
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
26 -o "$ngx_module_type" = "HTTP_AUX_FILTER" \) ]
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
27 then
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
28 eval ${ngx_module}_ORDER=\"$ngx_module_name \
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
29 ngx_http_copy_filter_module\"
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
30 else
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
31 eval ${ngx_module}_ORDER=\"$ngx_module_order\"
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
32 fi
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
33
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
34 if test -n "$ngx_module_incs"; then
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
35 CORE_INCS="$CORE_INCS $ngx_module_incs"
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
36 fi
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
37
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
38 libs=
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
39 for lib in $ngx_module_libs
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
40 do
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
41 case $lib in
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
42
6419
39a806ccf21e Dynamic modules: perl.
Ruslan Ermilov <ru@nginx.com>
parents: 6383
diff changeset
43 LIBXSLT | LIBGD | GEOIP | PERL)
6383
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
44 libs="$libs \$NGX_LIB_$lib"
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
45
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
46 if eval [ "\$USE_${lib}" = NO ] ; then
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
47 eval USE_${lib}=DYNAMIC
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
48 fi
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
49 ;;
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
50
6603
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
51 PCRE | OPENSSL | ZLIB)
6383
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
52 eval USE_${lib}=YES
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
53 ;;
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
54
6603
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
55 MD5 | SHA1)
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
56 # obsolete
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
57 ;;
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
58
6383
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
59 *)
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
60 libs="$libs $lib"
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
61 ;;
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
62
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
63 esac
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
64 done
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
65 eval ${ngx_module}_LIBS=\'$libs\'
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
66
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
67 elif [ "$ngx_module_link" = YES ]; then
6382
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
68
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
69 eval ${ngx_module_type}_MODULES=\"\$${ngx_module_type}_MODULES \
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
70 $ngx_module_name\"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
71
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
72 eval ${ngx_var}_SRCS=\"\$${ngx_var}_SRCS $ngx_module_srcs\"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
73
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
74 if test -n "$ngx_module_incs"; then
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
75 eval ${ngx_var}_INCS=\"\$${ngx_var}_INCS $ngx_module_incs\"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
76 fi
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
77
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
78 if test -n "$ngx_module_deps"; then
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
79 eval ${ngx_var}_DEPS=\"\$${ngx_var}_DEPS $ngx_module_deps\"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
80 fi
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
81
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
82 for lib in $ngx_module_libs
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
83 do
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
84 case $lib in
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
85
6603
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
86 PCRE | OPENSSL | ZLIB | LIBXSLT | LIBGD | PERL | GEOIP)
6382
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
87 eval USE_${lib}=YES
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
88 ;;
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
89
6603
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
90 MD5 | SHA1)
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
91 # obsolete
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
92 ;;
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
93
6382
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
94 *)
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
95 CORE_LIBS="$CORE_LIBS $lib"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
96 ;;
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
97
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
98 esac
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
99 done
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
100
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
101 elif [ "$ngx_module_link" = ADDON ]; then
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
102
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
103 eval ${ngx_module_type}_MODULES=\"\$${ngx_module_type}_MODULES \
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
104 $ngx_module_name\"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
105
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
106 NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_module_srcs"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
107
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
108 if test -n "$ngx_module_incs"; then
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
109 eval ${ngx_var}_INCS=\"\$${ngx_var}_INCS $ngx_module_incs\"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
110 fi
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
111
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
112 if test -n "$ngx_module_deps"; then
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
113 NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_module_deps"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
114 fi
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
115
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
116 for lib in $ngx_module_libs
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
117 do
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
118 case $lib in
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
119
6603
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
120 PCRE | OPENSSL | ZLIB | LIBXSLT | LIBGD | PERL | GEOIP)
6382
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
121 eval USE_${lib}=YES
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
122 ;;
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
123
6603
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
124 MD5 | SHA1)
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
125 # obsolete
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
126 ;;
9eefb38f0005 Internal md5 and sha1 implementations are now always used.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6419
diff changeset
127
6382
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
128 *)
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
129 CORE_LIBS="$CORE_LIBS $lib"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
130 ;;
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
131
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
132 esac
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
133 done
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
134 fi