Mercurial > hg > nginx
annotate docs/GNUmakefile @ 6806:75dbab4ea930
Events: improved error event handling for UDP sockets.
Normally, the epoll module calls the read and write handlers depending
on whether EPOLLIN and EPOLLOUT are reported by epoll_wait(). No error
processing is done in the module, the handlers are expected to get an
error when doing I/O.
If an error event is reported without EPOLLIN and EPOLLOUT, the module
set both EPOLLIN and EPOLLOUT to ensure the error event is handled at
least in one active handler.
This works well unless the error is delivered along with only one of
EPOLLIN or EPOLLOUT, and the corresponding handler does not do any I/O.
For example, it happened when getting EPOLLERR|EPOLLOUT from
epoll_wait() upon receiving "ICMP port unreachable" while proxying UDP.
As the write handler had nothing to send it was not able to detect and
log an error, and did not switch to the next upstream.
The fix is to unconditionally set EPOLLIN and EPOLLOUT in case of an
error event. In the aforementioned case, this causes the read handler
to be called which does recv() and detects an error.
In addition to the epoll module, analogous changes were made in
devpoll/eventport/poll.
author | Dmitry Volyntsev <xeioex@nginx.com> |
---|---|
date | Mon, 21 Nov 2016 16:03:42 +0300 |
parents | f303f3e43f7b |
children | 1bc938b270dc |
rev | line source |
---|---|
681 | 1 |
775 | 2 VER= $(shell grep 'define NGINX_VERSION' src/core/nginx.h \ |
5147
864030a4ff2a
Configure: unified nginx version computation constructs.
Ruslan Ermilov <ru@nginx.com>
parents:
4831
diff
changeset
|
3 | sed -e 's/^.*"\(.*\)".*/\1/') |
681 | 4 NGINX= nginx-$(VER) |
5 TEMP= tmp | |
5585
f303f3e43f7b
Docs: switched from java XSLScript to xslscript.pl.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5147
diff
changeset
|
6 XSLS?= xslscript.pl |
681 | 7 |
8 | |
4187
b9dade63fcc2
The reference documentation is moving elsewhere.
Ruslan Ermilov <ru@nginx.com>
parents:
4110
diff
changeset
|
9 all: changes |
4068
22364b1f61c9
Initial English translation of Core and HTTP Core modules.
Ruslan Ermilov <ru@nginx.com>
parents:
4013
diff
changeset
|
10 |
681 | 11 changes: $(TEMP)/$(NGINX)/CHANGES.ru \ |
12 $(TEMP)/$(NGINX)/CHANGES | |
13 | |
14 | |
4831
5e3bda6f5208
Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.
Ruslan Ermilov <ru@nginx.com>
parents:
4776
diff
changeset
|
15 $(TEMP)/$(NGINX)/CHANGES.ru: docs/dtd/changes.dtd \ |
5e3bda6f5208
Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.
Ruslan Ermilov <ru@nginx.com>
parents:
4776
diff
changeset
|
16 docs/xml/nginx/changes.xml \ |
4013
b427290fb6bc
- Added missing dependencies for the CHANGES{,ru} targets.
Ruslan Ermilov <ru@nginx.com>
parents:
3999
diff
changeset
|
17 docs/xml/change_log_conf.xml \ |
681 | 18 docs/xslt/changes.xslt |
19 | |
4776
3032f4854b81
Simplified makefile that builds CHANGES.
Ruslan Ermilov <ru@nginx.com>
parents:
4187
diff
changeset
|
20 mkdir -p $(TEMP)/$(NGINX) |
681 | 21 |
4831
5e3bda6f5208
Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.
Ruslan Ermilov <ru@nginx.com>
parents:
4776
diff
changeset
|
22 xmllint --noout --valid docs/xml/nginx/changes.xml |
4013
b427290fb6bc
- Added missing dependencies for the CHANGES{,ru} targets.
Ruslan Ermilov <ru@nginx.com>
parents:
3999
diff
changeset
|
23 xsltproc --stringparam lang ru \ |
4776
3032f4854b81
Simplified makefile that builds CHANGES.
Ruslan Ermilov <ru@nginx.com>
parents:
4187
diff
changeset
|
24 -o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml |
681 | 25 |
26 | |
4831
5e3bda6f5208
Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.
Ruslan Ermilov <ru@nginx.com>
parents:
4776
diff
changeset
|
27 $(TEMP)/$(NGINX)/CHANGES: docs/dtd/changes.dtd \ |
5e3bda6f5208
Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.
Ruslan Ermilov <ru@nginx.com>
parents:
4776
diff
changeset
|
28 docs/xml/nginx/changes.xml \ |
4013
b427290fb6bc
- Added missing dependencies for the CHANGES{,ru} targets.
Ruslan Ermilov <ru@nginx.com>
parents:
3999
diff
changeset
|
29 docs/xml/change_log_conf.xml \ |
681 | 30 docs/xslt/changes.xslt |
31 | |
4776
3032f4854b81
Simplified makefile that builds CHANGES.
Ruslan Ermilov <ru@nginx.com>
parents:
4187
diff
changeset
|
32 mkdir -p $(TEMP)/$(NGINX) |
681 | 33 |
4831
5e3bda6f5208
Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.
Ruslan Ermilov <ru@nginx.com>
parents:
4776
diff
changeset
|
34 xmllint --noout --valid docs/xml/nginx/changes.xml |
4013
b427290fb6bc
- Added missing dependencies for the CHANGES{,ru} targets.
Ruslan Ermilov <ru@nginx.com>
parents:
3999
diff
changeset
|
35 xsltproc --stringparam lang en \ |
4776
3032f4854b81
Simplified makefile that builds CHANGES.
Ruslan Ermilov <ru@nginx.com>
parents:
4187
diff
changeset
|
36 -o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml |
681 | 37 |
38 | |
5585
f303f3e43f7b
Docs: switched from java XSLScript to xslscript.pl.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5147
diff
changeset
|
39 docs/xslt/changes.xslt: docs/xsls/changes.xsls |
681 | 40 |
5585
f303f3e43f7b
Docs: switched from java XSLScript to xslscript.pl.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5147
diff
changeset
|
41 $(XSLS) -o $@ $< |