ext/curl: show curl option name in error message - #22908

Merged
arnaud-lb merged 9 commits into
php:masterfrom
Sjord:curl-error-option-name
Aug 6, 2026
Merged

ext/curl: show curl option name in error message#22908
arnaud-lb merged 9 commits into
php:masterfrom
Sjord:curl-error-option-name

Conversation

@Sjord

@SjordSjord commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

Retrieve the option name by using curl_easy_option_by_id or by walking zend_constants, depending on whether the curl version used has curl_easy_option_by_id.

Showing the option name is especially useful when using curl_setopt_array. A user may specify many options, and this change makes it clear which option is wrong exactly.

Related to #10097, #22705.

@SjordSjord mentioned this pull request Jul 28, 2026
Closed
@Sjord

Sjord commented Jul 28, 2026

Copy link
Copy Markdown
ContributorAuthor

@GrahamCampbell What do you think about this fallback in case curl_easy_option_by_id is not available?

@Sjord

Sjord commented Jul 29, 2026

Copy link
Copy Markdown
ContributorAuthor

php_curl_option_get_name currently does not work correctly for values that have multiple names:

  • CURLOPT_FTP_RESPONSE_TIMEOUT = CURLOPT_SERVER_RESPONSE_TIMEOUT
  • CURLOPT_ENCODING = CURLOPT_ACCEPT_ENCODING
  • CURLOPT_MAIL_RCPT_ALLLOWFAILS = CURLOPT_MAIL_RCPT_ALLOWFAILS

I think this is currently OK and can probably be fixed in the future.

I am also wondering if it makes sense to loop through zend_constants as a fallback when curl_easy_option_by_id returns null, but I can't think of a situation where that would result in anything.

@Sjord
Sjord marked this pull request as ready for review July 29, 2026 09:15
@Sjord
Sjord requested a review from adoy as a code ownerJuly 29, 2026 09:15
GrahamCampbell
GrahamCampbell reviewed Jul 29, 2026
View reviewed changes
Comment threadext/curl/interface.c
@GrahamCampbell

GrahamCampbell commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

Should this get a short Curl entry in NEWS? It changes user-visible validation messages, and the recent error-message clean-ups in other extensions have been recorded there. Perhaps:

- Curl:
. Improved cURL option validation errors to include the option name.
(Sjoerd Langkemper)

GrahamCampbell
GrahamCampbell reviewed Jul 29, 2026
View reviewed changes
Comment threadext/curl/tests/bug48207.phpt
@Sjord

Sjord commented Jul 29, 2026

Copy link
Copy Markdown
ContributorAuthor

@GrahamCampbell Thanks, great feedback.

GrahamCampbell
GrahamCampbell reviewed Jul 29, 2026
View reviewed changes
Comment threadNEWS Outdated
@SjordSjord changed the title Show curl option name in error messageext/curl: show curl option name in error messageJul 30, 2026
@Sjord
Sjordforce-pushed the curl-error-option-name branch from 0c92a07 to 37c402bCompareJuly 30, 2026 12:08
Sjord added 8 commits August 4, 2026 08:10
@Sjord
Show curl option name in error message
9f4891e
Use curl_easy_option_by_id to retrieve the name of the option, and also
show the name of the option in the case where strings contain a null
byte.
curl_easy_option_by_id simplifies the code, but was introduced in curl
7.73.0, so this also bumps the minimum version of curl. 7.73.0 was
released in 2020, so I think that's acceptable.
Showing the option name is especially useful when using
curl_setopt_array. A user may specify many options, and this change
makes it clear which option is wrong exactly.
@Sjord
Add function to determine name
d1cacef
@Sjord
Use option name in more error messages
22f44d0
@Sjord
Revert MIN_SUPPORTED_CURL_VERSION
18a866b
@Sjord
Fix type of prefix string
4a87680
@Sjord
Fix review comments
e9482da
- Add line to NEWS
- Test more values for writable file handles
- Fallback to zend_constants if curl_easy_option_by_id fails
@Sjord
Move NEWS item to alpha3
ab1f036
@Sjord
Move NEWS message even more
040221c
@Sjord
Sjordforce-pushed the curl-error-option-name branch from 37c402b to 040221cCompareAugust 4, 2026 08:11
@Sjord

Sjord commented Aug 4, 2026

Copy link
Copy Markdown
ContributorAuthor

This is ready.

@Sjord

Sjord commented Aug 6, 2026

Copy link
Copy Markdown
ContributorAuthor

@arnaud-lb Could you take a look at this, and perhaps merge it?

arnaud-lb
arnaud-lb approved these changes Aug 6, 2026
View reviewed changes

@arnaud-lbarnaud-lb 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.

Looks good to me!

@arnaud-lb
arnaud-lb merged commit 6a4ab2e into php:masterAug 6, 2026
18 checks passed
@arnaud-lb

arnaud-lb commented Aug 6, 2026

Copy link
Copy Markdown
Member

Thank you!

@NickSdotNickSdot mentioned this pull request Aug 9, 2026
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@arnaud-lbarnaud-lbarnaud-lb approved these changes
@adoyadoyAwaiting requested review from adoyadoy is a code owner
@GrahamCampbellGrahamCampbellAwaiting requested review from GrahamCampbell

Assignees

No one assigned

Labels

