Mercurial > hg > nginx
view auto/lib/sha1/conf @ 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 | 9c057d5e1c27 |
children | d620f497c50f |
line wrap: on
line source
# Copyright (C) Igor Sysoev if [ $SHA1 != NONE ]; then have=NGX_HAVE_SHA1 . auto/have CORE_INCS="$CORE_INCS $SHA1" case "$NGX_CC_NAME" in msvc* | owc* | bcc) LINK_DEPS="$LINK_DEPS $SHA1/sha1.lib" CORE_LIBS="$CORE_LIBS $SHA1/sha1.lib" ;; icc*) LINK_DEPS="$LINK_DEPS $SHA1/libsha.a" # to allow -ipo optimization we link with the *.o but not library CORE_LIBS="$CORE_LIBS $SHA1/sha1_dgst.o" if [ $SHA1_ASM = YES ]; then CORE_LIBS="$CORE_LIBS $SHA1/asm/sx86-elf.o" fi ;; *) LINK_DEPS="$LINK_DEPS $SHA1/libsha.a" CORE_LIBS="$CORE_LIBS $SHA1/libsha.a" #CORE_LIBS="$CORE_LIBS -L $SHA1 -lsha" ;; esac else if [ "$NGX_PLATFORM" != win32 ]; then SHA1=NO # FreeBSD ngx_feature="sha1 in system md library" ngx_feature_name=NGX_HAVE_SHA1 ngx_feature_run=no ngx_feature_incs="#include <sha.h>" ngx_feature_path= ngx_feature_libs="-lmd" ngx_feature_test="SHA_CTX sha1; SHA1_Init(&sha1)" . auto/feature ngx_sha1_lib="system md" if [ $ngx_found = no ]; then # OpenSSL crypto library ngx_feature="OpenSSL sha1 crypto library" ngx_feature_incs="#include <openssl/sha.h>" ngx_feature_libs="-lcrypto" . auto/feature ngx_sha1_lib="system crypto" if [ $ngx_found = yes ]; then have=NGX_HAVE_OPENSSL_SHA1_H . auto/have fi fi if [ $ngx_found = yes ]; then CORE_LIBS="$CORE_LIBS $ngx_feature_libs" SHA1=YES SHA1_LIB=$ngx_sha1_lib fi fi fi