Merge branch 'develop'

* develop:
  update Readme
  update makefile for x86 and x64
  build openssl 1.0.2j for x64
  build openssl 1.0.2h for x86
  nginx upgrade to 1.11.5
  加入一个导出函数

Author: BloodyKnight

Readme-en.md

@@ -3,34 +3,22 @@
 
 ### lastest release ###
 
-version:1.11.4.1001
+version:1.11.5.1001
 
-32 bit: http://pan.baidu.com/s/1o7ZBGz4
+32 bit: http://pan.baidu.com/s/1nvMysvn
 
-64 bit: http://pan.baidu.com/s/1mig1zcs
+64 bit: http://pan.baidu.com/s/1nv1z993
 
->Publish Time: 2016-09-14
+>Publish Time: 2016-10-14
 
 >Changelog:  
 
 >Nginx:
-- upgrade nginx core to 1.11.4
-
->Modules:
-- upgrade echo-nginx-module to 0.60
-- upgrade encrypted-session-nginx-module to 0.06
-- upgrade headers-more-nginx-module to 0.31
-- upgrade ngx_lua_upstream to 0.06
-- upgrade ngx_lua_module to 0.10.6
-- upgrade set-misc-nginx-module to 0.31 
+- upgrade nginx core to 1.11.5
 
 >Libs:
-- upgrade lua-resty-core to 0.1.8
-- upgrade lua-resty-dns to 0.17
-- upgrade lua-resty-redis to 0.25
+- upgrade openssl to 1.0.2j
 
->Tools:
-- upgrade resty-cli to 0.13
 
 
 ### about ###
@@ -445,4 +433,34 @@ version:1.11.3.1001
 
 >Changelog:  
 
-- update nginx core to 1.11.3
+- update nginx core to 1.11.3
+
+
+version:1.11.4.1001
+
+32 bit: http://pan.baidu.com/s/1o7ZBGz4
+        
+64 bit: http://pan.baidu.com/s/1mig1zcs
+
+>Publish Time: 2016-09-14
+
+>Changelog:  
+
+>Nginx:
+- upgrade nginx core to 1.11.4
+
+>Modules:
+- upgrade echo-nginx-module to 0.60
+- upgrade encrypted-session-nginx-module to 0.06
+- upgrade headers-more-nginx-module to 0.31
+- upgrade ngx_lua_upstream to 0.06
+- upgrade ngx_lua_module to 0.10.6
+- upgrade set-misc-nginx-module to 0.31 
+
+>Libs:
+- upgrade lua-resty-core to 0.1.8
+- upgrade lua-resty-dns to 0.17
+- upgrade lua-resty-redis to 0.25
+
+>Tools:
+- upgrade resty-cli to 0.13

Readme.md

@@ -3,33 +3,21 @@
 
 ### 最新版本 ###
 
-版本号:1.11.4.1001
+版本号:1.11.5.1001
 
-32 位下载地址: http://pan.baidu.com/s/1o7ZBGz4
+32 位下载地址: http://pan.baidu.com/s/1nvMysvn
 
-64 位下载地址: http://pan.baidu.com/s/1mig1zcs
+64 位下载地址: http://pan.baidu.com/s/1nv1z993
 
->发布时间: 2016-09-14
+>发布时间: 2016-10-14
 
 >修改日志:
 >Nginx:
-- 更新 nginx core 到 1.11.4
-
->Modules:
-- 更新 echo-nginx-module 到 0.60
-- 更新 encrypted-session-nginx-module 到 0.06
-- 更新 headers-more-nginx-module 到 0.31
-- 更新 ngx_lua_upstream 到 0.06
-- 更新 ngx_lua_module 到 0.10.6
-- 更新 set-misc-nginx-module 到 0.31 
+- 更新 nginx core 到 1.11.5
 
 >Libs:
