Mercurial > hg > nginx
annotate misc/GNUmakefile @ 4437:3a1507f48686 stable-1.0
Merge of r4372, r4373, r4374:
SCGI fixes:
*) Fixed incorrect use of r->http_version in scgi module.
The r->http_version is a version of client's request, and modules
must not set it unless they are really willing to downgrade protocol
version used for a response (i.e. to HTTP/0.9 if no response headers
are available). In neither case r->http_version may be upgraded.
The former code downgraded response from HTTP/1.1 to HTTP/1.0 for no
reason, causing various problems (see ticket #66). It was also
possible that HTTP/0.9 requests were upgraded to HTTP/1.0.
*) Removed duplicate function declaration.
*) Removed error if there is no Status header.
The SCGI specification doesn't specify format of the response, and
assuming CGI specs should be used there is no reason to complain.
RFC 3875 explicitly states that "A Status header field is optional,
and status 200 'OK' is assumed if it is omitted".
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sun, 05 Feb 2012 13:53:50 +0000 |
parents | dc7549aa8556 |
children | f9b3061e0f31 |
rev | line source |
---|---|
681 | 1 |
2725 | 2 VER = $(shell grep 'define NGINX_VERSION' src/core/nginx.h \ |
3 | sed -e 's/^.*\"\(.*\)\"/\1/') | |
4 NGINX = nginx-$(VER) | |
5 TEMP = tmp | |
4346
dc7549aa8556
Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Maxim Dounin <mdounin@mdounin.ru>
parents:
4250
diff
changeset
|
6 REPO = $(shell svn info | sed -n 's/^Repository Root: //p') |
2725 | 7 |
8 OBJS = objs.msvc8 | |
3869
ee223ca91129
copy OpenSSL-0.9.8r LICENSE for nginx/Windows zip
Igor Sysoev <igor@sysoev.ru>
parents:
3849
diff
changeset
|
9 OPENSSL = openssl-0.9.8r |
2725 | 10 ZLIB = zlib-1.2.3 |
2871
c7fe4b9118d2
fix "make zip", the bug has been introduced in r2841
Igor Sysoev <igor@sysoev.ru>
parents:
2734
diff
changeset
|
11 PCRE = pcre-7.9 |
681 | 12 |
13 | |
14 release: | |
15 rm -rf $(TEMP) | |
16 | |
17 svn export -rHEAD . $(TEMP)/$(NGINX) | |
18 | |
19 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX) | |
20 | |
21 # delete incomplete sources | |
22 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c | |
23 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c | |
24 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.* | |
25 rm -r $(TEMP)/$(NGINX)/src/os/win32 | |
26 | |
27 rm -r $(TEMP)/$(NGINX)/src/mysql | |
28 | |
29 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) | |
30 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) | |
31 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX) | |
3801
569716d0e447
add man page in release tarball and fix man building procedure
Igor Sysoev <igor@sysoev.ru>
parents:
3717
diff
changeset
|
32 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX) |
681 | 33 |
34 $(MAKE) -f docs/GNUmakefile changes | |
35 | |
36 rm -r $(TEMP)/$(NGINX)/docs | |
37 rm -r $(TEMP)/$(NGINX)/misc | |
38 | |
704
58bd27d72519
fix bug introduced with snapshot support
Igor Sysoev <igor@sysoev.ru>
parents:
701
diff
changeset
|
39 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX) |
58bd27d72519
fix bug introduced with snapshot support
Igor Sysoev <igor@sysoev.ru>
parents:
701
diff
changeset
|
40 |
701 | 41 |
4250 | 42 RELEASE: |
43 test -d $(TEMP) || mkdir -p $(TEMP) | |
44 | |
45 echo "nginx-$(VER)-RELEASE" > $(TEMP)/message | |
46 svn ci -F $(TEMP)/message | |
47 | |
48 echo "release-$(VER) tag" > $(TEMP)/message | |
4346
dc7549aa8556
Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Maxim Dounin <mdounin@mdounin.ru>
parents:
4250
diff
changeset
|
49 svn copy $(REPO)/branches/stable-1.0 \ |
dc7549aa8556
Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Maxim Dounin <mdounin@mdounin.ru>
parents:
4250
diff
changeset
|
50 $(REPO)/tags/release-$(VER) \ |
4250 | 51 -F $(TEMP)/message |
52 | |
53 svn up | |
54 | |
4346
dc7549aa8556
Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Maxim Dounin <mdounin@mdounin.ru>
parents:
4250
diff
changeset
|
55 $(MAKE) -f misc/GNUmakefile release |
4250 | 56 |
57 | |
701 | 58 snapshot: |
59 rm -rf $(TEMP) | |
60 | |
61 mkdir -p $(TEMP) | |
62 svn export . $(TEMP)/$(NGINX) | |
63 | |
64 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX) | |
65 | |
66 # delete incomplete sources | |
67 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c | |
68 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c | |
69 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.* | |
70 rm -r $(TEMP)/$(NGINX)/src/os/win32 | |
71 | |
72 rm -r $(TEMP)/$(NGINX)/src/mysql | |
73 | |
74 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) | |
75 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) | |
76 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX) | |
3801
569716d0e447
add man page in release tarball and fix man building procedure
Igor Sysoev <igor@sysoev.ru>
parents:
3717
diff
changeset
|
77 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX) |
701 | 78 |
79 $(MAKE) -f docs/GNUmakefile changes | |
80 | |
81 rm -r $(TEMP)/$(NGINX)/docs | |
82 rm -r $(TEMP)/$(NGINX)/misc | |
83 | |
681 | 84 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX) |
85 | |
86 | |
2725 | 87 zip: |
88 rm -rf $(TEMP) | |
89 rm -f $(NGINX).zip | |
90 | |
91 mkdir -p $(TEMP)/$(NGINX)/docs | |
92 mkdir -p $(TEMP)/$(NGINX)/logs | |
93 mkdir -p $(TEMP)/$(NGINX)/temp | |
94 | |
95 svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/ | |
96 perl -pi -e 's/$$/\r/' $(TEMP)/$(NGINX)/conf/* | |
97 | |
98 svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/ | |
99 svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/ | |
100 | |
101 $(MAKE) -f docs/GNUmakefile changes | |
102 | |
103 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX) | |
104 | |
105 cp -p docs/text/LICENSE $(TEMP)/$(NGINX)/docs/ | |
106 cp -p docs/text/README $(TEMP)/$(NGINX)/docs/ | |
107 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/ | |
108 | |
109 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \ | |
110 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE | |
111 | |
2871
c7fe4b9118d2
fix "make zip", the bug has been introduced in r2841
Igor Sysoev <igor@sysoev.ru>
parents:
2734
diff
changeset
|
112 cp -p $(OBJS)/lib/$(PCRE)/LICENCE \ |
c7fe4b9118d2
fix "make zip", the bug has been introduced in r2841
Igor Sysoev <igor@sysoev.ru>
parents:
2734
diff
changeset
|
113 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE |
2725 | 114 |
115 perl -ne 'print if /^ \(C\) 1995-2004/ .. /^ jloup\@gzip.org/' \ | |
116 $(OBJS)/lib/$(ZLIB)/README \ | |
117 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
118 | |
119 touch -r $(OBJS)/lib/$(ZLIB)/README \ | |
120 $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
121 | |
122 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX) | |
123 | |
124 | |
125 icons: src/os/win32/nginx.ico | |
681 | 126 |
2734 | 127 # 48x48, 32x32 and 16x16 icons |
681 | 128 |
2734 | 129 src/os/win32/nginx.ico: src/os/win32/nginx_icon48.xpm \ |
130 src/os/win32/nginx_icon32.xpm \ | |
681 | 131 src/os/win32/nginx_icon16.xpm |
132 | |
133 test -d $(TEMP) || mkdir $(TEMP) | |
134 | |
2734 | 135 xpmtoppm --alphaout=$(TEMP)/nginx48.pbm \ |
136 src/os/win32/nginx_icon48.xpm > $(TEMP)/nginx48.ppm | |
137 | |
681 | 138 xpmtoppm --alphaout=$(TEMP)/nginx32.pbm \ |
139 src/os/win32/nginx_icon32.xpm > $(TEMP)/nginx32.ppm | |
140 | |
141 xpmtoppm --alphaout=$(TEMP)/nginx16.pbm \ | |
142 src/os/win32/nginx_icon16.xpm > $(TEMP)/nginx16.ppm | |
143 | |
144 ppmtowinicon -output src/os/win32/nginx.ico -andpgms \ | |
2734 | 145 $(TEMP)/nginx48.ppm $(TEMP)/nginx48.pbm \ |
681 | 146 $(TEMP)/nginx32.ppm $(TEMP)/nginx32.pbm \ |
147 $(TEMP)/nginx16.ppm $(TEMP)/nginx16.pbm |