Skip to content
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

Revert libcurl 7.84.0 update #66

Merged
merged 2 commits into from
May 11, 2023
Merged

Revert libcurl 7.84.0 update #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cad212
Revert libcurl 7.84.0 update
andclt May 9, 2023
38acd8d
Apply curl wakeup patch
andclt May 11, 2023
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
Binary file added deps/curl-7_83_1.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file removed deps/curl-7_84_0.tar.gz
View file
Open in desktop
Binary file not shown.
14 changes: 14 additions & 0 deletions deps/patches/0001-curl-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/lib/multihandle.h b/lib/multihandle.h
index a26fb619a..18080f1c3 100644
--- a/lib/multihandle.h
+++ b/lib/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)
2 changes: 1 addition & 1 deletion deps/versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
AWS_LAMBDA_CPP_RELEASE=0.2.8
CURL_VERSION=7_84_0
CURL_VERSION=7_83_1
12 changes: 11 additions & 1 deletion scripts/update_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,17 @@ source versions
rm -f aws-lambda-cpp-*.tar.gz && rm -f curl-*.tar.gz

# Grab Curl
wget -c https://github.com/curl/curl/archive/refs/tags/curl-$CURL_VERSION.tar.gz
wget -c https://github.com/curl/curl/archive/refs/tags/curl-$CURL_VERSION.tar.gz -O - | tar -xz

# Apply patches
(
cd curl-curl-$CURL_VERSION && \
patch -p1 < ../patches/0001-curl-disable_wakeup.patch
)

# Pack again and remove the folder
tar -czvf curl-$CURL_VERSION.tar.gz curl-curl-$CURL_VERSION && \
rm -rf curl-curl-$CURL_VERSION

# Grab aws-lambda-cpp
wget -c https://github.com/awslabs/aws-lambda-cpp/archive/refs/tags/v$AWS_LAMBDA_CPP_RELEASE.tar.gz -O - | tar -xz
Expand Down