1.4.2-20230308

dc7b563c · 报告_前方高能 · bbaa5d95 · dc7b563c · dc7b563c · dc7b563c
108 changed file
--- a/ChangeLog
+++ b/ChangeLog
-2023-03-05 ahttp 集成asynframe-sdk_v1.4.1-20230305 https://github.com/netsecsp/asynframe
+2023-03-08 ahttp 集成asynframe-sdk_v1.4.2-20230308 https://github.com/netsecsp/asynframe
--- a/README.md
+++ b/README.md
-> asynframe-sdk_v1.4.1-202300305.zip is from https://github.com/netsecsp/asynframe  
+> asynframe-sdk_v1.4.2-20230308.zip is from https://github.com/netsecsp/asynframe  

 # ahttpclient.exe  
 > supports IPv4/IPv6 http/https client program under windows  

--- a/client/3rd/bin/asyncore.dll
+++ b/client/3rd/bin/asyncore.dll
--- a/client/3rd/bin/asynfile.dll
+++ b/client/3rd/bin/asynfile.dll
--- a/client/3rd/bin/asynipcs.dll
+++ b/client/3rd/bin/asynipcs.dll
--- a/client/3rd/bin/asynneta.dll
+++ b/client/3rd/bin/asynneta.dll
--- a/client/3rd/bin/asynsock.dll
+++ b/client/3rd/bin/asynsock.dll
--- a/client/3rd/bin/console.dll
+++ b/client/3rd/bin/console.dll
--- a/client/3rd/bin/crashexplorer.dll
+++ b/client/3rd/bin/crashexplorer.dll
--- a/client/3rd/bin/dns.dll
+++ b/client/3rd/bin/dns.dll
--- a/client/3rd/bin/dtp.dll
+++ b/client/3rd/bin/dtp.dll
--- a/client/3rd/bin/ftp.dll
+++ b/client/3rd/bin/ftp.dll
--- a/client/3rd/bin/http.dll
+++ b/client/3rd/bin/http.dll
--- a/client/3rd/bin/lua.dll
+++ b/client/3rd/bin/lua.dll
--- a/client/3rd/bin/prop.txt
+++ b/client/3rd/bin/prop.txt
-log4cplus.rootLogger=TRACE,  ROLLING_LOG_FILE
+log4cplus.rootLogger=TRACE, ROLLING_LOG_FILE

 #######################################################################
 # STDOUT                                                              #
