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.

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

ext/curl: Bump minimum Curl version to >= 7.61.0 #13259

Merged
merged 2 commits into from Jan 31, 2024
Merged

Conversation

Ayesh
Copy link
Contributor

@Ayesh Ayesh commented Jan 27, 2024

Bumps the minimum required libcurl version to 7.61.0.

Please also see #4917, which bumped minimum libcurl version to the current >= 7.29.0.

Ubuntu, Debian, RHEL, and RHEL derivatives have major and LTS version bumps this year. Following are the libcurl-dev/libcurl-devel versions available in the oldest supported (LTS or otherwise) in major OSs.

  • Debian buster: 7.64
  • Ubuntu 20.04: 7.68
  • CentOS/RHEL 7: 7.29
  • RHEL 8/Rocky 8/EL 8: 7.61
  • Fedora 38: 7.87

RHEL/CentOS 7 reaches EOL mid 2024, so for PHP 8.4 scheduled towards the end of this year, we can safely bump the minimum libcurl version.

7.61.0 was selected as the new minimum because RHEL and derivatives have libcurl-devel version 7.61. RHEL 8 is a current and supported RHEL version.

ext/curl/interface.c Outdated Show resolved Hide resolved
ext/curl/curl.stub.php Outdated Show resolved Hide resolved
ext/curl/curl.stub.php Outdated Show resolved Hide resolved
ext/curl/curl.stub.php Outdated Show resolved Hide resolved
ext/curl/curl_private.h Outdated Show resolved Hide resolved
ext/curl/interface.c Outdated Show resolved Hide resolved
ext/curl/interface.c Outdated Show resolved Hide resolved
ext/curl/curl.stub.php Outdated Show resolved Hide resolved
@Ayesh Ayesh force-pushed the libcurl-bump branch 6 times, most recently from 41be34e to b9f5f0c Compare January 29, 2024 06:30
@Ayesh
Copy link
Contributor Author

Ayesh commented Jan 29, 2024

Thank you so much @Girgias. You are right, I had missed quite a few version comparisons. I went through the code manually as well as some grepping to catch them, and adjusted accordingly. There are also some code blocks that we remove entirely now.

I also added comments to missing preprocess statements without the human-friendly version name in them.


#if LIBCURL_VERSION_NUM >= 0x072a00 /* Available since 7.42.0 */
/* Available since 7.42.0 */
Copy link
Member

Choose a reason for hiding this comment

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

Should you not remove the version availability? As in some cases you remove in others you keep them

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for noticing them, should have indeed removed them. I pushed with the entire #if LIBCURL... lines removed including the comments. For Versions >= 7.61, we still keep them. There are some leftover comments like /* Available since 7.10.6 */, not sure if we can clean them up at the same go, but I thought not to do it yet to keep the PR easier to (hopefully) merge. If you think we can clean everything up, I'll happily change them too.

@Ayesh Ayesh changed the title ext/curl: Bump minimim Curl version to >= 7.61.0 ext/curl: Bump minimum Curl version to >= 7.61.0 Jan 29, 2024
@Ayesh Ayesh force-pushed the libcurl-bump branch 2 times, most recently from ee858fe to 5811828 Compare January 29, 2024 16:07
Copy link
Member

@Girgias Girgias left a comment

Choose a reason for hiding this comment

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

LGTM, need UPGRADING/NEWS entry

@Ayesh
Copy link
Contributor Author

Ayesh commented Jan 31, 2024

Thank you so much @Girgias. I added the NEWS/UPGRADING entries as well.

Bumps the minimum required libcurl version to 7.61.0.

Please also see php#4917, which bumped minimum libcurl version to the current >= 7.29.0.
This bumps the minimum requirement to Curl 7.61.0 (released 2018 Sept).

