Merge branch 'develop'

Author: zqzjz0911

Readme-en.md

@@ -2,21 +2,36 @@
 [ languages: [中文](Readme.md), [English](Readme-en.md) ]
 
 ### lastest release ###
-version:1.13.4.1001
+version:1.13.5.1001
 
-32 bit: http://pan.baidu.com/s/1c27yqA0
+32 bit: http://pan.baidu.com/s/1c1JvOli
 
-64 bit: http://pan.baidu.com/s/1pLwS3Wn
+64 bit: http://pan.baidu.com/s/1dFbAAnZ
 
->Publish Time: 2017-08-16
+>Publish Time: 2017-09-28
 
 >Changelog:  
+> Moules:
+- upgrade echo-nginx-module to 0.61
+- upgrade ngx_postgres to 1.0
+- upgrade ngx_lua_upstream to 0.07
+- upgrade ngx-lua-module to 0.10.10
+- upgrade LuaJIT to 2.1-20170808
+
 > Libs:
-- upgrade openssl to 1.0.2l
-- upgrade pcre lib to 8.41
+- upgrade lua-resty-core to 0.1.12
+- upgrade lua-resty-dns to 0.19
+- upgrade lua-resty-limit-traffic to 0.04
+- upgrade lua-resty-lock to 0.07
+- upgrade lua-resty-mysql to 0.20
+- upgrade lua-resty-string to 0.10
+- upgrade lua-resty-upstream-healthcheck to 0.05
+
+- upgrade resty-cli to 0.19
+
 
 > Nginx core:
-- upgrade nginx core to 1.13.4
+- upgrade nginx core to 1.13.5
 
 
 
@@ -604,4 +619,22 @@ version:1.13.0.1001
 - upgrade resty-cli to 0.17
 
 > Nginx core:
-- upgrade nginx core to 1.13.0
+- upgrade nginx core to 1.13.0
+
+
+
+version:1.13.4.1001
+
+32 bit: http://pan.baidu.com/s/1c27yqA0
+        
+64 bit: http://pan.baidu.com/s/1pLwS3Wn
+
+>Publish Time: 2017-08-16
+
+>Changelog:  
+> Libs:
+- upgrade openssl to 1.0.2l
+- upgrade pcre lib to 8.41
+
+> Nginx core:
+- upgrade nginx core to 1.13.4

Readme.md

@@ -2,21 +2,33 @@
 [ 语言: [English](Readme-en.md), [中文](Readme.md)]
 
 ### 最新版本 ###
-版本号:1.13.4.1001
+版本号:1.13.5.1001
 
-32 位下载地址: http://pan.baidu.com/s/1c27yqA0
+32 位下载地址: http://pan.baidu.com/s/1c1JvOli
 
-64 位下载地址: http://pan.baidu.com/s/1pLwS3Wn
+64 位下载地址: http://pan.baidu.com/s/1dFbAAnZ
 
-> 发布时间: 2017-08-16
+> 发布时间: 2017-09-28
 
 > 修改日志:  
+> 模块:
+- 更新 echo-nginx-module 到 0.61
+- 更新 ngx_postgres 到 1.0
+- 更新 ngx_lua_upstream 到 0.07
+- 更新 ngx-lua-module 到 0.10.10
+- 更新 LuaJIT 到 2.1-20170808
+
 > 库:
-- 更新 openssl 到 1.0.2l
-- 更新 pcre 到 8.41
+- 更新 lua-resty-core 到 0.1.12
+- 更新 lua-resty-dns 到 0.19
+- 更新 lua-resty-limit-traffic 到 0.04
+- 更新 lua-resty-lock 到 0.07
+- 更新 lua-resty-mysql 到 0.20
+- 更新 lua-resty-string 到 0.10
+- 更新 lua-resty-upstream-healthcheck 到 0.05
 
 > Nginx 核心:
-- 更新 nginx core 到 1.13.4
+- 更新 nginx core 到 1.13.5
 
 
 
@@ -604,4 +616,22 @@ Version:1.9.7.1001
 - 更新 resty-cli 到 0.17
 
 > Nginx 核心:
-- 更新 nginx core 到 1.13.0
+- 更新 nginx core 到 1.13.0
+
+
+版本号:1.13.4.1001
+
+32 位下载地址: http://pan.baidu.com/s/1c27yqA0
+        
+64 位下载地址: http://pan.baidu.com/s/1pLwS3Wn
+
+> 发布时间: 2017-08-16
+
+> 修改日志:  
+> 库:
+- 更新 openssl 到 1.0.2l
+- 更新 pcre 到 8.41
+
+> Nginx 核心:
+- 更新 nginx core 到 1.13.4
+

