Skip to content

Commit

Permalink
Update quiche, add another quiche patch
Browse files Browse the repository at this point in the history
  • Loading branch information
patrikjuvonen committed Aug 29, 2023
1 parent dd7c023 commit 25893eb
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
FROM alpine:edge AS deps

ARG NGINX_VERSION=1.23.4
ARG QUICHE_CHECKOUT=7ab6a55cfe471267d61e4d28ba43d41defcd87e0
ARG QUICHE_CHECKOUT=e6ca4da17c1d93e3adfb92834db863fd735410f1
ARG MODSEC_TAG=v3/master
ARG MODSEC_NGX_TAG=master
ARG NJS_TAG=0.7.12
Expand Down Expand Up @@ -174,8 +174,9 @@ RUN git clone --depth=1 https://github.com/coreruleset/coreruleset /usr/local/sh
&& cp /usr/local/share/coreruleset/crs-setup.conf.example /usr/local/share/coreruleset/crs-setup.conf

FROM deps AS clone_nginx
COPY nginx.patch /usr/src/nginx.patch
RUN set -eux \
&& wget -q https://raw.githubusercontent.com/kn007/patch/1062e64ead7e1b21a52392cdd02d1d5bc631d231/nginx_with_quic.patch \
&& wget -q https://raw.githubusercontent.com/kn007/patch/ce70f81a3098afe0e27a8e579b77b6fb32870c54/nginx_with_quic.patch \
&& wget -q https://raw.githubusercontent.com/kn007/patch/cd03b77647c9bf7179acac0125151a0fbb4ac7c8/Enable_BoringSSL_OCSP.patch \
&& wget -qO nginx.tar.gz https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz \
&& wget -qO nginx.tar.gz.asc https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc \
Expand All @@ -197,7 +198,8 @@ RUN set -eux \
&& rm nginx.tar.gz \
&& cd /usr/src/nginx-$NGINX_VERSION \
&& patch -p01 < /usr/src/nginx_with_quic.patch \
&& patch -p01 < /usr/src/Enable_BoringSSL_OCSP.patch
&& patch -p01 < /usr/src/Enable_BoringSSL_OCSP.patch \
&& patch -p01 < /usr/src/nginx.patch

FROM deps AS builder
COPY --from=clone_nginx /usr/src/nginx-$NGINX_VERSION /usr/src/nginx-$NGINX_VERSION
Expand Down
14 changes: 14 additions & 0 deletions nginx.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/src/http/v3/ngx_http_v3.c b/src/http/v3/ngx_http_v3.c
index 77f04f1..de3d044 100644
--- a/src/http/v3/ngx_http_v3.c
+++ b/src/http/v3/ngx_http_v3.c
@@ -462,9 +462,6 @@ ngx_http_v3_handler(ngx_connection_t *c)
case QUICHE_H3_EVENT_PRIORITY_UPDATE:
break;

- case QUICHE_H3_EVENT_DATAGRAM:
- break;
-
case QUICHE_H3_EVENT_GOAWAY:
break;
}

0 comments on commit 25893eb

Please sign in to comment.