Skip to content

Explore curl support #1133

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

Closed
wants to merge 15 commits into from
Closed

Explore curl support #1133

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9ddf54b
PHP: Support http:// https:// and ssl:// stream wrappers
adamziel Mar 7, 2024
6085484
First take – Build libcurl, compile PHP with it
adamziel Mar 22, 2024
5e9c1f2
Merge branch 'ssl-network-bridge' into curl-support
adamziel Mar 22, 2024
25aecd1
First roadblock: getaddrinfo() thread failed to start
adamziel Mar 22, 2024
a0ea651
Disable AsynchDNS
bgrgicak Apr 1, 2024
19087b5
verbose output
bgrgicak Apr 1, 2024
0c84fd1
Add zlib
bgrgicak Apr 2, 2024
b5d49b4
Add OpenSSL
bgrgicak Apr 3, 2024
305fa1a
Reset PHP build to trunk
bgrgicak Apr 3, 2024
63fb62c
Merge branch 'trunk' into curl-support
bgrgicak Apr 3, 2024
0628695
Rebuild PHP 8.0 with CURL
bgrgicak Apr 3, 2024
b0a49c9
Provide a custom implementation for select()
adamziel Apr 4, 2024
e4017b2
Rebuild PHP
adamziel Apr 4, 2024
ae82388
Fix loop in request
bgrgicak Apr 8, 2024
130739b
Add asyncify functions
bgrgicak Apr 8, 2024
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: 3 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"file-saver": "^2.0.5",
"follow-redirects": "1.15.2",
"fs-extra": "11.1.1",
"node-forge": "1.3.1",
"octokit": "3.1.1",
"octokit-plugin-create-pull-request": "5.1.1",
"react": "^18.2.0",
Expand Down
9 changes: 8 additions & 1 deletion packages/php-wasm/compile/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,14 @@ oniguruma/dist/root/lib/lib/libonig.a: base-image
docker cp $$(docker create playground-php-wasm:oniguruma):/root/lib/lib ./oniguruma/dist/root/lib/
docker cp $$(docker create playground-php-wasm:oniguruma):/root/lib/include ./oniguruma/dist/root/lib

all: libz libzip libpng16 libxml2 libopenssl libsqlite3 libiconv libncurses libedit bison2.7 oniguruma
libcurl: libcurl/dist/root/lib/lib/libcurl.a
libcurl/dist/root/lib/lib/libcurl.a: base-image libz libopenssl
mkdir -p ./libcurl/dist/root/lib
docker build -f ./libcurl/Dockerfile -t playground-php-wasm:libcurl . --progress=plain
docker cp $$(docker create playground-php-wasm:libcurl):/root/curl-7.69.1/lib/.libs ./libcurl/dist/root/lib/lib
docker cp $$(docker create playground-php-wasm:libcurl):/root/curl-7.69.1/include/ ./libcurl/dist/root/lib

all: libz libzip libpng16 libxml2 libopenssl libsqlite3 libiconv libncurses libedit bison2.7 oniguruma libcurl
clean:
rm -rf ./libz/dist
rm -rf ./libzip/dist
Expand Down
3 changes: 3 additions & 0 deletions packages/php-wasm/compile/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,17 @@ const platformDefaults = {
},
['web-light']: {},
['web-kitchen-sink']: {
WITH_CURL: 'yes',
WITH_ICONV: 'yes',
WITH_LIBXML: 'yes',
WITH_LIBPNG: 'yes',
WITH_MBSTRING: 'yes',
WITH_MBREGEX: 'yes',
WITH_OPENSSL: 'yes',
WITH_WS_NETWORKING_PROXY: 'yes',
},
node: {
WITH_CURL: 'yes',
WITH_ICONV: 'yes',
WITH_LIBXML: 'yes',
WITH_LIBPNG: 'yes',
Expand Down
36 changes: 36 additions & 0 deletions packages/php-wasm/compile/libcurl/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
FROM playground-php-wasm:base

RUN mkdir -p /root/lib/include /root/lib/lib
COPY ./libz/dist/root/lib/include /root/lib/include
COPY ./libz/dist/root/lib/lib /root/lib/lib
COPY ./libopenssl/dist/root/lib/lib /root/lib/lib

ARG CURL_VERSION="curl-7.69.1"

RUN /root/copy-lib.sh lib-libz
RUN set -euxo pipefail && \
source /root/emsdk/emsdk_env.sh && \
wget https://curl.haxx.se/download/$CURL_VERSION.tar.gz && \
tar xf $CURL_VERSION.tar.gz

WORKDIR /root/$CURL_VERSION

RUN CPPFLAGS="-I/root/lib/include " \
LDFLAGS="-L/root/lib/lib " \
PKG_CONFIG_PATH=$PKG_CONFIG_PATH \
source /root/emsdk/emsdk_env.sh && \
emconfigure ./configure \
--build i386-pc-linux-gnu \
--target wasm32-unknown-emscripten \
--prefix=/root/install/ \
--disable-shared \
--enable-static \
--with-openssl \
--enable-https \
--enable-http \
--disable-pthreads \
--enable-websockets \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not needed for v1

--disable-threaded-resolver \
--with-zlib=/root/lib

RUN source /root/emsdk/emsdk_env.sh && EMCC_SKIP="-lc -lz -lcurl" EMCC_FLAGS="-sSIDE_MODULE" emmake make || true
Loading