Extension: curl

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Sjord@GrahamCampbell@arnaud-lb
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ext/curl: show curl option name in error message - #22908
Merged
arnaud-lb merged 9 commits into
php:masterfrom 
Sjord:curl-error-option-name
Aug 6, 2026
Merged
ext/curl: show curl option name in error message#22908
arnaud-lb merged 9 commits into
php:masterfrom 
Sjord:curl-error-option-name
Conversation
@Sjord
@SjordSjord
commented
Jul 28, 2026

Copy link


Copy Markdown

Contributor
Retrieve the option name by using curl_easy_option_by_id or by walking zend_constants, depending on whether the curl version used has curl_easy_option_by_id.
Showing the option name is especially useful when using curl_setopt_array. A user may specify many options, and this change makes it clear which option is wrong exactly.
Related to #10097, #22705.
@SjordSjord
mentioned this pull request
Jul 28, 2026
 Closed

@Sjord
Sjord
commented
Jul 28, 2026

Copy link


Copy Markdown

ContributorAuthor
@GrahamCampbell What do you think about this fallback in case curl_easy_option_by_id is not available?
@Sjord
Sjord
commented
Jul 29, 2026

Copy link


Copy Markdown

ContributorAuthor
php_curl_option_get_name currently does not work correctly for values that have multiple names:
  • CURLOPT_FTP_RESPONSE_TIMEOUT = CURLOPT_SERVER_RESPONSE_TIMEOUT
  • CURLOPT_ENCODING = CURLOPT_ACCEPT_ENCODING
  • CURLOPT_MAIL_RCPT_ALLLOWFAILS = CURLOPT_MAIL_RCPT_ALLOWFAILS
I think this is currently OK and can probably be fixed in the future.
I am also wondering if it makes sense to loop through zend_constants as a fallback when curl_easy_option_by_id returns null, but I can't think of a situation where that would result in anything.
@Sjord
Sjord
marked this pull request as ready for review
July 29, 2026 09:15
@Sjord
Sjord
requested a review
from adoy
as a code ownerJuly 29, 2026 09:15
GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadext/curl/interface.c
@GrahamCampbell
GrahamCampbell
commented
Jul 29, 2026

Copy link


Copy Markdown

Contributor
Should this get a short Curl entry in NEWS? It changes user-visible validation messages, and the recent error-message clean-ups in other extensions have been recorded there. Perhaps:
- Curl:
. Improved cURL option validation errors to include the option name.
(Sjoerd Langkemper)

GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadext/curl/tests/bug48207.phpt
@Sjord
Sjord
commented
Jul 29, 2026

Copy link


Copy Markdown

ContributorAuthor
@GrahamCampbell Thanks, great feedback.
GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadNEWS
Outdated

@SjordSjord
changed the title
Show curl option name in error messageext/curl: show curl option name in error messageJul 30, 2026
@Sjord
Sjordforce-pushed
the
curl-error-option-name
branch
from
0c92a07 to
37c402bCompareJuly 30, 2026 12:08
Sjord
added 8 commits
August 4, 2026 08:10
@Sjord
Show curl option name in error message
9f4891e
Use curl_easy_option_by_id to retrieve the name of the option, and also
show the name of the option in the case where strings contain a null
byte.
curl_easy_option_by_id simplifies the code, but was introduced in curl
7.73.0, so this also bumps the minimum version of curl. 7.73.0 was
released in 2020, so I think that's acceptable.
Showing the option name is especially useful when using
curl_setopt_array. A user may specify many options, and this change
makes it clear which option is wrong exactly.
@Sjord
Add function to determine name
d1cacef
@Sjord
Use option name in more error messages
22f44d0
@Sjord
Revert MIN_SUPPORTED_CURL_VERSION
18a866b
@Sjord
Fix type of prefix string
4a87680
@Sjord
Fix review comments
e9482da
- Add line to NEWS
- Test more values for writable file handles
- Fallback to zend_constants if curl_easy_option_by_id fails
@Sjord
Move NEWS item to alpha3
ab1f036
@Sjord
Move NEWS message even more
040221c
@Sjord
Sjordforce-pushed
the
curl-error-option-name
branch
from
37c402b to
040221cCompareAugust 4, 2026 08:11
@Sjord
Sjord
commented
Aug 4, 2026

Copy link


Copy Markdown

ContributorAuthor
This is ready.
@Sjord
Sjord
commented
Aug 6, 2026

Copy link


Copy Markdown

ContributorAuthor
@arnaud-lb Could you take a look at this, and perhaps merge it?
arnaud-lb
arnaud-lb
approved these changes
Aug 6, 2026
View reviewed changes
@arnaud-lbarnaud-lb
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.

Looks good to me!
@arnaud-lb
arnaud-lb
merged commit 6a4ab2e
into
php:masterAug 6, 2026

18 checks passed

@arnaud-lb
arnaud-lb
commented
Aug 6, 2026

Copy link


Copy Markdown

Member
Thank you!
@NickSdotNickSdot
mentioned this pull request
Aug 9, 2026
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@arnaud-lbarnaud-lbarnaud-lb approved these changes
@adoyadoyAwaiting requested review from adoyadoy is a code owner
@GrahamCampbellGrahamCampbellAwaiting requested review from GrahamCampbell

Assignees


No one assigned


Labels

