nginxtra 1.6.3.9 → 1.8.0.9

data/vendor/nginx/LICENSE

@@ -1,6 +1,6 @@
 /* 
- * Copyright (C) 2002-2014 Igor Sysoev
- * Copyright (C) 2011-2014 Nginx, Inc.
+ * Copyright (C) 2002-2015 Igor Sysoev
+ * Copyright (C) 2011-2015 Nginx, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

data/vendor/nginx/auto/cc/clang

@@ -88,6 +88,11 @@ CFLAGS="$CFLAGS -Wconditional-uninitialized"
 # we have a lot of unused function arguments
 CFLAGS="$CFLAGS -Wno-unused-parameter"
 
+# deprecated system OpenSSL library on OS X
+if [ "$NGX_SYSTEM" = "Darwin" ]; then
+    CFLAGS="$CFLAGS -Wno-deprecated-declarations"
+fi
+
 # stop on warning
 CFLAGS="$CFLAGS -Werror"
 

data/vendor/nginx/auto/cc/gcc

@@ -158,6 +158,11 @@ case "$NGX_GCC_VER" in
         CFLAGS="$CFLAGS -Wno-unused-parameter"
         # 4.2.1 shows the warning in wrong places
         #CFLAGS="$CFLAGS -Wunreachable-code"
+
+        # deprecated system OpenSSL library on OS X
+        if [ "$NGX_SYSTEM" = "Darwin" ]; then
+            CFLAGS="$CFLAGS -Wno-deprecated-declarations"
+        fi
     ;;
 
     *)

data/vendor/nginx/auto/lib/google-perftools/conf

@@ -52,7 +52,7 @@ else
 
 cat << END
 
-$0: error: the Google perftool module requires the Google perftools
+$0: error: the Google perftools module requires the Google perftools
 library. You can either do not enable the module or install the library.
 
 END

data/vendor/nginx/auto/lib/openssl/make

@@ -41,11 +41,6 @@ END
     ;;
 
     *)
-        case $USE_THREADS in
-            NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;;
-            *)  OPENSSL_OPT="$OPENSSL_OPT threads" ;;
-        esac
-
         case $OPENSSL in
             /*) ngx_prefix="$OPENSSL/.openssl" ;;
             *)  ngx_prefix="$PWD/$OPENSSL/.openssl" ;;

data/vendor/nginx/auto/lib/perl/conf

@@ -41,6 +41,8 @@ if test -n "$NGX_PERL_VER"; then
     ngx_perl_ldopts=`$NGX_PERL -MExtUtils::Embed -e ldopts`
 
     ngx_perl_dlext=`$NGX_PERL -MConfig -e 'print $Config{dlext}'`
+    ngx_perl_libdir="src/http/modules/perl/blib/arch/auto"
+    ngx_perl_module="$ngx_perl_libdir/nginx/nginx.$ngx_perl_dlext"
 
     if $NGX_PERL -V:usemultiplicity | grep define > /dev/null; then
         have=NGX_HAVE_PERL_MULTIPLICITY . auto/have
@@ -52,8 +54,14 @@ if test -n "$NGX_PERL_VER"; then
         ngx_perl_ldopts=`echo $ngx_perl_ldopts | sed 's/ -pthread//'`
     fi
 
+    if [ "$NGX_SYSTEM" = "Darwin" ]; then
+        # OS X system perl wants to link universal binaries
+        ngx_perl_ldopts=`echo $ngx_perl_ldopts \
+                         | sed -e 's/-arch x86_64 -arch i386//'`
+    fi
+
     CORE_LINK="$CORE_LINK $ngx_perl_ldopts"
-    LINK_DEPS="$LINK_DEPS $NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.$ngx_perl_dlext"
+    LINK_DEPS="$LINK_DEPS $NGX_OBJS/$ngx_perl_module"
 
     if test -n "$NGX_PERL_MODULES"; then
         have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\""

data/vendor/nginx/auto/make

@@ -8,7 +8,7 @@ echo "creating $NGX_MAKEFILE"
 mkdir -p $NGX_OBJS/src/core $NGX_OBJS/src/event $NGX_OBJS/src/event/modules \
          $NGX_OBJS/src/os/unix $NGX_OBJS/src/os/win32 \
          $NGX_OBJS/src/http $NGX_OBJS/src/http/modules \
-	 $NGX_OBJS/src/http/modules/perl \
+         $NGX_OBJS/src/http/modules/perl \
          $NGX_OBJS/src/mail \
          $NGX_OBJS/src/misc
 

data/vendor/nginx/auto/modules

@@ -371,6 +371,11 @@ if [ $HTTP_MP4 = YES ]; then
     HTTP_SRCS="$HTTP_SRCS $HTTP_MP4_SRCS"
 fi
 
+if [ $HTTP_UPSTREAM_HASH = YES ]; then
+    HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_HASH_MODULE"
+    HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_HASH_SRCS"
+fi
+
 if [ $HTTP_UPSTREAM_IP_HASH = YES ]; then
     HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_IP_HASH_MODULE"
     HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_IP_HASH_SRCS"
@@ -427,6 +432,12 @@ fi
 modules="$CORE_MODULES $EVENT_MODULES"
 
 
+# thread pool module should be initialized after events
+if [ $USE_THREADS = YES ]; then
+    modules="$modules $THREAD_POOL_MODULE"
+fi
+
+
 if [ $USE_OPENSSL = YES ]; then
     modules="$modules $OPENSSL_MODULE"
     CORE_DEPS="$CORE_DEPS $OPENSSL_DEPS"

data/vendor/nginx/auto/options

@@ -14,6 +14,7 @@ NGX_PID_PATH=
 NGX_LOCK_PATH=
 NGX_USER=
 NGX_GROUP=
+NGX_BUILD=
 
 CC=${CC:-cc}
 CPP=
@@ -98,6 +99,7 @@ HTTP_FLV=NO
 HTTP_MP4=NO
 HTTP_GUNZIP=NO
 HTTP_GZIP_STATIC=NO
+HTTP_UPSTREAM_HASH=YES
 HTTP_UPSTREAM_IP_HASH=YES
 HTTP_UPSTREAM_LEAST_CONN=YES
 HTTP_UPSTREAM_KEEPALIVE=YES
@@ -178,6 +180,7 @@ do
 
         --crossbuild=*)                  NGX_PLATFORM="$value"      ;;
 
+        --build=*)                       NGX_BUILD="$value"         ;;
         --builddir=*)                    NGX_OBJS="$value"          ;;
 
         --with-rtsig_module)             EVENT_RTSIG=YES            ;;
@@ -187,8 +190,7 @@ do
         --without-poll_module)           EVENT_POLL=NONE            ;;
         --with-aio_module)               EVENT_AIO=YES              ;;
 
-        #--with-threads=*)                USE_THREADS="$value"       ;;
-        #--with-threads)                  USE_THREADS="pthreads"     ;;
+        --with-threads)                  USE_THREADS=YES            ;;
 
         --with-file-aio)                 NGX_FILE_AIO=YES           ;;
         --with-ipv6)                     NGX_IPV6=YES               ;;
@@ -249,6 +251,7 @@ use the \"--without-http_limit_conn_module\" option instead"
         --without-http_limit_req_module) HTTP_LIMIT_REQ=NO         ;;
         --without-http_empty_gif_module) HTTP_EMPTY_GIF=NO          ;;
         --without-http_browser_module)   HTTP_BROWSER=NO            ;;
+        --without-http_upstream_hash_module) HTTP_UPSTREAM_HASH=NO  ;;
         --without-http_upstream_ip_hash_module) HTTP_UPSTREAM_IP_HASH=NO ;;
         --without-http_upstream_least_conn_module)
                                          HTTP_UPSTREAM_LEAST_CONN=NO ;;
@@ -341,6 +344,7 @@ cat << END
   --group=GROUP                      set non-privileged group for
                                      worker processes
 
+  --build=NAME                       set build name
   --builddir=DIR                     set build directory
 
   --with-rtsig_module                enable rtsig module
@@ -349,6 +353,8 @@ cat << END
   --with-poll_module                 enable poll module
   --without-poll_module              disable poll module
 
+  --with-threads                     enable thread pool support
+
   --with-file-aio                    enable file AIO support
   --with-ipv6                        enable IPv6 support
 
@@ -392,6 +398,8 @@ cat << END
   --without-http_limit_req_module    disable ngx_http_limit_req_module
   --without-http_empty_gif_module    disable ngx_http_empty_gif_module
   --without-http_browser_module      disable ngx_http_browser_module
+  --without-http_upstream_hash_module
+                                     disable ngx_http_upstream_hash_module
   --without-http_upstream_ip_hash_module
                                      disable ngx_http_upstream_ip_hash_module
   --without-http_upstream_least_conn_module

data/vendor/nginx/auto/os/darwin

@@ -100,7 +100,6 @@ ngx_feature_test="int s = 0, fd = 1;
 . auto/feature
 
 if [ $ngx_found = yes ]; then
-    have=NGX_HAVE_SENDFILE . auto/have
     CORE_SRCS="$CORE_SRCS $DARWIN_SENDFILE_SRCS"
 fi
 

data/vendor/nginx/auto/os/freebsd

@@ -44,10 +44,12 @@ if [ $osreldate -gt 300007 ]; then
     CORE_SRCS="$CORE_SRCS $FREEBSD_SENDFILE_SRCS"
 fi
 
-if [ $osreldate -gt 502103 ]; then
-    echo " + sendfile()'s SF_NODISKIO found"
+if [ $NGX_FILE_AIO = YES ]; then
+    if [ $osreldate -gt 502103 ]; then
+        echo " + sendfile()'s SF_NODISKIO found"
 
-    have=NGX_HAVE_AIO_SENDFILE . auto/have
+        have=NGX_HAVE_AIO_SENDFILE . auto/have
+    fi
 fi
 
 # POSIX semaphores
@@ -78,7 +80,7 @@ fi
 NGX_KQUEUE_CHECKED=YES
 
 
-# kqueue's NOTE_LAWAT
+# kqueue's NOTE_LOWAT
 
 if [ \( $version -lt 500000 -a $version -ge 430000 \) \
      -o $version -ge 500018 ]
@@ -97,25 +99,6 @@ then
 fi
 
 
-if [ $USE_THREADS = "rfork" ]; then
-
-    echo " + using rfork()"
-
-#    # kqueue's EVFILT_SIGNAL is safe
-#
-#    if [ $version -gt 460101 ]; then
-#        echo " + kqueue's EVFILT_SIGNAL is safe"
-#        have=NGX_HAVE_SAFE_EVFILT_SIGNAL . auto/have
-#    else
-#        echo "$0: error: the kqueue's EVFILT_SIGNAL is unsafe on this"
-#        echo "FreeBSD version, so --with-threads=rfork could not be used"
-#        echo
-#
-#        exit 1
-#    fi
-fi
-
-
 if [ $EVENT_AIO = YES ]; then
     if [ \( $version -lt 500000 -a $version -ge 430000 \) \
          -o $version -ge 500014 ]

data/vendor/nginx/auto/sources

@@ -37,7 +37,8 @@ CORE_DEPS="src/core/nginx.h \
            src/core/ngx_resolver.h \
            src/core/ngx_open_file_cache.h \
            src/core/ngx_crypt.h \
-           src/core/ngx_proxy_protocol.h"
+           src/core/ngx_proxy_protocol.h \
+           src/core/ngx_syslog.h"
 
 
 CORE_SRCS="src/core/nginx.c \
@@ -69,7 +70,8 @@ CORE_SRCS="src/core/nginx.c \
            src/core/ngx_resolver.c \
            src/core/ngx_open_file_cache.c \
            src/core/ngx_crypt.c \
-           src/core/ngx_proxy_protocol.c"
+           src/core/ngx_proxy_protocol.c \
+           src/core/ngx_syslog.c"
 
 
 REGEX_MODULE=ngx_regex_module
@@ -90,14 +92,12 @@ EVENT_INCS="src/event src/event/modules"
 EVENT_DEPS="src/event/ngx_event.h \
             src/event/ngx_event_timer.h \
             src/event/ngx_event_posted.h \
-            src/event/ngx_event_busy_lock.h \
             src/event/ngx_event_connect.h \
             src/event/ngx_event_pipe.h"
 
 EVENT_SRCS="src/event/ngx_event.c \
             src/event/ngx_event_timer.c \
             src/event/ngx_event_posted.c \
-            src/event/ngx_event_busy_lock.c \
             src/event/ngx_event_accept.c \
             src/event/ngx_event_connect.c \
             src/event/ngx_event_pipe.c"
@@ -191,14 +191,16 @@ UNIX_SRCS="$CORE_SRCS $EVENT_SRCS \
 
 POSIX_DEPS=src/os/unix/ngx_posix_config.h
 
+THREAD_POOL_MODULE=ngx_thread_pool_module
+THREAD_POOL_DEPS=src/core/ngx_thread_pool.h
+THREAD_POOL_SRCS="src/core/ngx_thread_pool.c
+                  src/os/unix/ngx_thread_cond.c
+                  src/os/unix/ngx_thread_mutex.c
+                  src/os/unix/ngx_thread_id.c"
+
 FREEBSD_DEPS="src/os/unix/ngx_freebsd_config.h src/os/unix/ngx_freebsd.h"
 FREEBSD_SRCS=src/os/unix/ngx_freebsd_init.c
 FREEBSD_SENDFILE_SRCS=src/os/unix/ngx_freebsd_sendfile_chain.c
-FREEBSD_RFORK_DEPS="src/os/unix/ngx_freebsd_rfork_thread.h"
-FREEBSD_RFORK_SRCS="src/os/unix/ngx_freebsd_rfork_thread.c"
-FREEBSD_RFORK_THREAD_SRCS="src/os/unix/rfork_thread.S"
-
-PTHREAD_SRCS="src/os/unix/ngx_pthread_thread.c"
 
 LINUX_DEPS="src/os/unix/ngx_linux_config.h src/os/unix/ngx_linux.h"
 LINUX_SRCS=src/os/unix/ngx_linux_init.c
@@ -293,8 +295,7 @@ HTTP_DEPS="src/http/ngx_http.h \
            src/http/ngx_http_variables.h \
            src/http/ngx_http_script.h \
            src/http/ngx_http_upstream.h \
-           src/http/ngx_http_upstream_round_robin.h \
-           src/http/ngx_http_busy_lock.h"
+           src/http/ngx_http_upstream_round_robin.h"
 
 HTTP_SRCS="src/http/ngx_http.c \
            src/http/ngx_http_core_module.c \
@@ -318,9 +319,6 @@ HTTP_SRCS="src/http/ngx_http.c \
            src/http/modules/ngx_http_headers_filter_module.c \
            src/http/modules/ngx_http_not_modified_filter_module.c"
 
-# STUB
-HTTP_SRCS="$HTTP_SRCS src/http/ngx_http_busy_lock.c"
-
 HTTP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c
 
 HTTP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c
@@ -495,6 +493,10 @@ HTTP_GZIP_STATIC_MODULE=ngx_http_gzip_static_module
 HTTP_GZIP_STATIC_SRCS=src/http/modules/ngx_http_gzip_static_module.c
 
 
+HTTP_UPSTREAM_HASH_MODULE=ngx_http_upstream_hash_module
+HTTP_UPSTREAM_HASH_SRCS=src/http/modules/ngx_http_upstream_hash_module.c
+
+
 HTTP_UPSTREAM_IP_HASH_MODULE=ngx_http_upstream_ip_hash_module
 HTTP_UPSTREAM_IP_HASH_SRCS=src/http/modules/ngx_http_upstream_ip_hash_module.c
 

data/vendor/nginx/auto/summary

@@ -3,34 +3,13 @@
 # Copyright (C) Nginx, Inc.
 
 
-### STUB
-
-if [ $USE_THREADS != NO ]; then
-
-cat << END
-
-$0: error: the threads support is broken now.
-
-END
-        exit 1
-    fi
-
-###
-
-
 echo
 echo "Configuration summary"
 
 
-#case $USE_THREADS in
-#    rfork)         echo "  + using rfork()ed threads" ;;
-#    pthreads)      echo "  + using libpthread threads library" ;;
-#    libthr)        echo "  + using FreeBSD libthr threads library" ;;
-#    libc_r)        echo "  + using FreeBSD libc_r threads library" ;;
-#    linuxthreads)  echo "  + using FreeBSD LinuxThreads port library" ;;
-#    NO)            echo "  + threads are not used" ;;
-#    *)             echo "  + using lib$USE_THREADS threads library" ;;
-#esac
+if [ $USE_THREADS = YES ]; then
+    echo "  + using threads"
+fi
 
 if [ $USE_PCRE = DISABLED ]; then
     echo "  + PCRE library is disabled"

data/vendor/nginx/auto/threads

@@ -0,0 +1,20 @@
+
+# Copyright (C) Nginx, Inc.
+
+
+if [ $USE_THREADS = YES ]; then
+
+    if [ "$NGX_PLATFORM" = win32 ]; then
+        cat << END
+
+$0: --with-threads is not supported on Windows
+
+END
+        exit 1
+    fi
+
+    have=NGX_THREADS . auto/have
+    CORE_DEPS="$CORE_DEPS $THREAD_POOL_DEPS"
+    CORE_SRCS="$CORE_SRCS $THREAD_POOL_SRCS"
+    CORE_LIBS="$CORE_LIBS -lpthread"
+fi

data/vendor/nginx/auto/types/sizeof

@@ -50,22 +50,12 @@ rm -rf $NGX_AUTOTEST*
 
 case $ngx_size in
     4)
-        if [ "$ngx_type"="long" ]; then
-            ngx_max_value=2147483647L
-        else
-            ngx_max_value=2147483647
-        fi
-
+        ngx_max_value=2147483647
         ngx_max_len='(sizeof("-2147483648") - 1)'
     ;;
 
     8)
-        if [ "$ngx_type"="long long" ]; then
-            ngx_max_value=9223372036854775807LL
-        else
-            ngx_max_value=9223372036854775807L
-        fi
-
+        ngx_max_value=9223372036854775807LL
         ngx_max_len='(sizeof("-9223372036854775808") - 1)'
     ;;
 

data/vendor/nginx/auto/unix

@@ -398,16 +398,36 @@ if [ $NGX_FILE_AIO = YES ]; then
 
     if [ $ngx_found = yes ]; then
         CORE_SRCS="$CORE_SRCS $FILE_AIO_SRCS"
+    fi
 
-    elif [ $ngx_found = no ]; then
+    if [ $ngx_found = no ]; then
 
         ngx_feature="Linux AIO support"
         ngx_feature_name="NGX_HAVE_FILE_AIO"
         ngx_feature_run=no
         ngx_feature_incs="#include <linux/aio_abi.h>
-                          #include <sys/syscall.h>"
+                          #include <sys/eventfd.h>"
         ngx_feature_path=
         ngx_feature_libs=
+        ngx_feature_test="struct iocb  iocb;
+                          iocb.aio_lio_opcode = IOCB_CMD_PREAD;
+                          iocb.aio_flags = IOCB_FLAG_RESFD;
+                          iocb.aio_resfd = -1;
+                          (void) eventfd(0, 0)"
+        . auto/feature
+
+        if [ $ngx_found = yes ]; then
+            have=NGX_HAVE_EVENTFD . auto/have
+            have=NGX_HAVE_SYS_EVENTFD_H . auto/have
+            CORE_SRCS="$CORE_SRCS $LINUX_AIO_SRCS"
+        fi
+    fi
+
+    if [ $ngx_found = no ]; then
+
+        ngx_feature="Linux AIO support (SYS_eventfd)"
+        ngx_feature_incs="#include <linux/aio_abi.h>
+                          #include <sys/syscall.h>"
         ngx_feature_test="int  n = SYS_eventfd;
                           struct iocb  iocb;
                           iocb.aio_lio_opcode = IOCB_CMD_PREAD;
@@ -418,16 +438,40 @@ if [ $NGX_FILE_AIO = YES ]; then
         if [ $ngx_found = yes ]; then
             have=NGX_HAVE_EVENTFD . auto/have
             CORE_SRCS="$CORE_SRCS $LINUX_AIO_SRCS"
+        fi
+    fi
 
-        else
-            cat << END
+    if [ $ngx_found = no ]; then
+        cat << END
 
 $0: no supported file AIO was found
 Currently file AIO is supported on FreeBSD 4.3+ and Linux 2.6.22+ only
 
 END
-           exit 1
-        fi
+        exit 1
+    fi
+
+else
+
+    ngx_feature="eventfd()"
+    ngx_feature_name="NGX_HAVE_EVENTFD"
+    ngx_feature_run=no
+    ngx_feature_incs="#include <sys/eventfd.h>"
+    ngx_feature_path=
+    ngx_feature_libs=
+    ngx_feature_test="(void) eventfd(0, 0)"
+    . auto/feature
+
+    if [ $ngx_found = yes ]; then
+        have=NGX_HAVE_SYS_EVENTFD_H . auto/have
+    fi
+
+    if [ $ngx_found = no ]; then
+
+        ngx_feature="eventfd() (SYS_eventfd)"
+        ngx_feature_incs="#include <sys/syscall.h>"
+        ngx_feature_test="int n = SYS_eventfd"
+        . auto/feature
     fi
 fi