Mercurial > hg > nginx-quic
view auto/cc/icc @ 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 | 293413010217 |
line wrap: on
line source
# Copyright (C) Igor Sysoev # Copyright (C) Nginx, Inc. # Intel C++ compiler 7.1, 8.0, 8.1, 9.0, 11.1 NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \ | sed -e 's/^.* Version \([^ ]*\) *Build.*$/\1/'` echo " + icc version: $NGX_ICC_VER" have=NGX_COMPILER value="\"Intel C Compiler $NGX_ICC_VER\"" . auto/define # optimizations CFLAGS="$CFLAGS -O" CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file" case $CPU in pentium) # optimize for Pentium and Athlon CPU_OPT="-march=pentium" ;; pentiumpro) # optimize for Pentium Pro, Pentium II and Pentium III CPU_OPT="-mcpu=pentiumpro -march=pentiumpro" ;; pentium4) # optimize for Pentium 4, default CPU_OPT="-march=pentium4" ;; esac CFLAGS="$CFLAGS $CPU_OPT" if [ ".$PCRE_OPT" = "." ]; then PCRE_OPT="-O $CPU_OPT" fi if [ ".$MD5_OPT" = "." ]; then MD5_OPT="-O $CPU_OPT" fi if [ ".$ZLIB_OPT" = "." ]; then ZLIB_OPT="-O $CPU_OPT" fi # warnings CFLAGS="$CFLAGS -w2" # disable some warnings # invalid type conversion: "int" to "char *" CFLAGS="$CFLAGS -wd171" # argument is incompatible with corresponding format string conversion CFLAGS="$CFLAGS -wd181" # zero used for undefined preprocessing identifier CFLAGS="$CFLAGS -wd193" # the format string ends before this argument CFLAGS="$CFLAGS -wd268" # invalid format string conversion CFLAGS="$CFLAGS -wd269" # conversion from "long long" to "size_t" may lose significant bits CFLAGS="$CFLAGS -wd810" # parameter was never referenced CFLAGS="$CFLAGS -wd869" # attribute "unused" is only allowed in a function definition, warning on pTHX_ CFLAGS="$CFLAGS -wd1301" # STUB # enumerated type mixed with another type CFLAGS="$CFLAGS -wd188" # controlling expression is constant CFLAGS="$CFLAGS -wd279" # operands are evaluated in unspecified order CFLAGS="$CFLAGS -wd981" # external definition with no prior declaration CFLAGS="$CFLAGS -wd1418" # external declaration in primary source file CFLAGS="$CFLAGS -wd1419" case "$NGX_ICC_VER" in 9.*) # "cc" clobber ignored, warnings for Liunx's htonl()/htons() CFLAGS="$CFLAGS -wd1469" # explicit conversion of a 64-bit integral type to a smaller # integral type CFLAGS="$CFLAGS -wd1683" # conversion from pointer to same-sized integral type, # warning on offsetof() CFLAGS="$CFLAGS -wd1684" # floating-point equality and inequality comparisons are unreliable, # warning on SvTRUE() CFLAGS="$CFLAGS -wd1572" ;; 8.*) # "cc" clobber ignored, warnings for Liunx's htonl()/htons() CFLAGS="$CFLAGS -wd1469" # floating-point equality and inequality comparisons are unreliable, # warning on SvTRUE() CFLAGS="$CFLAGS -wd1572" ;; *) ;; esac # stop on warning CFLAGS="$CFLAGS -Werror" # debug CFLAGS="$CFLAGS -g"