20201121

zhouyitian · Nov 21, 2020 · 4f9a990 · 4f9a990
1 parent d4f41d2
commit 4f9a990
Show file tree

Hide file tree

Showing 448 changed files with 18,615 additions and 19,347 deletions.
diff --git a/Doc/HP-Socket Development Guide.pdf b/Doc/HP-Socket Development Guide.pdf
diff --git a/Linux/Change-APIs.txt b/Linux/Change-APIs.txt
@@ -1,4 +1,15 @@
 # ======================================== #
+HP-Socket v5.7.3 API Update List:
+# ======================================== #
+--------------------
+1. Global:
+--------------------
+SYS_BrotliCompress							(ADD)
+SYS_BrotliCompressEx						(ADD)
+SYS_BrotliUncompress						(ADD)
+SYS_BrotliGuessCompressBound				(ADD)
+
+# ======================================== #
 HP-Socket v5.7.1 API Update List:
 # ======================================== #
 --------------------

diff --git a/Linux/ChangeLog.txt b/Linux/ChangeLog.txt
@@ -1,4 +1,13 @@
 ==========================================================================================
+v5.7.3 Update:
+==========================================================================================
+
+> Regular Upadate
+-----------------
+1. Add Brotli compression/decompression support, and provide _BROTLI_DISABLED recompiled macro to disable Brotli functions).
+2. openssl upgrade to version 1.1.1h.
+
+==========================================================================================
 v5.7.2 Update:
 ==========================================================================================
 

diff --git a/Linux/README.md b/Linux/README.md
@@ -1,4 +1,4 @@
-# HP-Socket for Linx
+# HP-Socket for Linux
 &nbsp;&nbsp;&nbsp;&nbsp;The exported API of HP-Socket for Linux is consistent with HP-Socket for Windows, but the implementation code is completely separated. HP-Socket for Linux uses the features of the *C++14* standard, and thus need to be compiled by a compiler which version is *GCC 5.x* and above, and the compilation and execution environments of HP-Socket requires Linux kernel version *2.6.32* and above.   
 ## Compilation
 &nbsp;&nbsp;&nbsp;&nbsp;Binary library files and sample executable files are available in the HP-Socket distribution. These files were compiled with GCC 6.3.1 under Linux kernel version 2.6.32. Alternatively, you can compile these files using the following two options:
@@ -15,6 +15,8 @@ Usage: compile.sh [...O.P.T.I.O.N.S...]
   -t|--http-enabled   : enable HTTP components (default: true)
   -s|--ssl-enabled    : enable SSL components (default: true)
   -z|--zlib-enabled   : enable ZLIB related functions (default: true)
+  -b|--brotli-enabled : enable BROTLI related functions
+                      : (x86/x64 default: true, ARM default: false)
   -i|--iconv-enabled  : enable ICONV related functions (default: true)
   -c|--compiler       : compiler (default: g++)
   -p|--platform       : platform: x86 / x64 / ARM
