nginx: Update to 1.12.0

6 files changed, 20 insertions, 2 deletions

diff --git a/pkg/nginx/gen.rc b/pkg/nginx/gen.rc
index 97cb9512..9f70f813 100644
--- a/pkg/nginx/gen.rc
+++ b/pkg/nginx/gen.rc
@@ -52,6 +52,7 @@ srcs=src/^(\
 		ngx_crc32.c\
 		ngx_murmurhash.c\
 		ngx_md5.c\
+		ngx_sha1.c\
 		ngx_rbtree.c\
 		ngx_radix_tree.c\
 		ngx_slab.c\
@@ -92,6 +93,7 @@ srcs=src/^(\
 		ngx_send.c\
 		ngx_writev_chain.c\
 		ngx_udp_send.c\
+		ngx_udp_sendmsg_chain.c\
 		ngx_channel.c\
 		ngx_shmem.c\
 		ngx_process.c\
diff --git a/pkg/nginx/ngx_auto_config.h b/pkg/nginx/ngx_auto_config.h
index e9c5ff62..b6e64748 100644
--- a/pkg/nginx/ngx_auto_config.h
+++ b/pkg/nginx/ngx_auto_config.h
@@ -10,6 +10,7 @@
 #define NGX_HAVE_EPOLL 1
 #define NGX_HAVE_CLEAR_EVENT 1
 #define NGX_HAVE_EPOLLRDHUP 1
+#define NGX_HAVE_EPOLLEXCLUSIVE 1
 #define NGX_HAVE_O_PATH 1
 #define NGX_HAVE_SENDFILE 1
 #define NGX_HAVE_SENDFILE64 1
@@ -30,6 +31,8 @@
 #define NGX_HAVE_DLOPEN 1
 #define NGX_HAVE_SCHED_YIELD 1
 #define NGX_HAVE_REUSEPORT 1
+#define NGX_HAVE_IP_BIND_ADDRESS_NO_PORT 1
+#define NGX_HAVE_TRANSPARENT_PROXY 1
 #define NGX_HAVE_IP_PKTINFO 1
 #define NGX_HAVE_IPV6_RECVPKTINFO 1
 #define NGX_HAVE_DEFERRED_ACCEPT 1
@@ -50,6 +53,7 @@
 #define NGX_TIME_T_SIZE 8
 #define NGX_TIME_T_LEN (sizeof("-9223372036854775808") - 1)
 #define NGX_MAX_TIME_T_VALUE 9223372036854775807LL
+#define NGX_HAVE_INET6 1
 #define NGX_HAVE_PREAD 1
 #define NGX_HAVE_PWRITE 1
 #define NGX_HAVE_PWRITEV 1
diff --git a/pkg/nginx/ngx_auto_headers.h b/pkg/nginx/ngx_auto_headers.h
index 5c8661e2..1107504a 100644
--- a/pkg/nginx/ngx_auto_headers.h
+++ b/pkg/nginx/ngx_auto_headers.h
@@ -1,3 +1,4 @@
+/* auto/headers */
 #define NGX_HAVE_UNISTD_H 1
 #define NGX_HAVE_INTTYPES_H 1
 #define NGX_HAVE_LIMITS_H 1
@@ -5,6 +6,8 @@
 #define NGX_HAVE_SYS_MOUNT_H 1
 #define NGX_HAVE_SYS_STATVFS_H 1
 #define NGX_HAVE_CRYPT_H 1
+
+/* auto/os/linux */
 #define NGX_LINUX 1
 #define NGX_HAVE_SYS_PRCTL_H 1
 #define NGX_HAVE_SYS_VFS_H 1
diff --git a/pkg/nginx/rev b/pkg/nginx/rev
index d00491fd..0cfbf088 100644
--- a/pkg/nginx/rev
+++ b/pkg/nginx/rev
@@ -1 +1 @@
-1
+2
diff --git a/pkg/nginx/sources.txt b/pkg/nginx/sources.txt
index 0c3e77c4..c78a5ed7 100644
--- a/pkg/nginx/sources.txt
+++ b/pkg/nginx/sources.txt
@@ -96,17 +96,26 @@ mail_auth_http mail/ngx_mail_auth_http_module.c
 mail_proxy mail/ngx_mail_proxy_module.c
 
 # STREAM_MODULES
-stream stream/ngx_stream.c stream/ngx_stream_handler.c
+stream stream/ngx_stream.c stream/ngx_stream_variables.c stream/ngx_stream_script.c stream/ngx_stream_handler.c
 stream_core stream/ngx_stream_core_module.c
+stream_log stream/ngx_stream_log_module.c
 stream_proxy stream/ngx_stream_proxy_module.c
 stream_upstream stream/ngx_stream_upstream.c stream/ngx_stream_upstream_round_robin.c
+stream_write_filter stream/ngx_stream_write_filter_module.c
 
 stream_ssl stream/ngx_stream_ssl_module.c
+stream_realip stream/ngx_stream_realip_module.c
 stream_limit_conn stream/ngx_stream_limit_conn_module.c
 stream_access stream/ngx_stream_access_module.c
+stream_geo stream/ngx_stream_geo_module.c
+stream_geoip stream/ngx_stream_geoip_module.c
+stream_map stream/ngx_stream_map_module.c
+stream_split_clients stream/ngx_stream_split_clients_module.c
+stream_return stream/ngx_stream_return_module.c
 stream_upstream_hash stream/ngx_stream_upstream_hash_module.c
 stream_upstream_least_conn stream/ngx_stream_upstream_least_conn_module.c
 stream_upstream_zone stream/ngx_stream_upstream_zone_module.c
+stream_ssl_preread stream/ngx_stream_ssl_preread_module.c
 
 # MISC_MODULES
 google_perftools misc/ngx_google_perftools_module.c
diff --git a/pkg/nginx/src b/pkg/nginx/src
-Subproject b708f694ea93a91656ea6243a611ba86ac139e7
+Subproject 58cb5f75ef90f28a7eaa2fde01670e62c3b3c8b