summaryrefslogtreecommitdiffhomepage
path: root/auto
diff options
context:
space:
mode:
authorRoman Arutyunyan <arut@nginx.com>2020-07-21 23:09:22 +0300
committerRoman Arutyunyan <arut@nginx.com>2020-07-21 23:09:22 +0300
commitb813b9ec358862a2a94868bc057420d6eca5c05d (patch)
tree57c250cf526c85f6d1a7889f65110daa9cb7e57b /auto
parenta305de07e934dd1ff21111d0314821a34880ab13 (diff)
downloadnginx-b813b9ec358862a2a94868bc057420d6eca5c05d.tar.gz
nginx-b813b9ec358862a2a94868bc057420d6eca5c05d.tar.bz2
QUIC: added "quic" listen parameter.
The parameter allows processing HTTP/0.9-2 over QUIC. Also, introduced ngx_http_quic_module and moved QUIC settings there
Diffstat (limited to 'auto')
-rw-r--r--auto/lib/openssl/conf1
-rw-r--r--auto/modules20
-rw-r--r--auto/options3
3 files changed, 20 insertions, 4 deletions
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index f4dcab725..94ccd5795 100644
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -166,6 +166,7 @@ END
exit 1
fi
+ have=NGX_QUIC . auto/have
fi
diff --git a/auto/modules b/auto/modules
index 67339e7fa..2bcc06e62 100644
--- a/auto/modules
+++ b/auto/modules
@@ -404,12 +404,9 @@ if [ $HTTP = YES ]; then
ngx_module_type=HTTP
if [ $HTTP_V3 = YES ]; then
- USE_OPENSSL=YES
- USE_OPENSSL_QUIC=YES
have=NGX_HTTP_V3 . auto/have
have=NGX_HTTP_HEADERS . auto/have
-
- HTTP_SSL=YES
+ HTTP_QUIC=YES
# XXX for Huffman
HTTP_V2=YES
@@ -696,6 +693,21 @@ if [ $HTTP = YES ]; then
. auto/module
fi
+ if [ $HTTP_QUIC = YES ]; then
+ USE_OPENSSL_QUIC=YES
+ have=NGX_HTTP_QUIC . auto/have
+ HTTP_SSL=YES
+
+ ngx_module_name=ngx_http_quic_module
+ ngx_module_incs=
+ ngx_module_deps=src/http/modules/ngx_http_quic_module.h
+ ngx_module_srcs=src/http/modules/ngx_http_quic_module.c
+ ngx_module_libs=
+ ngx_module_link=$HTTP_QUIC
+
+ . auto/module
+ fi
+
if [ $HTTP_SSL = YES ]; then
USE_OPENSSL=YES
have=NGX_HTTP_SSL . auto/have
diff --git a/auto/options b/auto/options
index ddb861783..a1ca80ce5 100644
--- a/auto/options
+++ b/auto/options
@@ -58,6 +58,7 @@ HTTP_CACHE=YES
HTTP_CHARSET=YES
HTTP_GZIP=YES
HTTP_SSL=NO
+HTTP_QUIC=NO
HTTP_V2=NO
HTTP_V3=NO
HTTP_SSI=YES
@@ -225,6 +226,7 @@ $0: warning: the \"--with-ipv6\" option is deprecated"
--http-scgi-temp-path=*) NGX_HTTP_SCGI_TEMP_PATH="$value" ;;
--with-http_ssl_module) HTTP_SSL=YES ;;
+ --with-http_quic_module) HTTP_QUIC=YES ;;
--with-http_v2_module) HTTP_V2=YES ;;
--with-http_v3_module) HTTP_V3=YES ;;
--with-http_realip_module) HTTP_REALIP=YES ;;
@@ -441,6 +443,7 @@ cat << END
--with-file-aio enable file AIO support
--with-http_ssl_module enable ngx_http_ssl_module
+ --with-http_quic_module enable ngx_http_quic_module
--with-http_v2_module enable ngx_http_v2_module
--with-http_v3_module enable ngx_http_v3_module
--with-http_realip_module enable ngx_http_realip_module