diff mbox series

hawkbit: Add more proxy environment variables

Message ID D074E6DD-682F-48DB-80D2-98B704FF9178@siemens.com
State Accepted
Headers show
Series hawkbit: Add more proxy environment variables | expand

Commit Message

Storm, Christian Dec. 19, 2023, 7:49 a.m. UTC 
As per https://everything.curl.dev/usingcurl/proxies/env,
{http,https}_proxy as well as {ALL,HTTPS}_PROXY environment
variables are valid.

Signed-off-by: Christian Storm <christian.storm@siemens.com>
---
 suricatta/server_hawkbit.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Stefano Babic Dec. 19, 2023, 2:56 p.m. UTC | #1 
On 19.12.23 08:49, 'Storm, Christian' via swupdate wrote:
> As per https://everything.curl.dev/usingcurl/proxies/env,
> {http,https}_proxy as well as {ALL,HTTPS}_PROXY environment
> variables are valid.
> 
> Signed-off-by: Christian Storm <christian.storm@siemens.com>
> ---
>   suricatta/server_hawkbit.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c
> index 572ee1e3..3e5f3bcb 100644
> --- a/suricatta/server_hawkbit.c
> +++ b/suricatta/server_hawkbit.c
> @@ -1848,7 +1848,9 @@ static server_op_res_t server_start(const char *fname, int argc, char *argv[])
>   			}
>   			if (channel_data_defaults.proxy == NULL) {
>   				if ((getenv("http_proxy") == NULL) &&
> -				    (getenv("all_proxy") == NULL)) {
> +				    (getenv("https_proxy") == NULL) &&
> +				    (getenv("HTTPS_PROXY") == NULL) &&
> +				    (getenv("ALL_PROXY") == NULL)) {
>   					ERROR("Should use proxy but no "
>   					      "proxy environment "
>   					      "variables nor proxy URL "


Applied to -master, thanks !

Best regards,
Stefano
diff mbox series

Patch

diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c
index 572ee1e3..3e5f3bcb 100644
--- a/suricatta/server_hawkbit.c
+++ b/suricatta/server_hawkbit.c
@@ -1848,7 +1848,9 @@  static server_op_res_t server_start(const char *fname, int argc, char *argv[])
 			}
 			if (channel_data_defaults.proxy == NULL) {
 				if ((getenv("http_proxy") == NULL) &&
-				    (getenv("all_proxy") == NULL)) {
+				    (getenv("https_proxy") == NULL) &&
+				    (getenv("HTTPS_PROXY") == NULL) &&
+				    (getenv("ALL_PROXY") == NULL)) {
 					ERROR("Should use proxy but no "
 					      "proxy environment "
 					      "variables nor proxy URL "