summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Griffis <pgriffis@igalia.com>2021-05-17 10:50:25 -0500
committerPatrick Griffis <pgriffis@igalia.com>2021-05-17 10:50:25 -0500
commit700340cb901be6c8dbd0aec06f739f96ab8dd558 (patch)
tree7f354cf17d3b9420821ba904545a8082fbcd7f84
parent4676a06504fd1d9131fcc23c543e676b91d3a3e8 (diff)
downloadlibsoup-700340cb901be6c8dbd0aec06f739f96ab8dd558.tar.gz
Add SOUP_ENABLE_HTTP2 env var
HTTP2 will be disabled by default and can be opt-in by setting this env var to any value.
-rw-r--r--libsoup/soup-session.c5
-rw-r--r--tests/http2-test.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index 80a1bb0a..f2ac9876 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -1788,8 +1788,9 @@ get_connection_for_host (SoupSession *session,
return conn;
}
- force_http1 = soup_message_get_force_http1 (item->msg);
- if (g_getenv ("SOUP_FORCE_HTTP1"))
+ if (g_getenv ("SOUP_ENABLE_HTTP2"))
+ force_http1 = soup_message_get_force_http1 (item->msg);
+ else
force_http1 = TRUE;
for (conns = host->connections; conns; conns = conns->next) {
diff --git a/tests/http2-test.c b/tests/http2-test.c
index f7828bfc..d5c75c43 100644
--- a/tests/http2-test.c
+++ b/tests/http2-test.c
@@ -561,6 +561,8 @@ 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,