[WASI] HTTP trailers

src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs

@@ -106,7 +106,7 @@ public static bool OpenSslPresentOnSystem
         {
             get
             {
-                if (IsWindows || IsAndroid || UsesMobileAppleCrypto || IsBrowser)
+                if (IsWindows || IsAndroid || UsesMobileAppleCrypto || IsBrowser || IsWasi)
                 {
                     return false;
                 }

src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttp.cs

@@ -1,4 +1,4 @@
-// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT!
+// Generated by `wit-bindgen` 0.32.0. DO NOT EDIT!
 // <auto-generated />
 #nullable enable
 using System;

src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpHandler.cs

@@ -60,18 +60,20 @@ public async Task<HttpResponseMessage> SendRequestAsync(HttpRequestMessage reque
                 // we will leave scope of this method
                 // we need to pass the ownership of the request and this wrapper to the response (via response content stream)
                 // unless we know that we are not streaming anymore
-                incomingStream = new WasiInputStream(this, incomingResponse.Consume());// passing self ownership, passing body ownership
+                incomingStream = new WasiInputStream(this, incomingResponse.Consume(), response);// passing self ownership, passing body ownership
                 response.Content = new StreamContent(incomingStream); // passing incomingStream ownership to SendAsync() caller
                 WasiHttpInterop.ConvertResponseHeaders(incomingResponse, response);
 
                 return response;
             }
             catch (WitException e)
             {
+                Dispose();
                 throw new HttpRequestException(WasiHttpInterop.ErrorCodeToString((ErrorCode)e.Value), e);
             }
             catch (Exception)
             {
+                Dispose();
                 throw;
             }
         }

src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpInterop.cs

@@ -178,6 +178,16 @@ public static void ConvertResponseHeaders(IncomingResponse incomingResponse, Htt
             }
         }
 