-- 更新 lua-resty-core 到 0.1.8
-- 更新 lua-resty-dns 到 0.17
-- 更新 lua-resty-redis 到 0.25
+- 更新 openssl 到 1.0.2j
 
->Tools:
-- 更新 resty-cli 到 0.13
 
 ### 关于 ###
 
@@ -443,4 +431,33 @@ Version:1.9.7.1001
 >发布时间: 2016-08-03
 
 >修改日志:
-- 更新nginx core 到1.11.3
+- 更新nginx core 到1.11.3
+
+
+版本号:1.11.4.1001
+
+32 位下载地址: http://pan.baidu.com/s/1o7ZBGz4
+
+64 位下载地址: http://pan.baidu.com/s/1mig1zcs
+
+>发布时间: 2016-09-14
+
+>修改日志:
+>Nginx:
+- 更新 nginx core 到 1.11.4
+
+>Modules:
+- 更新 echo-nginx-module 到 0.60
+- 更新 encrypted-session-nginx-module 到 0.06
+- 更新 headers-more-nginx-module 到 0.31
+- 更新 ngx_lua_upstream 到 0.06
+- 更新 ngx_lua_module 到 0.10.6
+- 更新 set-misc-nginx-module 到 0.31 
+
+>Libs:
+- 更新 lua-resty-core 到 0.1.8
+- 更新 lua-resty-dns 到 0.17
+- 更新 lua-resty-redis 到 0.25
+
+>Tools:
+- 更新 resty-cli 到 0.13

src/nginx/auto/lib/geoip/conf

@@ -74,17 +74,15 @@ if [ $ngx_found = yes ]; then
 
     NGX_LIB_GEOIP=$ngx_feature_libs
 
-    if [ $NGX_IPV6 = YES ]; then
-        ngx_feature="GeoIP IPv6 support"
-        ngx_feature_name="NGX_HAVE_GEOIP_V6"
-        ngx_feature_run=no
-        ngx_feature_incs="#include <stdio.h>
-                          #include <GeoIP.h>"
-        #ngx_feature_path=
-        #ngx_feature_libs=
-        ngx_feature_test="printf(\"%d\", GEOIP_CITY_EDITION_REV0_V6);"
-        . auto/feature
-    fi
+    ngx_feature="GeoIP IPv6 support"
+    ngx_feature_name="NGX_HAVE_GEOIP_V6"
+    ngx_feature_run=no
+    ngx_feature_incs="#include <stdio.h>
+                      #include <GeoIP.h>"
+    #ngx_feature_path=
+    #ngx_feature_libs=
+    ngx_feature_test="printf(\"%d\", GEOIP_CITY_EDITION_REV0_V6);"
+    . auto/feature
 
 else
 

src/nginx/auto/lib/perl/conf

@@ -28,8 +28,10 @@ if test -n "$NGX_PERL_VER"; then
         exit 1;
     fi
 
-    NGX_PERL_CFLAGS="$CFLAGS `$NGX_PERL -MExtUtils::Embed -e ccopts`"
     NGX_PM_CFLAGS=`$NGX_PERL -MExtUtils::Embed -e ccopts`
