annotate auto/module @ 6891:749bcfdf097a stable-1.10

HTTP/2: fixed posted streams handling. A bug was introduced by 82efcedb310b that could lead to timing out of responses or segmentation fault, when accept_mutex was enabled. The output queue in HTTP/2 can contain frames from different streams. When the queue is sent, all related write handlers need to be called. In order to do so, the streams were added to the h2c->posted queue after handling sent frames. Then this queue was processed in ngx_http_v2_write_handler(). If accept_mutex is enabled, the event's "ready" flag is set but its handler is not called immediately. Instead, the event is added to the ngx_posted_events queue. At the same time in this queue can be events from upstream connections. Such events can result in sending output queue before ngx_http_v2_write_handler() is triggered. And at the time ngx_http_v2_write_handler() is called, the output queue can be already empty with some streams added to h2c->posted. But after 82efcedb310b, these streams weren't processed if all frames have already been sent and the output queue was empty. This might lead to a situation when a number of streams were get stuck in h2c->posted queue for a long time. Eventually these streams might get closed by the send timeout. In the worst case this might also lead to a segmentation fault, if already freed stream was left in the h2c->posted queue. This could happen if one of the streams was terminated but wasn't closed, due to the HEADERS frame or a partially sent DATA frame left in the output queue. If this happened the ngx_http_v2_filter_cleanup() handler removed the stream from the h2c->waiting or h2c->posted queue on termination stage, before the frame has been sent, and the stream was again added to the h2c->posted queue after the frame was sent. In order to fix all these problems and simplify the code, write events of fake stream connections are now added to ngx_posted_events instead of using a custom h2c->posted queue.
author Valentin Bartenev <vbart@nginx.com>
date Mon, 28 Nov 2016 20:58:14 +0300
parents 39a806ccf21e
children 9eefb38f0005
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
6419
39a806ccf21e Dynamic modules: perl.
Ruslan Ermilov <ru@nginx.com>
parents: 6383
diff changeset
51 PCRE | OPENSSL | MD5 | SHA1 | 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
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
55 *)
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
56 libs="$libs $lib"
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
57 ;;
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
58
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
59 esac
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
60 done
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6382
diff changeset
61 eval ${ngx_module}_LIBS=\'$libs\'
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 elif [ "$ngx_module_link" = YES ]; then
6382
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
64
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
65 eval ${ngx_module_type}_MODULES=\"\$${ngx_module_type}_MODULES \
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
66 $ngx_module_name\"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
67
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
68 eval ${ngx_var}_SRCS=\"\$${ngx_var}_SRCS $ngx_module_srcs\"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
69
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
70 if test -n "$ngx_module_incs"; then
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
71 eval ${ngx_var}_INCS=\"\$${ngx_var}_INCS $ngx_module_incs\"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
72 fi
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_deps"; then
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
75 eval ${ngx_var}_DEPS=\"\$${ngx_var}_DEPS $ngx_module_deps\"
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 for lib in $ngx_module_libs
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
79 do
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
80 case $lib in
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 PCRE | OPENSSL | MD5 | SHA1 | ZLIB | LIBXSLT | LIBGD | PERL | GEOIP)
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
83 eval USE_${lib}=YES
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
84 ;;
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
85
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
86 *)
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
87 CORE_LIBS="$CORE_LIBS $lib"
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
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
90 esac
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
91 done
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
92
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
93 elif [ "$ngx_module_link" = ADDON ]; then
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 eval ${ngx_module_type}_MODULES=\"\$${ngx_module_type}_MODULES \
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
96 $ngx_module_name\"
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 NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_module_srcs"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
99
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
100 if test -n "$ngx_module_incs"; then
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
101 eval ${ngx_var}_INCS=\"\$${ngx_var}_INCS $ngx_module_incs\"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
102 fi
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
103
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
104 if test -n "$ngx_module_deps"; then
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
105 NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_module_deps"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
106 fi
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 for lib in $ngx_module_libs
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
109 do
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
110 case $lib in
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 PCRE | OPENSSL | MD5 | SHA1 | ZLIB | LIBXSLT | LIBGD | PERL | GEOIP)
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
113 eval USE_${lib}=YES
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
114 ;;
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 *)
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
117 CORE_LIBS="$CORE_LIBS $lib"
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
118 ;;
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
119
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
120 esac
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
121 done
392959224560 Dynamic modules: auto/module script.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
122 fi