src/LuaJIT/.travis.yml

@@ -0,0 +1,49 @@
+sudo: required
+dist: trusty
+
+os: linux
+
+language: c
+
+compiler:
+  - gcc
+  - clang
+
+addons:
+  apt:
+    packages:
+    - axel
+    - cpanminus
+    - libtest-base-perl
+    - libtext-diff-perl
+    - libtest-longstring-perl
+    - liblist-moreutils-perl
+    - libparallel-forkmanager-perl
+    - libgd-dev
+    - libmpc-dev
+    - build-essential
+    - libgtk2.0-dev
+    - valgrind
+
+env:
+  global:
+  - JOBS=3
+  - LUAJIT_PREFIX=/opt/luajit21
+  - LUAJIT_SYSM_PREFIX=/opt/luajit21-sysm
+
+install:
+  - git clone https://github.com/openresty/luajit2-test-suite.git ../luajit2-test-suite
+
+script:
+  - valgrind --version
+  - make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT -DLUAJIT_NUMMODE=2 -msse4.2 -O1' > build.log 2>&1 || (cat build.log && exit 1)
+  - sudo make install PREFIX=$LUAJIT_PREFIX > build.log 2>&1 || (cat build.log && exit 1)
+  - cd ../luajit2-test-suite
+  - ./run-tests -j $JOBS $LUAJIT_PREFIX
+  - echo "starting valgrind mod"
+  - cd ../luajit2
+  - make clean
+  - make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_SYSM_PREFIX CC=$CC XCFLAGS='-DLUAJIT_NUMMODE=2 -DLUA_USE_APICHECK -DLUA_USE_ASSERT -DLUAJIT_USE_VALGRIND -DLUAJIT_USE_SYSMALLOC -O1 -msse4.2' > build.log 2>&1 || (cat build.log && exit 1)
+  - sudo make install PREFIX=$LUAJIT_SYSM_PREFIX > build.log 2>&1 || (cat build.log && exit 1)
+  - cd ../luajit2-test-suite
+  - ./run-tests -j $JOBS -v $LUAJIT_SYSM_PREFIX

src/LuaJIT/Makefile

@@ -16,7 +16,7 @@
 MAJVER=  2
 MINVER=  1
 RELVER=  0
-PREREL=  -beta2
+PREREL=  -beta3
 VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
 ABIVER=  5.1
 

src/LuaJIT/README

@@ -1,4 +1,4 @@
-README for LuaJIT 2.1.0-beta2
+README for LuaJIT 2.1.0-beta3
 -----------------------------
 
 LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.

src/LuaJIT/doc/changes.html

@@ -65,7 +65,7 @@ <h1>LuaJIT Change History</h1>
 <div id="main">
 <p>
 This is a list of changes between the released versions of LuaJIT.<br>
-The current <span style="color: #0000c0;">stable version</span> is <strong>LuaJIT&nbsp;2.0.4</strong>.<br>
+The current <span style="color: #0000c0;">stable version</span> is <strong>LuaJIT&nbsp;2.0.5</strong>.<br>
 </p>
 <p>
 Please check the
@@ -74,6 +74,30 @@ <h1>LuaJIT Change History</h1>
 </p>
 
 <div class="major" style="background: #d0d0ff;">
+<h2 id="LuaJIT-2.1.0-beta3">LuaJIT 2.1.0-beta3 &mdash; 2017-05-01</h2>
+<ul>
+<li>Rewrite memory block allocator.</li>
+<li>Add various extension from Lua 5.2/5.3.</li>
+<li>Remove old Lua 5.0 compatibility defines.</li>
+<li>Set arg table before evaluating <tt>LUA_INIT</tt> and <tt>-e</tt> chunks.</li>
+<li>Fix FOLD rules for <tt>math.abs()</tt> and FP negation.</li>
+<li>Fix soft-float <tt>math.abs()</tt> and negation.</li>
+<li>Fix formatting of some small denormals at low precision.</li>
+<li>LJ_GC64: Add JIT compiler support.</li>
+<li>x64/LJ_GC64: Add JIT compiler backend.</li>
+<li>x86/x64: Generate BMI2 shifts and rotates, if available.</li>
+<li>Windows/x86: Add full exception interoperability.</li>
+<li>ARM64: Add big-endian support.</li>
+<li>ARM64: Add JIT compiler backend.</li>
+<li>MIPS: Fix <tt>TSETR</tt> barrier.</li>
+<li>MIPS: Support MIPS16 interlinking.</li>
+<li>MIPS soft-float: Fix code generation for <tt>HREF</tt>.</li>
+<li>MIPS64: Add MIPS64 hard-float JIT compiler backend.</li>
+<li>MIPS64: Add MIPS64 hard-float/soft-float support to interpreter.</li>
+<li>FFI: Compile bitfield loads/stores.</li>
+<li>Various fixes common with the 2.0 branch.</li>
+</ul>
+
 <h2 id="LuaJIT-2.1.0-beta2">LuaJIT 2.1.0-beta2 &mdash; 2016-03-03</h2>
 <ul>
 <li>Enable trace stitching.</li>
