Mercurial > hg > nginx
view 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 |
line wrap: on
line source
# Copyright (C) Igor Sysoev case "$NGX_CC_NAME" in msvc*) ngx_makefile=makefile.msvc ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC MD5_ASM=$MD5_ASM" ngx_md5="MD5=\"$MD5\"" ;; owc*) ngx_makefile=makefile.owc ngx_opt="CPU_OPT=\"$CPU_OPT\"" ngx_md5=`echo MD5=\"$MD5\" | sed -e "s/\//$ngx_regex_dirsep/g"` ;; bcc) ngx_makefile=makefile.bcc ngx_opt="-DCPU_OPT=\"$CPU_OPT\" -DMD5_ASM=$MD5_ASM" ngx_md5=`echo \-DMD5=\"$MD5\" | sed -e "s/\//$ngx_regex_dirsep/g"` ;; esac done=NO case "$NGX_PLATFORM" in win32) cat << END >> $NGX_MAKEFILE `echo "$MD5/md5.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` \$(MAKE) -f auto/lib/md5/$ngx_makefile $ngx_opt $ngx_md5 END done=YES ;; SunOS:*:i86pc) if [ $MD5_ASM = YES ]; then cat << END >> $NGX_MAKEFILE $MD5/libmd5.a: $NGX_MAKEFILE cd $MD5 \\ && \$(MAKE) CFLAGS="$MD5_OPT -DSOL -DMD5_ASM -DL_ENDIAN" \\ CC="\$(CC)" CPP="\$(CPP)" \\ MD5_ASM_OBJ=asm/mx86-sol.o clean libmd5.a END done=YES fi ;; # FreeBSD: i386 # Linux: i686 *:i386 | *:i686) if [ $MD5_ASM = YES ]; then cat << END >> $NGX_MAKEFILE $MD5/libmd5.a: $NGX_MAKEFILE cd $MD5 \\ && \$(MAKE) CFLAGS="$MD5_OPT -DELF -DMD5_ASM -DL_ENDIAN" \\ CC="\$(CC)" CPP="\$(CPP)" \\ MD5_ASM_OBJ=asm/mx86-elf.o clean libmd5.a END done=YES fi ;; esac if [ $done = NO ]; then cat << END >> $NGX_MAKEFILE $MD5/libmd5.a: $NGX_MAKEFILE cd $MD5 \\ && \$(MAKE) CFLAGS="$MD5_OPT" \\ CC="\$(CC)" MD5_ASM_OBJ= clean libmd5.a END fi