Extension: curl

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Sjord@GrahamCampbell@arnaud-lb

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ext/curl: show curl option name in error message - #22908
Merged
arnaud-lb merged 9 commits into
php:masterfrom 
Sjord:curl-error-option-name
Aug 6, 2026
Merged
ext/curl: show curl option name in error message#22908
arnaud-lb merged 9 commits into
php:masterfrom 
Sjord:curl-error-option-name
Conversation
@Sjord
@SjordSjord
commented
Jul 28, 2026

Copy link


Copy Markdown

Contributor
Retrieve the option name by using curl_easy_option_by_id or by walking zend_constants, depending on whether the curl version used has curl_easy_option_by_id.
Showing the option name is especially useful when using curl_setopt_array. A user may specify many options, and this change makes it clear which option is wrong exactly.
Related to #10097, #22705.
@SjordSjord
mentioned this pull request
Jul 28, 2026
 Closed

@Sjord
Sjord
commented
Jul 28, 2026

Copy link


Copy Markdown

ContributorAuthor
@GrahamCampbell What do you think about this fallback in case curl_easy_option_by_id is not available?
@Sjord
Sjord
commented
Jul 29, 2026

Copy link


Copy Markdown

ContributorAuthor
php_curl_option_get_name currently does not work correctly for values that have multiple names:
  • CURLOPT_FTP_RESPONSE_TIMEOUT = CURLOPT_SERVER_RESPONSE_TIMEOUT
  • CURLOPT_ENCODING = CURLOPT_ACCEPT_ENCODING
  • CURLOPT_MAIL_RCPT_ALLLOWFAILS = CURLOPT_MAIL_RCPT_ALLOWFAILS
I think this is currently OK and can probably be fixed in the future.
I am also wondering if it makes sense to loop through zend_constants as a fallback when curl_easy_option_by_id returns null, but I can't think of a situation where that would result in anything.
@Sjord
Sjord
marked this pull request as ready for review
July 29, 2026 09:15
@Sjord
Sjord
requested a review
from adoy
as a code ownerJuly 29, 2026 09:15
GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadext/curl/interface.c
@GrahamCampbell
GrahamCampbell
commented
Jul 29, 2026

Copy link


Copy Markdown

Contributor
Should this get a short Curl entry in NEWS? It changes user-visible validation messages, and the recent error-message clean-ups in other extensions have been recorded there. Perhaps:
- Curl:
. Improved cURL option validation errors to include the option name.
(Sjoerd Langkemper)

GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadext/curl/tests/bug48207.phpt
@Sjord
Sjord
commented
Jul 29, 2026

Copy link


Copy Markdown

ContributorAuthor
@GrahamCampbell Thanks, great feedback.
GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadNEWS
Outdated

@SjordSjord
changed the title
Show curl option name in error messageext/curl: show curl option name in error messageJul 30, 2026
@Sjord
Sjordforce-pushed
the
curl-error-option-name
branch
from
0c92a07 to
37c402bCompareJuly 30, 2026 12:08
Sjord
added 8 commits
August 4, 2026 08:10
@Sjord
Show curl option name in error message
9f4891e
Use curl_easy_option_by_id to retrieve the name of the option, and also
show the name of the option in the case where strings contain a null
byte.
curl_easy_option_by_id simplifies the code, but was introduced in curl
7.73.0, so this also bumps the minimum version of curl. 7.73.0 was
released in 2020, so I think that's acceptable.
Showing the option name is especially useful when using
curl_setopt_array. A user may specify many options, and this change
makes it clear which option is wrong exactly.
@Sjord
Add function to determine name
d1cacef
@Sjord
Use option name in more error messages
22f44d0
@Sjord
Revert MIN_SUPPORTED_CURL_VERSION
18a866b
@Sjord
Fix type of prefix string
4a87680
@Sjord
Fix review comments
e9482da
- Add line to NEWS
- Test more values for writable file handles
- Fallback to zend_constants if curl_easy_option_by_id fails
@Sjord
Move NEWS item to alpha3
ab1f036
@Sjord
Move NEWS message even more
040221c
@Sjord
Sjordforce-pushed
the
curl-error-option-name
branch
from
37c402b to
040221cCompareAugust 4, 2026 08:11
@Sjord
Sjord
commented
Aug 4, 2026

Copy link


Copy Markdown

ContributorAuthor
This is ready.
@Sjord
Sjord
commented
Aug 6, 2026

Copy link


Copy Markdown

ContributorAuthor
@arnaud-lb Could you take a look at this, and perhaps merge it?
arnaud-lb
arnaud-lb
approved these changes
Aug 6, 2026
View reviewed changes
@arnaud-lbarnaud-lb
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.

Looks good to me!
@arnaud-lb
arnaud-lb
merged commit 6a4ab2e
into
php:masterAug 6, 2026

18 checks passed

@arnaud-lb
arnaud-lb
commented
Aug 6, 2026

Copy link


Copy Markdown

Member
Thank you!
@NickSdotNickSdot
mentioned this pull request
Aug 9, 2026
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@arnaud-lbarnaud-lbarnaud-lb approved these changes
@adoyadoyAwaiting requested review from adoyadoy is a code owner
@GrahamCampbellGrahamCampbellAwaiting requested review from GrahamCampbell

Assignees


No one assigned


Labels

Extension: curl

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Sjord@GrahamCampbell@arnaud-lb

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