+        public static HttpResponseHeaders ConvertTrailingResponseHeaders(Fields headers)
+        {
+            var result = new HttpResponseHeaders();
+            foreach ((var key, var value) in headers.Entries())
+            {
+                result.Add(key, Encoding.UTF8.GetString(value));
+            }
+            return result;
+        }
+
         private static bool IsContentHeader(string headerName)
         {
             return HeaderDescriptor.TryGet(headerName, out HeaderDescriptor descriptor) && (descriptor.HeaderType & HttpHeaderType.Content) != 0;

src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.clocks.v0_2_1.MonotonicClockInterop.cs

@@ -1,4 +1,4 @@
-// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT!
+// Generated by `wit-bindgen` 0.32.0. DO NOT EDIT!
 // <auto-generated />
 #nullable enable
 

src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.ITypes.cs

@@ -1,4 +1,4 @@
-// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT!
+// Generated by `wit-bindgen` 0.32.0. DO NOT EDIT!
 // <auto-generated />
 #nullable enable
 
@@ -605,23 +605,18 @@ internal Fields(THandle handle) {
 
         public void Dispose() {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         [DllImport("wasi:http/[email protected]", EntryPoint = "[resource-drop]fields"), WasmImportLinkage]
         private static extern void wasmImportResourceDrop(int p0);
 
         protected virtual void Dispose(bool disposing) {
-            if (Handle != 0) {
+            if (disposing && Handle != 0) {
                 wasmImportResourceDrop(Handle);
                 Handle = 0;
             }
         }
 
-        ~Fields() {
-            Dispose(false);
-        }
-
         internal static class ConstructorWasmInterop
         {
             [DllImport("wasi:http/[email protected]", EntryPoint = "[constructor]fields"), WasmImportLinkage]
@@ -1071,23 +1066,18 @@ internal IncomingRequest(THandle handle) {
 
         public void Dispose() {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         [DllImport("wasi:http/[email protected]", EntryPoint = "[resource-drop]incoming-request"), WasmImportLinkage]
         private static extern void wasmImportResourceDrop(int p0);
 
         protected virtual void Dispose(bool disposing) {
-            if (Handle != 0) {
+            if (disposing && Handle != 0) {
                 wasmImportResourceDrop(Handle);
                 Handle = 0;
             }
         }
 
-        ~IncomingRequest() {
-            Dispose(false);
-        }
-
         internal static class MethodWasmInterop
         {
             [DllImport("wasi:http/[email protected]", EntryPoint = "[method]incoming-request.method"), WasmImportLinkage]
@@ -1385,23 +1375,18 @@ internal OutgoingRequest(THandle handle) {
 
         public void Dispose() {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         [DllImport("wasi:http/[email protected]", EntryPoint = "[resource-drop]outgoing-request"), WasmImportLinkage]
         private static extern void wasmImportResourceDrop(int p0);
 
         protected virtual void Dispose(bool disposing) {
-            if (Handle != 0) {
+            if (disposing && Handle != 0) {
                 wasmImportResourceDrop(Handle);
                 Handle = 0;
             }
         }
 
-        ~OutgoingRequest() {
-            Dispose(false);
-        }
-
         internal static class ConstructorWasmInterop
         {
             [DllImport("wasi:http/[email protected]", EntryPoint = "[constructor]outgoing-request"), WasmImportLinkage]
@@ -2069,23 +2054,18 @@ internal RequestOptions(THandle handle) {
 
         public void Dispose() {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         [DllImport("wasi:http/[email protected]", EntryPoint = "[resource-drop]request-options"), WasmImportLinkage]
         private static extern void wasmImportResourceDrop(int p0);
 
         protected virtual void Dispose(bool disposing) {
-            if (Handle != 0) {
+            if (disposing && Handle != 0) {
                 wasmImportResourceDrop(Handle);
                 Handle = 0;
             }
         }
 
-        ~RequestOptions() {
-            Dispose(false);
-        }
-
         internal static class ConstructorWasmInterop
         {
             [DllImport("wasi:http/[email protected]", EntryPoint = "[constructor]request-options"), WasmImportLinkage]
@@ -2401,23 +2381,18 @@ internal ResponseOutparam(THandle handle) {
 
         public void Dispose() {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         [DllImport("wasi:http/[email protected]", EntryPoint = "[resource-drop]response-outparam"), WasmImportLinkage]
         private static extern void wasmImportResourceDrop(int p0);
 
         protected virtual void Dispose(bool disposing) {
-            if (Handle != 0) {
+            if (disposing && Handle != 0) {
                 wasmImportResourceDrop(Handle);
                 Handle = 0;
             }
         }
 
-        ~ResponseOutparam() {
-            Dispose(false);
-        }
-
         internal static class SetWasmInterop
         {
             [DllImport("wasi:http/[email protected]", EntryPoint = "[static]response-outparam.set"), WasmImportLinkage]
@@ -3409,23 +3384,18 @@ internal IncomingResponse(THandle handle) {
 
         public void Dispose() {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         [DllImport("wasi:http/[email protected]", EntryPoint = "[resource-drop]incoming-response"), WasmImportLinkage]
         private static extern void wasmImportResourceDrop(int p0);
 
         protected virtual void Dispose(bool disposing) {
-            if (Handle != 0) {
+            if (disposing && Handle != 0) {
                 wasmImportResourceDrop(Handle);
                 Handle = 0;
             }
         }
 
-        ~IncomingResponse() {
-            Dispose(false);
-        }
-
         internal static class StatusWasmInterop
         {
             [DllImport("wasi:http/[email protected]", EntryPoint = "[method]incoming-response.status"), WasmImportLinkage]
@@ -3528,23 +3498,18 @@ internal IncomingBody(THandle handle) {
 
         public void Dispose() {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         [DllImport("wasi:http/[email protected]", EntryPoint = "[resource-drop]incoming-body"), WasmImportLinkage]
         private static extern void wasmImportResourceDrop(int p0);
 
         protected virtual void Dispose(bool disposing) {
-            if (Handle != 0) {
+            if (disposing && Handle != 0) {
                 wasmImportResourceDrop(Handle);
                 Handle = 0;
             }
         }
 
-        ~IncomingBody() {
-            Dispose(false);
-        }
-
         internal static class StreamWasmInterop
         {
             [DllImport("wasi:http/[email protected]", EntryPoint = "[method]incoming-body.stream"), WasmImportLinkage]
@@ -3629,23 +3594,18 @@ internal FutureTrailers(THandle handle) {
 
         public void Dispose() {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         [DllImport("wasi:http/[email protected]", EntryPoint = "[resource-drop]future-trailers"), WasmImportLinkage]
         private static extern void wasmImportResourceDrop(int p0);
 
         protected virtual void Dispose(bool disposing) {
-            if (Handle != 0) {
+            if (disposing && Handle != 0) {
                 wasmImportResourceDrop(Handle);
                 Handle = 0;
             }
         }
 
-        ~FutureTrailers() {
-            Dispose(false);
-        }
-
         internal static class SubscribeWasmInterop
         {
             [DllImport("wasi:http/[email protected]", EntryPoint = "[method]future-trailers.subscribe"), WasmImportLinkage]
@@ -4353,23 +4313,18 @@ internal OutgoingResponse(THandle handle) {
 
         public void Dispose() {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         [DllImport("wasi:http/[email protected]", EntryPoint = "[resource-drop]outgoing-response"), WasmImportLinkage]
         private static extern void wasmImportResourceDrop(int p0);
 
         protected virtual void Dispose(bool disposing) {
-            if (Handle != 0) {
+            if (disposing && Handle != 0) {
                 wasmImportResourceDrop(Handle);
                 Handle = 0;
             }
         }
 
-        ~OutgoingResponse() {
-            Dispose(false);
-        }
-
         internal static class ConstructorWasmInterop
         {
             [DllImport("wasi:http/[email protected]", EntryPoint = "[constructor]outgoing-response"), WasmImportLinkage]
@@ -4535,23 +4490,18 @@ internal OutgoingBody(THandle handle) {
 
         public void Dispose() {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         [DllImport("wasi:http/[email protected]", EntryPoint = "[resource-drop]outgoing-body"), WasmImportLinkage]
         private static extern void wasmImportResourceDrop(int p0);
 
         protected virtual void Dispose(bool disposing) {
-            if (Handle != 0) {
+            if (disposing && Handle != 0) {
                 wasmImportResourceDrop(Handle);
                 Handle = 0;
             }
         }
 
-        ~OutgoingBody() {
-            Dispose(false);
-        }
-
         internal static class WriteWasmInterop
         {
             [DllImport("wasi:http/[email protected]", EntryPoint = "[method]outgoing-body.write"), WasmImportLinkage]
@@ -5263,23 +5213,18 @@ internal FutureIncomingResponse(THandle handle) {
 
         public void Dispose() {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         [DllImport("wasi:http/[email protected]", EntryPoint = "[resource-drop]future-incoming-response"), WasmImportLinkage]
         private static extern void wasmImportResourceDrop(int p0);
 
         protected virtual void Dispose(bool disposing) {
-            if (Handle != 0) {
+            if (disposing && Handle != 0) {
                 wasmImportResourceDrop(Handle);
                 Handle = 0;
             }
         }
 
-        ~FutureIncomingResponse() {
-            Dispose(false);
-        }
-
         internal static class SubscribeWasmInterop
         {
             [DllImport("wasi:http/[email protected]", EntryPoint = "[method]future-incoming-response.subscribe"), WasmImportLinkage]

src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.OutgoingHandlerInterop.cs

@@ -1,4 +1,4 @@
-// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT!
+// Generated by `wit-bindgen` 0.32.0. DO NOT EDIT!
 // <auto-generated />
 #nullable enable
 

src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.http.v0_2_1.TypesInterop.cs

@@ -1,4 +1,4 @@
-// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT!
+// Generated by `wit-bindgen` 0.32.0. DO NOT EDIT!
 // <auto-generated />
 #nullable enable
 

src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.ErrorInterop.cs

@@ -1,4 +1,4 @@
-// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT!
+// Generated by `wit-bindgen` 0.32.0. DO NOT EDIT!
 // <auto-generated />
 #nullable enable
 

src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld.wit.imports.wasi.io.v0_2_1.IError.cs

@@ -1,4 +1,4 @@
-// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT!
+// Generated by `wit-bindgen` 0.32.0. DO NOT EDIT!
 // <auto-generated />
 #nullable enable
 
@@ -46,23 +46,18 @@ internal Error(THandle handle) {
 
         public void Dispose() {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         [DllImport("wasi:io/[email protected]", EntryPoint = "[resource-drop]error"), WasmImportLinkage]
         private static extern void wasmImportResourceDrop(int p0);
 
         protected virtual void Dispose(bool disposing) {
-            if (Handle != 0) {
+            if (disposing && Handle != 0) {
                 wasmImportResourceDrop(Handle);
                 Handle = 0;
             }
         }
 
-        ~Error() {
-            Dispose(false);
-        }
-
         internal static class ToDebugStringWasmInterop
         {
             [DllImport("wasi:io/[email protected]", EntryPoint = "[method]error.to-debug-string"), WasmImportLinkage]