增加 mbedtls 支持

winddriver · Jan 15, 2019 · e8383ef · e8383ef
1 parent c537d7b
commit e8383ef
Show file tree

Hide file tree

Showing 180 changed files with 4,043 additions and 866 deletions.
diff --git a/Net/Demos/CrossHttpConsole/uDM.pas b/Net/Demos/CrossHttpConsole/uDM.pas
@@ -5,12 +5,14 @@ interface
 uses
   {$IFDEF __CROSS_SSL__}
   Net.CrossSslSocket,
-  {$IFDEF POSIX}
   Net.CrossSslDemoCert,
   {$ENDIF}
-  {$ENDIF}
   System.SysUtils, System.Classes, System.Generics.Collections,
-  Net.CrossSocket.Base, Net.CrossSocket, Net.CrossHttpServer, Net.CrossHttpMiddleware;
+  Net.CrossSocket.Base,
+  Net.CrossSocket,
+  Net.CrossHttpServer,
+  Net.CrossHttpMiddleware,
+  Net.CrossHttpUtils;
 
 type
   IProgress = interface
@@ -200,17 +202,14 @@ procedure TDM.DataModuleCreate(Sender: TObject);
 begin
   FHttpServer := TCrossHttpServer.Create(0);
   {$IFDEF __CROSS_SSL__}
-  {$IFDEF POSIX}
   FHttpServer.SetCertificate(SSL_SERVER_CERT);
   FHttpServer.SetPrivateKey(SSL_SERVER_PKEY);
-  {$ELSE}
-  FHttpServer.SetCertificateFile('server.crt');
-  FHttpServer.SetPrivateKeyFile('server.key');
-  {$ENDIF}
   {$ENDIF}
-  FHttpServer.Addr := IPv4_ALL; // IPv4
+//  FHttpServer.Addr := IPv4_ALL; // IPv4
+//  FHttpServer.Addr := IPv6_ALL; // IPv6
+  FHttpServer.Addr := IPv4v6_ALL; // IPv4v6
   FHttpServer.Port := AppCfg.ListenPort;
-  FHttpServer.Compressible := False;
+  FHttpServer.Compressible := True;
 
   FHttpServer.OnConnected := _OnConnected;
   FHttpServer.OnDisconnected := _OnDisconnected;
@@ -277,15 +276,15 @@ procedure TDM._CreateRouter;
   ;
 
   FHttpServer
