Merge remote-tracking branch 'remotes/origin/develop'

* remotes/origin/develop:
  Update Readme
  update Readme
  build lua jit.
  make it build successfully
  fix the config.
  fix the stdint.h file includeing
  add doc file
  upgrade echo-nginx-module to 0.60+
  upgrade ngx-lua-module 0.10.9rc5
  update config.bat
  * Module: upgrade lua-cjson to 2.1.0.5 upgrade lua-redis-parser to 0.13 upgrade redis2-nginx-module to 0.14 upgrade drizzle-nginx-module to 0.1.10 upgrade ngx-lua-module to 0.10.8 upgrade memc-nginx-module to 0.18 upgrade LuaJIT to 2.1-20170405
  * nginx upgrade to 1.11.13
  * nginx upgrade to 1.11.11

Author: hanyugang

Readme-en.md

@@ -2,20 +2,37 @@
 [ languages: [中文](Readme.md), [English](Readme-en.md) ]
 
 ### lastest release ###
-version:1.11.9.1001
+version:1.13.0.1001
 
-32 bit: http://pan.baidu.com/s/1pLczj3H
+32 bit: http://pan.baidu.com/s/1qYNk6h2
 
-64 bit: http://pan.baidu.com/s/1ciVqkY
+64 bit: http://pan.baidu.com/s/1gf89Mr5
 
->Publish Time: 2017-02-06
+>Publish Time: 2017-05-31
 
 >Changelog:  
+> Moules:
+- upgrade lua-cjson to 2.1.0.5
+- upgrade lua-redis-parser to 0.13
+- upgrade redis2-nginx-module to 0.14
+- upgrade drizzle-nginx-module to 0.1.10
+- upgrade ngx-lua-module 0.10.9rc5
+- upgrade memc-nginx-module to 0.18
+- upgrade LuaJIT to 2.1-20170405
+
+> Libs:
+- upgrade lua-resty-core to 0.1.11
+- upgrade lua-resty-limit-traffic to 0.03
+- upgrade lua-resty-mysql to 0.19
+- upgrade lua-resty-lock to 0.06
+- upgrade lua-resty-lrucache to 0.06
+
+- upgrade resty-cli to 0.17
+
+> Nginx core:
+- upgrade nginx core to 1.13.0
+
 
->Nginx core:
-- update nginx core to 1.11.9
-- update pcre to 8.40
-- update zlib to version 1.2.11
 
 
 ### IOCP version (develop) ###
@@ -553,4 +570,20 @@ version:1.11.7.1002
 >Changelog:  
 
 >Nginx core:
-- add more export functions, now 82 functions exported in total
+- add more export functions, now 82 functions exported in total
+
+
+version:1.11.9.1001
+
+32 bit: http://pan.baidu.com/s/1pLczj3H
+        
+64 bit: http://pan.baidu.com/s/1ciVqkY
+
+>Publish Time: 2017-02-06
+
+>Changelog:  
+
+>Nginx core:
+- update nginx core to 1.11.9
+- update pcre to 8.40
+- update zlib to version 1.2.11

Readme.md

@@ -2,21 +2,36 @@
 [ 语言: [English](Readme-en.md), [中文](Readme.md)]
 
 ### 最新版本 ###
+版本号:1.13.0.1001
 
-版本号:1.11.9.1001
+32 位下载地址: http://pan.baidu.com/s/1qYNk6h2
+        
+64 位下载地址: http://pan.baidu.com/s/1gf89Mr5
 
-32 位下载地址: http://pan.baidu.com/s/1pLczj3H
+> 发布时间: 2017-05-31
 
-64 位下载地址: http://pan.baidu.com/s/1ciVqkY
+> 修改日志:  
+> 模块:
+- 更新 lua-cjson 到 2.1.0.5
+- 更新 lua-redis-parser 到 0.13
+- 更新 redis2-nginx-module 到 0.14
+- 更新 drizzle-nginx-module 到 0.1.10
+- 更新 ngx-lua-module 到 0.10.9rc5
+- 更新 memc-nginx-module 到 0.18
+- 更新 LuaJIT 到 2.1-20170405
 
->发布时间: 2017-02-06
+> 库:
+- 更新 lua-resty-core 到 0.1.11
+- 更新 lua-resty-limit-traffic 到 0.03
+- 更新 lua-resty-mysql 到 0.19
+- 更新 lua-resty-lock 到 0.06
+- 更新 lua-resty-lrucache 到 0.06
 
->修改日志:  
+- 更新 resty-cli 到 0.17
+
+> Nginx 核心:
+- 更新 nginx core 到 1.13.0
 
->Nginx:
-- 更新 nginx core 到版本 1.11.9
-- 更新 pcre 到版本 8.40
-- 更新 zlib 到版本 1.2.11
 
 
 
@@ -557,4 +572,20 @@ Version:1.9.7.1001
 >修改日志:  
 
 >Nginx:
-- 添加更多的导出函数，使ngx目录下面的库文件可以正确引用，目前一共有82个函数被导出
+- 添加更多的导出函数，使ngx目录下面的库文件可以正确引用，目前一共有82个函数被导出
+
+
+版本号:1.11.9.1001
+
+32 位下载地址: http://pan.baidu.com/s/1pLczj3H
+
+64 位下载地址: http://pan.baidu.com/s/1ciVqkY
+
+>发布时间: 2017-02-06
+
+>修改日志:  
+
+>Nginx:
+- 更新 nginx core 到版本 1.11.9
+- 更新 pcre 到版本 8.40
+- 更新 zlib 到版本 1.2.11

src/LuaJIT/COPYRIGHT

@@ -1,7 +1,7 @@
 ===============================================================================
 LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
 
