diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 9229d204..1019b082 100644 --- a/RELEASE_NOTES.md +++ b/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 diff --git a/VS2012/civetweb_lua/civetweb_lua.vcxproj b/VS2012/civetweb_lua/civetweb_lua.vcxproj index fe9f7861..15b33266 100644 --- a/VS2012/civetweb_lua/civetweb_lua.vcxproj +++ b/VS2012/civetweb_lua/civetweb_lua.vcxproj @@ -119,7 +119,7 @@ Level3 Disabled LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) Windows @@ -133,7 +133,7 @@ Level3 Disabled LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;CONSOLE;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) Console @@ -147,7 +147,7 @@ Level3 Disabled LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) Windows @@ -161,7 +161,7 @@ Level3 Disabled LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) Windows @@ -177,7 +177,7 @@ true true LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) Windows @@ -195,7 +195,7 @@ true true LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) Windows @@ -209,8 +209,8 @@ - - + + @@ -235,4 +235,4 @@ - \ No newline at end of file + diff --git a/VS2012/civetweb_lua/civetweb_lua.vcxproj.filters b/VS2012/civetweb_lua/civetweb_lua.vcxproj.filters index 649e1886..504327e4 100644 --- a/VS2012/civetweb_lua/civetweb_lua.vcxproj.filters +++ b/VS2012/civetweb_lua/civetweb_lua.vcxproj.filters @@ -24,10 +24,10 @@ Header Files - + Header Files - + Header Files @@ -60,4 +60,4 @@ inl files - \ No newline at end of file + diff --git a/VS2012/lua_lib/lua_lib.vcxproj b/VS2012/lua_lib/lua_lib.vcxproj index d16fcc93..e3f54bd5 100644 --- a/VS2012/lua_lib/lua_lib.vcxproj +++ b/VS2012/lua_lib/lua_lib.vcxproj @@ -85,7 +85,7 @@ TurnOffAllWarnings Disabled LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) Windows @@ -99,7 +99,7 @@ Level3 Disabled LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) Windows @@ -115,7 +115,7 @@ true true LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) Windows @@ -133,7 +133,7 @@ true true LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) Windows @@ -144,38 +144,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -187,4 +187,4 @@ - \ No newline at end of file + diff --git a/VS2012/lua_lib/lua_lib.vcxproj.filters b/VS2012/lua_lib/lua_lib.vcxproj.filters index af4d063a..657c5f25 100644 --- a/VS2012/lua_lib/lua_lib.vcxproj.filters +++ b/VS2012/lua_lib/lua_lib.vcxproj.filters @@ -24,100 +24,100 @@ Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files @@ -132,4 +132,4 @@ Header Files - \ No newline at end of file + diff --git a/VS2012/unit_test/unit_test.vcxproj b/VS2012/unit_test/unit_test.vcxproj index 8540e6df..71baab73 100644 --- a/VS2012/unit_test/unit_test.vcxproj +++ b/VS2012/unit_test/unit_test.vcxproj @@ -52,7 +52,7 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(ProjectDir)..\..\src;$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\src;$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) Console @@ -68,7 +68,7 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(ProjectDir)..\..\src;$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.3\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\src;$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) Console @@ -83,4 +83,4 @@ - \ No newline at end of file + diff --git a/docs/Embedding.md b/docs/Embedding.md index 6f290d91..e9fe96f5 100644 --- a/docs/Embedding.md +++ b/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 diff --git a/docs/UserManual.md b/docs/UserManual.md index 61e5047c..a86d620d 100644 --- a/docs/UserManual.md +++ b/docs/UserManual.md @@ -408,7 +408,7 @@ page, one can write:

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/). diff --git a/resources/Makefile.in-lua b/resources/Makefile.in-lua index f9657bb7..f4608027 100644 --- a/resources/Makefile.in-lua +++ b/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 diff --git a/src/main.c b/src/main.c index 7aea0134..9b292507 100644 --- a/src/main.c +++ b/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