[libsoup] Enable HTTP/2 by default

[Carlos Garcia Campos <carlosgc src gnome org>]

commit 6cef69ae03732cad5d9aaf6eeedc49205153fa9c
Author: Carlos Garcia Campos <cgarcia igalia com>
Date:   Fri Jun 4 11:50:45 2021 +0200

    Enable HTTP/2 by default

 libsoup/soup-session.c | 6 +++---
 tests/http2-test.c     | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index 68d87fb0..37e3e5ea 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -1812,10 +1812,10 @@ get_connection_for_host (SoupSession *session,
                return conn;
        }
 
-        if (g_getenv ("SOUP_ENABLE_HTTP2"))
-                force_http1 = soup_message_get_force_http1 (item->msg);
-        else
+        if (g_getenv ("SOUP_FORCE_HTTP1"))
                 force_http1 = TRUE;
+        else
+                force_http1 = soup_message_get_force_http1 (item->msg);
 
        for (conns = host->connections; conns; conns = conns->next) {
                 SoupHTTPVersion http_version;
diff --git a/tests/http2-test.c b/tests/http2-test.c
index c19aa00f..5eef10b2 100644
--- a/tests/http2-test.c
+++ b/tests/http2-test.c
@@ -944,8 +944,6 @@ main (int argc, char **argv)
                 return 1;
         }
 
-        g_setenv ("SOUP_ENABLE_HTTP2", "1", TRUE);
-
         g_test_add ("/http2/basic/async", Test, NULL,
                     setup_session,
                     do_basic_async_test,