From ad3a632927c06e5ed7d4b14ca3a6dd95a2e6c720 Mon Sep 17 00:00:00 2001 From: Joseph Cloutier Date: Fri, 3 Jun 2022 23:14:16 -0400 Subject: [PATCH 1/2] Only call `buildBuffer()` when needed. Turns out, `HTTPRequest`'s call is only needed for internet requests. Files on the local machine will be loaded directly into `bytes`, leaving `buffer` empty. Calling `buildBuffer()` will then delete the data. --- src/lime/_internal/backend/native/NativeHTTPRequest.hx | 2 +- src/lime/net/HTTPRequest.hx | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/lime/_internal/backend/native/NativeHTTPRequest.hx b/src/lime/_internal/backend/native/NativeHTTPRequest.hx index 92e4d737e..d0c8a0674 100644 --- a/src/lime/_internal/backend/native/NativeHTTPRequest.hx +++ b/src/lime/_internal/backend/native/NativeHTTPRequest.hx @@ -571,7 +571,7 @@ class NativeHTTPRequest { if (!instance.promise.isError) { - instance.promise.complete(instance.bytes); + instance.promise.complete(instance.buildBuffer()); } } else if (instance.bytes != null) diff --git a/src/lime/net/HTTPRequest.hx b/src/lime/net/HTTPRequest.hx index f86e02aca..ce5a0eaa7 100644 --- a/src/lime/net/HTTPRequest.hx +++ b/src/lime/net/HTTPRequest.hx @@ -110,10 +110,6 @@ public function load(uri:String = null):Future future.onComplete(function(bytes) { - #if sys - bytes = @:privateAccess __backend.buildBuffer(); - #end - responseData = fromBytes(bytes); promise.complete(responseData); }); From 17232fd7dceb570562b1ad31ce7c3745daf1656a Mon Sep 17 00:00:00 2001 From: Joseph Cloutier Date: Fri, 3 Jun 2022 23:14:27 -0400 Subject: [PATCH 2/2] Remove trailing whitespace. --- src/lime/_internal/backend/native/NativeHTTPRequest.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lime/_internal/backend/native/NativeHTTPRequest.hx b/src/lime/_internal/backend/native/NativeHTTPRequest.hx index d0c8a0674..f9dedf9af 100644 --- a/src/lime/_internal/backend/native/NativeHTTPRequest.hx +++ b/src/lime/_internal/backend/native/NativeHTTPRequest.hx @@ -42,7 +42,7 @@ class NativeHTTPRequest private static var multiAddHandle:Deque; #end private static var cookieList:Array; - + private var buffer:BytesBuffer = new BytesBuffer(); private var bytes:Bytes; private var bytesLoaded:Int; @@ -362,12 +362,12 @@ class NativeHTTPRequest return promise.future; } - + private function buildBuffer() { bytes = buffer.getBytes(); return bytes; } - + // Event Handlers private function curl_onHeader(curl:CURL, header:String):Void {