Add curl patch (aws#419)

anton-stepanof · web-flow · commit 15449b8faf8b · 2023-04-14T13:46:01.000+01:00
diff --git a/aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.glibc b/aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.glibc
@@ -7,14 +7,19 @@ RUN yum install -y \
         tar \
         gzip \
         make \
+        patch \
         gcc \
         gcc-c++ \
         java-11-amazon-corretto
 
 # Install curl dependency
 COPY ./deps/curl-$CURL_VERSION.tar.gz /src/deps/
+COPY ./deps/curl_001_disable_wakeup.patch /src/deps/
+
 RUN tar xzf /src/deps/curl-$CURL_VERSION.tar.gz -C /src/deps
+
 WORKDIR /src/deps/curl-$CURL_VERSION
+RUN patch lib/multihandle.h ../curl_001_disable_wakeup.patch
 RUN ./configure \
         --prefix $(pwd)/../artifacts \
         --disable-shared \
diff --git a/aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.musl b/aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.musl
@@ -10,12 +10,17 @@ RUN apk update && \
         g++ \
         gcc \
         make \
+        patch \
         perl
 
 # Install curl dependency
 COPY ./deps/curl-$CURL_VERSION.tar.gz /src/deps/
+COPY ./deps/curl_001_disable_wakeup.patch /src/deps/
+
 RUN tar xzf /src/deps/curl-$CURL_VERSION.tar.gz -C /src/deps
+
 WORKDIR /src/deps/curl-$CURL_VERSION
+RUN patch lib/multihandle.h ../curl_001_disable_wakeup.patch
 RUN ./configure \
         --prefix $(pwd)/../artifacts \
         --disable-shared \
diff --git a/aws-lambda-java-runtime-interface-client/src/main/jni/deps/curl_001_disable_wakeup.patch b/aws-lambda-java-runtime-interface-client/src/main/jni/deps/curl_001_disable_wakeup.patch
@@ -0,0 +1,14 @@
+diff --git a/multihandle.h b/multihandle.h
+index a26fb619a..18080f1c3 100644
+--- a/multihandle.h
++++ b/multihandle.h
+@@ -70,10 +70,6 @@ typedef enum {
+
+ #define CURLPIPE_ANY (CURLPIPE_MULTIPLEX)
+
+-#if !defined(CURL_DISABLE_SOCKETPAIR)
+-#define ENABLE_WAKEUP
+-#endif
+-
+ /* value for MAXIMUM CONCURRENT STREAMS upper limit */
+ #define INITIAL_MAX_CONCURRENT_STREAMS ((1U << 31) - 1)