Skip to content
ext/curl: show curl option name in error message - #22908
Merged
arnaud-lb merged 9 commits into
php:masterfrom 
Sjord:curl-error-option-name
Aug 6, 2026
Merged
ext/curl: show curl option name in error message#22908
arnaud-lb merged 9 commits into
php:masterfrom 
Sjord:curl-error-option-name
Conversation
@Sjord
@SjordSjord
commented
Jul 28, 2026

Copy link


Copy Markdown

Contributor
Retrieve the option name by using curl_easy_option_by_id or by walking zend_constants, depending on whether the curl version used has curl_easy_option_by_id.
Showing the option name is especially useful when using curl_setopt_array. A user may specify many options, and this change makes it clear which option is wrong exactly.
Related to #10097, #22705.
@SjordSjord
mentioned this pull request
Jul 28, 2026
 Closed

@Sjord
Sjord
commented
Jul 28, 2026

Copy link


Copy Markdown

ContributorAuthor
@GrahamCampbell What do you think about this fallback in case curl_easy_option_by_id is not available?
@Sjord
Sjord
commented
Jul 29, 2026

Copy link


Copy Markdown

ContributorAuthor
php_curl_option_get_name currently does not work correctly for values that have multiple names:
  • CURLOPT_FTP_RESPONSE_TIMEOUT = CURLOPT_SERVER_RESPONSE_TIMEOUT
  • CURLOPT_ENCODING = CURLOPT_ACCEPT_ENCODING
  • CURLOPT_MAIL_RCPT_ALLLOWFAILS = CURLOPT_MAIL_RCPT_ALLOWFAILS
I think this is currently OK and can probably be fixed in the future.
I am also wondering if it makes sense to loop through zend_constants as a fallback when curl_easy_option_by_id returns null, but I can't think of a situation where that would result in anything.
@Sjord
Sjord
marked this pull request as ready for review
July 29, 2026 09:15
@Sjord
Sjord
requested a review
from adoy
as a code ownerJuly 29, 2026 09:15
GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadext/curl/interface.c
@GrahamCampbell
GrahamCampbell
commented
Jul 29, 2026

Copy link


Copy Markdown

Contributor
Should this get a short Curl entry in NEWS? It changes user-visible validation messages, and the recent error-message clean-ups in other extensions have been recorded there. Perhaps:
- Curl:
. Improved cURL option validation errors to include the option name.
(Sjoerd Langkemper)

GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadext/curl/tests/bug48207.phpt
@Sjord
Sjord
commented
Jul 29, 2026

Copy link


Copy Markdown

ContributorAuthor
@GrahamCampbell Thanks, great feedback.
GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadNEWS
Outdated

@SjordSjord
changed the title
Show curl option name in error messageext/curl: show curl option name in error messageJul 30, 2026
@Sjord
Sjordforce-pushed
the
curl-error-option-name
branch
from
0c92a07 to
37c402bCompareJuly 30, 2026 12:08
Sjord
added 8 commits
August 4, 2026 08:10
@Sjord
Show curl option name in error message
9f4891e
Use curl_easy_option_by_id to retrieve the name of the option, and also
show the name of the option in the case where strings contain a null
byte.
curl_easy_option_by_id simplifies the code, but was introduced in curl
7.73.0, so this also bumps the minimum version of curl. 7.73.0 was
released in 2020, so I think that's acceptable.
Showing the option name is especially useful when using
curl_setopt_array. A user may specify many options, and this change
makes it clear which option is wrong exactly.
@Sjord
Add function to determine name
d1cacef
@Sjord
Use option name in more error messages
22f44d0
@Sjord
Revert MIN_SUPPORTED_CURL_VERSION
18a866b
@Sjord
Fix type of prefix string
4a87680
@Sjord
Fix review comments
e9482da
- Add line to NEWS
- Test more values for writable file handles
- Fallback to zend_constants if curl_easy_option_by_id fails
@Sjord
Move NEWS item to alpha3
ab1f036
@Sjord
Move NEWS message even more
040221c
@Sjord
Sjordforce-pushed
the
curl-error-option-name
branch
from
37c402b to
040221cCompareAugust 4, 2026 08:11
@Sjord
Sjord
commented
Aug 4, 2026

Copy link


Copy Markdown

ContributorAuthor
This is ready.
@Sjord
Sjord
commented
Aug 6, 2026

Copy link


Copy Markdown

ContributorAuthor
@arnaud-lb Could you take a look at this, and perhaps merge it?
arnaud-lb
arnaud-lb
approved these changes
Aug 6, 2026
View reviewed changes
@arnaud-lbarnaud-lb
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.

Looks good to me!
@arnaud-lb
arnaud-lb
merged commit 6a4ab2e
into
php:masterAug 6, 2026

18 checks passed

@arnaud-lb
arnaud-lb
commented
Aug 6, 2026

Copy link


Copy Markdown

Member
Thank you!
@NickSdotNickSdot
mentioned this pull request
Aug 9, 2026
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@arnaud-lbarnaud-lbarnaud-lb approved these changes
@adoyadoyAwaiting requested review from adoyadoy is a code owner
@GrahamCampbellGrahamCampbellAwaiting requested review from GrahamCampbell

Assignees


No one assigned


Labels

