Upgrade baseline curl to 8.1.1 (#160)

* Upgrade baseline curl to 8.1.1

New curl version includes bugfixes, new options but mainly websocket
support which was long requested in curl impersonate. Upstream curl
reworked a lot of their http2 code which necessitated a lot of changes
on our side as well.

* Fix build on mac due to bad header priorities

On macos, clang gives priority to /usr/local/include
over locations specified with -isystem for some unknown reason. In turn
this causes clang to use the system's openssl, which conflicts with
curl-impersonate's boringssl headers.
To prevent that, disable curl's automatic conversion of -I flags to
-isystem.

* Upgrade zlib version

* Upgrade GitHub Mac runner to macos-12

* Upgrade nghttp2 version to 1.56.0

curl-8.1.1 uses an nghttp2 function that only exists in newer versions
of nghttp2.

chrome/Dockerfile

@@ -54,8 +54,8 @@ RUN mkdir boringssl/build/lib && \
     ln -s ../ssl/libssl.a boringssl/build/lib/libssl.a && \
     cp -R boringssl/include boringssl/build
 
-ARG NGHTTP2_VERSION=nghttp2-1.46.0
-ARG NGHTTP2_URL=https://github.com/nghttp2/nghttp2/releases/download/v1.46.0/nghttp2-1.46.0.tar.bz2
+ARG NGHTTP2_VERSION=nghttp2-1.56.0
+ARG NGHTTP2_URL=https://github.com/nghttp2/nghttp2/releases/download/v1.56.0/nghttp2-1.56.0.tar.bz2
 
 # Download nghttp2 for HTTP/2.0 support.
 RUN curl -o ${NGHTTP2_VERSION}.tar.bz2 -L ${NGHTTP2_URL}
@@ -67,7 +67,7 @@ RUN cd ${NGHTTP2_VERSION} && \
     make && make install
 
 # Download curl.
-ARG CURL_VERSION=curl-7.84.0
+ARG CURL_VERSION=curl-8.1.1
 RUN curl -o ${CURL_VERSION}.tar.xz https://curl.se/download/${CURL_VERSION}.tar.xz
 RUN tar xf ${CURL_VERSION}.tar.xz
 

chrome/Dockerfile.alpine

@@ -51,8 +51,8 @@ RUN mkdir boringssl/build/lib && \
     ln -s ../ssl/libssl.a boringssl/build/lib/libssl.a && \
     cp -R boringssl/include boringssl/build
 
-ARG NGHTTP2_VERSION=nghttp2-1.46.0
-ARG NGHTTP2_URL=https://github.com/nghttp2/nghttp2/releases/download/v1.46.0/nghttp2-1.46.0.tar.bz2
+ARG NGHTTP2_VERSION=nghttp2-1.56.0
+ARG NGHTTP2_URL=https://github.com/nghttp2/nghttp2/releases/download/v1.56.0/nghttp2-1.56.0.tar.bz2
 
 # Download nghttp2 for HTTP/2.0 support.
 RUN curl -o ${NGHTTP2_VERSION}.tar.bz2 -L ${NGHTTP2_URL}
@@ -64,7 +64,7 @@ RUN cd ${NGHTTP2_VERSION} && \
     make && make install
 
 # Download curl.
-ARG CURL_VERSION=curl-7.84.0
+ARG CURL_VERSION=curl-8.1.1
 RUN curl -o ${CURL_VERSION}.tar.xz https://curl.se/download/${CURL_VERSION}.tar.xz
 RUN tar xf ${CURL_VERSION}.tar.xz
 

chrome/curl_chrome100

@@ -21,6 +21,6 @@ dir=${0%/*}
     -H 'Accept-Encoding: gzip, deflate, br' \
     -H 'Accept-Language: en-US,en;q=0.9' \
     --http2 --false-start --compressed \
-    --tlsv1.2 --no-npn --alps \
+    --tlsv1.2 --alps \
     --cert-compression brotli \
     "$@"

chrome/curl_chrome101

@@ -21,6 +21,6 @@ dir=${0%/*}
     -H 'Accept-Encoding: gzip, deflate, br' \
     -H 'Accept-Language: en-US,en;q=0.9' \
     --http2 --false-start --compressed \
-    --tlsv1.2 --no-npn --alps \
+    --tlsv1.2 --alps \
     --cert-compression brotli \
     "$@"

chrome/curl_chrome104

@@ -21,6 +21,6 @@ dir=${0%/*}
     -H 'Accept-Encoding: gzip, deflate, br' \
     -H 'Accept-Language: en-US,en;q=0.9' \
     --http2 --false-start --compressed \
-    --tlsv1.2 --no-npn --alps \
+    --tlsv1.2 --alps \
     --cert-compression brotli \
     "$@"

chrome/curl_chrome107

@@ -21,6 +21,6 @@ dir=${0%/*}
     -H 'Accept-Encoding: gzip, deflate, br' \
     -H 'Accept-Language: en-US,en;q=0.9' \
     --http2 --http2-no-server-push --false-start --compressed \
-    --tlsv1.2 --no-npn --alps \
+    --tlsv1.2 --alps \
     --cert-compression brotli \
     "$@"

chrome/curl_chrome110

@@ -21,6 +21,6 @@ dir=${0%/*}
     -H 'Accept-Encoding: gzip, deflate, br' \
     -H 'Accept-Language: en-US,en;q=0.9' \
     --http2 --http2-no-server-push --false-start --compressed \
-    --tlsv1.2 --no-npn --alps --tls-permute-extensions \
+    --tlsv1.2 --alps --tls-permute-extensions \
     --cert-compression brotli \
     "$@"

chrome/curl_chrome99

@@ -21,6 +21,6 @@ dir=${0%/*}
     -H 'Accept-Encoding: gzip, deflate, br' \
     -H 'Accept-Language: en-US,en;q=0.9' \
     --http2 --false-start --compressed \
-    --tlsv1.2 --no-npn --alps \
+    --tlsv1.2 --alps \
     --cert-compression brotli \
     "$@"

chrome/curl_chrome99_android

@@ -21,6 +21,6 @@ dir=${0%/*}
     -H 'Accept-Encoding: gzip, deflate, br' \
     -H 'Accept-Language: en-US,en;q=0.9' \
     --http2 --false-start --compressed \
-    --tlsv1.2 --no-npn --alps \
+    --tlsv1.2 --alps \
     --cert-compression brotli \
     "$@"

chrome/curl_edge101

@@ -21,6 +21,6 @@ dir=${0%/*}
     -H 'Accept-Encoding: gzip, deflate, br' \
     -H 'Accept-Language: en-US,en;q=0.9' \
     --http2 --false-start --compressed \
-    --tlsv1.2 --no-npn --alps \
+    --tlsv1.2 --alps \
     --cert-compression brotli \
     "$@"

chrome/curl_edge99

@@ -21,6 +21,6 @@ dir=${0%/*}
     -H 'Accept-Encoding: gzip, deflate, br' \
     -H 'Accept-Language: en-US,en;q=0.9' \
     --http2 --false-start --compressed \
-    --tlsv1.2 --no-npn --alps \
+    --tlsv1.2 --alps \
     --cert-compression brotli \
     "$@"

chrome/curl_safari15_3

@@ -15,6 +15,6 @@ dir=${0%/*}
     -H 'Accept-Language: en-us' \
     -H 'Accept-Encoding: gzip, deflate, br' \
     --http2 --false-start --compressed \
-    --tlsv1.0 --no-npn --no-tls-session-ticket \
+    --tlsv1.0 --no-tls-session-ticket \
     --http2-pseudo-headers-order 'mspa' \
     "$@"

chrome/curl_safari15_5

@@ -15,7 +15,7 @@ dir=${0%/*}
     -H 'Accept-Language: en-GB,en-US;q=0.9,en;q=0.8' \
     -H 'Accept-Encoding: gzip, deflate, br' \
     --http2 --false-start --compressed \
-    --tlsv1.0 --no-npn --no-tls-session-ticket \
+    --tlsv1.0 --no-tls-session-ticket \
     --cert-compression zlib \
     --http2-pseudo-headers-order 'mspa' \
     "$@"