Changeset 469 for TFP-WebServer/SpaceWizards.HttpListener/src/System/Net

Timestamp:

Aug 19, 2023, 9:44:10 PM (15 months ago)

Author:

alloc

Message:

21.1.16.4 Release
Webserver forces query parameter decoding to use UTF-8
All mods built with portable debugging symbols

File:

• TFP-WebServer/SpaceWizards.HttpListener/src/System/Net/HttpListenerRequest.cs (modified) (4 diffs)

TFP-WebServer/SpaceWizards.HttpListener/src/System/Net/HttpListenerRequest.cs

@@ -78 +78 @@
         }
 
+        // TFP: Added to manually set the encoding used for the query parameters
+        private Encoding contentEncoding;
         public Encoding ContentEncoding
         {
             get
             {
+                if (contentEncoding != null) {
+                    return contentEncoding;
+                }
+                
                 if (UserAgent != null && CultureInfo.InvariantCulture.CompareInfo.IsPrefix(UserAgent, "UP"))
                 {
@@ -89 +95 @@
                         try
                         {
-                            return Encoding.GetEncoding(postDataCharset);
+                            contentEncoding = Encoding.GetEncoding(postDataCharset);
+                            return contentEncoding;
                         }
                         catch (ArgumentException)
@@ -105 +112 @@
                             try
                             {
-                                return Encoding.GetEncoding(charSet);
+                                contentEncoding = Encoding.GetEncoding(charSet);
+                                return contentEncoding;
                             }
                             catch (ArgumentException)
@@ -113 +121 @@
                     }
                 }
-                return Encoding.Default;
+                contentEncoding = Encoding.Default;
+                return contentEncoding;
+            }
+            set
+            {
+                contentEncoding = value;
             }
         }