Extension: curl

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Sjord@GrahamCampbell@arnaud-lb

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ext/curl: show curl option name in error message - #22908
Merged
arnaud-lb merged 9 commits into
php:masterfrom 
Sjord:curl-error-option-name
Aug 6, 2026
Merged
ext/curl: show curl option name in error message#22908
arnaud-lb merged 9 commits into
php:masterfrom 
Sjord:curl-error-option-name
Conversation
@Sjord
@SjordSjord
commented
Jul 28, 2026

Copy link


Copy Markdown

Contributor
Retrieve the option name by using curl_easy_option_by_id or by walking zend_constants, depending on whether the curl version used has curl_easy_option_by_id.
Showing the option name is especially useful when using curl_setopt_array. A user may specify many options, and this change makes it clear which option is wrong exactly.
Related to #10097, #22705.
@SjordSjord
mentioned this pull request
Jul 28, 2026
 Closed

@Sjord
Sjord
commented
Jul 28, 2026

Copy link


Copy Markdown

ContributorAuthor
@GrahamCampbell What do you think about this fallback in case curl_easy_option_by_id is not available?
@Sjord
Sjord
commented
Jul 29, 2026

Copy link


Copy Markdown

ContributorAuthor
php_curl_option_get_name currently does not work correctly for values that have multiple names:
  • CURLOPT_FTP_RESPONSE_TIMEOUT = CURLOPT_SERVER_RESPONSE_TIMEOUT
  • CURLOPT_ENCODING = CURLOPT_ACCEPT_ENCODING
  • CURLOPT_MAIL_RCPT_ALLLOWFAILS = CURLOPT_MAIL_RCPT_ALLOWFAILS
I think this is currently OK and can probably be fixed in the future.
I am also wondering if it makes sense to loop through zend_constants as a fallback when curl_easy_option_by_id returns null, but I can't think of a situation where that would result in anything.
@Sjord
Sjord
marked this pull request as ready for review
July 29, 2026 09:15
@Sjord
Sjord
requested a review
from adoy
as a code ownerJuly 29, 2026 09:15
GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadext/curl/interface.c
@GrahamCampbell
GrahamCampbell
commented
Jul 29, 2026

Copy link


Copy Markdown

Contributor
Should this get a short Curl entry in NEWS? It changes user-visible validation messages, and the recent error-message clean-ups in other extensions have been recorded there. Perhaps:
- Curl:
. Improved cURL option validation errors to include the option name.
(Sjoerd Langkemper)

GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadext/curl/tests/bug48207.phpt
@Sjord
Sjord
commented
Jul 29, 2026

Copy link


Copy Markdown

ContributorAuthor
@GrahamCampbell Thanks, great feedback.
GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadNEWS
Outdated

@SjordSjord
changed the title
Show curl option name in error messageext/curl: show curl option name in error messageJul 30, 2026
@Sjord
Sjordforce-pushed
the
curl-error-option-name
branch
from
0c92a07 to
37c402bCompareJuly 30, 2026 12:08
Sjord
added 8 commits
August 4, 2026 08:10
@Sjord
Show curl option name in error message
9f4891e
Use curl_easy_option_by_id to retrieve the name of the option, and also
show the name of the option in the case where strings contain a null
byte.
curl_easy_option_by_id simplifies the code, but was introduced in curl
7.73.0, so this also bumps the minimum version of curl. 7.73.0 was
released in 2020, so I think that's acceptable.
Showing the option name is especially useful when using
curl_setopt_array. A user may specify many options, and this change
makes it clear which option is wrong exactly.
@Sjord
Add function to determine name
d1cacef
@Sjord
Use option name in more error messages
22f44d0
@Sjord
Revert MIN_SUPPORTED_CURL_VERSION
18a866b
@Sjord
Fix type of prefix string
4a87680
@Sjord
Fix review comments
e9482da
- Add line to NEWS
- Test more values for writable file handles
- Fallback to zend_constants if curl_easy_option_by_id fails
@Sjord
Move NEWS item to alpha3
ab1f036
@Sjord
Move NEWS message even more
040221c
@Sjord
Sjordforce-pushed
the
curl-error-option-name
branch
from
37c402b to
040221cCompareAugust 4, 2026 08:11
@Sjord
Sjord
commented
Aug 4, 2026

Copy link


Copy Markdown

ContributorAuthor
This is ready.
@Sjord
Sjord
commented
Aug 6, 2026

Copy link


Copy Markdown

ContributorAuthor
@arnaud-lb Could you take a look at this, and perhaps merge it?
arnaud-lb
arnaud-lb
approved these changes
Aug 6, 2026
View reviewed changes
@arnaud-lbarnaud-lb
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.

Looks good to me!
@arnaud-lb
arnaud-lb
merged commit 6a4ab2e
into
php:masterAug 6, 2026

18 checks passed

@arnaud-lb
arnaud-lb
commented
Aug 6, 2026

Copy link


Copy Markdown

Member
Thank you!
@NickSdotNickSdot
mentioned this pull request
Aug 9, 2026
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@arnaud-lbarnaud-lbarnaud-lb approved these changes
@adoyadoyAwaiting requested review from adoyadoy is a code owner
@GrahamCampbellGrahamCampbellAwaiting requested review from GrahamCampbell

Assignees


No one assigned


Labels