@@ -140,6 +164,48 @@ <h2 id="LuaJIT-2.1.0-beta1">LuaJIT 2.1.0-beta1 &mdash; 2015-08-25</h2>
 </div>
 
 <div class="major" style="background: #ffffd0;">
+<h2 id="LuaJIT-2.0.5">LuaJIT 2.0.5 &mdash; 2017-05-01</h2>
+<ul>
+<li>Add workaround for MSVC 2015 stdio changes.</li>
+<li>Limit mcode alloc probing, depending on the available pool size.</li>
+<li>Fix overly restrictive range calculation in mcode allocation.</li>
+<li>Fix out-of-scope goto handling in parser.</li>
+<li>Remove internal <tt>__mode = "K"</tt> and replace with safe check.</li>
+<li>Add "proto" field to <tt>jit.util.funcinfo()</tt>.</li>
+<li>Fix GC step size calculation.</li>
+<li>Initialize <tt>uv-&gt;immutable</tt> for upvalues of loaded chunks.</li>
+<li>Fix for cdata vs. non-cdata arithmetics/comparisons.</li>
+<li>Drop leftover regs in 'for' iterator assignment, too.</li>
+<li>Fix PHI remarking in SINK pass.</li>
+<li>Don't try to record outermost <tt>pcall()</tt> return to lower frame.</li>
+<li>Add guard for obscure aliasing between open upvalues and SSA slots.</li>
+<li>Remove assumption that <tt>lj_math_random_step()</tt> doesn't clobber FPRs.</li>
+<li>Fix handling of non-numeric strings in arithmetic coercions.</li>
+<li>Fix recording of <tt>select(n, ...)</tt> with off-trace varargs</li>
+<li>Fix install for cross-builds.</li>
+<li>Don't allocate unused 2nd result register in JIT compiler backend.</li>
+<li>Drop marks from replayed instructions when sinking.</li>
+<li>Fix unsinking check.</li>
+<li>Properly handle OOM in <tt>trace_save()</tt>.</li>
+<li>Limit number of arguments given to <tt>io.lines()</tt> and <tt>fp:lines()</tt>.</li>
+<li>Fix narrowing of <tt>TOBIT</tt>.</li>
+<li>OSX: Fix build with recent XCode.</li>
+<li>x86/x64: Don't spill an explicit <tt>REF_BASE</tt> in the IR.</li>
+<li>x86/x64: Fix instruction length decoder.</li>
+<li>x86/x64: Search for exit jumps with instruction length decoder.</li>
+<li>ARM: Fix <tt>BLX</tt> encoding for Thumb interworking calls.</li>
+<li>MIPS: Don't use <tt>RID_GP</tt> as a scratch register.</li>
+<li>MIPS: Fix emitted code for U32 to float conversion.</li>
+<li>MIPS: Backport workaround for compact unwind tables.</li>
+<li>MIPS: Fix cross-endian jit.bcsave.</li>
+<li>MIPS: Fix <tt>BC_ISNEXT</tt> fallback path.</li>
+<li>MIPS: Fix use of ffgccheck delay slots in interpreter.</li>
+<li>FFI: Fix FOLD rules for <tt>int64_t</tt> comparisons.</li>
+<li>FFI: Fix SPLIT pass for <tt>CONV i64.u64</tt>.</li>
+<li>FFI: Fix <tt>ipairs()</tt> recording.</li>
+<li>FFI: Don't propagate qualifiers into subtypes of complex.</li>
+</ul>
+
 <h2 id="LuaJIT-2.0.4">LuaJIT 2.0.4 &mdash; 2015-05-14</h2>
 <ul>
 <li>Fix stack check in narrowing optimization.</li>

src/LuaJIT/doc/ext_ffi_semantics.html

@@ -1221,13 +1221,12 @@ <h2 id="status">Current Status</h2>
 suboptimal performance, especially when used in inner loops:
 </p>
 <ul>