@@ -57,11 +59,12 @@ $ ./build-android-ndk.sh
 $ ./build-android-ndk.sh APP_ABI=armeabi-v7a,x86
 ```
 ### Features
-&nbsp;&nbsp;&nbsp;&nbsp;By default, all optional features (*UDP, SSL, HTTP, ZLIB, ICONV*) were enabled. You can set one or more ***_XXX_DISABLED=true*** parameters for *build-android-ndk.sh* to disable corresponding features.  
+&nbsp;&nbsp;&nbsp;&nbsp;By default, all optional features (*UDP, SSL, HTTP, ZLIB, BROTLI, ICONV*) were enabled. You can set one or more ***_XXX_DISABLED=true*** parameters for *build-android-ndk.sh* to disable corresponding features.  
   - *_UDP_DISABLED=true*&nbsp;&nbsp;&nbsp;(disable UDP)
   - *_SSL_DISABLED=true*&nbsp;&nbsp;&nbsp;(disable SSL)
   - *_HTTP_DISABLED=true*&nbsp;&nbsp;(disable HTTP)
   - *_ZLIB_DISABLED=true*&nbsp;&nbsp;(disable ZLIB)
+  - *_BROTLI_DISABLED=true*&nbsp;&nbsp;(disable BROTLI)
   - *_ICONV_DISABLED=true*&nbsp;(disable ICONV)
 
 &nbsp;&nbsp;&nbsp;&nbsp;(for example: disable *SSL* and *ICONV* features):

diff --git a/Linux/build-android-ndk.bat b/Linux/build-android-ndk.bat
@@ -8,7 +8,9 @@ set OBJ_OUT=.\lib\android-ndk\obj
 
 cd %~dp0
 
-rd /s /q %LIBS_OUT%
+if exist %LIBS_OUT% (
+	rd /s /q %LIBS_OUT%
+)
 
 call ndk-build NDK_PROJECT_PATH=%PROJECT_PATH% NDK_LIBS_OUT=%LIBS_OUT% NDK_OUT=%OBJ_OUT% %*
 

diff --git a/Linux/build-android-ndk.sh b/Linux/build-android-ndk.sh
@@ -10,6 +10,7 @@ OBJ_OUT=./lib/android-ndk/obj
 
 function cp_static_lib
 {
+	mkdir -p $LIBS_OUT/$1
 	cp -f $OBJ_OUT/local/$1/*.a $LIBS_OUT/$1
 }
 

diff --git a/Linux/compile.sh b/Linux/compile.sh
@@ -12,6 +12,7 @@ UDP_ENABLED=1
 HTTP_ENABLED=1
 SSL_ENABLED=1
 ZLIB_ENABLED=1
+BROTLI_ENABLED=
 ICONV_ENABLED=1
 CC=g++
 
@@ -22,11 +23,13 @@ LIB_NAME_JEMALLOC=jemalloc_pic
 LIB_NAME_SSL_1=ssl
 LIB_NAME_SSL_2=crypto
 LIB_NAME_ZLIB=z
+LIB_NAME_BROTLI=brotli
 
 LIB_FILE_JEMALLOC=lib$LIB_NAME_JEMALLOC.a
 LIB_FILE_SSL_1=lib$LIB_NAME_SSL_1.a
 LIB_FILE_SSL_2=lib$LIB_NAME_SSL_2.a
 LIB_FILE_ZLIB=lib$LIB_NAME_ZLIB.a
+LIB_FILE_BROTLI=lib$LIB_NAME_BROTLI.a
 
 CFG_RELEASE=Release
 CFG_DEBUG=Debug
@@ -47,6 +50,8 @@ print_usage()
 	printf "  %-19s : %s\n" "-t|--http-enabled"		"enable HTTP components (default: true)"
 	printf "  %-19s : %s\n" "-s|--ssl-enabled"		"enable SSL components (default: true)"
 	printf "  %-19s : %s\n" "-z|--zlib-enabled"		"enable ZLIB related functions (default: true)"
+	printf "  %-19s : %s\n" "-b|--brotli-enabled"	"enable BROTLI related functions"
+	printf "  %-19s : %s\n" ""						"(x86/x64 default: true, ARM default: false)"
 	printf "  %-19s : %s\n" "-i|--iconv-enabled"	"enable ICONV related functions (default: true)"
 	printf "  %-19s : %s\n" "-c|--compiler"			"compiler (default: g++)"
 	printf "  %-19s : %s\n" "-p|--platform"			"platform: x86 / x64 / ARM"
@@ -74,6 +79,7 @@ print_config()
 		printf "%17s : %s\n" "--http-enabled"	"$(int_to_bool "$HTTP_ENABLED")"
 		printf "%17s : %s\n" "--ssl-enabled"	"$(int_to_bool "$SSL_ENABLED")"
 		printf "%17s : %s\n" "--zlib-enabled"	"$(int_to_bool "$ZLIB_ENABLED")"
+		printf "%17s : %s\n" "--brotli-enabled"	"$(int_to_bool "$BROTLI_ENABLED")"
 		printf "%17s : %s\n" "--iconv-enabled"	"$(int_to_bool "$ICONV_ENABLED")"
 	else
 		printf "%17s : %s\n" "$ACTION_NAME path" "$PACKAGE_PATH/$LIB_DIR"
@@ -86,7 +92,7 @@ print_config()
 
 parse_args()
 {
-	ARGS=$(getopt -o d:j:u:t:s:z:i:c:p:ervh -l with-debug-lib:,use-jemalloc:,udp-enabled:,http-enabled:,ssl-enabled:,zlib-enabled:,iconv-enabled:,compiler:platform:,clean,remove,version,help -n "$SH_NAME" -- "$@")
+	ARGS=$(getopt -o d:j:u:t:s:z:b:i:c:p:ervh -l with-debug-lib:,use-jemalloc:,udp-enabled:,http-enabled:,ssl-enabled:,zlib-enabled:,brotli-enabled:,iconv-enabled:,compiler:,platform:,clean,remove,version,help -n "$SH_NAME" -- "$@")
 	RS=$?
 
 	if [ $RS -ne 0 ]; then
@@ -97,6 +103,7 @@ parse_args()
 	eval set -- "${ARGS}"
 
 	local _SET_JEMALLOC="false"
+	local _SET_BROTLI="false"
 
 	while true; do
 		case "$1" in
@@ -165,6 +172,18 @@ parse_args()
 					exit 2
 				fi
 
+				shift 2
+				;;
+			-b|--brotli-enabled)
+				BROTLI_ENABLED=$(bool_to_int "$2")
+				_SET_BROTLI="true"
+
+				if [[ -z "$BROTLI_ENABLED" ]]; then
+					printf "Invalid arg value: %s %s\n" "$1" "$2"
+					print_usage
+					exit 2
+				fi
+
 				shift 2
 				;;
 			-i|--iconv-enabled)
@@ -243,6 +262,10 @@ parse_args()
 	if [ $_SET_JEMALLOC != "true" ]; then
 		USE_JEMALLOC=$([[ $PLATFORM == "ARM" ]] && echo 0 || echo 1)
 	fi
+
+	if [ $_SET_BROTLI != "true" ]; then
+		BROTLI_ENABLED=$([[ $PLATFORM == "ARM" ]] && echo 0 || echo 1)
+	fi
 }
 
 do_build()
@@ -330,10 +353,19 @@ parse_compile_args()
 		_CL_OPTS="-D_ZLIB_DISABLED $_CL_OPTS"
 	fi
 
+	if [ $BROTLI_ENABLED -eq 1 ]; then
+		_LN_OPTS="-l$LIB_NAME_BROTLI $_LN_OPTS"
+		if [ -f $DEPT_LIB_DIR/$LIB_FILE_BROTLI ]; then
+			_AR_FLAG=$(($_AR_FLAG+4))
+		fi
+	else
+		_CL_OPTS="-D_BROTLI_DISABLED $_CL_OPTS"
+	fi
+
 	if [[ $USE_JEMALLOC -eq 1 && $_CFG_NAME == $CFG_RELEASE ]]; then
 		_LN_OPTS="-l$LIB_NAME_JEMALLOC $_LN_OPTS"
 		if [ -f $DEPT_LIB_DIR/$LIB_FILE_JEMALLOC ]; then
-			_AR_FLAG=$(($_AR_FLAG+4))
+			_AR_FLAG=$(($_AR_FLAG+8))
 		fi
 	fi
 
@@ -465,6 +497,7 @@ update_hp_def()
 	do_update_hp_def $SSL_ENABLED "_SSL_DISABLED"
 	do_update_hp_def $HTTP_ENABLED "_HTTP_DISABLED"
 	do_update_hp_def $ZLIB_ENABLED "_ZLIB_DISABLED"
+	do_update_hp_def $BROTLI_ENABLED "_BROTLI_DISABLED"
 	do_update_hp_def $ICONV_ENABLED "_ICONV_DISABLED"
 }
 

diff --git a/Linux/demo/testecho-arq-pfm/client/client.vcxproj.user b/Linux/demo/testecho-arq-pfm/client/client.vcxproj.user
@@ -13,13 +13,13 @@
     <RemoteDebuggerCommandArguments>-b -</RemoteDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <RemoteTarget>970599627;192.168.56.11 (username=bruce, port=22, authentication=Password)</RemoteTarget>
+    <RemoteTarget>78784327;192.168.56.101 (username=, port=22, authentication=Password)</RemoteTarget>
     <RemoteDebuggingMode>gdbserver</RemoteDebuggingMode>
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <RemoteDebuggerCommandArguments>-b -</RemoteDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <RemoteTarget>970599627;192.168.56.11 (username=bruce, port=22, authentication=Password)</RemoteTarget>
+    <RemoteTarget>78784327;192.168.56.101 (username=, port=22, authentication=Password)</RemoteTarget>
     <RemoteDebuggingMode>gdbserver</RemoteDebuggingMode>
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <RemoteDebuggerCommandArguments>-b -</RemoteDebuggerCommandArguments>

diff --git a/Linux/demo/testecho-arq-pfm/server/server.vcxproj.user b/Linux/demo/testecho-arq-pfm/server/server.vcxproj.user
@@ -15,14 +15,14 @@
     </RemoteDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <RemoteTarget>970599627;192.168.56.11 (username=bruce, port=22, authentication=Password)</RemoteTarget>
+    <RemoteTarget>78784327;192.168.56.101 (username=, port=22, authentication=Password)</RemoteTarget>
     <RemoteDebuggingMode>gdbserver</RemoteDebuggingMode>
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <RemoteDebuggerCommandArguments>
     </RemoteDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <RemoteTarget>970599627;192.168.56.11 (username=bruce, port=22, authentication=Password)</RemoteTarget>
+    <RemoteTarget>78784327;192.168.56.101 (username=, port=22, authentication=Password)</RemoteTarget>
     <RemoteDebuggingMode>gdbserver</RemoteDebuggingMode>
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <RemoteDebuggerCommandArguments>

diff --git a/Linux/demo/testecho-arq/client/client.vcxproj b/Linux/demo/testecho-arq/client/client.vcxproj
@@ -176,7 +176,7 @@
       <CppLanguageStandard>c++1y</CppLanguageStandard>
       <SymbolsHiddenByDefault>true</SymbolsHiddenByDefault>
       <AdditionalIncludeDirectories>../../../dependent/$(Platform)/include;$(StlIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_ZLIB_DISABLED</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SSL_DISABLED;_HTTP_DISABLED;_ZLIB_DISABLED;_BROTLI_DISABLED;</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <LibraryDependencies>rt;pthread;dl</LibraryDependencies>
@@ -190,7 +190,7 @@
       <DebugInformationFormat>None</DebugInformationFormat>
       <SymbolsHiddenByDefault>true</SymbolsHiddenByDefault>
       <AdditionalIncludeDirectories>../../../dependent/$(Platform)/include;$(StlIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_ZLIB_DISABLED;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SSL_DISABLED;_HTTP_DISABLED;_ZLIB_DISABLED;_BROTLI_DISABLED;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <LibraryDependencies>jemalloc_pic;rt;pthread;dl</LibraryDependencies>
@@ -203,7 +203,7 @@
       <CppLanguageStandard>c++1y</CppLanguageStandard>
       <SymbolsHiddenByDefault>true</SymbolsHiddenByDefault>
       <AdditionalIncludeDirectories>../../../dependent/$(Platform)/include;$(StlIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_ZLIB_DISABLED</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SSL_DISABLED;_HTTP_DISABLED;_ZLIB_DISABLED;_BROTLI_DISABLED;</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <LibraryDependencies>rt;pthread;dl</LibraryDependencies>
@@ -217,7 +217,7 @@
       <DebugInformationFormat>None</DebugInformationFormat>
       <SymbolsHiddenByDefault>true</SymbolsHiddenByDefault>
       <AdditionalIncludeDirectories>../../../dependent/$(Platform)/include;$(StlIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_ZLIB_DISABLED;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SSL_DISABLED;_HTTP_DISABLED;_ZLIB_DISABLED;_BROTLI_DISABLED;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <LibraryDependencies>jemalloc_pic;rt;pthread;dl</LibraryDependencies>
@@ -230,7 +230,7 @@
       <CppLanguageStandard>c++1y</CppLanguageStandard>
       <SymbolsHiddenByDefault>true</SymbolsHiddenByDefault>
       <AdditionalIncludeDirectories>../../../dependent/$(Platform)/include;$(StlIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_ZLIB_DISABLED</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SSL_DISABLED;_HTTP_DISABLED;_ZLIB_DISABLED;_BROTLI_DISABLED;</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <LibraryDependencies>rt;pthread;dl</LibraryDependencies>
@@ -244,7 +244,7 @@
       <DebugInformationFormat>None</DebugInformationFormat>
       <SymbolsHiddenByDefault>true</SymbolsHiddenByDefault>
       <AdditionalIncludeDirectories>../../../dependent/$(Platform)/include;$(StlIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_ZLIB_DISABLED;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SSL_DISABLED;_HTTP_DISABLED;_ZLIB_DISABLED;_BROTLI_DISABLED;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <LibraryDependencies>jemalloc_pic;rt;pthread;dl</LibraryDependencies>

diff --git a/Linux/demo/testecho-arq/client/client.vcxproj.user b/Linux/demo/testecho-arq/client/client.vcxproj.user
@@ -13,13 +13,13 @@
     <RemoteDebuggerCommandArguments>-n 0</RemoteDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <RemoteTarget>970599627;192.168.56.11 (username=bruce, port=22, authentication=Password)</RemoteTarget>
+    <RemoteTarget>78784327;192.168.56.101 (username=, port=22, authentication=Password)</RemoteTarget>
     <RemoteDebuggingMode>gdbserver</RemoteDebuggingMode>
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <RemoteDebuggerCommandArguments>-n 0</RemoteDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <RemoteTarget>970599627;192.168.56.11 (username=bruce, port=22, authentication=Password)</RemoteTarget>
+    <RemoteTarget>78784327;192.168.56.101 (username=, port=22, authentication=Password)</RemoteTarget>
     <RemoteDebuggingMode>gdbserver</RemoteDebuggingMode>
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <RemoteDebuggerCommandArguments>-n 0</RemoteDebuggerCommandArguments>

diff --git a/Linux/demo/testecho-arq/server/server.vcxproj b/Linux/demo/testecho-arq/server/server.vcxproj
@@ -176,7 +176,7 @@
       <CppLanguageStandard>c++1y</CppLanguageStandard>
       <SymbolsHiddenByDefault>true</SymbolsHiddenByDefault>
       <AdditionalIncludeDirectories>../../../dependent/$(Platform)/include;$(StlIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_ZLIB_DISABLED</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SSL_DISABLED;_HTTP_DISABLED;_ZLIB_DISABLED;_BROTLI_DISABLED;</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <LibraryDependencies>rt;pthread;dl</LibraryDependencies>
@@ -190,7 +190,7 @@
       <DebugInformationFormat>None</DebugInformationFormat>
       <SymbolsHiddenByDefault>true</SymbolsHiddenByDefault>
       <AdditionalIncludeDirectories>../../../dependent/$(Platform)/include;$(StlIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_ZLIB_DISABLED;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SSL_DISABLED;_HTTP_DISABLED;_ZLIB_DISABLED;_BROTLI_DISABLED;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <LibraryDependencies>jemalloc_pic;rt;pthread;dl</LibraryDependencies>
@@ -203,7 +203,7 @@
       <CppLanguageStandard>c++1y</CppLanguageStandard>
       <SymbolsHiddenByDefault>true</SymbolsHiddenByDefault>
       <AdditionalIncludeDirectories>../../../dependent/$(Platform)/include;$(StlIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_ZLIB_DISABLED</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SSL_DISABLED;_HTTP_DISABLED;_ZLIB_DISABLED;_BROTLI_DISABLED;</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <LibraryDependencies>rt;pthread;dl</LibraryDependencies>
@@ -217,7 +217,7 @@
       <DebugInformationFormat>None</DebugInformationFormat>
       <SymbolsHiddenByDefault>true</SymbolsHiddenByDefault>
       <AdditionalIncludeDirectories>../../../dependent/$(Platform)/include;$(StlIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_ZLIB_DISABLED;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SSL_DISABLED;_HTTP_DISABLED;_ZLIB_DISABLED;_BROTLI_DISABLED;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <LibraryDependencies>jemalloc_pic;rt;pthread;dl</LibraryDependencies>
@@ -230,7 +230,7 @@
       <CppLanguageStandard>c++1y</CppLanguageStandard>
       <SymbolsHiddenByDefault>true</SymbolsHiddenByDefault>
       <AdditionalIncludeDirectories>../../../dependent/$(Platform)/include;$(StlIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_ZLIB_DISABLED</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SSL_DISABLED;_HTTP_DISABLED;_ZLIB_DISABLED;_BROTLI_DISABLED;</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <LibraryDependencies>rt;pthread;dl</LibraryDependencies>
@@ -244,7 +244,7 @@
       <DebugInformationFormat>None</DebugInformationFormat>
       <SymbolsHiddenByDefault>true</SymbolsHiddenByDefault>
       <AdditionalIncludeDirectories>../../../dependent/$(Platform)/include;$(StlIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_ZLIB_DISABLED;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SSL_DISABLED;_HTTP_DISABLED;_ZLIB_DISABLED;_BROTLI_DISABLED;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <LibraryDependencies>jemalloc_pic;rt;pthread;dl</LibraryDependencies>

diff --git a/Linux/demo/testecho-arq/server/server.vcxproj.user b/Linux/demo/testecho-arq/server/server.vcxproj.user
@@ -15,14 +15,14 @@
     </RemoteDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <RemoteTarget>970599627;192.168.56.11 (username=bruce, port=22, authentication=Password)</RemoteTarget>
+    <RemoteTarget>78784327;192.168.56.101 (username=, port=22, authentication=Password)</RemoteTarget>
     <RemoteDebuggingMode>gdbserver</RemoteDebuggingMode>
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <RemoteDebuggerCommandArguments>
     </RemoteDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <RemoteTarget>970599627;192.168.56.11 (username=bruce, port=22, authentication=Password)</RemoteTarget>
+    <RemoteTarget>78784327;192.168.56.101 (username=, port=22, authentication=Password)</RemoteTarget>
     <RemoteDebuggingMode>gdbserver</RemoteDebuggingMode>
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <RemoteDebuggerCommandArguments>

diff --git a/Linux/demo/testecho-http-4c/agent/agent.vcxproj.user b/Linux/demo/testecho-http-4c/agent/agent.vcxproj.user
@@ -13,13 +13,13 @@
     <RemoteDebuggerCommandArguments>-b -</RemoteDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <RemoteTarget>970599627;192.168.56.11 (username=bruce, port=22, authentication=Password)</RemoteTarget>
+    <RemoteTarget>78784327;192.168.56.101 (username=, port=22, authentication=Password)</RemoteTarget>
     <RemoteDebuggingMode>gdbserver</RemoteDebuggingMode>
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <RemoteDebuggerCommandArguments>-b -</RemoteDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <RemoteTarget>970599627;192.168.56.11 (username=bruce, port=22, authentication=Password)</RemoteTarget>
+    <RemoteTarget>78784327;192.168.56.101 (username=, port=22, authentication=Password)</RemoteTarget>
     <RemoteDebuggingMode>gdbserver</RemoteDebuggingMode>
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <RemoteDebuggerCommandArguments>-b -</RemoteDebuggerCommandArguments>
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ OBJ_OUT=./lib/android-ndk/obj @@
     function cp_static_lib
     {
+    	mkdir -p $LIBS_OUT/$1
     	cp -f $OBJ_OUT/local/$1/*.a $LIBS_OUT/$1
     }
@@ Expand Down @@