diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-06-15 22:33:41 +0400 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-06-15 22:33:41 +0400 |
| commit | b145b067e296fd0c72d764e36db7a97102045b2c (patch) | |
| tree | 1604c71100a9ea0dc0be0f848ed7ed9dc7108843 /auto/lib/pcre | |
| parent | e08f105e27475ea77f5ceb39fc76d9cb2ba078d1 (diff) | |
nginx-0.1.36-RELEASE importrelease-0.1.36
*) Change: if the request header has duplicate the "Host",
"Connection", "Content-Length", or "Authorization" lines, then nginx
now returns the 400 error.
*) Change: the "post_accept_timeout" directive was canceled.
*) Feature: the "default", "af=", "bl=", "deferred", and "bind"
parameters of the "listen" directive.
*) Feature: the FreeBSD accept filters support.
*) Feature: the Linux TCP_DEFER_ACCEPT support.
*) Bugfix: the ngx_http_autoindex_module did not support the file names
in UTF-8.
*) Bugfix: the new log file can be rotated by the -USR1 signal only if
the reconfiguration by the -HUP signal was made twice.
Diffstat (limited to 'auto/lib/pcre')
| -rw-r--r-- | auto/lib/pcre/conf | 27 | ||||
| -rw-r--r-- | auto/lib/pcre/make | 4 |
2 files changed, 24 insertions, 7 deletions
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf index 65163272a..1b79f94ec 100644 --- a/auto/lib/pcre/conf +++ b/auto/lib/pcre/conf @@ -23,11 +23,30 @@ if [ $PCRE != NONE ]; then LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" + echo $ngx_n "checking for PCRE library ...$ngx_c" + + ngx_pcre_ver=`grep PCRE_MAJOR= $PCRE/configure.in \ + | sed -e 's/^.*=\(.*\)$/\1/'` + + echo " $ngx_pcre_ver major version found" + # to allow -ipo optimization we link with the *.o but not library - CORE_LIBS="$CORE_LIBS $PCRE/maketables.o" - CORE_LIBS="$CORE_LIBS $PCRE/get.o" - CORE_LIBS="$CORE_LIBS $PCRE/study.o" - CORE_LIBS="$CORE_LIBS $PCRE/pcre.o" + + case "$ngx_pcre_ver" in + 6) + CORE_LIBS="$CORE_LIBS $PCRE/pcre_chartables.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_compile.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_exec.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_fullinfo.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_globals.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_tables.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_try_flipped.o" + ;; + + *) + CORE_LIBS="$CORE_LIBS $PCRE/pcre.o" + ;; + esac ;; *) diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make index f57f7d9ec..f5723c852 100644 --- a/auto/lib/pcre/make +++ b/auto/lib/pcre/make @@ -55,9 +55,7 @@ END $PCRE/pcre.h: $NGX_MAKEFILE cd $PCRE \\ - && if [ -f Makefile ]; then \$(MAKE) distclean; fi - - cd $PCRE \\ + && if [ -f Makefile ]; then \$(MAKE) distclean; fi \\ && CC="\$(CC)" CFLAGS="$PCRE_OPT" \\ ./configure --disable-shared |