update to 1.0.12

35 files changed, 36 insertions, 7 deletions

diff --git a/usr.sbin/nginx/auto/lib/conf b/usr.sbin/nginx/auto/lib/conf
index 357e7810d69..e1e447557e9 100644
--- a/usr.sbin/nginx/auto/lib/conf
+++ b/usr.sbin/nginx/auto/lib/conf
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 if [ $USE_PCRE = YES -o $PCRE != NONE ]; then
diff --git a/usr.sbin/nginx/auto/lib/geoip/conf b/usr.sbin/nginx/auto/lib/geoip/conf
index 5647e9167e6..3764d764979 100644
--- a/usr.sbin/nginx/auto/lib/geoip/conf
+++ b/usr.sbin/nginx/auto/lib/geoip/conf
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
     ngx_feature="GeoIP library"
diff --git a/usr.sbin/nginx/auto/lib/google-perftools/conf b/usr.sbin/nginx/auto/lib/google-perftools/conf
index 67df9f8ac0e..398ddd05e02 100644
--- a/usr.sbin/nginx/auto/lib/google-perftools/conf
+++ b/usr.sbin/nginx/auto/lib/google-perftools/conf
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
     ngx_feature="Google perftools"
diff --git a/usr.sbin/nginx/auto/lib/libatomic/conf b/usr.sbin/nginx/auto/lib/libatomic/conf
index 5cf16f381b5..d1e484ab32e 100644
--- a/usr.sbin/nginx/auto/lib/libatomic/conf
+++ b/usr.sbin/nginx/auto/lib/libatomic/conf
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 if [ $NGX_LIBATOMIC != YES ]; then
diff --git a/usr.sbin/nginx/auto/lib/libatomic/make b/usr.sbin/nginx/auto/lib/libatomic/make
index e1672e324b4..b84267b63e4 100644
--- a/usr.sbin/nginx/auto/lib/libatomic/make
+++ b/usr.sbin/nginx/auto/lib/libatomic/make
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
     cat << END                                            >> $NGX_MAKEFILE
diff --git a/usr.sbin/nginx/auto/lib/libgd/conf b/usr.sbin/nginx/auto/lib/libgd/conf
index 6378723706e..b0bc74c15f4 100644
--- a/usr.sbin/nginx/auto/lib/libgd/conf
+++ b/usr.sbin/nginx/auto/lib/libgd/conf
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
     ngx_feature="GD library"
diff --git a/usr.sbin/nginx/auto/lib/libxslt/conf b/usr.sbin/nginx/auto/lib/libxslt/conf
index 8c9ea8ba192..bc19d83ddce 100644
--- a/usr.sbin/nginx/auto/lib/libxslt/conf
+++ b/usr.sbin/nginx/auto/lib/libxslt/conf
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
     ngx_feature="libxslt"
