Mercurial > hg > nginx
annotate auto/lib/md5/make @ 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 | ecdc41bf2047 |
children | d620f497c50f |
rev | line source |
---|---|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
1 |
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
2 # Copyright (C) Igor Sysoev |
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
3 |
273
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
4 |
467 | 5 case "$NGX_CC_NAME" in |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
6 |
467 | 7 msvc*) |
8 ngx_makefile=makefile.msvc | |
503 | 9 ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC MD5_ASM=$MD5_ASM" |
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
2832
diff
changeset
|
10 ngx_md5="MD5=\"$MD5\"" |
297
ee394e997c77
nginx-0.0.3-2004-03-29-21:43:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
295
diff
changeset
|
11 ;; |
ee394e997c77
nginx-0.0.3-2004-03-29-21:43:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
295
diff
changeset
|
12 |
467 | 13 owc*) |
14 ngx_makefile=makefile.owc | |
503 | 15 ngx_opt="CPU_OPT=\"$CPU_OPT\"" |
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
2832
diff
changeset
|
16 ngx_md5=`echo MD5=\"$MD5\" | sed -e "s/\//$ngx_regex_dirsep/g"` |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
17 ;; |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
18 |
467 | 19 bcc) |
20 ngx_makefile=makefile.bcc | |
503 | 21 ngx_opt="-DCPU_OPT=\"$CPU_OPT\" -DMD5_ASM=$MD5_ASM" |
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
2832
diff
changeset
|
22 ngx_md5=`echo \-DMD5=\"$MD5\" | sed -e "s/\//$ngx_regex_dirsep/g"` |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
23 ;; |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
24 |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
25 esac |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
26 |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
27 |
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
28 done=NO |
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
29 |
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
30 |
493 | 31 case "$NGX_PLATFORM" in |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
32 |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
33 win32) |
467 | 34 cat << END >> $NGX_MAKEFILE |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
35 |
467 | 36 `echo "$MD5/md5.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` |
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
2832
diff
changeset
|
37 \$(MAKE) -f auto/lib/md5/$ngx_makefile $ngx_opt $ngx_md5 |
467 | 38 |
39 END | |
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
40 |
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
41 done=YES |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
42 ;; |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
43 |
283
8f65fee68270
nginx-0.0.2-2004-03-10-20:55:19 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
44 SunOS:*:i86pc) |
284
1fecc9478d92
nginx-0.0.2-2004-03-10-23:56:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
283
diff
changeset
|
45 if [ $MD5_ASM = YES ]; then |
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
46 |
467 | 47 cat << END >> $NGX_MAKEFILE |
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
48 |
467 | 49 $MD5/libmd5.a: $NGX_MAKEFILE |
50 cd $MD5 \\ | |
51 && \$(MAKE) CFLAGS="$MD5_OPT -DSOL -DMD5_ASM -DL_ENDIAN" \\ | |
52 CC="\$(CC)" CPP="\$(CPP)" \\ | |
53 MD5_ASM_OBJ=asm/mx86-sol.o clean libmd5.a | |
54 | |
55 END | |
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
56 |
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
57 done=YES |
284
1fecc9478d92
nginx-0.0.2-2004-03-10-23:56:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
283
diff
changeset
|
58 fi |
273
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
59 ;; |
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
60 |
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
61 # FreeBSD: i386 |
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
62 # Linux: i686 |
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
63 |
285
8f48e6366d09
nginx-0.0.2-2004-03-11-18:42:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
284
diff
changeset
|
64 *:i386 | *:i686) |
284
1fecc9478d92
nginx-0.0.2-2004-03-10-23:56:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
283
diff
changeset
|
65 if [ $MD5_ASM = YES ]; then |
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
66 |
467 | 67 cat << END >> $NGX_MAKEFILE |
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
68 |
467 | 69 $MD5/libmd5.a: $NGX_MAKEFILE |
70 cd $MD5 \\ | |
71 && \$(MAKE) CFLAGS="$MD5_OPT -DELF -DMD5_ASM -DL_ENDIAN" \\ | |
72 CC="\$(CC)" CPP="\$(CPP)" \\ | |
73 MD5_ASM_OBJ=asm/mx86-elf.o clean libmd5.a | |
74 | |
75 END | |
273
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
76 |
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
77 done=YES |
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
78 fi |
273
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
79 ;; |
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
80 |
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
81 esac |
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
82 |
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
83 |
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
84 if [ $done = NO ]; then |
467 | 85 |
86 cat << END >> $NGX_MAKEFILE | |
87 | |
88 $MD5/libmd5.a: $NGX_MAKEFILE | |
89 cd $MD5 \\ | |
90 && \$(MAKE) CFLAGS="$MD5_OPT" \\ | |
91 CC="\$(CC)" MD5_ASM_OBJ= clean libmd5.a | |
92 | |
93 END | |
94 | |
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
95 fi |