Extension: curl

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Sjord@GrahamCampbell@arnaud-lb

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ext/curl: show curl option name in error message - #22908
Merged
arnaud-lb merged 9 commits into
php:masterfrom 
Sjord:curl-error-option-name
Aug 6, 2026
Merged
ext/curl: show curl option name in error message#22908
arnaud-lb merged 9 commits into
php:masterfrom 
Sjord:curl-error-option-name
Conversation
@Sjord
@SjordSjord
commented
Jul 28, 2026

Copy link


Copy Markdown

Contributor
Retrieve the option name by using curl_easy_option_by_id or by walking zend_constants, depending on whether the curl version used has curl_easy_option_by_id.
Showing the option name is especially useful when using curl_setopt_array. A user may specify many options, and this change makes it clear which option is wrong exactly.
Related to #10097, #22705.
@SjordSjord
mentioned this pull request
Jul 28, 2026
 Closed

@Sjord
Sjord
commented
Jul 28, 2026

Copy link


Copy Markdown

ContributorAuthor
@GrahamCampbell What do you think about this fallback in case curl_easy_option_by_id is not available?
@Sjord
Sjord
commented
Jul 29, 2026

Copy link


Copy Markdown

ContributorAuthor
php_curl_option_get_name currently does not work correctly for values that have multiple names:
  • CURLOPT_FTP_RESPONSE_TIMEOUT = CURLOPT_SERVER_RESPONSE_TIMEOUT
  • CURLOPT_ENCODING = CURLOPT_ACCEPT_ENCODING
  • CURLOPT_MAIL_RCPT_ALLLOWFAILS = CURLOPT_MAIL_RCPT_ALLOWFAILS
I think this is currently OK and can probably be fixed in the future.
I am also wondering if it makes sense to loop through zend_constants as a fallback when curl_easy_option_by_id returns null, but I can't think of a situation where that would result in anything.
@Sjord
Sjord
marked this pull request as ready for review
July 29, 2026 09:15
@Sjord
Sjord
requested a review
from adoy
as a code ownerJuly 29, 2026 09:15
GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadext/curl/interface.c
@GrahamCampbell
GrahamCampbell
commented
Jul 29, 2026

Copy link


Copy Markdown

Contributor
Should this get a short Curl entry in NEWS? It changes user-visible validation messages, and the recent error-message clean-ups in other extensions have been recorded there. Perhaps:
- Curl:
. Improved cURL option validation errors to include the option name.
(Sjoerd Langkemper)

GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadext/curl/tests/bug48207.phpt
@Sjord
Sjord
commented
Jul 29, 2026

Copy link


Copy Markdown

ContributorAuthor
@GrahamCampbell Thanks, great feedback.
GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadNEWS
Outdated

@SjordSjord
changed the title
Show curl option name in error messageext/curl: show curl option name in error messageJul 30, 2026
@Sjord
Sjordforce-pushed
the
curl-error-option-name
branch
from
0c92a07 to
37c402bCompareJuly 30, 2026 12:08
Sjord
added 8 commits
August 4, 2026 08:10
@Sjord
Show curl option name in error message
9f4891e
Use curl_easy_option_by_id to retrieve the name of the option, and also
show the name of the option in the case where strings contain a null
byte.
curl_easy_option_by_id simplifies the code, but was introduced in curl
7.73.0, so this also bumps the minimum version of curl. 7.73.0 was
released in 2020, so I think that's acceptable.
Showing the option name is especially useful when using
curl_setopt_array. A user may specify many options, and this change
makes it clear which option is wrong exactly.
@Sjord
Add function to determine name
d1cacef
@Sjord
Use option name in more error messages
22f44d0
@Sjord
Revert MIN_SUPPORTED_CURL_VERSION
18a866b
@Sjord
Fix type of prefix string
4a87680
@Sjord
Fix review comments
e9482da
- Add line to NEWS
- Test more values for writable file handles
- Fallback to zend_constants if curl_easy_option_by_id fails
@Sjord
Move NEWS item to alpha3
ab1f036
@Sjord
Move NEWS message even more
040221c
@Sjord
Sjordforce-pushed
the
curl-error-option-name
branch
from
37c402b to
040221cCompareAugust 4, 2026 08:11
@Sjord
Sjord
commented
Aug 4, 2026

Copy link


Copy Markdown

ContributorAuthor
This is ready.
@Sjord
Sjord
commented
Aug 6, 2026

Copy link


Copy Markdown

ContributorAuthor
@arnaud-lb Could you take a look at this, and perhaps merge it?
arnaud-lb
arnaud-lb
approved these changes
Aug 6, 2026
View reviewed changes
@arnaud-lbarnaud-lb
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.

Looks good to me!
@arnaud-lb
arnaud-lb
merged commit 6a4ab2e
into
php:masterAug 6, 2026

18 checks passed

@arnaud-lb
arnaud-lb
commented
Aug 6, 2026

Copy link


Copy Markdown

Member
Thank you!
@NickSdotNickSdot
mentioned this pull request
Aug 9, 2026
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@arnaud-lbarnaud-lbarnaud-lb approved these changes
@adoyadoyAwaiting requested review from adoyadoy is a code owner
@GrahamCampbellGrahamCampbellAwaiting requested review from GrahamCampbell

Assignees


No one assigned


Labels