-<li>Bitfield accesses and initializations.</li>
 <li>Vector operations.</li>
 <li>Table initializers.</li>
 <li>Initialization of nested <tt>struct</tt>/<tt>union</tt> types.</li>
 <li>Non-default initialization of VLA/VLS or large C&nbsp;types
 (&gt; 128&nbsp;bytes or &gt; 16 array elements.</li>
-<li>Conversions from lightuserdata to <tt>void&nbsp;*</tt>.</li>
+<li>Bitfield initializations.</li>
 <li>Pointer differences for element sizes that are not a power of
 two.</li>
 <li>Calls to C&nbsp;functions with aggregates passed or returned by

src/LuaJIT/doc/extensions.html

@@ -313,9 +313,13 @@ <h2 id="lua52">Extensions from Lua 5.2</h2>
 C&nbsp;functions.</li>
 <li><tt>debug.upvalueid()</tt> and <tt>debug.upvaluejoin()</tt>.</li>
 <li>Lua/C API extensions:
+<tt>lua_version()</tt>
 <tt>lua_upvalueid()</tt>
 <tt>lua_upvaluejoin()</tt>
 <tt>lua_loadx()</tt>
+<tt>lua_copy()</tt>
+<tt>lua_tonumberx()</tt>
+<tt>lua_tointegerx()</tt>
 <tt>luaL_fileresult()</tt>
 <tt>luaL_execresult()</tt>
 <tt>luaL_loadfilex()</tt>
@@ -325,6 +329,8 @@ <h2 id="lua52">Extensions from Lua 5.2</h2>
 <tt>luaL_pushmodule()</tt>
 <tt>luaL_newlibtable()</tt>
 <tt>luaL_newlib()</tt>
+<tt>luaL_testudata()</tt>
+<tt>luaL_setmetatable()</tt>
 </li>
 <li>Command line option <tt>-E</tt>.</li>
 <li>Command line checks <tt>__tostring</tt> for errors.</li>
@@ -370,6 +376,9 @@ <h2 id="lua53">Extensions from Lua 5.3</h2>
 <li><tt>io.read()</tt> and <tt>file:read()</tt> accept formats with or without a leading <tt>*</tt>.</li>
 <li><tt>table.move(a1, f, e, t [,a2])</tt>.</li>
 <li><tt>coroutine.isyieldable()</tt>.</li>
+<li>Lua/C API extensions:
+<tt>lua_isyieldable()</tt>
+</li>
 </ul>
 
 <h2 id="exceptions">C++ Exception Interoperability</h2>

src/LuaJIT/doc/install.html

@@ -198,8 +198,8 @@ <h3>Prerequisites</h3>
 and change to the newly created directory:
 </p>
 <pre class="code">
-tar zxf LuaJIT-2.0.4.tar.gz
-cd LuaJIT-2.0.4</pre>
+tar zxf LuaJIT-2.0.5.tar.gz
+cd LuaJIT-2.0.5</pre>
 <h3>Building LuaJIT</h3>
 <p>
 The supplied Makefiles try to auto-detect the settings needed for your

src/LuaJIT/doc/running.html

@@ -189,7 +189,7 @@ <h3 id="opt_j"><tt>-j cmd[=arg[,arg...]]</tt></h3>
 read the comment block at the start of their source.
 They can be found in the <tt>lib</tt> directory of the source
 distribution or installed under the <tt>jit</tt> directory. By default
-this is <tt>/usr/local/share/luajit-2.0.4/jit</tt> on POSIX
+this is <tt>/usr/local/share/luajit-2.0.5/jit</tt> on POSIX
 systems.
 </p>
 

src/LuaJIT/etc/luajit.pc

@@ -2,7 +2,7 @@
 majver=2
 minver=1
 relver=0
-version=${majver}.${minver}.${relver}-beta2
+version=${majver}.${minver}.${relver}-beta3
 abiver=5.1
 
 prefix=/usr/local

src/LuaJIT/src/Makefile

@@ -209,7 +209,7 @@ TARGET_CC= $(STATIC_CC)
 TARGET_STCC= $(STATIC_CC)
 TARGET_DYNCC= $(DYNAMIC_CC)
 TARGET_LD= $(CROSS)$(CC)
-TARGET_AR= $(CROSS)ar rcus 2>/dev/null
+TARGET_AR= $(CROSS)ar rcus
 TARGET_STRIP= $(CROSS)strip
 
 TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib)
@@ -308,6 +308,7 @@ ifeq (Windows,$(TARGET_SYS))
   TARGET_XSHLDFLAGS= -shared
   TARGET_DYNXLDOPTS=
 else
+  TARGET_AR+= 2>/dev/null
 ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1))
   TARGET_XCFLAGS+= -fno-stack-protector
 endif