Ubuntu, Debian, RHEL, and RHEL derivatives have major and LTS version bumps this year. Following are the
libcurl-dev/libcurl-devel versions available in the oldest supported (LTS or otherwise) in major OSs.

 - Debian buster: [7.64](https://packages.debian.org/buster/libcurl4-openssl-dev)
 - Ubuntu 20.04: [7.68](https://packages.ubuntu.com/focal/libcurl-dev)
 - CentOS/RHEL 7: 7.29
 - RHEL 8/Rocky 8/EL 8: 7.61
 - Fedora 38: 7.87

RHEL/CentOS 7 reaches EOL mid 2024, so for PHP 8.4 scheduled towards the end of this year, we can safely
bump the minimum libcurl version.

7.61.0 was selected as the new minimum because RHEL and derivatives have libcurl-devel version 7.61. RHEL 8 is
a current and supported RHEL version.
…n-friendly version names

Adds missing human-friendly version number comments where missing.
@Girgias Girgias merged commit edb9f65 into php:master Jan 31, 2024
9 checks passed
Ayesh added a commit to Ayesh/php-src that referenced this pull request Feb 6, 2024
ext/curl now requires libcurl 7.61.0, which means a lot of CURL* constants can be re-organized.

This commit re-arranges all of the CURLE_* constants to a single part of the `curl.stub.php` file,
and rearranges them to match the order of the error constants in the libcurl documentation[^1].

Constants that are deprecated[^2] are moved shifted to the end of the `CURLE_*` constants list.

1: https://curl.se/libcurl/c/libcurl-errors.html
2: https://curl.se/libcurl/c/symbols-in-versions.html

Related: php#12000, php#13259, php#13209, php#13282
Ayesh added a commit to Ayesh/php-src that referenced this pull request Feb 6, 2024
ext/curl now requires libcurl 7.61.0, which means a lot of CURL* constants can be re-organized.

This commit re-arranges all of the CURLE_* constants to a single part of the `curl.stub.php` file,
and rearranges them to match the order of the error constants in the libcurl documentation[^1].

Constants that are deprecated[^2] are moved shifted to the end of the `CURLE_*` constants list.

[^1]: https://curl.se/libcurl/c/libcurl-errors.html
[^2]: https://curl.se/libcurl/c/symbols-in-versions.html

Related: php#12000, php#13259, php#13209, php#13282
Ayesh added a commit to Ayesh/php-src that referenced this pull request Feb 7, 2024
ext/curl now requires libcurl 7.61.0, which means a lot of CURL* constants can be re-organized.

This commit re-arranges all of the CURLE_* constants to a single part of the `curl.stub.php` file,
and rearranges them to match the order of the error constants in the libcurl documentation[^1].

Constants that are deprecated[^2] are moved shifted to the end of the `CURLE_*` constants list.

[^1]: https://curl.se/libcurl/c/libcurl-errors.html
[^2]: https://curl.se/libcurl/c/symbols-in-versions.html

Related: php#12000, php#13259, php#13209, php#13282
Ayesh added a commit to Ayesh/php-src that referenced this pull request Feb 7, 2024
ext/curl now requires libcurl 7.61.0, which means a lot of CURL* constants can be re-organized.

This commit re-arranges all of the CURLE_* constants to a single part of the `curl.stub.php` file,
and rearranges them to match the order of the error constants in the libcurl documentation[^1].

Constants that are deprecated[^2] are moved shifted to the end of the `CURLE_*` constants list.

[^1]: https://curl.se/libcurl/c/libcurl-errors.html
[^2]: https://curl.se/libcurl/c/symbols-in-versions.html

Related: php#12000, php#13259, php#13209, php#13282
Ayesh added a commit to Ayesh/php-src that referenced this pull request Feb 7, 2024
ext/curl now requires libcurl 7.61.0, which means a lot of CURL* constants can be re-organized.

This commit re-arranges all of the CURLE_* constants to a single part of the `curl.stub.php` file,
and rearranges them to match the order of the error constants in the libcurl documentation[^1].

Constants that are deprecated[^2] are moved shifted to the end of the `CURLE_*` constants list.

[^1]: https://curl.se/libcurl/c/libcurl-errors.html
[^2]: https://curl.se/libcurl/c/symbols-in-versions.html

Related: php#12000, php#13259, php#13209, php#13282
@Ayesh Ayesh deleted the libcurl-bump branch February 24, 2024 04:18
Ayesh added a commit to Ayesh/php-src that referenced this pull request Mar 6, 2024
ext/curl now requires libcurl 7.61.0, which means a lot of CURL* constants can be re-organized.

This commit re-arranges all of the CURLE_* constants to a single part of the `curl.stub.php` file,
and rearranges them to match the order of the error constants in the libcurl documentation[^1].

Constants that are deprecated[^2] are moved shifted to the end of the `CURLE_*` constants list.

[^1]: https://curl.se/libcurl/c/libcurl-errors.html
[^2]: https://curl.se/libcurl/c/symbols-in-versions.html

Related: php#12000, php#13259, php#13209, php#13282
Ayesh added a commit to Ayesh/php-src that referenced this pull request Mar 11, 2024
ext/curl now requires libcurl 7.61.0, which means a lot of CURL* constants can be re-organized.

This commit re-arranges all of the CURLE_* constants to a single part of the `curl.stub.php` file,
and rearranges them to match the order of the error constants in the libcurl documentation[^1].

Constants that are deprecated[^2] are moved shifted to the end of the `CURLE_*` constants list.

[^1]: https://curl.se/libcurl/c/libcurl-errors.html
[^2]: https://curl.se/libcurl/c/symbols-in-versions.html

Related: php#12000, php#13259, php#13209, php#13282
Ayesh added a commit to Ayesh/php-src that referenced this pull request Mar 12, 2024
ext/curl now requires libcurl 7.61.0, which means a lot of CURL* constants can be re-organized.

This commit re-arranges all of the CURLE_* constants to a single part of the `curl.stub.php` file,
and rearranges them to match the order of the error constants in the libcurl documentation[^1].

Constants that are deprecated[^2] are moved shifted to the end of the `CURLE_*` constants list.

[^1]: https://curl.se/libcurl/c/libcurl-errors.html
[^2]: https://curl.se/libcurl/c/symbols-in-versions.html

Related: php#12000, php#13259, php#13209, php#13282
Ayesh added a commit to Ayesh/php-src that referenced this pull request Mar 16, 2024
ext/curl now requires libcurl 7.61.0, which means a lot of CURL* constants can be re-organized.

This commit re-arranges all of the CURLE_* constants to a single part of the `curl.stub.php` file,
and rearranges them to match the order of the error constants in the libcurl documentation[^1].

Constants that are deprecated[^2] are moved shifted to the end of the `CURLE_*` constants list.

[^1]: https://curl.se/libcurl/c/libcurl-errors.html
[^2]: https://curl.se/libcurl/c/symbols-in-versions.html

Related: php#12000, php#13259, php#13209, php#13282
Ayesh added a commit to Ayesh/php-src that referenced this pull request Mar 19, 2024
ext/curl now requires libcurl 7.61.0, which means a lot of CURL* constants can be re-organized.

This commit re-arranges all of the CURLE_* constants to a single part of the `curl.stub.php` file,
and rearranges them to match the order of the error constants in the libcurl documentation[^1].

Constants that are deprecated[^2] are moved shifted to the end of the `CURLE_*` constants list.

[^1]: https://curl.se/libcurl/c/libcurl-errors.html
[^2]: https://curl.se/libcurl/c/symbols-in-versions.html

Related: php#12000, php#13259, php#13209, php#13282
Ayesh added a commit to Ayesh/php-src that referenced this pull request Mar 19, 2024
ext/curl now requires libcurl 7.61.0, which means a lot of CURL* constants can be re-organized.

This commit re-arranges all of the CURLE_* constants to a single part of the `curl.stub.php` file,
and rearranges them to match the order of the error constants in the libcurl documentation[^1].

Constants that are deprecated[^2] are moved shifted to the end of the `CURLE_*` constants list.

[^1]: https://curl.se/libcurl/c/libcurl-errors.html
[^2]: https://curl.se/libcurl/c/symbols-in-versions.html

Related: php#12000, php#13259, php#13209, php#13282
Ayesh added a commit to Ayesh/php-src that referenced this pull request Apr 10, 2024
ext/curl now requires libcurl 7.61.0, which means a lot of CURL* constants can be re-organized.

This commit re-arranges all of the CURLE_* constants to a single part of the `curl.stub.php` file,
and rearranges them to match the order of the error constants in the libcurl documentation[^1].

Constants that are deprecated[^2] are moved shifted to the end of the `CURLE_*` constants list.

[^1]: https://curl.se/libcurl/c/libcurl-errors.html
[^2]: https://curl.se/libcurl/c/symbols-in-versions.html

Related: php#12000, php#13259, php#13209, php#13282
Ayesh added a commit to Ayesh/php-src that referenced this pull request May 6, 2024
ext/curl now requires libcurl 7.61.0, which means a lot of CURL* constants can be re-organized.

This commit re-arranges all of the CURLE_* constants to a single part of the `curl.stub.php` file,
and rearranges them to match the order of the error constants in the libcurl documentation[^1].

Constants that are deprecated[^2] are moved shifted to the end of the `CURLE_*` constants list.

[^1]: https://curl.se/libcurl/c/libcurl-errors.html
[^2]: https://curl.se/libcurl/c/symbols-in-versions.html

Related: php#12000, php#13259, php#13209, php#13282
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants