Skip to content

Add curl patch #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2023
Merged

Add curl patch #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.glibc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
5 changes: 5 additions & 0 deletions aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.musl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
14 changes: 14 additions & 0 deletions aws-lambda-java-runtime-interface-client/src/main/jni/deps/curl_001_disable_wakeup.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)