diff --git a/usr.sbin/nginx/auto/lib/make b/usr.sbin/nginx/auto/lib/make
index f22767eb494..58a84a34cac 100644
--- a/usr.sbin/nginx/auto/lib/make
+++ b/usr.sbin/nginx/auto/lib/make
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 if [ $PCRE != NONE -a $PCRE != NO -a $PCRE != YES ]; then
diff --git a/usr.sbin/nginx/auto/lib/md5/conf b/usr.sbin/nginx/auto/lib/md5/conf
index 9afe5b8deda..f9c1ed90296 100644
--- a/usr.sbin/nginx/auto/lib/md5/conf
+++ b/usr.sbin/nginx/auto/lib/md5/conf
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 if [ $MD5 != NONE ]; then
diff --git a/usr.sbin/nginx/auto/lib/md5/make b/usr.sbin/nginx/auto/lib/md5/make
index 60af28ccad6..81f138ab671 100644
--- a/usr.sbin/nginx/auto/lib/md5/make
+++ b/usr.sbin/nginx/auto/lib/md5/make
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 case "$NGX_CC_NAME" in
diff --git a/usr.sbin/nginx/auto/lib/md5/makefile.bcc b/usr.sbin/nginx/auto/lib/md5/makefile.bcc
index c02ef95bd1a..eb6fb624178 100644
--- a/usr.sbin/nginx/auto/lib/md5/makefile.bcc
+++ b/usr.sbin/nginx/auto/lib/md5/makefile.bcc
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN
diff --git a/usr.sbin/nginx/auto/lib/md5/makefile.msvc b/usr.sbin/nginx/auto/lib/md5/makefile.msvc
index 233da0fb592..90d62fac7f0 100644
--- a/usr.sbin/nginx/auto/lib/md5/makefile.msvc
+++ b/usr.sbin/nginx/auto/lib/md5/makefile.msvc
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN
diff --git a/usr.sbin/nginx/auto/lib/md5/makefile.owc b/usr.sbin/nginx/auto/lib/md5/makefile.owc
index c36c9369fcc..78c1e61dde7 100644
--- a/usr.sbin/nginx/auto/lib/md5/makefile.owc
+++ b/usr.sbin/nginx/auto/lib/md5/makefile.owc
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
diff --git a/usr.sbin/nginx/auto/lib/openssl/conf b/usr.sbin/nginx/auto/lib/openssl/conf
index 8218a5b975a..528ee1794e9 100644
--- a/usr.sbin/nginx/auto/lib/openssl/conf
+++ b/usr.sbin/nginx/auto/lib/openssl/conf
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 if [ $OPENSSL != NONE ]; then
diff --git a/usr.sbin/nginx/auto/lib/openssl/make b/usr.sbin/nginx/auto/lib/openssl/make
index a2025bbd669..9090fcbfd34 100644
--- a/usr.sbin/nginx/auto/lib/openssl/make
+++ b/usr.sbin/nginx/auto/lib/openssl/make
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 case "$CC" in
diff --git a/usr.sbin/nginx/auto/lib/openssl/makefile.bcc b/usr.sbin/nginx/auto/lib/openssl/makefile.bcc
index 5938cbf6b3a..6a94ff74982 100644
--- a/usr.sbin/nginx/auto/lib/openssl/makefile.bcc
+++ b/usr.sbin/nginx/auto/lib/openssl/makefile.bcc
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 all:
diff --git a/usr.sbin/nginx/auto/lib/openssl/makefile.msvc b/usr.sbin/nginx/auto/lib/openssl/makefile.msvc
index 379b95dc028..fc9e57864ae 100644
--- a/usr.sbin/nginx/auto/lib/openssl/makefile.msvc
+++ b/usr.sbin/nginx/auto/lib/openssl/makefile.msvc
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 all:
diff --git a/usr.sbin/nginx/auto/lib/pcre/conf b/usr.sbin/nginx/auto/lib/pcre/conf
index bfa600c81ca..c8942caa77b 100644
--- a/usr.sbin/nginx/auto/lib/pcre/conf
+++ b/usr.sbin/nginx/auto/lib/pcre/conf
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 if [ $PCRE != NONE ]; then
@@ -83,7 +84,7 @@ if [ $PCRE != NONE ]; then
 
 else
 
-    if [ "$NGX_PLATFORM" != win32 -a `uname -s` != OpenBSD ]; then
+    if [ "$NGX_PLATFORM" != win32 ]; then
 
         PCRE=NO
 
@@ -164,12 +165,6 @@ else
         fi
     fi
 
-    have=NGX_PCRE . auto/have
-    CORE_SRCS="$CORE_SRCS $PCRE_SRCS $REGEX_SRCS"
-    CORE_INCS="$CORE_INCS src/pcre"
-    CFLAGS="$CFLAGS -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10"
-    PCRE=YES
-
     if [ $PCRE != YES ]; then
 cat << END
 
