comparison auto/lib/openssl/make @ 2945:87da6664fb49 stable-0.7

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
author Igor Sysoev <igor@sysoev.ru>
date Mon, 15 Jun 2009 09:48:15 +0000
parents 824d885aa0b1
children 83c940b0d18a
comparison
equal deleted inserted replaced
2944:f892042956e3 2945:87da6664fb49
1 1
2 # Copyright (C) Igor Sysoev 2 # Copyright (C) Igor Sysoev
3 3
4
5 case $USE_THREADS in
6 NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;;
7 *) OPENSSL_OPT="$OPENSSL_OPT threads" ;;
8 esac
9 4
10 case "$CC" in 5 case "$CC" in
11 6
12 cl) 7 cl)
13 8
19 14
20 END 15 END
21 16
22 ;; 17 ;;
23 18
24 cl | bcc32) 19 bcc32)
25 20
26 ngx_opt=`echo "-DOPENSSL=\"$OPENSSL\" -DOPENSSL_OPT=\"$OPENSSL_OPT\"" \ 21 ngx_opt=`echo "-DOPENSSL=\"$OPENSSL\" -DOPENSSL_OPT=\"$OPENSSL_OPT\"" \
27 | sed -e "s/\//$ngx_regex_dirsep/g"` 22 | sed -e "s/\//$ngx_regex_dirsep/g"`
28 23
29 cat << END >> $NGX_MAKEFILE 24 cat << END >> $NGX_MAKEFILE
43 END 38 END
44 39
45 ;; 40 ;;
46 41
47 *) 42 *)
43 case $USE_THREADS in
44 NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;;
45 *) OPENSSL_OPT="$OPENSSL_OPT threads" ;;
46 esac
47
48 case $OPENSSL in 48 case $OPENSSL in
49 49 /*) ngx_prefix="$OPENSSL/openssl" ;;
50 /*) 50 *) ngx_prefix="$PWD/$OPENSSL/openssl" ;;
51 ngx_prefix="$OPENSSL/openssl"
52 ;;
53
54 *)
55 ngx_prefix="$PWD/$OPENSSL/openssl"
56 ;;
57
58 esac 51 esac
59 52
60 cat << END >> $NGX_MAKEFILE 53 cat << END >> $NGX_MAKEFILE
61 54
62 $OPENSSL/openssl/include/openssl/ssl.h: $NGX_MAKEFILE 55 $OPENSSL/openssl/include/openssl/ssl.h: $NGX_MAKEFILE