diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-06-15 09:48:15 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-06-15 09:48:15 +0000 |
| commit | d8615fb29018da7ecb428506204af81b55b46b84 (patch) | |
| tree | 53868e9ef5e13b810f70be3d724a9adc2309e419 /auto/lib/openssl | |
| parent | 47246d6a1d65bb11c6db7d074ed8d317813ccfdb (diff) | |
| download | nginx-d8615fb29018da7ecb428506204af81b55b46b84.tar.gz nginx-d8615fb29018da7ecb428506204af81b55b46b84.tar.bz2 | |
merge r2897, r2898, r2899, r2901, r2902, r2904, r2905, r2906, r2907,
r2909, r2910, r2922, r2923, r2924, r2925, r2929:
various win32 fixes:
*) use no-threads for Unix builds only
*) Win32 returns ERROR_PATH_NOT_FOUND instead of ERROR_FILE_NOT_FOUND
*) add trailing zero to a file name in ngx_win32_rename_file()
*) fix logging in ngx_win32_rename_file()
*) allow shared memory segments more than 4G
*) fix memory leak in successful case
*) log shared memory name in failure case
*) test that zone has the same addresses in different processes
*) add drive letter for Win32 root path
*) log GetExitCodeProcess()'s errno
*) test premature process termination
*) fix debug logging
*) exit if no workers could not be started
*) do not quit old workers if no new workers could not be started
*) a signaller process should stop configuration processing just after
it is able to get pid file, this allows to not open log files, etc.
*) win32 master process had aready closed listening sockets
Diffstat (limited to 'auto/lib/openssl')
| -rw-r--r-- | auto/lib/openssl/make | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make index 6646cb2a4..3c21f436b 100644 --- a/auto/lib/openssl/make +++ b/auto/lib/openssl/make @@ -2,11 +2,6 @@ # Copyright (C) Igor Sysoev -case $USE_THREADS in - NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;; - *) OPENSSL_OPT="$OPENSSL_OPT threads" ;; -esac - case "$CC" in cl) @@ -21,7 +16,7 @@ END ;; - cl | bcc32) + bcc32) ngx_opt=`echo "-DOPENSSL=\"$OPENSSL\" -DOPENSSL_OPT=\"$OPENSSL_OPT\"" \ | sed -e "s/\//$ngx_regex_dirsep/g"` @@ -45,16 +40,14 @@ END ;; *) - case $OPENSSL in - - /*) - ngx_prefix="$OPENSSL/openssl" - ;; - - *) - ngx_prefix="$PWD/$OPENSSL/openssl" - ;; + case $USE_THREADS in + NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;; + *) OPENSSL_OPT="$OPENSSL_OPT threads" ;; + esac + case $OPENSSL in + /*) ngx_prefix="$OPENSSL/openssl" ;; + *) ngx_prefix="$PWD/$OPENSSL/openssl" ;; esac cat << END >> $NGX_MAKEFILE |