Browse Source

Update to Lua 5.2.4

bel2125 10 years ago
parent
commit
acd1df40c9

+ 1 - 0
RELEASE_NOTES.md

@@ -5,6 +5,7 @@ Release Notes v1.7 (Under Development)
 Changes
 -------
 
+- Update Lua to 5.2.4
 - Fix build for MinGW-x64 and TDM-GCC
 - Update SQLite to 3.8.8.3
 - Fix CGI variables SCRIPT_NAME and PATH_TRANSLATED

+ 9 - 9
VS2012/civetweb_lua/civetweb_lua.vcxproj

@@ -119,7 +119,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -133,7 +133,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;CONSOLE;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -147,7 +147,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -161,7 +161,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -177,7 +177,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -195,7 +195,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -209,8 +209,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\civetweb.h" />
-    <ClInclude Include="..\..\src\third_party\lua-5.2.3\src\lauxlib.h" />
-    <ClInclude Include="..\..\src\third_party\lua-5.2.3\src\lua.h" />
+    <ClInclude Include="..\..\src\third_party\lua-5.2.4\src\lauxlib.h" />
+    <ClInclude Include="..\..\src\third_party\lua-5.2.4\src\lua.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\civetweb.c" />
@@ -235,4 +235,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

+ 3 - 3
VS2012/civetweb_lua/civetweb_lua.vcxproj.filters

@@ -24,10 +24,10 @@
     <ClInclude Include="..\..\include\civetweb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\third_party\lua-5.2.3\src\lua.h">
+    <ClInclude Include="..\..\src\third_party\lua-5.2.4\src\lua.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\third_party\lua-5.2.3\src\lauxlib.h">
+    <ClInclude Include="..\..\src\third_party\lua-5.2.4\src\lauxlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -60,4 +60,4 @@
       <Filter>inl files</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>

+ 37 - 37
VS2012/lua_lib/lua_lib.vcxproj

@@ -85,7 +85,7 @@
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -99,7 +99,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -115,7 +115,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -133,7 +133,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -144,38 +144,38 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\third_party\lfs.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lapi.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lauxlib.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lbaselib.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lbitlib.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lcode.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lcorolib.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lctype.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\ldblib.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\ldebug.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\ldo.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\ldump.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lfunc.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lgc.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\linit.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\liolib.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\llex.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lmathlib.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lmem.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\loadlib.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lobject.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lopcodes.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\loslib.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lparser.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lstate.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lstring.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lstrlib.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\ltable.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\ltablib.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\ltm.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lundump.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lvm.c" />
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lzio.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lapi.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lauxlib.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lbaselib.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lbitlib.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lcode.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lcorolib.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lctype.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\ldblib.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\ldebug.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\ldo.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\ldump.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lfunc.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lgc.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\linit.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\liolib.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\llex.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lmathlib.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lmem.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\loadlib.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lobject.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lopcodes.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\loslib.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lparser.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lstate.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lstring.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lstrlib.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\ltable.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\ltablib.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\ltm.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lundump.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lvm.c" />
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lzio.c" />
     <ClCompile Include="..\..\src\third_party\lsqlite3.c" />
     <ClCompile Include="..\..\src\third_party\LuaXML_lib.c" />
     <ClCompile Include="..\..\src\third_party\sqlite3.c" />
@@ -187,4 +187,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

+ 33 - 33
VS2012/lua_lib/lua_lib.vcxproj.filters

@@ -24,100 +24,100 @@
     <ClCompile Include="..\..\src\third_party\lfs.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lapi.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lapi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lauxlib.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lauxlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lbaselib.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lbaselib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lbitlib.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lbitlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lcode.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lcode.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lcorolib.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lcorolib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lctype.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lctype.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\ldblib.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\ldblib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\ldebug.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\ldebug.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\ldo.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\ldo.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\ldump.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\ldump.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lfunc.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lfunc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lgc.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lgc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\linit.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\linit.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\liolib.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\liolib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\llex.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\llex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lmathlib.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lmathlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lmem.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lmem.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\loadlib.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\loadlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lobject.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lobject.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lopcodes.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lopcodes.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\loslib.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\loslib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lparser.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lparser.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lstate.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lstate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lstring.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lstring.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lstrlib.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lstrlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\ltable.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\ltable.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\ltablib.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\ltablib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\ltm.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\ltm.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lundump.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lundump.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lvm.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lvm.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\third_party\lua-5.2.3\src\lzio.c">
+    <ClCompile Include="..\..\src\third_party\lua-5.2.4\src\lzio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\third_party\LuaXML_lib.c">
@@ -132,4 +132,4 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
+</Project>

+ 3 - 3
VS2012/unit_test/unit_test.vcxproj

@@ -52,7 +52,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src;$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src;$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -68,7 +68,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src;$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src;$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -83,4 +83,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

+ 1 - 1
docs/Embedding.md

@@ -64,7 +64,7 @@ Lua is a server side include functionality.  Files ending in .la will be process
 ##### Add the following sources
 
   - src/mod_lua.inl
-  - src/third_party/lua-5.2.3/src
+  - src/third_party/lua-5.2.4/src
      + lapi.c
      + lauxlib.c
      + lbaselib.c

+ 1 - 1
docs/UserManual.md

@@ -408,7 +408,7 @@ page, one can write:
     </p>
 
 Lua is known for it's speed and small size. Civetweb currently uses Lua
-version 5.2.3. The documentation for it can be found in the
+version 5.2.4. The documentation for it can be found in the
 [Lua 5.2 reference manual](http://www.lua.org/manual/5.2/).
 
 

+ 3 - 1
resources/Makefile.in-lua

@@ -1,5 +1,7 @@
 #
 # Copyright (c) 2013 No Face Press, LLC
+# Copyright (c) 2014-2015 the Civetweb developers
+#
 # License http://opensource.org/licenses/mit-license.php MIT License
 #
 
@@ -7,7 +9,7 @@ ifndef WITH_LUA
   $(error WITH_LUA is not defined)
 endif
 
-LUA_DIR = src/third_party/lua-5.2.3/src
+LUA_DIR = src/third_party/lua-5.2.4/src
 LUA_CFLAGS = -I$(LUA_DIR) -DLUA_COMPAT_ALL -DUSE_LUA
 
 ifdef WITH_LUA_SHARED

+ 1 - 1
src/main.c

@@ -564,7 +564,7 @@ static void set_absolute_path(char *options[], const char *option_name,
 #define luaL_openlibs lua_civet_open_all_libs
 struct lua_State;
 extern void lua_civet_open_all_libs(struct lua_State *L);
-#include "../src/third_party/lua-5.2.3/src/lua.c"
+#include "../src/third_party/lua-5.2.4/src/lua.c"
 #undef main
 #endif