@@ -11,7 +11,7 @@ log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%Y-%m-%d %H:%M:%S,%q} [%-5
 # ROLLING_LOG_FILE                                                    #
 #######################################################################
 log4cplus.appender.ROLLING_LOG_FILE=log4cplus::RollingFileAppender
-log4cplus.appender.ROLLING_LOG_FILE.File=.\prop.log
+log4cplus.appender.ROLLING_LOG_FILE.File=prop.log
 log4cplus.appender.ROLLING_LOG_FILE.MaxFileSize=10240KB
 log4cplus.appender.ROLLING_LOG_FILE.MaxBackupIndex=5
 # Truncate 'test' if it aleady exists.

--- a/client/3rd/bin/proxy.dll
+++ b/client/3rd/bin/proxy.dll
--- a/client/3rd/bin/ras.dll
+++ b/client/3rd/bin/ras.dll
--- a/client/3rd/bin/rtsp.dll
+++ b/client/3rd/bin/rtsp.dll
--- a/client/3rd/bin/sqlite.dll
+++ b/client/3rd/bin/sqlite.dll
--- a/client/3rd/bin/ssl.dll
+++ b/client/3rd/bin/ssl.dll
--- a/client/3rd/bin/websocket.dll
+++ b/client/3rd/bin/websocket.dll
--- a/client/3rd/bin/x64/asyncore.dll
+++ b/client/3rd/bin/x64/asyncore.dll
--- a/client/3rd/bin/x64/asynfile.dll
+++ b/client/3rd/bin/x64/asynfile.dll
--- a/client/3rd/bin/x64/asynipcs.dll
+++ b/client/3rd/bin/x64/asynipcs.dll
--- a/client/3rd/bin/x64/asynneta.dll
+++ b/client/3rd/bin/x64/asynneta.dll
--- a/client/3rd/bin/x64/asynsock.dll
+++ b/client/3rd/bin/x64/asynsock.dll
--- a/client/3rd/bin/x64/console.dll
+++ b/client/3rd/bin/x64/console.dll
--- a/client/3rd/bin/x64/crashexplorer.dll
+++ b/client/3rd/bin/x64/crashexplorer.dll
--- a/client/3rd/bin/x64/dns.dll
+++ b/client/3rd/bin/x64/dns.dll
--- a/client/3rd/bin/x64/dtp.dll
+++ b/client/3rd/bin/x64/dtp.dll
--- a/client/3rd/bin/x64/ftp.dll
+++ b/client/3rd/bin/x64/ftp.dll
--- a/client/3rd/bin/x64/http.dll
+++ b/client/3rd/bin/x64/http.dll
--- a/client/3rd/bin/x64/lua.dll
+++ b/client/3rd/bin/x64/lua.dll
--- a/client/3rd/bin/x64/prop.txt
+++ b/client/3rd/bin/x64/prop.txt
-log4cplus.rootLogger=TRACE,  ROLLING_LOG_FILE
+log4cplus.rootLogger=TRACE, ROLLING_LOG_FILE

 #######################################################################
 # STDOUT                                                              #
@@ -11,7 +11,7 @@ log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%Y-%m-%d %H:%M:%S,%q} [%-5
 # ROLLING_LOG_FILE                                                    #
 #######################################################################
 log4cplus.appender.ROLLING_LOG_FILE=log4cplus::RollingFileAppender
-log4cplus.appender.ROLLING_LOG_FILE.File=.\prop.log
+log4cplus.appender.ROLLING_LOG_FILE.File=prop.log
 log4cplus.appender.ROLLING_LOG_FILE.MaxFileSize=10240KB
 log4cplus.appender.ROLLING_LOG_FILE.MaxBackupIndex=5
 # Truncate 'test' if it aleady exists.

--- a/client/3rd/bin/x64/proxy.dll
+++ b/client/3rd/bin/x64/proxy.dll
--- a/client/3rd/bin/x64/ras.dll
+++ b/client/3rd/bin/x64/ras.dll
--- a/client/3rd/bin/x64/rtsp.dll
+++ b/client/3rd/bin/x64/rtsp.dll
--- a/client/3rd/bin/x64/sqlite.dll
+++ b/client/3rd/bin/x64/sqlite.dll
--- a/client/3rd/bin/x64/ssl.dll
+++ b/client/3rd/bin/x64/ssl.dll
--- a/client/3rd/bin/x64/websocket.dll
+++ b/client/3rd/bin/x64/websocket.dll
--- a/client/3rd/bin/x64/zip.dll
+++ b/client/3rd/bin/x64/zip.dll
--- a/client/3rd/bin/zip.dll
+++ b/client/3rd/bin/zip.dll
--- a/client/3rd/include/frame/AsynCore_internal.h
+++ b/client/3rd/include/frame/AsynCore_internal.h
@@ -113,6 +113,8 @@ END_ASYN_IOERROR()
 #define Io_connect                      ( 17)
 #define Io_bind                         ( 18)
 #define Io_hostdns                      ( 19)
+#define Io_allocsize                    ( 20)
+#define Io_flushfile                    ( 21)

 /////////////////////////////////////////////////////////////////////////////////
 //ISpeedController.IObjectHolder(lType)

--- a/client/3rd/include/frame/Console.h
+++ b/client/3rd/include/frame/Console.h
@@ -43,6 +43,10 @@ NAMESPACE_BEGIN(asynsdk)
 //IConsole(InstanceName)
 #define IN_Console "com.asynframe.console"

+/////////////////////////////////////////////////////////////////////////////////
+#define ENABLE_INPUT_KEYBOARD 0x1
+#define ENABLE_INPUT_MOUSE    0x2
+
 NAMESPACE_END(asynsdk)

 #endif // !defined(AFX_CONSOLE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
\ No newline at end of file
--- a/client/3rd/include/frame/app/AsynMessageEvents.h
+++ b/client/3rd/include/frame/app/AsynMessageEvents.h
@@ -57,7 +57,7 @@ public:
 //      COM_INTERFACE_ENTRY(IAsynMessageEvents)
 //  END_COM_MAP()
    BEGIN_OBJ_MAP(CAsynMessageEvents_base)
-    OBJ_INTERFACE_ENTRY(IAsynMessageEvents)
+        OBJ_INTERFACE_ENTRY(IAsynMessageEvents)
    END_OBJ_MAP()

 public: //interface of IAsynMessageEvents

--- a/client/3rd/lib/asynsdk_mini-MD.lib
+++ b/client/3rd/lib/asynsdk_mini-MD.lib
--- a/client/3rd/lib/asynsdk_mini-MDd.lib
+++ b/client/3rd/lib/asynsdk_mini-MDd.lib
--- a/client/3rd/lib/asynsdk_mini-MT.lib
+++ b/client/3rd/lib/asynsdk_mini-MT.lib
--- a/client/3rd/lib/asynsdk_mini-MTd.lib
+++ b/client/3rd/lib/asynsdk_mini-MTd.lib
--- a/client/3rd/lib/x64/asynsdk_mini-MD.lib
+++ b/client/3rd/lib/x64/asynsdk_mini-MD.lib
--- a/client/3rd/lib/x64/asynsdk_mini-MDd.lib
+++ b/client/3rd/lib/x64/asynsdk_mini-MDd.lib
--- a/client/3rd/lib/x64/asynsdk_mini-MT.lib
+++ b/client/3rd/lib/x64/asynsdk_mini-MT.lib
--- a/client/3rd/lib/x64/asynsdk_mini-MTd.lib
+++ b/client/3rd/lib/x64/asynsdk_mini-MTd.lib
--- a/client/bin/ahttpclient-x64.exe
+++ b/client/bin/ahttpclient-x64.exe
--- a/client/bin/ahttpclient.exe
+++ b/client/bin/ahttpclient.exe
--- a/server/3rd/bin/asyncore.dll
+++ b/server/3rd/bin/asyncore.dll
--- a/server/3rd/bin/asynfile.dll
+++ b/server/3rd/bin/asynfile.dll
--- a/server/3rd/bin/asynipcs.dll
+++ b/server/3rd/bin/asynipcs.dll
--- a/server/3rd/bin/asynneta.dll
+++ b/server/3rd/bin/asynneta.dll
--- a/server/3rd/bin/asynsock.dll
+++ b/server/3rd/bin/asynsock.dll
--- a/server/3rd/bin/console.dll
+++ b/server/3rd/bin/console.dll
--- a/server/3rd/bin/crashexplorer.dll
+++ b/server/3rd/bin/crashexplorer.dll
--- a/server/3rd/bin/dns.dll
+++ b/server/3rd/bin/dns.dll
--- a/server/3rd/bin/dtp.dll
+++ b/server/3rd/bin/dtp.dll
--- a/server/3rd/bin/ftp.dll
+++ b/server/3rd/bin/ftp.dll
--- a/server/3rd/bin/http.dll
+++ b/server/3rd/bin/http.dll
--- a/server/3rd/bin/lua.dll
+++ b/server/3rd/bin/lua.dll
--- a/server/3rd/bin/prop.txt
+++ b/server/3rd/bin/prop.txt
-log4cplus.rootLogger=TRACE,  ROLLING_LOG_FILE
+log4cplus.rootLogger=TRACE, ROLLING_LOG_FILE

 #######################################################################
 # STDOUT                                                              #
@@ -11,7 +11,7 @@ log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%Y-%m-%d %H:%M:%S,%q} [%-5
 # ROLLING_LOG_FILE                                                    #
 #######################################################################
 log4cplus.appender.ROLLING_LOG_FILE=log4cplus::RollingFileAppender
-log4cplus.appender.ROLLING_LOG_FILE.File=.\prop.log
+log4cplus.appender.ROLLING_LOG_FILE.File=prop.log
 log4cplus.appender.ROLLING_LOG_FILE.MaxFileSize=10240KB
 log4cplus.appender.ROLLING_LOG_FILE.MaxBackupIndex=5
 # Truncate 'test' if it aleady exists.

--- a/server/3rd/bin/proxy.dll
+++ b/server/3rd/bin/proxy.dll
--- a/server/3rd/bin/ras.dll
+++ b/server/3rd/bin/ras.dll
--- a/server/3rd/bin/rtsp.dll
+++ b/server/3rd/bin/rtsp.dll
--- a/server/3rd/bin/sqlite.dll
+++ b/server/3rd/bin/sqlite.dll
--- a/server/3rd/bin/ssl.dll
+++ b/server/3rd/bin/ssl.dll
--- a/server/3rd/bin/websocket.dll
+++ b/server/3rd/bin/websocket.dll
--- a/server/3rd/bin/x64/asyncore.dll
+++ b/server/3rd/bin/x64/asyncore.dll
--- a/server/3rd/bin/x64/asynfile.dll
+++ b/server/3rd/bin/x64/asynfile.dll
--- a/server/3rd/bin/x64/asynipcs.dll
+++ b/server/3rd/bin/x64/asynipcs.dll
--- a/server/3rd/bin/x64/asynneta.dll
+++ b/server/3rd/bin/x64/asynneta.dll
--- a/server/3rd/bin/x64/asynsock.dll
+++ b/server/3rd/bin/x64/asynsock.dll
--- a/server/3rd/bin/x64/console.dll
+++ b/server/3rd/bin/x64/console.dll
--- a/server/3rd/bin/x64/crashexplorer.dll
+++ b/server/3rd/bin/x64/crashexplorer.dll
--- a/server/3rd/bin/x64/dns.dll
+++ b/server/3rd/bin/x64/dns.dll
--- a/server/3rd/bin/x64/dtp.dll
+++ b/server/3rd/bin/x64/dtp.dll
--- a/server/3rd/bin/x64/ftp.dll
+++ b/server/3rd/bin/x64/ftp.dll
--- a/server/3rd/bin/x64/http.dll
+++ b/server/3rd/bin/x64/http.dll
--- a/server/3rd/bin/x64/lua.dll
+++ b/server/3rd/bin/x64/lua.dll
--- a/server/3rd/bin/x64/prop.txt
+++ b/server/3rd/bin/x64/prop.txt
-log4cplus.rootLogger=TRACE,  ROLLING_LOG_FILE
+log4cplus.rootLogger=TRACE, ROLLING_LOG_FILE

 #######################################################################
 # STDOUT                                                              #
@@ -11,7 +11,7 @@ log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%Y-%m-%d %H:%M:%S,%q} [%-5
 # ROLLING_LOG_FILE                                                    #
 #######################################################################
 log4cplus.appender.ROLLING_LOG_FILE=log4cplus::RollingFileAppender
-log4cplus.appender.ROLLING_LOG_FILE.File=.\prop.log
+log4cplus.appender.ROLLING_LOG_FILE.File=prop.log
 log4cplus.appender.ROLLING_LOG_FILE.MaxFileSize=10240KB
 log4cplus.appender.ROLLING_LOG_FILE.MaxBackupIndex=5
 # Truncate 'test' if it aleady exists.

--- a/server/3rd/bin/x64/proxy.dll
+++ b/server/3rd/bin/x64/proxy.dll
--- a/server/3rd/bin/x64/ras.dll
+++ b/server/3rd/bin/x64/ras.dll
--- a/server/3rd/bin/x64/rtsp.dll
+++ b/server/3rd/bin/x64/rtsp.dll
--- a/server/3rd/bin/x64/sqlite.dll
+++ b/server/3rd/bin/x64/sqlite.dll
--- a/server/3rd/bin/x64/ssl.dll
+++ b/server/3rd/bin/x64/ssl.dll
--- a/server/3rd/bin/x64/websocket.dll
+++ b/server/3rd/bin/x64/websocket.dll
--- a/server/3rd/bin/x64/zip.dll
+++ b/server/3rd/bin/x64/zip.dll
--- a/server/3rd/bin/zip.dll
+++ b/server/3rd/bin/zip.dll
--- a/server/3rd/include/frame/AsynCore_internal.h
+++ b/server/3rd/include/frame/AsynCore_internal.h
@@ -113,6 +113,8 @@ END_ASYN_IOERROR()
 #define Io_connect                      ( 17)
 #define Io_bind                         ( 18)
 #define Io_hostdns                      ( 19)
+#define Io_allocsize                    ( 20)
+#define Io_flushfile                    ( 21)

 /////////////////////////////////////////////////////////////////////////////////
 //ISpeedController.IObjectHolder(lType)

--- a/server/3rd/include/frame/Console.h
+++ b/server/3rd/include/frame/Console.h
@@ -43,6 +43,10 @@ NAMESPACE_BEGIN(asynsdk)
 //IConsole(InstanceName)
 #define IN_Console "com.asynframe.console"

+/////////////////////////////////////////////////////////////////////////////////
+#define ENABLE_INPUT_KEYBOARD 0x1
+#define ENABLE_INPUT_MOUSE    0x2
+
 NAMESPACE_END(asynsdk)

 #endif // !defined(AFX_CONSOLE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
\ No newline at end of file
--- a/server/3rd/include/frame/app/AsynMessageEvents.h
+++ b/server/3rd/include/frame/app/AsynMessageEvents.h
@@ -57,7 +57,7 @@ public:
 //      COM_INTERFACE_ENTRY(IAsynMessageEvents)
 //  END_COM_MAP()
    BEGIN_OBJ_MAP(CAsynMessageEvents_base)
-    OBJ_INTERFACE_ENTRY(IAsynMessageEvents)
+        OBJ_INTERFACE_ENTRY(IAsynMessageEvents)
    END_OBJ_MAP()

 public: //interface of IAsynMessageEvents

--- a/server/3rd/lib/asynsdk_mini-MD.lib
+++ b/server/3rd/lib/asynsdk_mini-MD.lib
--- a/server/3rd/lib/asynsdk_mini-MDd.lib
+++ b/server/3rd/lib/asynsdk_mini-MDd.lib
--- a/server/3rd/lib/asynsdk_mini-MT.lib
+++ b/server/3rd/lib/asynsdk_mini-MT.lib
--- a/server/3rd/lib/asynsdk_mini-MTd.lib
+++ b/server/3rd/lib/asynsdk_mini-MTd.lib
--- a/server/3rd/lib/x64/asynsdk_mini-MD.lib
+++ b/server/3rd/lib/x64/asynsdk_mini-MD.lib
--- a/server/3rd/lib/x64/asynsdk_mini-MDd.lib
+++ b/server/3rd/lib/x64/asynsdk_mini-MDd.lib
--- a/server/3rd/lib/x64/asynsdk_mini-MT.lib
+++ b/server/3rd/lib/x64/asynsdk_mini-MT.lib
--- a/server/3rd/lib/x64/asynsdk_mini-MTd.lib
+++ b/server/3rd/lib/x64/asynsdk_mini-MTd.lib
--- a/server/bin/ahttpserver-x64.exe
+++ b/server/bin/ahttpserver-x64.exe
--- a/server/bin/ahttpserver.exe
+++ b/server/bin/ahttpserver.exe