Merge branch 'master' of https://github.com/F-Stack/f-stack

app/redis-3.2.8/deps/lua/etc/luavs.bat

@@ -1,28 +1,28 @@
-@rem Script to build Lua under "Visual Studio .NET Command Prompt".
+@rem Script to build Lua under "Visual Studio .NET Command Prompt".
-@rem Do not run from this directory; run it from the toplevel: etc\luavs.bat .
+@rem Do not run from this directory; run it from the toplevel: etc\luavs.bat .
-@rem It creates lua51.dll, lua51.lib, lua.exe, and luac.exe in src.
+@rem It creates lua51.dll, lua51.lib, lua.exe, and luac.exe in src.
-@rem (contributed by David Manura and Mike Pall)
+@rem (contributed by David Manura and Mike Pall)
-
+
-@setlocal
+@setlocal
-@set MYCOMPILE=cl /nologo /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE
+@set MYCOMPILE=cl /nologo /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE
-@set MYLINK=link /nologo
+@set MYLINK=link /nologo
-@set MYMT=mt /nologo
+@set MYMT=mt /nologo
-
+
-cd src
+cd src
-%MYCOMPILE% /DLUA_BUILD_AS_DLL l*.c
+%MYCOMPILE% /DLUA_BUILD_AS_DLL l*.c
-del lua.obj luac.obj
+del lua.obj luac.obj
-%MYLINK% /DLL /out:lua51.dll l*.obj
+%MYLINK% /DLL /out:lua51.dll l*.obj
-if exist lua51.dll.manifest^
+if exist lua51.dll.manifest^
-  %MYMT% -manifest lua51.dll.manifest -outputresource:lua51.dll;2
+  %MYMT% -manifest lua51.dll.manifest -outputresource:lua51.dll;2
-%MYCOMPILE% /DLUA_BUILD_AS_DLL lua.c
+%MYCOMPILE% /DLUA_BUILD_AS_DLL lua.c
-%MYLINK% /out:lua.exe lua.obj lua51.lib
+%MYLINK% /out:lua.exe lua.obj lua51.lib
-if exist lua.exe.manifest^
+if exist lua.exe.manifest^
-  %MYMT% -manifest lua.exe.manifest -outputresource:lua.exe
+  %MYMT% -manifest lua.exe.manifest -outputresource:lua.exe
-%MYCOMPILE% l*.c print.c
+%MYCOMPILE% l*.c print.c
-del lua.obj linit.obj lbaselib.obj ldblib.obj liolib.obj lmathlib.obj^
+del lua.obj linit.obj lbaselib.obj ldblib.obj liolib.obj lmathlib.obj^
-    loslib.obj ltablib.obj lstrlib.obj loadlib.obj
+    loslib.obj ltablib.obj lstrlib.obj loadlib.obj
-%MYLINK% /out:luac.exe *.obj
+%MYLINK% /out:luac.exe *.obj
-if exist luac.exe.manifest^
+if exist luac.exe.manifest^
-  %MYMT% -manifest luac.exe.manifest -outputresource:luac.exe
+  %MYMT% -manifest luac.exe.manifest -outputresource:luac.exe
-del *.obj *.manifest
+del *.obj *.manifest
-cd ..
+cd ..

app/redis-3.2.8/redis.conf

@@ -81,7 +81,7 @@ protected-mode no
 
 # Accept connections on the specified port, default is 6379 (IANA #815344).
 # If port 0 is specified Redis will not listen on a TCP socket.
-port 6666
+port 6379
 
 # TCP listen() backlog.
 #
@@ -477,7 +477,7 @@ slave-priority 100
 # 150k passwords per second against a good box. This means that you should
 # use a very strong password otherwise it will be very easy to break.
 #
-requirepass fstacktest
+# requirepass foobared
 
 # Command renaming.
 #