ext/curl: Add CURLOPT_PREREQFUNCTION
#13255
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mvorisek
reviewed
Jan 26, 2024
|
Looking good overall, @mvorisek remark is valid. |
f0efdd4 to
1e856f5
Compare
devnexen
reviewed
Jan 26, 2024
1e856f5 to
5c06c5b
Compare
|
In my opinion, |
81c6b26 to
c7bb6f0
Compare
|
Thank you @SakiTakamachi - I added comments to indicate it's for Curl 7.80.0 throughout everywhere I had |
Girgias
reviewed
Jan 28, 2024
eafa628 to
c388954
Compare
|
Can you wait for #13291 and rebase on top of this when it is merged? As the refactoring should simplify the code. |
|
Awesome, thank you! I can also learn how to do it from your PR too, so this is perfect. |
4f1e413 to
545e929
Compare
60eda9b to
e53986f
Compare
Girgias
reviewed
May 7, 2024
962835e to
68e357c
Compare
68e357c to
fce7d17
Compare
|
Thank you @Girgias - I made a bunch of force-pushes with a few more added tests, but I tested them locally. fingers crossed CI marks them green too. |
|
|
fce7d17 to
9c50e79
Compare
Girgias
reviewed
Aug 24, 2024
Comment on lines
+36
to
+37
| var_dump(filter_var($args[1], FILTER_VALIDATE_IP) !== false); | ||
| var_dump(filter_var($args[2], FILTER_VALIDATE_IP) !== false); |
There was a problem hiding this comment.
Would it be possible to have the test not rely on the filter extension? Found this out while trying it locally without ext/filter compiled.
Otherwise it needs to be added to the EXTENSIONS section as I did.
b74ce81 to
885364c
Compare
Curl >= 7.80.0 supports declaring a function for `CURLOPT_PREREQFUNCTION` option that gets called after Curl establishes a connection (including the TLS handshake for HTTPS connections), but before the actual request is made. The callable must return either `CURL_PREREQFUNC_OK` or `CURL_PREREQFUNC_ABORT` to allow or abort the request. This adds support for it to PHP with required ifdef. - libc: https://curl.se/libcurl/c/CURLOPT_PREREQFUNCTION.html Co-Authored-By: Gina Peter Bnayard <girgias@php.net>
885364c to
882e64e
Compare
|
CI green finally, and |
isfedorov
pushed a commit
to JetBrains/phpstorm-stubs
that referenced
this pull request
Aug 26, 2024
`CURLOPT_PREREQFUNCTION` is a new Curl option added in PHP 8.4, along with two constants `CURL_PREREQFUNC_ABORT` and `CURL_PREREQFUNC_OK`. - [php/php-src#13255](php/php-src#13255) - [libcurl doc - `CURLOPT_PREREQFUNCTION`](https://curl.se/libcurl/c/CURLOPT_PREREQFUNCTION.html) - [PHP.Watch Codex - `CURLOPT_PREREQFUNCTION`](https://php.watch/codex/CURLOPT_PREREQFUNCTION) - [PHP.Watch Codex - `CURL_PREREQFUNC_ABORT`](https://php.watch/codex/CURL_PREREQFUNC_ABORT) - [PHP.Watch Codex - `CURL_PREREQFUNC_OK`](https://php.watch/codex/CURL_PREREQFUNC_OK)
Ayesh
added a commit
to Ayesh/php-src
that referenced
this pull request
Aug 30, 2024
Ayesh
added a commit
to Ayesh/php-src
that referenced
this pull request
Nov 14, 2024
…tions This is a follow-up to phpGH-13255. When the `CURLOPT_PREREQFUNCTION` callback does not return any value or return an invalid value, we throw a `ValueError` or a `TypeError` exception. However, it does not prevent the Curl request from going forward because our default return value is `CURL_PREREQFUNC_OK`. This changes the default value to `CURL_PREREQFUNC_ABORT`.
Ayesh
added a commit
to Ayesh/doc-en
that referenced
this pull request
Nov 14, 2024
Commit: php/php-src#13255 PHP.Watch: [PHP 8.4: Curl: New `CURLOPT_PREREQFUNCTION` option](https://php.watch/versions/8.4/CURLOPT_PREREQFUNCTION)
Ayesh
added a commit
to Ayesh/doc-en
that referenced
this pull request
Nov 15, 2024
Commit: php/php-src#13255 PHP.Watch: [PHP 8.4: Curl: New `CURLOPT_PREREQFUNCTION` option](https://php.watch/versions/8.4/CURLOPT_PREREQFUNCTION)
Ayesh
added a commit
to Ayesh/doc-en
that referenced
this pull request
Nov 15, 2024
Commit: php/php-src#13255 PHP.Watch: [PHP 8.4: Curl: New `CURLOPT_PREREQFUNCTION` option](https://php.watch/versions/8.4/CURLOPT_PREREQFUNCTION)
Ayesh
added a commit
to Ayesh/doc-en
that referenced
this pull request
Nov 16, 2024
Commit: php/php-src#13255 PHP.Watch: [PHP 8.4: Curl: New `CURLOPT_PREREQFUNCTION` option](https://php.watch/versions/8.4/CURLOPT_PREREQFUNCTION)
Girgias
pushed a commit
to php/doc-en
that referenced
this pull request
Nov 16, 2024
Commit: php/php-src#13255 PHP.Watch: [PHP 8.4: Curl: New `CURLOPT_PREREQFUNCTION` option](https://php.watch/versions/8.4/CURLOPT_PREREQFUNCTION)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Curl >= 7.80.0 supports declaring a function for
CURLOPT_PREREQFUNCTIONoption that gets called after Curl establishes a connection (including the TLS handshake for HTTPS connections), but before the actual request is made.The callable must return either
CURL_PREREQFUNC_OKorCURL_PREREQFUNC_ABORTto allow or abort the request.This adds support for it to PHP with required ifdef.