Extension: curl

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Sjord@GrahamCampbell@arnaud-lb

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ext/curl: show curl option name in error message - #22908
Merged
arnaud-lb merged 9 commits into
php:masterfrom 
Sjord:curl-error-option-name
Aug 6, 2026
Merged
ext/curl: show curl option name in error message#22908
arnaud-lb merged 9 commits into
php:masterfrom 
Sjord:curl-error-option-name
Conversation
@Sjord
@SjordSjord
commented
Jul 28, 2026

Copy link


Copy Markdown

Contributor
Retrieve the option name by using curl_easy_option_by_id or by walking zend_constants, depending on whether the curl version used has curl_easy_option_by_id.
Showing the option name is especially useful when using curl_setopt_array. A user may specify many options, and this change makes it clear which option is wrong exactly.
Related to #10097, #22705.
@SjordSjord
mentioned this pull request
Jul 28, 2026
 Closed

@Sjord
Sjord
commented
Jul 28, 2026

Copy link


Copy Markdown

ContributorAuthor
@GrahamCampbell What do you think about this fallback in case curl_easy_option_by_id is not available?
@Sjord
Sjord
commented
Jul 29, 2026

Copy link


Copy Markdown

ContributorAuthor
php_curl_option_get_name currently does not work correctly for values that have multiple names:
  • CURLOPT_FTP_RESPONSE_TIMEOUT = CURLOPT_SERVER_RESPONSE_TIMEOUT
  • CURLOPT_ENCODING = CURLOPT_ACCEPT_ENCODING
  • CURLOPT_MAIL_RCPT_ALLLOWFAILS = CURLOPT_MAIL_RCPT_ALLOWFAILS
I think this is currently OK and can probably be fixed in the future.
I am also wondering if it makes sense to loop through zend_constants as a fallback when curl_easy_option_by_id returns null, but I can't think of a situation where that would result in anything.
@Sjord
Sjord
marked this pull request as ready for review
July 29, 2026 09:15
@Sjord
Sjord
requested a review
from adoy
as a code ownerJuly 29, 2026 09:15
GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadext/curl/interface.c
@GrahamCampbell
GrahamCampbell
commented
Jul 29, 2026

Copy link


Copy Markdown

Contributor
Should this get a short Curl entry in NEWS? It changes user-visible validation messages, and the recent error-message clean-ups in other extensions have been recorded there. Perhaps:
- Curl:
. Improved cURL option validation errors to include the option name.
(Sjoerd Langkemper)

GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadext/curl/tests/bug48207.phpt
@Sjord
Sjord
commented
Jul 29, 2026

Copy link


Copy Markdown

ContributorAuthor
@GrahamCampbell Thanks, great feedback.
GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadNEWS
Outdated

@SjordSjord
changed the title
Show curl option name in error messageext/curl: show curl option name in error messageJul 30, 2026
@Sjord
Sjordforce-pushed
the
curl-error-option-name
branch
from
0c92a07 to
37c402bCompareJuly 30, 2026 12:08
Sjord
added 8 commits
August 4, 2026 08:10
@Sjord
Show curl option name in error message
9f4891e
Use curl_easy_option_by_id to retrieve the name of the option, and also
show the name of the option in the case where strings contain a null
byte.
curl_easy_option_by_id simplifies the code, but was introduced in curl
7.73.0, so this also bumps the minimum version of curl. 7.73.0 was
released in 2020, so I think that's acceptable.
Showing the option name is especially useful when using
curl_setopt_array. A user may specify many options, and this change
makes it clear which option is wrong exactly.
@Sjord
Add function to determine name
d1cacef
@Sjord
Use option name in more error messages
22f44d0
@Sjord
Revert MIN_SUPPORTED_CURL_VERSION
18a866b
@Sjord
Fix type of prefix string
4a87680
@Sjord
Fix review comments
e9482da
- Add line to NEWS
- Test more values for writable file handles
- Fallback to zend_constants if curl_easy_option_by_id fails
@Sjord
Move NEWS item to alpha3
ab1f036
@Sjord
Move NEWS message even more
040221c
@Sjord
Sjordforce-pushed
the
curl-error-option-name
branch
from
37c402b to
040221cCompareAugust 4, 2026 08:11
@Sjord
Sjord
commented
Aug 4, 2026

Copy link


Copy Markdown

ContributorAuthor
This is ready.
@Sjord
Sjord
commented
Aug 6, 2026

Copy link


Copy Markdown

ContributorAuthor
@arnaud-lb Could you take a look at this, and perhaps merge it?
arnaud-lb
arnaud-lb
approved these changes
Aug 6, 2026
View reviewed changes
@arnaud-lbarnaud-lb
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.

Looks good to me!
@arnaud-lb
arnaud-lb
merged commit 6a4ab2e
into
php:masterAug 6, 2026

18 checks passed

@arnaud-lb
arnaud-lb
commented
Aug 6, 2026

Copy link


Copy Markdown

Member
Thank you!
@NickSdotNickSdot
mentioned this pull request
Aug 9, 2026
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@arnaud-lbarnaud-lbarnaud-lb approved these changes
@adoyadoyAwaiting requested review from adoyadoy is a code owner
@GrahamCampbellGrahamCampbellAwaiting requested review from GrahamCampbell

Assignees


No one assigned


Labels

Extension: curl

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Sjord@GrahamCampbell@arnaud-lb

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

