Mercurial > hg > nginx-quic
view auto/cc/msvc @ 5058:f25d0bbc4392 stable-1.2
Merge of r5004, r5019-r5025: ssl fixes.
*) SSL: speedup loading of configs with many ssl servers. The patch
saves one EC_KEY_generate_key() call per server{} block by informing
OpenSSL about SSL_OP_SINGLE_ECDH_USE we are going to use before
the SSL_CTX_set_tmp_ecdh() call.
For a configuration file with 10k simple server{} blocks with SSL
enabled this change reduces startup time from 18s to 5s on a slow
test box here.
*) SSL: removed conditions that always hold true.
*) SSL: resetting of flush flag after the data was written. There is
no need to flush next chunk of data if it does not contain a buffer
with the flush or last_buf flags set.
*) SSL: preservation of flush flag for buffered data. Previously,
if SSL buffer was not sent we lost information that the data
must be flushed.
*) SSL: calculation of buffer size moved closer to its usage.
No functional changes.
*) SSL: avoid calling SSL_write() with zero data size. According to
documentation, calling SSL_write() with num=0 bytes to be sent
results in undefined behavior.
We don't currently call ngx_ssl_send_chain() with empty chain and
buffer. This check handles the case of a chain with total data size
that is a multiple of NGX_SSL_BUFSIZE, and with the special buffer
at the end.
In practice such cases resulted in premature connection close and
critical error "SSL_write() failed (SSL:)" in the error log.
*) SSL: take into account data in the buffer while limiting output.
In some rare cases this can result in a more smooth sending rate.
*) SSL: fixed ngx_ssl_handshake() with level-triggered event methods.
Missing calls to ngx_handle_write_event() and ngx_handle_read_event()
resulted in a CPU hog during SSL handshake if an level-triggered event
method (e.g. select) was used.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 11 Feb 2013 15:12:06 +0000 |
parents | d620f497c50f |
children | 2b71f6535c76 |
line wrap: on
line source
# Copyright (C) Igor Sysoev # Copyright (C) Nginx, Inc. # MSVC 6.0 SP2 # MSVC Toolkit 2003 (7.1) # MSVC 2005 Express Edition SP1 (8.0) # optimizations # maximize speed, equivalent to -Og -Oi -Ot -Oy -Ob2 -Gs -GF -Gy CFLAGS="$CFLAGS -O2" # enable global optimization #CFLAGS="$CFLAGS -Og" # enable intrinsic functions #CFLAGS="$CFLAGS -Oi" # disable inline expansion #CFLAGS="$CFLAGS -Ob0" # explicit inline expansion #CFLAGS="$CFLAGS -Ob1" # explicit and implicit inline expansion #CFLAGS="$CFLAGS -Ob2" # enable frame pointer omission #CFLAGS="$CFLAGS -Oy" # disable stack checking calls #CFLAGS="$CFLAGS -Gs" # pools strings as read/write #CFLAGS="$CFLAGS -Gf" # pools strings as read-only #CFLAGS="$CFLAGS -GF" case $CPU in pentium) # optimize for Pentium and Athlon CPU_OPT="-G5" ;; pentiumpro) # optimize for Pentium Pro, Pentium II and Pentium III CPU_OPT="-G6" ;; pentium4) # optimize for Pentium 4, MSVC 7 CPU_OPT="-G7" ;; esac # __cdecl, default, must be used with OpenSSL, md5 asm, and sha1 asm #CPU_OPT="$CPU_OPT -Gd" # __stdcall #CPU_OPT="$CPU_OPT -Gz" # __fastcall #CPU_OPT="$CPU_OPT -Gr" CFLAGS="$CFLAGS $CPU_OPT" # warnings CFLAGS="$CFLAGS -W4" # stop on warning CFLAGS="$CFLAGS -WX" # disable logo CFLAGS="$CFLAGS -nologo" LINK="\$(CC)" # the link flags CORE_LINK="$CORE_LINK -link -verbose:lib" # link with libcmt.lib, multithreaded LIBC="-MT" # link with msvcrt.dll # however, MSVC Toolkit 2003 has no MSVCRT.LIB #LIBC="-MD" CFLAGS="$CFLAGS $LIBC" CORE_LIBS="$CORE_LIBS kernel32.lib user32.lib" # Win32 GUI mode application #CORE_LINK="$CORE_LINK -subsystem:windows -entry:mainCRTStartup" # debug # msvc8 under Wine issues # Program database manager mismatch; please check your installation if [ $NGX_CC_NAME != msvc8 ]; then CFLAGS="$CFLAGS -Zi" CORE_LINK="$CORE_LINK -debug" fi # MSVC 2005 supports C99 variadic macros if [ $NGX_CC_NAME = msvc8 ]; then have=NGX_HAVE_C99_VARIADIC_MACROS . auto/have fi # precompiled headers CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch" NGX_PCH="$NGX_OBJS/ngx_config.pch" NGX_BUILD_PCH="-Ycngx_config.h -Fp$NGX_OBJS/ngx_config.pch" NGX_USE_PCH="-Yungx_config.h -Fp$NGX_OBJS/ngx_config.pch" # the resource file NGX_RES="$NGX_OBJS/nginx.res" NGX_RCC="rc -fo$NGX_RES \$(CORE_INCS) $NGX_WIN32_RC" CORE_LINK="$NGX_RES $CORE_LINK" ngx_objout="-Fo" ngx_binout="-Fe" ngx_objext="obj" ngx_binext=".exe" ngx_long_start='@<< ' ngx_long_end='<<' ngx_long_regex_cont=' \ ' ngx_long_cont=' ' # MSVC understand / in path #ngx_regex_dirsep='\\' #ngx_dirsep="\\"