Mercurial > hg > nginx-vendor-current
diff auto/lib/openssl/conf @ 480:549994537f15 NGINX_0_7_52
nginx 0.7.52
*) Feature: the first native Windows binary release.
*) Bugfix: in processing HEAD method while caching.
*) Bugfix: in processing the "If-Modified-Since", "If-Range", etc.
client request header lines while caching.
*) Bugfix: now the "Set-Cookie" and "P3P" header lines are hidden in
cacheable responses.
*) Bugfix: if nginx was built with the ngx_http_perl_module and with a
perl which supports threads, then during a master process exit the
message "panic: MUTEX_LOCK" might be issued.
*) Bugfix: nginx could not be built --without-http-cache; the bug had
appeared in 0.7.48.
*) Bugfix: nginx could not be built on platforms different from i386,
amd64, sparc, and ppc; the bug had appeared in 0.7.42.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Mon, 20 Apr 2009 00:00:00 +0400 |
| parents | 6ae1357b7b7c |
| children | 392c16f2d858 |
line wrap: on
line diff
--- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -6,6 +6,21 @@ if [ $OPENSSL != NONE ]; then CORE_INCS="$CORE_INCS $OPENSSL/include" case "$CC" in + + cl|bcc32) + have=NGX_OPENSSL . auto/have + have=NGX_SSL . auto/have + + LINK_DEPS="$LINK_DEPS $OPENSSL/out32/ssleay32.lib" + CORE_LIBS="$CORE_LIBS $OPENSSL/out32/ssleay32.lib" + + LINK_DEPS="$LINK_DEPS $OPENSSL/out32/libeay32.lib" + CORE_LIBS="$CORE_LIBS $OPENSSL/out32/libeay32.lib" + + # libeay32.lib requires gdi32.lib and advapi32.lib + CORE_LIBS="$CORE_LIBS gdi32.lib advapi32.lib" + ;; + *) have=NGX_OPENSSL . auto/have have=NGX_SSL . auto/have @@ -34,10 +49,8 @@ else CORE_LIBS="$CORE_LIBS c:/openssl/ssleay32.lib" CORE_LIBS="$CORE_LIBS c:/openssl/libeay32.lib" - # libeay32.lib requires gdi32.lib - CORE_LIBS="$CORE_LIBS gdi32.lib" - # OpenSSL 0.8's libeay32.lib requires advapi32.lib - CORE_LIBS="$CORE_LIBS advapi32.lib" + # libeay32.lib requires gdi32.lib and advapi32.lib + CORE_LIBS="$CORE_LIBS gdi32.lib advapi32.lib" ;; *)