Skip to content

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

Merged
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump
Jan 31, 2024
Merged

ext/curl: Bump minimum Curl version to >= 7.61.0#13259
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump

Conversation

@Ayesh

Copy link
Copy Markdown
Member

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.

Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl_private.h Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
@Ayesh
Ayeshforce-pushed the libcurl-bump branch 6 times, most recently from 41be34e to b9f5f0cCompareJanuary 29, 2024 06:30
@Ayesh

Copy link
Copy Markdown
MemberAuthor

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.

Comment threadext/curl/curl.stub.php Outdated

Copy link
Copy Markdown
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
Copy Markdown
MemberAuthor

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.

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

@GirgiasGirgias left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
MemberAuthor

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.
@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 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
Girgias pushed a commit to php/doc-en that referenced this pull request Nov 16, 2024
Commit: php/php-src#13259
PHP.Watch: [PHP 8.4: Curl: Minimum required libcurl version increased to 7.61.0](https://php.watch/versions/8.4/curl-libcurl-version-bump)
Sign up for freeto 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.

4 participants

@Ayesh@mvorisek@Girgias@SakiTakamachi
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
ext/curl: Bump minimum Curl version to >= 7.61.0 by Ayesh · Pull Request #13259 · php/php-src · GitHub
Skip to content

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

Merged
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump
Jan 31, 2024
Merged

ext/curl: Bump minimum Curl version to >= 7.61.0#13259
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump

Conversation

@Ayesh

Copy link
Copy Markdown
Member

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.

Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl_private.h Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
@Ayesh
Ayeshforce-pushed the libcurl-bump branch 6 times, most recently from 41be34e to b9f5f0cCompareJanuary 29, 2024 06:30
@Ayesh

Copy link
Copy Markdown
MemberAuthor

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.

Comment threadext/curl/curl.stub.php Outdated

Copy link
Copy Markdown
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
Copy Markdown
MemberAuthor

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.

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

@GirgiasGirgias left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
MemberAuthor

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.
@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 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
Girgias pushed a commit to php/doc-en that referenced this pull request Nov 16, 2024
Commit: php/php-src#13259
PHP.Watch: [PHP 8.4: Curl: Minimum required libcurl version increased to 7.61.0](https://php.watch/versions/8.4/curl-libcurl-version-bump)
Sign up for freeto 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.

4 participants

@Ayesh@mvorisek@Girgias@SakiTakamachi
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ext/curl: Bump minimum Curl version to >= 7.61.0 by Ayesh · Pull Request #13259 · php/php-src · GitHub
Skip to content

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

Merged
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump
Jan 31, 2024
Merged

ext/curl: Bump minimum Curl version to >= 7.61.0#13259
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump

Conversation

@Ayesh

Copy link
Copy Markdown
Member

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.

Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl_private.h Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
@Ayesh
Ayeshforce-pushed the libcurl-bump branch 6 times, most recently from 41be34e to b9f5f0cCompareJanuary 29, 2024 06:30
@Ayesh

Copy link
Copy Markdown
MemberAuthor

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.

Comment threadext/curl/curl.stub.php Outdated

Copy link
Copy Markdown
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
Copy Markdown
MemberAuthor

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.

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

@GirgiasGirgias left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
MemberAuthor

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.
@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 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
Girgias pushed a commit to php/doc-en that referenced this pull request Nov 16, 2024
Commit: php/php-src#13259
PHP.Watch: [PHP 8.4: Curl: Minimum required libcurl version increased to 7.61.0](https://php.watch/versions/8.4/curl-libcurl-version-bump)
Sign up for freeto 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.

4 participants

@Ayesh@mvorisek@Girgias@SakiTakamachi
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ext/curl: Bump minimum Curl version to >= 7.61.0 by Ayesh · Pull Request #13259 · php/php-src · GitHub
Skip to content

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

Merged
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump
Jan 31, 2024
Merged

ext/curl: Bump minimum Curl version to >= 7.61.0#13259
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump

Conversation

@Ayesh

Copy link
Copy Markdown
Member

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.

Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl_private.h Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
@Ayesh
Ayeshforce-pushed the libcurl-bump branch 6 times, most recently from 41be34e to b9f5f0cCompareJanuary 29, 2024 06:30
@Ayesh

Copy link
Copy Markdown
MemberAuthor

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.

Comment threadext/curl/curl.stub.php Outdated

Copy link
Copy Markdown
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
Copy Markdown
MemberAuthor

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.

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

@GirgiasGirgias left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
MemberAuthor

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.
@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 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
Girgias pushed a commit to php/doc-en that referenced this pull request Nov 16, 2024
Commit: php/php-src#13259
PHP.Watch: [PHP 8.4: Curl: Minimum required libcurl version increased to 7.61.0](https://php.watch/versions/8.4/curl-libcurl-version-bump)
Sign up for freeto 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.

4 participants

@Ayesh@mvorisek@Girgias@SakiTakamachi
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' ext/curl: Bump minimum Curl version to >= 7.61.0 by Ayesh · Pull Request #13259 · php/php-src · GitHub
Skip to content

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

Merged
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump
Jan 31, 2024
Merged

ext/curl: Bump minimum Curl version to >= 7.61.0#13259
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump

Conversation

@Ayesh

Copy link
Copy Markdown
Member

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.

Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl_private.h Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
@Ayesh
Ayeshforce-pushed the libcurl-bump branch 6 times, most recently from 41be34e to b9f5f0cCompareJanuary 29, 2024 06:30
@Ayesh

Copy link
Copy Markdown
MemberAuthor

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.

Comment threadext/curl/curl.stub.php Outdated

Copy link
Copy Markdown
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
Copy Markdown
MemberAuthor

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.

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

@GirgiasGirgias left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
MemberAuthor

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.
@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 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
Girgias pushed a commit to php/doc-en that referenced this pull request Nov 16, 2024
Commit: php/php-src#13259
PHP.Watch: [PHP 8.4: Curl: Minimum required libcurl version increased to 7.61.0](https://php.watch/versions/8.4/curl-libcurl-version-bump)
Sign up for freeto 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.

4 participants

@Ayesh@mvorisek@Girgias@SakiTakamachi
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ext/curl: Bump minimum Curl version to >= 7.61.0 by Ayesh · Pull Request #13259 · php/php-src · GitHub
Skip to content

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

Merged
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump
Jan 31, 2024
Merged

ext/curl: Bump minimum Curl version to >= 7.61.0#13259
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump

Conversation

@Ayesh

Copy link
Copy Markdown
Member

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.

Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl_private.h Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
@Ayesh
Ayeshforce-pushed the libcurl-bump branch 6 times, most recently from 41be34e to b9f5f0cCompareJanuary 29, 2024 06:30
@Ayesh

Copy link
Copy Markdown
MemberAuthor

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.

Comment threadext/curl/curl.stub.php Outdated

Copy link
Copy Markdown
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
Copy Markdown
MemberAuthor

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.

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

@GirgiasGirgias left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
MemberAuthor

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.
@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 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
Girgias pushed a commit to php/doc-en that referenced this pull request Nov 16, 2024
Commit: php/php-src#13259
PHP.Watch: [PHP 8.4: Curl: Minimum required libcurl version increased to 7.61.0](https://php.watch/versions/8.4/curl-libcurl-version-bump)
Sign up for freeto 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.

4 participants

@Ayesh@mvorisek@Girgias@SakiTakamachi
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ext/curl: Bump minimum Curl version to >= 7.61.0 by Ayesh · Pull Request #13259 · php/php-src · GitHub
Skip to content

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

Merged
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump
Jan 31, 2024
Merged

ext/curl: Bump minimum Curl version to >= 7.61.0#13259
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump

Conversation

@Ayesh

Copy link
Copy Markdown
Member

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.

Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl_private.h Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
@Ayesh
Ayeshforce-pushed the libcurl-bump branch 6 times, most recently from 41be34e to b9f5f0cCompareJanuary 29, 2024 06:30
@Ayesh

Copy link
Copy Markdown
MemberAuthor

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.

Comment threadext/curl/curl.stub.php Outdated

Copy link
Copy Markdown
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
Copy Markdown
MemberAuthor

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.

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

@GirgiasGirgias left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
MemberAuthor

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.
@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 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
Girgias pushed a commit to php/doc-en that referenced this pull request Nov 16, 2024
Commit: php/php-src#13259
PHP.Watch: [PHP 8.4: Curl: Minimum required libcurl version increased to 7.61.0](https://php.watch/versions/8.4/curl-libcurl-version-bump)
Sign up for freeto 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.

4 participants

@Ayesh@mvorisek@Girgias@SakiTakamachi
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); ext/curl: Bump minimum Curl version to >= 7.61.0 by Ayesh · Pull Request #13259 · php/php-src · GitHub
Skip to content

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

Merged
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump
Jan 31, 2024
Merged

ext/curl: Bump minimum Curl version to >= 7.61.0#13259
Girgias merged 2 commits into
php:masterfrom
Ayesh:libcurl-bump

Conversation

@Ayesh

Copy link
Copy Markdown
Member

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.

Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl.stub.php Outdated
Comment threadext/curl/curl_private.h Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/interface.c Outdated
Comment threadext/curl/curl.stub.php Outdated
@Ayesh
Ayeshforce-pushed the libcurl-bump branch 6 times, most recently from 41be34e to b9f5f0cCompareJanuary 29, 2024 06:30
@Ayesh

Copy link
Copy Markdown
MemberAuthor

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.

Comment threadext/curl/curl.stub.php Outdated

Copy link
Copy Markdown
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
Copy Markdown
MemberAuthor

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.

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

@GirgiasGirgias left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
MemberAuthor

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.
@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 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
Girgias pushed a commit to php/doc-en that referenced this pull request Nov 16, 2024
Commit: php/php-src#13259
PHP.Watch: [PHP 8.4: Curl: Minimum required libcurl version increased to 7.61.0](https://php.watch/versions/8.4/curl-libcurl-version-bump)
Sign up for freeto 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.

4 participants

@Ayesh@mvorisek@Girgias@SakiTakamachi