-Copyright (C) 2005-2016 Mike Pall. All rights reserved.
+Copyright (C) 2005-2017 Mike Pall. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/LuaJIT/Makefile

@@ -10,7 +10,7 @@
 # For MSVC, please follow the instructions given in src/msvcbuild.bat.
 # For MinGW and Cygwin, cd to src and run make with the Makefile there.
 #
-# Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h
+# Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
 ##############################################################################
 
 MAJVER=  2
@@ -86,8 +86,9 @@ FILE_MAN= luajit.1
 FILE_PC= luajit.pc
 FILES_INC= lua.h lualib.h lauxlib.h luaconf.h lua.hpp luajit.h
 FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \
-	      dis_x86.lua dis_x64.lua dis_arm.lua dis_ppc.lua \
-	      dis_mips.lua dis_mipsel.lua vmdef.lua
+	      dis_x86.lua dis_x64.lua dis_arm.lua dis_arm64.lua \
+	      dis_arm64be.lua dis_ppc.lua dis_mips.lua dis_mipsel.lua \
+	      dis_mips64.lua dis_mips64el.lua vmdef.lua
 
 ifeq (,$(findstring Windows,$(OS)))
   HOST_SYS:= $(shell uname -s)

src/LuaJIT/README

@@ -5,7 +5,7 @@ LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.
 
 Project Homepage: http://luajit.org/
 
-LuaJIT is Copyright (C) 2005-2016 Mike Pall.
+LuaJIT is Copyright (C) 2005-2017 Mike Pall.
 LuaJIT is free software, released under the MIT license.
 See full Copyright Notice in the COPYRIGHT file or in luajit.h.
 

src/LuaJIT/doc/bluequad-print.css

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2016 Mike Pall.
+/* Copyright (C) 2004-2017 Mike Pall.
  *
  * You are welcome to use the general ideas of this design for your own sites.
  * But please do not steal the stylesheet, the layout or the color scheme.

src/LuaJIT/doc/bluequad.css

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2016 Mike Pall.
+/* Copyright (C) 2004-2017 Mike Pall.
  *
  * You are welcome to use the general ideas of this design for your own sites.
  * But please do not steal the stylesheet, the layout or the color scheme.

src/LuaJIT/doc/changes.html

@@ -4,7 +4,7 @@
 <title>LuaJIT Change History</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <meta name="Author" content="Mike Pall">
-<meta name="Copyright" content="Copyright (C) 2005-2016, Mike Pall">
+<meta name="Copyright" content="Copyright (C) 2005-2017, Mike Pall">
 <meta name="Language" content="en">
 <link rel="stylesheet" type="text/css" href="bluequad.css" media="screen">
 <link rel="stylesheet" type="text/css" href="bluequad-print.css" media="print">
@@ -807,7 +807,7 @@ <h2 id="LuaJIT-2.0.0-beta1">LuaJIT 2.0.0-beta1 &mdash; 2009-10-31</h2>
 </div>
 <div id="foot">
 <hr class="hide">
-Copyright &copy; 2005-2016 Mike Pall
+Copyright &copy; 2005-2017 Mike Pall
 <span class="noprint">
 &middot;
 <a href="contact.html">Contact</a>

src/LuaJIT/doc/contact.html

@@ -4,7 +4,7 @@
 <title>Contact</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <meta name="Author" content="Mike Pall">
-<meta name="Copyright" content="Copyright (C) 2005-2016, Mike Pall">
+<meta name="Copyright" content="Copyright (C) 2005-2017, Mike Pall">
 <meta name="Language" content="en">
 <link rel="stylesheet" type="text/css" href="bluequad.css" media="screen">
 <link rel="stylesheet" type="text/css" href="bluequad-print.css" media="print">
@@ -61,8 +61,15 @@ <h1>Contact</h1>
 </div>
 <div id="main">
 <p>
+If you want to report bugs, propose fixes or suggest enhancements,
+please use the
+<a href="https://github.com/LuaJIT/LuaJIT/issues">GitHub issue tracker</a>.
+</p>
+<p>
 Please send general questions to the
 <a href="http://luajit.org/list.html"><span class="ext">&raquo;</span>&nbsp;LuaJIT mailing list</a>.
+</p>
+<p>
 You can also send any questions you have directly to me:
 </p>
 
@@ -86,15 +93,15 @@ <h1>Contact</h1>
 <h2>Copyright</h2>
 <p>
 All documentation is
-Copyright &copy; 2005-2016 Mike Pall.
+Copyright &copy; 2005-2017 Mike Pall.
 </p>
 
 
 <br class="flush">
 </div>
 <div id="foot">
 <hr class="hide">
-Copyright &copy; 2005-2016 Mike Pall
+Copyright &copy; 2005-2017 Mike Pall
 <span class="noprint">
 &middot;
 <a href="contact.html">Contact</a>

src/LuaJIT/doc/ext_c_api.html

@@ -4,7 +4,7 @@
 <title>Lua/C API Extensions</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <meta name="Author" content="Mike Pall">
-<meta name="Copyright" content="Copyright (C) 2005-2016, Mike Pall">
+<meta name="Copyright" content="Copyright (C) 2005-2017, Mike Pall">
 <meta name="Language" content="en">
 <link rel="stylesheet" type="text/css" href="bluequad.css" media="screen">
 <link rel="stylesheet" type="text/css" href="bluequad-print.css" media="print">
@@ -179,7 +179,7 @@ <h3 id="mode_wrapcfunc"><tt>luaJIT_setmode(L, idx, LUAJIT_MODE_WRAPCFUNC|flag)</
 </div>
 <div id="foot">
 <hr class="hide">
-Copyright &copy; 2005-2016 Mike Pall
+Copyright &copy; 2005-2017 Mike Pall
 <span class="noprint">
 &middot;
 <a href="contact.html">Contact</a>