Merge branch 'develop'

* develop:
  update Readme
  add console script for building nginx
  add build_all script for x64 and x86
  add copy pdb files.
  add build cjson and redis parser dll.
  fix the return path in build_luajit.bat
  modify the restylib.bat for running at windows console without mingw
  add makefile for x64
  update pcre to 8.39 for x64
  update pcre to 8.39 for x86
  update makefile for 1.11.2
  nginx upgrade to 1.11.2
  change the requireAdministrator in manifest
  support the so_keepalive parameter in listen directive.
  add crt_admin.xml
  build luajit for x64 and x86
  config x86 config for nginx.
  Module: upgraded echo nginx module to 0.59 upgraded memc nginx module to 0.17 upgraded encrypted session nginx module to 0.05 upgraded form input nginx module to 0.12 upgraded headers more nginx module to 0.30 upgraded iconv nginx module to 0.14 upgraded ngx devel kit to 0.3.0 upgraded ngx lua module to 0.10.5 upgraded redis2 nginx module to 0.13 upgraded srcache nginx module to 0.31
  nginx upgrade to 1.11.1
  nginx update to 1.11.0

Author: BloodyKnight

Readme-en.md

@@ -3,18 +3,20 @@
 
 ### lastest release ###
 
-version:1.9.15.1002
+version:1.11.2.1001
 
-32 bit: http://pan.baidu.com/s/1bpsjbAJ
+32 bit: http://pan.baidu.com/s/1cIBUbW
 
-64 bit: http://pan.baidu.com/s/1slw0ppN
+64 bit: http://pan.baidu.com/s/1miETFQw
 
->Publish Time: 2016-05-26
+>Publish Time: 2016-07-11
 
 >Changelog:  
 
-- ngx_stream_proxy_module support udp(Thanks to lihui0213）
-- upgrade openssl to 1.0.2h
+- update nginx core to 1.11.2
+- update pcre to 8.39
+- update LuaJIT to 2.1-20160517
+- support so_keepalive parameter in listen directive
 
 
 
@@ -387,4 +389,18 @@ version:1.9.15.1001
 
 - upgraded nginx core to 1.9.15
 - upgraded cjson dll
-- support for the function ngx.worker.id in ngx_lua_module
+- support for the function ngx.worker.id in ngx_lua_module
+
+
+version:1.9.15.1002
+
+32 bit: http://pan.baidu.com/s/1bpsjbAJ
+        
+64 bit: http://pan.baidu.com/s/1slw0ppN
+
+>Publish Time: 2016-05-26
+
+>Changelog:  
+
+- ngx_stream_proxy_module support udp(Thanks to lihui0213）
+- upgrade openssl to 1.0.2h

Readme.md

@@ -3,18 +3,19 @@
 
 ### 最新版本 ###
 
-版本号:1.9.15.1002
+版本号:1.11.2.1001
 
-32 位下载地址: http://pan.baidu.com/s/1bpsjbAJ
+32 位下载地址: http://pan.baidu.com/s/1cIBUbW
 
-64 位下载地址: http://pan.baidu.com/s/1slw0ppN
-
->发布时间: 2016-05-26
+64 位下载地址: http://pan.baidu.com/s/1miETFQw
 
->修改日志:  
-- ngx_stream_proxy_module模块支持udp(感谢 lihui0213 贡献的代码）
-- openssl更新到1.0.2h
+>发布时间: 2016-07-11
 
+>修改日志:
+- 更新nginx core 到1.11.2
+- 更新pcre到8.39
+- 更新LuaJIT 2.1-20160517
+- 在listen指令中支持so_keepalive参数
 
 
 ### 关于 ###
@@ -389,4 +390,17 @@ Version:1.9.7.1001
 >修改日志:  
 - 更新 nginx 版本到 1.9.15
 - 更新 cjson dll
-- 适配ngx_lua_module的ngx.worker.id函数，现在windows上ngx_lua模块也可以使用这个函数了
+- 适配ngx_lua_module的ngx.worker.id函数，现在windows上ngx_lua模块也可以使用这个函数了
+
+
+版本号:1.9.15.1002
+
+32 位下载地址: http://pan.baidu.com/s/1bpsjbAJ
+
+64 位下载地址: http://pan.baidu.com/s/1slw0ppN
+
+>发布时间: 2016-05-26
+
+>修改日志:  
+- ngx_stream_proxy_module模块支持udp(感谢 lihui0213 贡献的代码）
+- openssl更新到1.0.2h