when Wine is detected, fallback to our useHttpAsync server

- http.sys emulation is far away from stable and efficient IIRC
synopse · Jul 26, 2022 · 8663a3f · 8663a3f
1 parent 4488c01
commit 8663a3f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 25 deletions.
diff --git a/src/mormot.commit.inc b/src/mormot.commit.inc
@@ -1 +1 @@
-'2.0.3778'
+'2.0.3779'
diff --git a/src/rest/mormot.rest.http.server.pas b/src/rest/mormot.rest.http.server.pas
@@ -782,32 +782,35 @@ constructor TRestHttpServer.Create(const aPort: RawUtf8;
   //include(hso, hsoHeadersInterning);
   {$ifdef USEHTTPSYS}
   if aUse in HTTP_API_MODES then
-  try
     if PosEx('Wine', OSVersionInfoEx) > 0 then
-      log.Log(sllWarning, '%: httpapi probably not well supported on % -> ' +
-        'try useHttpSocket/useHttpAsync',
-        [ToText(aUse)^, OSVersionInfoEx], self);
-    // first try to use fastest http.sys
-    fHttpServer := THttpApiServer.Create(aQueueName, HttpThreadStart,
-      HttpThreadTerminate, TrimU(fDBServerNames), hso);
-    for i := 0 to high(aServers) do
-      HttpApiAddUri(aServers[i].Model.Root, fDomainName, aSecurity,
-        fUse in HTTP_API_REGISTERING_MODES, true);
-    if aAdditionalUrl <> '' then
-      HttpApiAddUri(aAdditionalUrl, fDomainName, aSecurity,
-        fUse in HTTP_API_REGISTERING_MODES, true);
-  except
-    on E: Exception do
     begin
-      log.Log(sllError, '% for % % at%  -> fallback to socket-based server',
-        [E, ToText(aUse)^, fHttpServer, fDBServerNames], self);
-      FreeAndNilSafe(fHttpServer); // if http.sys initialization failed
-      if fUse in [useHttpApiOnly, useHttpApiRegisteringURIOnly] then
-        // propagate fatal exception with no fallback to the sockets HTTP server
-        raise;
-      aUse := useHttpSocket; // conservative: useHttpAsync is less mature on Win
+      log.Log(sllWarning, '%: httpapi probably not well supported on % -> ' +
+        'fallback to useHttpAsync', [ToText(aUse)^, OSVersionInfoEx], self);
+      aUse := useHttpAsync; // the closest server we have using sockets
+    end
+    else
+    try
+      // first try to use fastest http.sys
+      fHttpServer := THttpApiServer.Create(aQueueName, HttpThreadStart,
+        HttpThreadTerminate, TrimU(fDBServerNames), hso);
+      for i := 0 to high(aServers) do
+        HttpApiAddUri(aServers[i].Model.Root, fDomainName, aSecurity,
+          fUse in HTTP_API_REGISTERING_MODES, true);
+      if aAdditionalUrl <> '' then
+        HttpApiAddUri(aAdditionalUrl, fDomainName, aSecurity,
+          fUse in HTTP_API_REGISTERING_MODES, true);
+    except
+      on E: Exception do
+      begin
+        log.Log(sllError, '% for % % at%  -> fallback to socket-based server',
+          [E, ToText(aUse)^, fHttpServer, fDBServerNames], self);
+        FreeAndNilSafe(fHttpServer); // if http.sys initialization failed
+        if fUse in [useHttpApiOnly, useHttpApiRegisteringURIOnly] then
+          // propagate fatal exception with no fallback to the sockets server
+          raise;
+        aUse := useHttpSocket; // conservative: useHttpAsync less mature on Win
+      end;
     end;
-  end;
   {$endif USEHTTPSYS}
   if fHttpServer = nil then
   begin
@@ -821,7 +824,7 @@ constructor TRestHttpServer.Create(const aPort: RawUtf8;
         [self, fDBServerNames, ToText(aUse)^]);
     if aSecurity = secTLSSelfSigned then
     begin
-      InitNetTlsContextSelfSignedServer(net {, caaES256});
+      InitNetTlsContextSelfSignedServer(net {, caaES256}); // RSA is more common
       tls := @net;
     end;
     try