summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/access/access.pro
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@theqtcompany.com>2016-08-04 14:40:33 +0200
committerTimur Pocheptsov <timur.pocheptsov@theqtcompany.com>2016-08-11 15:38:20 +0000
commit69ff49e8f1885b48e14efdd5e58d3e780c63c727 (patch)
tree74caf5b83865275fd3ba97b77b7edc933ce54ffe /tests/auto/network/access/access.pro
parent193abdfc0798cf10eac06769b650ac03e86eb55e (diff)
Enable cleartext HTTP/2 and bring the auto-test back to life
HTTP/2 does not require TLS connection, it can work in a cleartext mode. Plus at the moment only OpenSSL backend allows HTTP/2 negotiation via ALPN/NPN (and none of our CI configurations with OpenSSL supports these extensions, rendering HTTP/2 auto-test useless). This patch implements cleartext HTTP/2 ('h2c') in 'direct' mode - this is allowed if a client has a prior knowledge that HTTP/2 is supported by a server. Change-Id: I4978775e9732c40bc77f549b83bb4a5d1761887e Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/network/access/access.pro')
-rw-r--r--tests/auto/network/access/access.pro13
1 files changed, 4 insertions, 9 deletions
diff --git a/tests/auto/network/access/access.pro b/tests/auto/network/access/access.pro
index ef0aeac3c8..58cfd781a9 100644
--- a/tests/auto/network/access/access.pro
+++ b/tests/auto/network/access/access.pro
@@ -12,17 +12,12 @@ SUBDIRS=\
qftp \
qhttpnetworkreply \
qabstractnetworkcache \
- hpack
+ hpack \
+ http2
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
qhttpnetworkconnection \
qhttpnetworkreply \
qftp \
- hpack
-
-contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
- contains(QT_CONFIG, private_tests) {
- SUBDIRS += \
- http2
- }
-}
+ hpack \
+ http2