diff --git a/usr.sbin/nginx/auto/lib/pcre/make b/usr.sbin/nginx/auto/lib/pcre/make
index 9f2c658bf17..1695b934073 100644
--- a/usr.sbin/nginx/auto/lib/pcre/make
+++ b/usr.sbin/nginx/auto/lib/pcre/make
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 case "$NGX_CC_NAME" in
diff --git a/usr.sbin/nginx/auto/lib/pcre/makefile.bcc b/usr.sbin/nginx/auto/lib/pcre/makefile.bcc
index 40d579fb59d..1c140d668b7 100644
--- a/usr.sbin/nginx/auto/lib/pcre/makefile.bcc
+++ b/usr.sbin/nginx/auto/lib/pcre/makefile.bcc
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 CFLAGS =	-q -O2 -tWM -w-8004 $(CPU_OPT)
diff --git a/usr.sbin/nginx/auto/lib/pcre/makefile.msvc b/usr.sbin/nginx/auto/lib/pcre/makefile.msvc
index 47ae6991aee..7a8da715818 100644
--- a/usr.sbin/nginx/auto/lib/pcre/makefile.msvc
+++ b/usr.sbin/nginx/auto/lib/pcre/makefile.msvc
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 CFLAGS =	-O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
diff --git a/usr.sbin/nginx/auto/lib/pcre/makefile.owc b/usr.sbin/nginx/auto/lib/pcre/makefile.owc
index b2f1d1297b2..bfb69206879 100644
--- a/usr.sbin/nginx/auto/lib/pcre/makefile.owc
+++ b/usr.sbin/nginx/auto/lib/pcre/makefile.owc
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 CFLAGS =	-c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)
diff --git a/usr.sbin/nginx/auto/lib/perl/conf b/usr.sbin/nginx/auto/lib/perl/conf
index 3f7b908493f..52c7084e974 100644
--- a/usr.sbin/nginx/auto/lib/perl/conf
+++ b/usr.sbin/nginx/auto/lib/perl/conf
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 echo "checking for perl"
diff --git a/usr.sbin/nginx/auto/lib/perl/make b/usr.sbin/nginx/auto/lib/perl/make
index 49eb5cf3430..f5d9ab50189 100644
--- a/usr.sbin/nginx/auto/lib/perl/make
+++ b/usr.sbin/nginx/auto/lib/perl/make
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 cat << END                                                    >> $NGX_MAKEFILE
diff --git a/usr.sbin/nginx/auto/lib/sha1/conf b/usr.sbin/nginx/auto/lib/sha1/conf
index af3d3fba2e7..1e644c02f12 100644
--- a/usr.sbin/nginx/auto/lib/sha1/conf
+++ b/usr.sbin/nginx/auto/lib/sha1/conf
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 if [ $SHA1 != NONE ]; then
diff --git a/usr.sbin/nginx/auto/lib/sha1/make b/usr.sbin/nginx/auto/lib/sha1/make
index 6c89acf1b10..fc10aaef38b 100644
--- a/usr.sbin/nginx/auto/lib/sha1/make
+++ b/usr.sbin/nginx/auto/lib/sha1/make
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 case "$NGX_CC_NAME" in
diff --git a/usr.sbin/nginx/auto/lib/sha1/makefile.bcc b/usr.sbin/nginx/auto/lib/sha1/makefile.bcc
index 1d8b5e4c8b0..b0685fa4512 100644
--- a/usr.sbin/nginx/auto/lib/sha1/makefile.bcc
+++ b/usr.sbin/nginx/auto/lib/sha1/makefile.bcc
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN
diff --git a/usr.sbin/nginx/auto/lib/sha1/makefile.msvc b/usr.sbin/nginx/auto/lib/sha1/makefile.msvc
index 4abd366cad3..3cbd21b3dbd 100644
--- a/usr.sbin/nginx/auto/lib/sha1/makefile.msvc
+++ b/usr.sbin/nginx/auto/lib/sha1/makefile.msvc
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN
diff --git a/usr.sbin/nginx/auto/lib/sha1/makefile.owc b/usr.sbin/nginx/auto/lib/sha1/makefile.owc
index c1a3e04311c..fc095cc980a 100644
--- a/usr.sbin/nginx/auto/lib/sha1/makefile.owc
+++ b/usr.sbin/nginx/auto/lib/sha1/makefile.owc
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
diff --git a/usr.sbin/nginx/auto/lib/test b/usr.sbin/nginx/auto/lib/test
index 6821b51da2a..907e2353b7f 100644
--- a/usr.sbin/nginx/auto/lib/test
+++ b/usr.sbin/nginx/auto/lib/test
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 echo $ngx_n "checking for $ngx_lib ...$ngx_c"
diff --git a/usr.sbin/nginx/auto/lib/zlib/conf b/usr.sbin/nginx/auto/lib/zlib/conf
index 843dd5a557d..cefc874b222 100644
--- a/usr.sbin/nginx/auto/lib/zlib/conf
+++ b/usr.sbin/nginx/auto/lib/zlib/conf
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 if [ $ZLIB != NONE ]; then
diff --git a/usr.sbin/nginx/auto/lib/zlib/make b/usr.sbin/nginx/auto/lib/zlib/make
index b874b04addd..9401a1d1a8e 100644
--- a/usr.sbin/nginx/auto/lib/zlib/make
+++ b/usr.sbin/nginx/auto/lib/zlib/make
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 case "$NGX_CC_NAME" in
diff --git a/usr.sbin/nginx/auto/lib/zlib/makefile.bcc b/usr.sbin/nginx/auto/lib/zlib/makefile.bcc
index 69a728c76a9..56f8356884e 100644
--- a/usr.sbin/nginx/auto/lib/zlib/makefile.bcc
+++ b/usr.sbin/nginx/auto/lib/zlib/makefile.bcc
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 CFLAGS = -q -O2 -tWM -w-8004 -w-8012 $(CPU_OPT)
diff --git a/usr.sbin/nginx/auto/lib/zlib/makefile.msvc b/usr.sbin/nginx/auto/lib/zlib/makefile.msvc
index d02f2b68e37..2c7c1ae1025 100644
--- a/usr.sbin/nginx/auto/lib/zlib/makefile.msvc
+++ b/usr.sbin/nginx/auto/lib/zlib/makefile.msvc
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
diff --git a/usr.sbin/nginx/auto/lib/zlib/makefile.owc b/usr.sbin/nginx/auto/lib/zlib/makefile.owc
index 738e9a01b6e..f75e66d4f5b 100644
--- a/usr.sbin/nginx/auto/lib/zlib/makefile.owc
+++ b/usr.sbin/nginx/auto/lib/zlib/makefile.owc
@@ -1,5 +1,6 @@
 
 # Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
 
 
 CFLAGS = -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)