diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-04-20 06:16:24 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2009-04-20 06:16:24 +0000 |
| commit | e7d62b21eb69be11894969ba66d3590f4cbd5b9d (patch) | |
| tree | 4eb771dd2000343925a35b4742af684f6603d0c8 /auto/lib/openssl | |
| parent | b0e75119a75c319f70cc0ddd980fa92a8a716580 (diff) | |
| download | nginx-e7d62b21eb69be11894969ba66d3590f4cbd5b9d.tar.gz | |
Changes with nginx 0.7.52 20 Apr 2009v0.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.
Diffstat (limited to 'auto/lib/openssl')
| -rw-r--r-- | auto/lib/openssl/conf | 21 | ||||
| -rw-r--r-- | auto/lib/openssl/make | 33 |
2 files changed, 49 insertions, 5 deletions
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index 02e9e610b..bf12d2eb0 100644 --- 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" ;; *) diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make index 7da0d8dc1..96b86befa 100644 --- a/auto/lib/openssl/make +++ b/auto/lib/openssl/make @@ -13,7 +13,38 @@ case $USE_THREADS in *) NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG threads" ;; esac -case "$NGX_PLATFORM" in +case "$CC" in + cl) + cat << END >> $NGX_MAKEFILE + +$OPENSSL/out32/ssleay32.lib: + cd $OPENSSL + perl Configure VC-WIN32 no-shared + ms\\do_ms + \$(MAKE) -f ms\\nt.mak + cd ..\\..\\.. + +END + + ;; + + bcc32) + cat << END >> $NGX_MAKEFILE + +`echo "$OPENSSL\\out32\\libeay32.lib: $OPENSSL\\out32\\ssleay32.lib" \ + | sed -e "s/\//$ngx_regex_dirsep/g"` + +`echo "$OPENSSL\\out32\\ssleay32.lib:" | sed -e "s/\//$ngx_regex_dirsep/g"` + cd `echo "$OPENSSL" | sed -e "s/\//$ngx_regex_dirsep/g"` + perl Configure BC-32 no-shared + ms\\do_nasm + \$(MAKE) -f ms\\bcb.mak + cd ..\\..\\.. + +END + + ;; + *) cat << END >> $NGX_MAKEFILE |