From 9726c2bcf07672c91d61dd9dcd48003dfc3d8354 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 24 Aug 2022 19:40:11 +0200
Subject: proxy: T4642: bugfix regex, add hyphen to allow list

(cherry picked from commit bfa13e367d0b77105ba350a34da8212859f07f59)
---
 interface-definitions/system-proxy.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface-definitions/system-proxy.xml.in b/interface-definitions/system-proxy.xml.in
index 791f41f2f..4e1094530 100644
--- a/interface-definitions/system-proxy.xml.in
+++ b/interface-definitions/system-proxy.xml.in
@@ -11,7 +11,7 @@
             <properties>
               <help>Proxy URL</help>
               <constraint>
-                <regex>http:\/\/[a-z0-9\.]+$</regex>
+                <regex>http:\/\/[a-z0-9-\.]+$</regex>
               </constraint>
             </properties>
           </leafNode>
-- 
cgit v1.2.3


From b7a8bb3981216ee29bb45ac5b9650b9ce9a16778 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 25 Aug 2022 18:59:00 +0200
Subject: proxy: T4642: allow https proxy transports

(cherry picked from commit 73be77ec42d06a369974bfb1255839164f73c276)
---
 interface-definitions/system-proxy.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface-definitions/system-proxy.xml.in b/interface-definitions/system-proxy.xml.in
index 4e1094530..abd29ea22 100644
--- a/interface-definitions/system-proxy.xml.in
+++ b/interface-definitions/system-proxy.xml.in
@@ -11,7 +11,7 @@
             <properties>
               <help>Proxy URL</help>
               <constraint>
-                <regex>http:\/\/[a-z0-9-\.]+$</regex>
+                <regex>http(s)?:\/\/[a-z0-9-\.]+$</regex>
               </constraint>
             </properties>
           </leafNode>
-- 
cgit v1.2.3