From 43063f33f54085484131da437e0d405c1911efed Mon Sep 17 00:00:00 2001 From: Raul Dias Date: Sat, 30 Oct 2021 12:17:10 -0300 Subject: [PATCH] Add Raw Format support Created Raw Format support based on issue #398 by @joekane101 --- src/WebHelpers.bas | 2 ++ src/WebResponse.cls | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/WebHelpers.bas b/src/WebHelpers.bas index 090f9c8e..0151d40e 100644 --- a/src/WebHelpers.bas +++ b/src/WebHelpers.bas @@ -356,6 +356,7 @@ End Enum ' @param FormUrlEncoded ' @param Xml ' @param Custom +' @param Raw ' @default PlainText '' Public Enum WebFormat @@ -363,6 +364,7 @@ Public Enum WebFormat Json = 1 FormUrlEncoded = 2 Xml = 3 + Raw = 4 Custom = 9 End Enum diff --git a/src/WebResponse.cls b/src/WebResponse.cls index a24a1ce7..a3ccae51 100644 --- a/src/WebResponse.cls +++ b/src/WebResponse.cls @@ -138,7 +138,7 @@ Public Sub CreateFromHttp(Client As WebClient, Request As WebRequest, Http As Ob Me.StatusCode = Http.Status Me.StatusDescription = Http.StatusText - Me.Content = Http.ResponseText + If Request.ResponseFormat <> WebFormat.Raw Then Me.Content = Http.ResponseText Me.Body = Http.ResponseBody web_LoadValues Http.GetAllResponseHeaders, Me.Content, Me.Body, Request @@ -302,7 +302,7 @@ End Function Private Sub web_LoadValues(web_Headers As String, web_Content As String, web_Body As Variant, web_Request As WebRequest) ' Convert content to data by format - If web_Request.ResponseFormat <> WebFormat.PlainText Then + If web_Request.ResponseFormat <> WebFormat.PlainText And web_Request.ResponseFormat <> WebFormat.Raw Then On Error Resume Next Set Me.Data = _ WebHelpers.ParseByFormat(web_Content, web_Request.ResponseFormat, web_Request.CustomResponseFormat, web_Body)