Skip to content
ext/curl: show curl option name in error message - #22908
Merged
arnaud-lb merged 9 commits into
php:masterfrom 
Sjord:curl-error-option-name
Aug 6, 2026
Merged
ext/curl: show curl option name in error message#22908
arnaud-lb merged 9 commits into
php:masterfrom 
Sjord:curl-error-option-name
Conversation
@Sjord
@SjordSjord
commented
Jul 28, 2026

Copy link


Copy Markdown

Contributor
Retrieve the option name by using curl_easy_option_by_id or by walking zend_constants, depending on whether the curl version used has curl_easy_option_by_id.
Showing the option name is especially useful when using curl_setopt_array. A user may specify many options, and this change makes it clear which option is wrong exactly.
Related to #10097, #22705.
@SjordSjord
mentioned this pull request
Jul 28, 2026
 Closed

@Sjord
Sjord
commented
Jul 28, 2026

Copy link


Copy Markdown

ContributorAuthor
@GrahamCampbell What do you think about this fallback in case curl_easy_option_by_id is not available?
@Sjord
Sjord
commented
Jul 29, 2026

Copy link


Copy Markdown

ContributorAuthor
php_curl_option_get_name currently does not work correctly for values that have multiple names:
  • CURLOPT_FTP_RESPONSE_TIMEOUT = CURLOPT_SERVER_RESPONSE_TIMEOUT
  • CURLOPT_ENCODING = CURLOPT_ACCEPT_ENCODING
  • CURLOPT_MAIL_RCPT_ALLLOWFAILS = CURLOPT_MAIL_RCPT_ALLOWFAILS
I think this is currently OK and can probably be fixed in the future.
I am also wondering if it makes sense to loop through zend_constants as a fallback when curl_easy_option_by_id returns null, but I can't think of a situation where that would result in anything.
@Sjord
Sjord
marked this pull request as ready for review
July 29, 2026 09:15
@Sjord
Sjord
requested a review
from adoy
as a code ownerJuly 29, 2026 09:15
GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadext/curl/interface.c
@GrahamCampbell
GrahamCampbell
commented
Jul 29, 2026

Copy link


Copy Markdown

Contributor
Should this get a short Curl entry in NEWS? It changes user-visible validation messages, and the recent error-message clean-ups in other extensions have been recorded there. Perhaps:
- Curl:
. Improved cURL option validation errors to include the option name.
(Sjoerd Langkemper)

GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadext/curl/tests/bug48207.phpt
@Sjord
Sjord
commented
Jul 29, 2026

Copy link


Copy Markdown

ContributorAuthor
@GrahamCampbell Thanks, great feedback.
GrahamCampbell
GrahamCampbell
reviewed
Jul 29, 2026
View reviewed changes
Comment threadNEWS
Outdated

@SjordSjord
changed the title
Show curl option name in error messageext/curl: show curl option name in error messageJul 30, 2026
@Sjord
Sjordforce-pushed
the
curl-error-option-name
branch
from
0c92a07 to
37c402bCompareJuly 30, 2026 12:08
Sjord
added 8 commits
August 4, 2026 08:10
@Sjord
Show curl option name in error message
9f4891e
Use curl_easy_option_by_id to retrieve the name of the option, and also
show the name of the option in the case where strings contain a null
byte.
curl_easy_option_by_id simplifies the code, but was introduced in curl
7.73.0, so this also bumps the minimum version of curl. 7.73.0 was
released in 2020, so I think that's acceptable.
Showing the option name is especially useful when using
curl_setopt_array. A user may specify many options, and this change
makes it clear which option is wrong exactly.
@Sjord
Add function to determine name
d1cacef
@Sjord
Use option name in more error messages
22f44d0
@Sjord
Revert MIN_SUPPORTED_CURL_VERSION
18a866b
@Sjord
Fix type of prefix string
4a87680
@Sjord
Fix review comments
e9482da
- Add line to NEWS
- Test more values for writable file handles
- Fallback to zend_constants if curl_easy_option_by_id fails
@Sjord
Move NEWS item to alpha3
ab1f036
@Sjord
Move NEWS message even more
040221c
@Sjord
Sjordforce-pushed
the
curl-error-option-name
branch
from
37c402b to
040221cCompareAugust 4, 2026 08:11
@Sjord
Sjord
commented
Aug 4, 2026

Copy link


Copy Markdown

ContributorAuthor
This is ready.
@Sjord
Sjord
commented
Aug 6, 2026

Copy link


Copy Markdown

ContributorAuthor
@arnaud-lb Could you take a look at this, and perhaps merge it?
arnaud-lb
arnaud-lb
approved these changes
Aug 6, 2026
View reviewed changes
@arnaud-lbarnaud-lb
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.

Looks good to me!
@arnaud-lb
arnaud-lb
merged commit 6a4ab2e
into
php:masterAug 6, 2026

18 checks passed

@arnaud-lb
arnaud-lb
commented
Aug 6, 2026

Copy link


Copy Markdown

Member
Thank you!
@NickSdotNickSdot
mentioned this pull request
Aug 9, 2026
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@arnaud-lbarnaud-lbarnaud-lb approved these changes
@adoyadoyAwaiting requested review from adoyadoy is a code owner
@GrahamCampbellGrahamCampbellAwaiting requested review from GrahamCampbell

Assignees


No one assigned


Labels

Extension: curl

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Sjord@GrahamCampbell@arnaud-lb