Mercurial > hg > nginx
annotate docs/GNUmakefile @ 4160:88369902edb1 stable-1.0
Merging r4010, r4065:
SSL related fixes:
*) Fixing proxy_set_body and proxy_pass_request_body with SSL.
Flush flag wasn't set in constructed buffer and this prevented any data
from being actually sent to upstream due to SSL buffering. Make sure
we always set flush in the last buffer we are going to sent.
See here for report:
http://nginx.org/pipermail/nginx-ru/2011-June/041552.html
*) Proper SSL shutdown handling.
If connection has unsent alerts, SSL_shutdown() tries to send them even
if SSL_set_shutdown(SSL_RECEIVED_SHUTDOWN|SSL_SENT_SHUTDOWN) was used.
This can be prevented by SSL_set_quiet_shutdown(). SSL_set_shutdown()
is required nevertheless to preserve session.
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Fri, 30 Sep 2011 13:42:59 +0000 |
| parents | 3e706fcccbf3 |
| children | dc7549aa8556 |
| rev | line source |
|---|---|
| 681 | 1 |
| 775 | 2 VER= $(shell grep 'define NGINX_VERSION' src/core/nginx.h \ |
| 3 | sed -e 's/^.*\"\(.*\)\"/\1/') | |
| 681 | 4 NGINX= nginx-$(VER) |
| 5 TEMP= tmp | |
| 6 CP= $(HOME)/java | |
| 7 | |
| 8 define XSLScript | |
|
4047
3e706fcccbf3
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
9 java -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar \ |
| 681 | 10 com.pault.StyleSheet \ |
| 11 -x com.pault.XX -y com.pault.XX \ | |
|
4047
3e706fcccbf3
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
12 $(1) docs/xsls/dump.xsls \ |
|
3e706fcccbf3
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
13 | sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $(2) |
| 681 | 14 |
| 15 if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2) | |
| 16 endef | |
| 17 | |
| 18 define XSLT | |
|
4047
3e706fcccbf3
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
19 xmllint --noout --valid $2; \ |
|
3e706fcccbf3
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
20 xsltproc -o $3 \ |
|
3e706fcccbf3
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
21 $(shell echo $4 \\ |
| 681 | 22 | sed -e "s/\([^= ]*\)=\([^= ]*\)/--param \1 \"'\2'\"/g") \ |
|
4047
3e706fcccbf3
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
23 $1 $2 |
| 681 | 24 endef |
| 25 | |
| 26 | |
| 27 changes: $(TEMP)/$(NGINX)/CHANGES.ru \ | |
| 28 $(TEMP)/$(NGINX)/CHANGES | |
| 29 | |
| 30 | |
| 31 $(TEMP)/$(NGINX)/CHANGES.ru: docs/xml/nginx/changes.xml \ | |
| 32 docs/xslt/changes.xslt | |
| 33 | |
| 34 test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX) | |
| 35 | |
| 36 xsltproc --param lang "'ru'" \ | |
| 37 -o $(TEMP)/$(NGINX)/CHANGES.ru \ | |
| 38 docs/xslt/changes.xslt docs/xml/nginx/changes.xml | |
| 39 | |
| 40 | |
| 41 $(TEMP)/$(NGINX)/CHANGES: docs/xml/nginx/changes.xml \ | |
| 42 docs/xslt/changes.xslt | |
| 43 | |
| 2065 | 44 test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX) |
| 681 | 45 |
| 46 xsltproc --param lang "'en'" \ | |
| 47 -o $(TEMP)/$(NGINX)/CHANGES \ | |
| 48 docs/xslt/changes.xslt docs/xml/nginx/changes.xml | |
| 49 | |
| 50 | |
| 51 docs/xslt/changes.xslt: docs/xsls/changes.xsls | |
| 52 | |
| 53 $(call XSLScript, docs/xsls/changes.xsls, $@) | |
| 54 |