-  .Get('/null',
+  .Get('/hello',
     procedure(ARequest: ICrossHttpRequest; AResponse: ICrossHttpResponse)
     begin
-      AResponse.Send('');
+      AResponse.Send('Hello World');
     end)
-  .Get('/hello',
+  .Get('/null',
     procedure(ARequest: ICrossHttpRequest; AResponse: ICrossHttpResponse)
     begin
-      AResponse.Send('Hello World');
+      AResponse.Send('');
     end)
   .Get('/yeah',
     procedure(ARequest: ICrossHttpRequest; AResponse: ICrossHttpResponse)
@@ -348,6 +347,55 @@ procedure TDM._CreateRouter;
           LWatch.Stop;
         end);
     end)
+  .Dir('/static', 'D:\')
+  .Dir('/g', 'G:\')
+  .Get('/file',
+    procedure(ARequest: ICrossHttpRequest; AResponse: ICrossHttpResponse)
+    var
+      LStream: TStream;
+    begin
+      LStream := TFile.OpenRead('d:\2.txt');
+      AResponse.ContentType := TMediaType.TEXT_HTML;
+      AResponse.SendNoCompress(LStream,
+        StrToInt64Def(ARequest.Query['pos'], 0),
+        StrToInt64Def(ARequest.Query['count'], 0),
+        procedure(AConnection: ICrossConnection; ASuccess: Boolean)
+        begin
+          FreeAndNil(LStream);
+        end);
+    end)
+  .Get('/stream',
+    procedure(ARequest: ICrossHttpRequest; AResponse: ICrossHttpResponse)
+    var
+      LStream: TMemoryStream;
+    begin
+      LStream := TMemoryStream.Create;
+      LStream.LoadFromFile('d:\2.txt');
+      AResponse.ContentType := TMediaType.TEXT_HTML;
+      AResponse.SendZCompress(LStream,
+        StrToInt64Def(ARequest.Query['pos'], 0),
+        StrToInt64Def(ARequest.Query['count'], 0),
+        TCompressType.ctGZip,
+        procedure(AConnection: ICrossConnection; ASuccess: Boolean)
+        begin
+          FreeAndNil(LStream);
+        end);
+    end)
+  .Get('/bytes',
+    procedure(ARequest: ICrossHttpRequest; AResponse: ICrossHttpResponse)
+    var
+      LBytes: TBytes;
+    begin
+      LBytes := TFile.ReadAllBytes('d:\2.txt');
+      AResponse.ContentType := TMediaType.TEXT_HTML;
+      AResponse.SendNoCompress(LBytes,
+        StrToInt64Def(ARequest.Query['pos'], 0),
+        StrToInt64Def(ARequest.Query['count'], 0),
+        procedure(AConnection: ICrossConnection; ASuccess: Boolean)
+        begin
+          LBytes := nil;
+        end);
+    end)
     ;
 
   for I := 0 to AppCfg.DirMaps.Count - 1 do

diff --git a/Net/Demos/TestCrossSocket/TestCrossSocket.dproj b/Net/Demos/TestCrossSocket/TestCrossSocket.dproj
diff --git a/Net/Demos/TestCrossSocket/uMain.pas b/Net/Demos/TestCrossSocket/uMain.pas
@@ -11,11 +11,10 @@ interface
   FMX.Controls.Presentation, FMX.Edit, FMX.EditBox, FMX.SpinBox,
   System.Diagnostics, FMX.Objects,
   {$IFDEF __SSL__}
+  Net.CrossSslSocket.Base,
   Net.CrossSslSocket,
-  {$IFDEF POSIX}
   Net.CrossSslDemoCert,
   {$ENDIF}
-  {$ENDIF}
   Net.SocketAPI, Net.CrossSocket.Base, Net.CrossSocket;
 
 type
@@ -309,14 +308,8 @@ procedure TfmMain.FormCreate(Sender: TObject);
   FRunWatch := TStopwatch.StartNew;
 
   {$IFDEF __SSL__}
-  FSocket.InitSslCtx(SSLv23);
-  {$IFDEF POSIX}
   FSocket.SetCertificate(SSL_SERVER_CERT);
   FSocket.SetPrivateKey(SSL_SERVER_PKEY);
-  {$ELSE}
-  FSocket.SetCertificateFile('server.crt');
-  FSocket.SetPrivateKeyFile('server.key');
-  {$ENDIF}
   {$ENDIF}
 
   FTestProc :=

diff --git a/Net/MbedObj/Android/libmbedtls.a b/Net/MbedObj/Android/libmbedtls.a
diff --git a/Net/MbedObj/Linux64/libmbedcrypto.so b/Net/MbedObj/Linux64/libmbedcrypto.so
diff --git a/Net/MbedObj/Linux64/libmbedtls.so b/Net/MbedObj/Linux64/libmbedtls.so
diff --git a/Net/MbedObj/Linux64/libmbedx509.so b/Net/MbedObj/Linux64/libmbedx509.so
diff --git a/Net/MbedObj/MbedTls.zip b/Net/MbedObj/MbedTls.zip
diff --git a/Net/MbedObj/Win32/aes.obj b/Net/MbedObj/Win32/aes.obj
diff --git a/Net/MbedObj/Win32/aesni.obj b/Net/MbedObj/Win32/aesni.obj
diff --git a/Net/MbedObj/Win32/arc4.obj b/Net/MbedObj/Win32/arc4.obj
diff --git a/Net/MbedObj/Win32/aria.obj b/Net/MbedObj/Win32/aria.obj
diff --git a/Net/MbedObj/Win32/asn1parse.obj b/Net/MbedObj/Win32/asn1parse.obj
diff --git a/Net/MbedObj/Win32/asn1write.obj b/Net/MbedObj/Win32/asn1write.obj
diff --git a/Net/MbedObj/Win32/base64.obj b/Net/MbedObj/Win32/base64.obj
diff --git a/Net/MbedObj/Win32/bignum.obj b/Net/MbedObj/Win32/bignum.obj
diff --git a/Net/MbedObj/Win32/blowfish.obj b/Net/MbedObj/Win32/blowfish.obj
diff --git a/Net/MbedObj/Win32/camellia.obj b/Net/MbedObj/Win32/camellia.obj
diff --git a/Net/MbedObj/Win32/ccm.obj b/Net/MbedObj/Win32/ccm.obj
diff --git a/Net/MbedObj/Win32/chacha20.obj b/Net/MbedObj/Win32/chacha20.obj
diff --git a/Net/MbedObj/Win32/chachapoly.obj b/Net/MbedObj/Win32/chachapoly.obj
diff --git a/Net/MbedObj/Win32/cipher.obj b/Net/MbedObj/Win32/cipher.obj
diff --git a/Net/MbedObj/Win32/cipher_wrap.obj b/Net/MbedObj/Win32/cipher_wrap.obj
diff --git a/Net/MbedObj/Win32/cmac.obj b/Net/MbedObj/Win32/cmac.obj
diff --git a/Net/MbedObj/Win32/ctr_drbg.obj b/Net/MbedObj/Win32/ctr_drbg.obj
diff --git a/Net/MbedObj/Win32/debug.obj b/Net/MbedObj/Win32/debug.obj
diff --git a/Net/MbedObj/Win32/des.obj b/Net/MbedObj/Win32/des.obj
diff --git a/Net/MbedObj/Win32/dhm.obj b/Net/MbedObj/Win32/dhm.obj
diff --git a/Net/MbedObj/Win32/ecdh.obj b/Net/MbedObj/Win32/ecdh.obj
diff --git a/Net/MbedObj/Win32/ecdsa.obj b/Net/MbedObj/Win32/ecdsa.obj
diff --git a/Net/MbedObj/Win32/ecjpake.obj b/Net/MbedObj/Win32/ecjpake.obj
diff --git a/Net/MbedObj/Win32/ecp.obj b/Net/MbedObj/Win32/ecp.obj
diff --git a/Net/MbedObj/Win32/ecp_curves.obj b/Net/MbedObj/Win32/ecp_curves.obj
diff --git a/Net/MbedObj/Win32/entropy.obj b/Net/MbedObj/Win32/entropy.obj
diff --git a/Net/MbedObj/Win32/entropy_poll.obj b/Net/MbedObj/Win32/entropy_poll.obj
diff --git a/Net/MbedObj/Win32/error.obj b/Net/MbedObj/Win32/error.obj
diff --git a/Net/MbedObj/Win32/gcm.obj b/Net/MbedObj/Win32/gcm.obj
diff --git a/Net/MbedObj/Win32/havege.obj b/Net/MbedObj/Win32/havege.obj
diff --git a/Net/MbedObj/Win32/hkdf.obj b/Net/MbedObj/Win32/hkdf.obj
diff --git a/Net/MbedObj/Win32/hmac_drbg.obj b/Net/MbedObj/Win32/hmac_drbg.obj
diff --git a/Net/MbedObj/Win32/md.obj b/Net/MbedObj/Win32/md.obj
diff --git a/Net/MbedObj/Win32/md2.obj b/Net/MbedObj/Win32/md2.obj
diff --git a/Net/MbedObj/Win32/md4.obj b/Net/MbedObj/Win32/md4.obj
diff --git a/Net/MbedObj/Win32/md5.obj b/Net/MbedObj/Win32/md5.obj
diff --git a/Net/MbedObj/Win32/md_wrap.obj b/Net/MbedObj/Win32/md_wrap.obj
diff --git a/Net/MbedObj/Win32/memory_buffer_alloc.obj b/Net/MbedObj/Win32/memory_buffer_alloc.obj
diff --git a/Net/MbedObj/Win32/nist_kw.obj b/Net/MbedObj/Win32/nist_kw.obj
diff --git a/Net/MbedObj/Win32/oid.obj b/Net/MbedObj/Win32/oid.obj
diff --git a/Net/MbedObj/Win32/padlock.obj b/Net/MbedObj/Win32/padlock.obj
diff --git a/Net/MbedObj/Win32/pem.obj b/Net/MbedObj/Win32/pem.obj
diff --git a/Net/MbedObj/Win32/pk.obj b/Net/MbedObj/Win32/pk.obj
diff --git a/Net/MbedObj/Win32/pk_wrap.obj b/Net/MbedObj/Win32/pk_wrap.obj
diff --git a/Net/MbedObj/Win32/pkcs11.obj b/Net/MbedObj/Win32/pkcs11.obj
diff --git a/Net/MbedObj/Win32/pkcs12.obj b/Net/MbedObj/Win32/pkcs12.obj
diff --git a/Net/MbedObj/Win32/pkcs5.obj b/Net/MbedObj/Win32/pkcs5.obj
diff --git a/Net/MbedObj/Win32/pkparse.obj b/Net/MbedObj/Win32/pkparse.obj
diff --git a/Net/MbedObj/Win32/pkwrite.obj b/Net/MbedObj/Win32/pkwrite.obj
diff --git a/Net/MbedObj/Win32/platform.obj b/Net/MbedObj/Win32/platform.obj
diff --git a/Net/MbedObj/Win32/platform_util.obj b/Net/MbedObj/Win32/platform_util.obj
diff --git a/Net/MbedObj/Win32/poly1305.obj b/Net/MbedObj/Win32/poly1305.obj
diff --git a/Net/MbedObj/Win32/ripemd160.obj b/Net/MbedObj/Win32/ripemd160.obj
diff --git a/Net/MbedObj/Win32/rsa.obj b/Net/MbedObj/Win32/rsa.obj
diff --git a/Net/MbedObj/Win32/rsa_internal.obj b/Net/MbedObj/Win32/rsa_internal.obj
diff --git a/Net/MbedObj/Win32/sha1.obj b/Net/MbedObj/Win32/sha1.obj
diff --git a/Net/MbedObj/Win32/sha256.obj b/Net/MbedObj/Win32/sha256.obj
diff --git a/Net/MbedObj/Win32/sha512.obj b/Net/MbedObj/Win32/sha512.obj
diff --git a/Net/MbedObj/Win32/ssl_cache.obj b/Net/MbedObj/Win32/ssl_cache.obj
diff --git a/Net/MbedObj/Win32/ssl_ciphersuites.obj b/Net/MbedObj/Win32/ssl_ciphersuites.obj
diff --git a/Net/MbedObj/Win32/ssl_cli.obj b/Net/MbedObj/Win32/ssl_cli.obj
diff --git a/Net/MbedObj/Win32/ssl_cookie.obj b/Net/MbedObj/Win32/ssl_cookie.obj
diff --git a/Net/MbedObj/Win32/ssl_srv.obj b/Net/MbedObj/Win32/ssl_srv.obj
diff --git a/Net/MbedObj/Win32/ssl_ticket.obj b/Net/MbedObj/Win32/ssl_ticket.obj
diff --git a/Net/MbedObj/Win32/ssl_tls.obj b/Net/MbedObj/Win32/ssl_tls.obj
diff --git a/Net/MbedObj/Win32/threading.obj b/Net/MbedObj/Win32/threading.obj
diff --git a/Net/MbedObj/Win32/timing.obj b/Net/MbedObj/Win32/timing.obj
diff --git a/Net/MbedObj/Win32/version.obj b/Net/MbedObj/Win32/version.obj
diff --git a/Net/MbedObj/Win32/version_features.obj b/Net/MbedObj/Win32/version_features.obj
diff --git a/Net/MbedObj/Win32/x509.obj b/Net/MbedObj/Win32/x509.obj
diff --git a/Net/MbedObj/Win32/x509_create.obj b/Net/MbedObj/Win32/x509_create.obj
diff --git a/Net/MbedObj/Win32/x509_crl.obj b/Net/MbedObj/Win32/x509_crl.obj
diff --git a/Net/MbedObj/Win32/x509_crt.obj b/Net/MbedObj/Win32/x509_crt.obj
diff --git a/Net/MbedObj/Win32/x509_csr.obj b/Net/MbedObj/Win32/x509_csr.obj
diff --git a/Net/MbedObj/Win32/x509write_crt.obj b/Net/MbedObj/Win32/x509write_crt.obj
diff --git a/Net/MbedObj/Win32/x509write_csr.obj b/Net/MbedObj/Win32/x509write_csr.obj
diff --git a/Net/MbedObj/Win32/xtea.obj b/Net/MbedObj/Win32/xtea.obj
diff --git a/Net/MbedObj/Win64/aes.o b/Net/MbedObj/Win64/aes.o
diff --git a/Net/MbedObj/Win64/aesni.o b/Net/MbedObj/Win64/aesni.o
diff --git a/Net/MbedObj/Win64/arc4.o b/Net/MbedObj/Win64/arc4.o
diff --git a/Net/MbedObj/Win64/aria.o b/Net/MbedObj/Win64/aria.o
diff --git a/Net/MbedObj/Win64/asn1parse.o b/Net/MbedObj/Win64/asn1parse.o
diff --git a/Net/MbedObj/Win64/asn1write.o b/Net/MbedObj/Win64/asn1write.o
diff --git a/Net/MbedObj/Win64/base64.o b/Net/MbedObj/Win64/base64.o
diff --git a/Net/MbedObj/Win64/bignum.o b/Net/MbedObj/Win64/bignum.o
diff --git a/Net/MbedObj/Win64/blowfish.o b/Net/MbedObj/Win64/blowfish.o
diff --git a/Net/MbedObj/Win64/camellia.o b/Net/MbedObj/Win64/camellia.o
diff --git a/Net/MbedObj/Win64/ccm.o b/Net/MbedObj/Win64/ccm.o
diff --git a/Net/MbedObj/Win64/chacha20.o b/Net/MbedObj/Win64/chacha20.o
diff --git a/Net/MbedObj/Win64/chachapoly.o b/Net/MbedObj/Win64/chachapoly.o
diff --git a/Net/MbedObj/Win64/cipher.o b/Net/MbedObj/Win64/cipher.o
diff --git a/Net/MbedObj/Win64/cipher_wrap.o b/Net/MbedObj/Win64/cipher_wrap.o
diff --git a/Net/MbedObj/Win64/cmac.o b/Net/MbedObj/Win64/cmac.o
diff --git a/Net/MbedObj/Win64/ctr_drbg.o b/Net/MbedObj/Win64/ctr_drbg.o
diff --git a/Net/MbedObj/Win64/debug.o b/Net/MbedObj/Win64/debug.o
diff --git a/Net/MbedObj/Win64/des.o b/Net/MbedObj/Win64/des.o
diff --git a/Net/MbedObj/Win64/dhm.o b/Net/MbedObj/Win64/dhm.o
diff --git a/Net/MbedObj/Win64/ecdh.o b/Net/MbedObj/Win64/ecdh.o
diff --git a/Net/MbedObj/Win64/ecdsa.o b/Net/MbedObj/Win64/ecdsa.o
diff --git a/Net/MbedObj/Win64/ecjpake.o b/Net/MbedObj/Win64/ecjpake.o
diff --git a/Net/MbedObj/Win64/ecp.o b/Net/MbedObj/Win64/ecp.o
diff --git a/Net/MbedObj/Win64/ecp_curves.o b/Net/MbedObj/Win64/ecp_curves.o
diff --git a/Net/MbedObj/Win64/entropy.o b/Net/MbedObj/Win64/entropy.o
diff --git a/Net/MbedObj/Win64/entropy_poll.o b/Net/MbedObj/Win64/entropy_poll.o
diff --git a/Net/MbedObj/Win64/error.o b/Net/MbedObj/Win64/error.o
diff --git a/Net/MbedObj/Win64/gcm.o b/Net/MbedObj/Win64/gcm.o
diff --git a/Net/MbedObj/Win64/havege.o b/Net/MbedObj/Win64/havege.o
diff --git a/Net/MbedObj/Win64/hkdf.o b/Net/MbedObj/Win64/hkdf.o
diff --git a/Net/MbedObj/Win64/hmac_drbg.o b/Net/MbedObj/Win64/hmac_drbg.o
diff --git a/Net/MbedObj/Win64/md.o b/Net/MbedObj/Win64/md.o
diff --git a/Net/MbedObj/Win64/md2.o b/Net/MbedObj/Win64/md2.o
diff --git a/Net/MbedObj/Win64/md4.o b/Net/MbedObj/Win64/md4.o
diff --git a/Net/MbedObj/Win64/md5.o b/Net/MbedObj/Win64/md5.o
diff --git a/Net/MbedObj/Win64/md_wrap.o b/Net/MbedObj/Win64/md_wrap.o
diff --git a/Net/MbedObj/Win64/memory_buffer_alloc.o b/Net/MbedObj/Win64/memory_buffer_alloc.o
diff --git a/Net/MbedObj/Win64/nist_kw.o b/Net/MbedObj/Win64/nist_kw.o
diff --git a/Net/MbedObj/Win64/oid.o b/Net/MbedObj/Win64/oid.o
diff --git a/Net/MbedObj/Win64/padlock.o b/Net/MbedObj/Win64/padlock.o
diff --git a/Net/MbedObj/Win64/pem.o b/Net/MbedObj/Win64/pem.o
diff --git a/Net/MbedObj/Win64/pk.o b/Net/MbedObj/Win64/pk.o
diff --git a/Net/MbedObj/Win64/pk_wrap.o b/Net/MbedObj/Win64/pk_wrap.o
diff --git a/Net/MbedObj/Win64/pkcs11.o b/Net/MbedObj/Win64/pkcs11.o
diff --git a/Net/MbedObj/Win64/pkcs12.o b/Net/MbedObj/Win64/pkcs12.o
diff --git a/Net/MbedObj/Win64/pkcs5.o b/Net/MbedObj/Win64/pkcs5.o
diff --git a/Net/MbedObj/Win64/pkparse.o b/Net/MbedObj/Win64/pkparse.o
diff --git a/Net/MbedObj/Win64/pkwrite.o b/Net/MbedObj/Win64/pkwrite.o
diff --git a/Net/MbedObj/Win64/platform.o b/Net/MbedObj/Win64/platform.o
diff --git a/Net/MbedObj/Win64/platform_util.o b/Net/MbedObj/Win64/platform_util.o
diff --git a/Net/MbedObj/Win64/poly1305.o b/Net/MbedObj/Win64/poly1305.o
diff --git a/Net/MbedObj/Win64/ripemd160.o b/Net/MbedObj/Win64/ripemd160.o
diff --git a/Net/MbedObj/Win64/rsa.o b/Net/MbedObj/Win64/rsa.o
diff --git a/Net/MbedObj/Win64/rsa_internal.o b/Net/MbedObj/Win64/rsa_internal.o
diff --git a/Net/MbedObj/Win64/sha1.o b/Net/MbedObj/Win64/sha1.o
diff --git a/Net/MbedObj/Win64/sha256.o b/Net/MbedObj/Win64/sha256.o
diff --git a/Net/MbedObj/Win64/sha512.o b/Net/MbedObj/Win64/sha512.o
diff --git a/Net/MbedObj/Win64/ssl_cache.o b/Net/MbedObj/Win64/ssl_cache.o
diff --git a/Net/MbedObj/Win64/ssl_ciphersuites.o b/Net/MbedObj/Win64/ssl_ciphersuites.o
diff --git a/Net/MbedObj/Win64/ssl_cli.o b/Net/MbedObj/Win64/ssl_cli.o
diff --git a/Net/MbedObj/Win64/ssl_cookie.o b/Net/MbedObj/Win64/ssl_cookie.o
diff --git a/Net/MbedObj/Win64/ssl_srv.o b/Net/MbedObj/Win64/ssl_srv.o
diff --git a/Net/MbedObj/Win64/ssl_ticket.o b/Net/MbedObj/Win64/ssl_ticket.o
diff --git a/Net/MbedObj/Win64/ssl_tls.o b/Net/MbedObj/Win64/ssl_tls.o
diff --git a/Net/MbedObj/Win64/threading.o b/Net/MbedObj/Win64/threading.o
diff --git a/Net/MbedObj/Win64/timing.o b/Net/MbedObj/Win64/timing.o
diff --git a/Net/MbedObj/Win64/version.o b/Net/MbedObj/Win64/version.o
diff --git a/Net/MbedObj/Win64/version_features.o b/Net/MbedObj/Win64/version_features.o
diff --git a/Net/MbedObj/Win64/x509.o b/Net/MbedObj/Win64/x509.o
diff --git a/Net/MbedObj/Win64/x509_create.o b/Net/MbedObj/Win64/x509_create.o
diff --git a/Net/MbedObj/Win64/x509_crl.o b/Net/MbedObj/Win64/x509_crl.o
diff --git a/Net/MbedObj/Win64/x509_crt.o b/Net/MbedObj/Win64/x509_crt.o
diff --git a/Net/MbedObj/Win64/x509_csr.o b/Net/MbedObj/Win64/x509_csr.o
diff --git a/Net/MbedObj/Win64/x509write_crt.o b/Net/MbedObj/Win64/x509write_crt.o
diff --git a/Net/MbedObj/Win64/x509write_csr.o b/Net/MbedObj/Win64/x509write_csr.o
diff --git a/Net/MbedObj/Win64/xtea.o b/Net/MbedObj/Win64/xtea.o
diff --git a/Net/MbedObj/iOSDevice64/libmbedtls.a b/Net/MbedObj/iOSDevice64/libmbedtls.a
diff --git a/Net/Net.CrossHttpParams.pas b/Net/Net.CrossHttpParams.pas
@@ -12,10 +12,17 @@
 interface
 
 uses
-  System.SysUtils, System.Classes, System.Generics.Collections,
-  System.Generics.Defaults, System.NetEncoding, System.IOUtils,
-  System.RegularExpressions, System.SyncObjs, System.Diagnostics,
-  System.DateUtils, Net.CrossHttpUtils;
+  System.SysUtils,
+  System.Classes,
+  System.Generics.Collections,
+  System.Generics.Defaults,
+  System.NetEncoding,
+  System.IOUtils,
+  System.RegularExpressions,
+  System.SyncObjs,
+  System.Diagnostics,
+  System.DateUtils,
+  Net.CrossHttpUtils;
 
 type
   TNameValue = record
@@ -331,7 +338,6 @@   TFormField = class
     FFilePath: string;
     FContentType: string;
     FContentTransferEncoding: string;
-    FAutoDeleteFile: Boolean;
   public
     constructor Create;
     destructor Destroy; override;
@@ -374,11 +380,6 @@   TFormField = class
     /// </summary>
     property FilePath: string read FFilePath;
 
-    /// <summary>
-    /// 对象释放时自动删除上传的文件
-    /// </summary>
-    property AutoDeleteFile: Boolean read FAutoDeleteFile write FAutoDeleteFile;
-
     /// <summary>
     ///   内容类型（只有文件才有该属性）
     /// </summary>
@@ -503,6 +504,11 @@     TEnumerator = class(TEnumerator<TFormField>)
     procedure SetExpiryTime(const Value: Integer);
     procedure SetValue(const AName, AValue: string);
 
+    /// <summary>
+    ///   更新最后访问时间
+    /// </summary>
+    procedure Touch;
+
     /// <summary>
     ///   是否已过期
     /// </summary>
@@ -559,6 +565,7 @@   TSessionBase = class abstract(TInterfacedObject, ISession)
   public
     constructor Create(const ASessionID: string); virtual; abstract;
 
+    procedure Touch; virtual;
     function Expired: Boolean; virtual;
 
     property SessionID: string read GetSessionID write SetSessionID;
@@ -809,7 +816,8 @@   TSessions = class(TSessionsBase)
 implementation
 
 uses
-  Utils.Utils, Utils.DateTime;
+  Utils.Utils,
+  Utils.DateTime;
 
 { TNameValue }
 
@@ -1268,9 +1276,6 @@ destructor TFormField.Destroy;
 begin
   FreeValue;
 
-  if FAutoDeleteFile and (FFilePath <> '') and TFile.Exists(FFilePath) then
-    TFile.Delete(FFilePath);
-
   inherited;
 end;
 
@@ -1352,7 +1357,18 @@ destructor THttpMultiPartFormData.Destroy;
 end;
 
 procedure THttpMultiPartFormData.Clear;
+var
+  LField: TFormField;
 begin
+  for LField in FPartFields do
+  begin
+    if FAutoDeleteFiles and TFile.Exists(LField.FilePath) then
+    begin
+      LField.FreeValue;
+      TFile.Delete(LField.FilePath);
+    end;
+  end;
+
   FPartFields.Clear;
 end;
 
@@ -1550,7 +1566,6 @@ function THttpMultiPartFormData.Decode(const ABuf: Pointer; ALen: Integer): Inte
             LPartHeader := TEncoding.UTF8.GetString(FCurrentPartHeader.Bytes, 0, FCurrentPartHeader.Size - 4{#13#10#13#10});
             FCurrentPartHeader.Clear;
             FCurrentPartField := TFormField.Create;
-            FCurrentPartField.AutoDeleteFile := FAutoDeleteFiles;
             __InitFormFieldByHeader(FCurrentPartField, LPartHeader);
             FPartFields.Add(FCurrentPartField);
 
@@ -1694,6 +1709,11 @@ function TSessionBase.Expired: Boolean;
   Result := (Now.SecondsDiffer(LastAccessTime) >= ExpiryTime);
 end;
 
+procedure TSessionBase.Touch;
+begin
+  LastAccessTime := Now;
+end;
+
 { TSession }
 
 constructor TSession.Create(const ASessionID: string);

diff --git a/Net/Net.CrossHttpRouter.pas b/Net/Net.CrossHttpRouter.pas
@@ -41,6 +41,17 @@   TNetCrossRouter = class
     ///   本地目录
     /// </param>
     class function Dir(const APath, ALocalDir, ADirParamName: string): TCrossHttpRouterProc2; static;
+
+    /// <summary>
+    ///   含有默认首页文件的静态文件路由
+    /// </summary>
+    /// <param name="ALocalDir">
+    ///   含有默认首页文件的本地目录
+    /// </param>
+    /// <param name="ADefIndexFiles">
+    ///   默认的首页文件,按顺序选择,先找到哪个就使用哪个
+    /// </param>
+    class function Index(const ALocalDir, AFileParamName: string; const ADefIndexFiles: TArray<string>): TCrossHttpRouterProc2; static;
   end;
 
 implementation
@@ -50,6 +61,58 @@ implementation
 
 { TNetCrossRouter }
 
+class function TNetCrossRouter.Index(const ALocalDir, AFileParamName: string;
+  const ADefIndexFiles: TArray<string>): TCrossHttpRouterProc2;
+var
+  LDefIndexFiles: TArray<string>;
+begin
+  if (ADefIndexFiles <> nil) then
+    LDefIndexFiles := ADefIndexFiles
+  else
+    LDefIndexFiles := [
+      'index.html',
+      'main.html',
+      'index.js',
+      'main.js',
+      'index.htm',
+      'main.htm'
+    ];
+
+  Result :=
+    procedure(ARequest: ICrossHttpRequest; AResponse: ICrossHttpResponse; var AHandled: Boolean)
+    var
+      LPath, LFile, LDefMainFile: string;
+    begin
+      LPath := ALocalDir;
+      LFile := ARequest.Params[AFileParamName];
+
+      if (LFile = '') then
+      begin
+        for LDefMainFile in LDefIndexFiles do
+        begin
+          LFile := TPath.Combine(LPath, LDefMainFile);
+          if TFile.Exists(LFile) then
+          begin
+            AResponse.SendFile(LFile);
+            AHandled := True;
+            Exit;
+          end;
+        end;
+      end else
+      begin
+        LFile := TPath.Combine(LPath, LFile);
+        if TFile.Exists(LFile) then
+        begin
+          AResponse.SendFile(LFile);
+          AHandled := True;
+          Exit;
+        end;
+      end;
+
+      AHandled := False;
+    end;
+end;
+
 class function TNetCrossRouter.Static(
   const ALocalDir, AFileParamName: string): TCrossHttpRouterProc2;
 begin
@@ -173,8 +236,8 @@ function BuildDirList(const ARealPath, ARequestPath, AHome: string): string;
     LPath := _NormalizePath(APath);
     LHome := _NormalizePath(AHome);
 
-    LPathArr := LPath.Split(['/', '\'], ExcludeEmpty);
-    LHomeArr := LHome.Split(['/', '\'], ExcludeEmpty);
+    LPathArr := LPath.Split(['/', '\'], TStringSplitOptions.ExcludeEmpty);
+    LHomeArr := LHome.Split(['/', '\'], TStringSplitOptions.ExcludeEmpty);
     if Length(LHomeArr) > Length(LPathArr) then Exit('');
 
     I := 0;