+    NGX_PM_LDFLAGS=`$NGX_PERL -MConfig -e 'print $Config{lddlflags}'`
+
+    NGX_PERL_CFLAGS="$CFLAGS `$NGX_PERL -MExtUtils::Embed -e ccopts`"
 
     # gcc 4.1/4.2 warn about unused values in pTHX_
     NGX_PERL_CFLAGS=`echo $NGX_PERL_CFLAGS \

src/nginx/auto/lib/perl/make

@@ -35,6 +35,7 @@ $NGX_OBJS/src/http/modules/perl/Makefile: \\
 
 	cd $NGX_OBJS/src/http/modules/perl \\
 		&& NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \\
+			NGX_PM_LDFLAGS="$NGX_LD_OPT \$(NGX_PM_LDFLAGS)" \\
 			NGX_INCS="$CORE_INCS $NGX_OBJS $HTTP_INCS" \\
 			NGX_DEPS="\$(CORE_DEPS) \$(HTTP_DEPS)" \\
 		$NGX_PERL Makefile.PL \\

src/nginx/auto/make

@@ -31,6 +31,7 @@ END
 if test -n "$NGX_PERL_CFLAGS"; then
     echo NGX_PERL_CFLAGS = $NGX_PERL_CFLAGS                   >> $NGX_MAKEFILE
     echo NGX_PM_CFLAGS = $NGX_PM_CFLAGS                       >> $NGX_MAKEFILE
+    echo NGX_PM_LDFLAGS = $NGX_PM_LDFLAGS                     >> $NGX_MAKEFILE
 fi
 
 

src/nginx/auto/modules

@@ -973,7 +973,8 @@ if [ $STREAM != NO ]; then
                      ngx_stream_core_module \
                      ngx_stream_log_module \
                      ngx_stream_proxy_module \
-                     ngx_stream_upstream_module"
+                     ngx_stream_upstream_module \
+                     ngx_stream_write_filter_module"
     ngx_module_incs="src/stream"
     ngx_module_deps="src/stream/ngx_stream.h \
                      src/stream/ngx_stream_variables.h \
@@ -988,7 +989,8 @@ if [ $STREAM != NO ]; then
                      src/stream/ngx_stream_log_module.c \
                      src/stream/ngx_stream_proxy_module.c \
                      src/stream/ngx_stream_upstream.c \
-                     src/stream/ngx_stream_upstream_round_robin.c"
+                     src/stream/ngx_stream_upstream_round_robin.c \
+                     src/stream/ngx_stream_write_filter_module.c"
 
     . auto/module
 
@@ -1118,6 +1120,16 @@ if [ $STREAM != NO ]; then
 
         . auto/module
     fi
+
+    if [ $STREAM_SSL_PREREAD = YES ]; then
+        ngx_module_name=ngx_stream_ssl_preread_module
+        ngx_module_deps=
+        ngx_module_srcs=src/stream/ngx_stream_ssl_preread_module.c
+        ngx_module_libs=
+        ngx_module_link=$STREAM_SSL_PREREAD
+
+        . auto/module
+    fi
 fi
 
 
@@ -1300,6 +1312,18 @@ fi
 modules="$modules $MISC_MODULES"
 
 
+if [ $NGX_COMPAT = YES ]; then
+    have=NGX_COMPAT . auto/have
+    have=NGX_HTTP_GZIP . auto/have
+    have=NGX_HTTP_DAV . auto/have
+    have=NGX_HTTP_REALIP . auto/have
+    have=NGX_HTTP_X_FORWARDED_FOR . auto/have
+    have=NGX_HTTP_HEADERS . auto/have
+    have=NGX_HTTP_UPSTREAM_ZONE . auto/have
+    have=NGX_STREAM_UPSTREAM_ZONE . auto/have
+fi
+
+
 cat << END                                    > $NGX_MODULES_C
 
 #include <ngx_config.h>

src/nginx/auto/options

@@ -44,7 +44,6 @@ EVENT_POLL=NO
 USE_THREADS=NO
 
 NGX_FILE_AIO=NO
-NGX_IPV6=NO
 
 HTTP=YES
 
@@ -126,13 +125,16 @@ STREAM_RETURN=YES
 STREAM_UPSTREAM_HASH=YES
 STREAM_UPSTREAM_LEAST_CONN=YES
 STREAM_UPSTREAM_ZONE=YES
+STREAM_SSL_PREREAD=NO
 
 DYNAMIC_MODULES=
 
 NGX_ADDONS=
 NGX_ADDON_DEPS=
 DYNAMIC_ADDONS=
 
+NGX_COMPAT=NO
+
 USE_PCRE=NO
 PCRE=NONE
 PCRE_OPT=
@@ -201,7 +203,11 @@ do
         --with-threads)                  USE_THREADS=YES            ;;
 
         --with-file-aio)                 NGX_FILE_AIO=YES           ;;
-        --with-ipv6)                     NGX_IPV6=YES               ;;
+
+        --with-ipv6)
+            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
+$0: warning: the \"--with-ipv6\" option is deprecated"
+        ;;
 
         --without-http)                  HTTP=NO                    ;;
         --without-http-cache)            HTTP_CACHE=NO              ;;
@@ -301,6 +307,8 @@ use the \"--with-mail_ssl_module\" option instead"
         --with-stream_geoip_module)      STREAM_GEOIP=YES           ;;
         --with-stream_geoip_module=dynamic)
                                          STREAM_GEOIP=DYNAMIC       ;;
+        --with-stream_ssl_preread_module)
+                                         STREAM_SSL_PREREAD=YES     ;;
         --without-stream_limit_conn_module)
                                          STREAM_LIMIT_CONN=NO       ;;
         --without-stream_access_module)  STREAM_ACCESS=NO           ;;
@@ -322,6 +330,8 @@ use the \"--with-mail_ssl_module\" option instead"
         --add-module=*)                  NGX_ADDONS="$NGX_ADDONS $value" ;;
         --add-dynamic-module=*)          DYNAMIC_ADDONS="$DYNAMIC_ADDONS $value" ;;
 
+        --with-compat)                   NGX_COMPAT=YES             ;;
+
         --with-cc=*)                     CC="$value"                ;;
         --with-cpp=*)                    CPP="$value"               ;;
         --with-cc-opt=*)                 NGX_CC_OPT="$value"        ;;
@@ -417,7 +427,6 @@ cat << END
   --with-threads                     enable thread pool support
 
   --with-file-aio                    enable file AIO support
-  --with-ipv6                        enable IPv6 support
 
   --with-http_ssl_module             enable ngx_http_ssl_module
   --with-http_v2_module              enable ngx_http_v2_module
@@ -508,6 +517,7 @@ cat << END
   --with-stream_realip_module        enable ngx_stream_realip_module
   --with-stream_geoip_module         enable ngx_stream_geoip_module
   --with-stream_geoip_module=dynamic enable dynamic ngx_stream_geoip_module
+  --with-stream_ssl_preread_module   enable ngx_stream_ssl_preread_module
   --without-stream_limit_conn_module disable ngx_stream_limit_conn_module
   --without-stream_access_module     disable ngx_stream_access_module
   --without-stream_geo_module        disable ngx_stream_geo_module
@@ -528,6 +538,8 @@ cat << END
   --add-module=PATH                  enable external module
   --add-dynamic-module=PATH          enable dynamic external module
 
+  --with-compat                      dynamic modules compatibility
+
   --with-cc=PATH                     set C compiler pathname
   --with-cpp=PATH                    set C preprocessor pathname
   --with-cc-opt=OPTIONS              set additional C compiler options

src/nginx/auto/os/win32

@@ -38,8 +38,6 @@ if [ $EVENT_SELECT = NO ]; then
     EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE"
 fi
 
-if [ $NGX_IPV6 = YES ]; then
-    have=NGX_HAVE_INET6 . auto/have
-fi
+have=NGX_HAVE_INET6 . auto/have
 
 have=NGX_HAVE_IOCP . auto/have

src/nginx/auto/sources

@@ -167,6 +167,7 @@ UNIX_SRCS="$CORE_SRCS $EVENT_SRCS \
             src/os/unix/ngx_send.c \
             src/os/unix/ngx_writev_chain.c \
             src/os/unix/ngx_udp_send.c \
+            src/os/unix/ngx_udp_sendmsg_chain.c \
             src/os/unix/ngx_channel.c \
             src/os/unix/ngx_shmem.c \
             src/os/unix/ngx_process.c \