Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Girgias merged 2 commits into from
Jan 31, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fee6760
ext/curl: Bump minimim Curl version to >= 7.61.0
Ayesh Jan 27, 2024
4cea17f
ext/curl: Update libcurl ver comparison preprocessors to contain huma…
Ayesh Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Core:

Curl:
. Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)
. Bumped required libcurl version to 7.61.0. (Ayesh)

Date:
. Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)
Expand Down
3 changes: 3 additions & 0 deletions UPGRADING
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,9 @@ PDO_SQLITE:
9. Other Changes to Extensions
========================================

- Curl:
. The Curl extension now requires at least libcurl 7.61.0.

- Intl:
. The class constants are typed now.

Expand Down
2 changes: 1 addition & 1 deletion ext/curl/config.m4
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ PHP_ARG_WITH([curl],
[Include cURL support])])

if test "$PHP_CURL" != "no"; then
PKG_CHECK_MODULES([CURL], [libcurl >= 7.29.0])
PKG_CHECK_MODULES([CURL], [libcurl >= 7.61.0])
PKG_CHECK_VAR([CURL_FEATURES], [libcurl], [supported_features])

PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
Expand Down
68 changes: 0 additions & 68 deletions ext/curl/curl.stub.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -472,13 +472,11 @@
* @cvalue CURLOPT_WRITEHEADER
*/
const CURLOPT_WRITEHEADER = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072000
/**
* @var int
* @cvalue CURLOPT_XFERINFOFUNCTION
*/
const CURLOPT_XFERINFOFUNCTION = UNKNOWN;
#endif

/* */
/**
Expand DownExpand Up@@ -776,13 +774,11 @@
* @cvalue CURLE_SSL_PEER_CERTIFICATE
*/
const CURLE_SSL_PEER_CERTIFICATE = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
* @var int
* @cvalue CURLE_SSL_PINNEDPUBKEYNOTMATCH
*/
const CURLE_SSL_PINNEDPUBKEYNOTMATCH = UNKNOWN;
#endif
/**
* @var int
* @cvalue CURLE_TELNET_OPTION_SYNTAX
Expand DownExpand Up@@ -998,13 +994,11 @@
* @cvalue CURLM_OUT_OF_MEMORY
*/
const CURLM_OUT_OF_MEMORY = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072001 /* Available since 7.32.1 */
/**
* @var int
* @cvalue CURLM_ADDED_ALREADY
*/
const CURLM_ADDED_ALREADY = UNKNOWN;
#endif

/* Curl proxy constants */
/**
Expand DownExpand Up@@ -2385,7 +2379,6 @@
*/
const CURLSSH_AUTH_AGENT = UNKNOWN;

#if LIBCURL_VERSION_NUM >= 0x071e00 /* Available since 7.30.0 */
/**
* @var int
* @cvalue CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE
Expand All@@ -2411,17 +2404,13 @@
* @cvalue CURLMOPT_MAX_TOTAL_CONNECTIONS
*/
const CURLMOPT_MAX_TOTAL_CONNECTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x071f00 /* Available since 7.31.0 */
/**
* @var int
* @cvalue CURLOPT_SASL_IR
*/
const CURLOPT_SASL_IR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072100 /* Available since 7.33.0 */
/**
* @var int
* @cvalue CURLOPT_DNS_INTERFACE
Expand DownExpand Up@@ -2453,9 +2442,7 @@
* @cvalue CURL_VERSION_HTTP2
*/
const CURL_VERSION_HTTP2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
/**
* @var int
* @cvalue CURLOPT_LOGIN_OPTIONS
Expand All@@ -2477,9 +2464,7 @@
* @cvalue CURL_SSLVERSION_TLSv1_2
*/
const CURL_SSLVERSION_TLSv1_2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072400 /* Available since 7.36.0 */
/**
* @var int
* @cvalue CURLOPT_EXPECT_100_TIMEOUT_MS
Expand All@@ -2495,9 +2480,7 @@
* @cvalue CURLOPT_SSL_ENABLE_NPN
*/
const CURLOPT_SSL_ENABLE_NPN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072500 /* Available since 7.37.0 */
/**
* @var int
* @cvalue CURLHEADER_SEPARATE
Expand All@@ -2518,9 +2501,7 @@
* @cvalue CURLOPT_PROXYHEADER
*/
const CURLOPT_PROXYHEADER = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072600 /* Available since 7.38.0 */
/**
* @var int
* @cvalue CURLAUTH_NEGOTIATE
Expand All@@ -2531,17 +2512,13 @@
* @cvalue CURL_VERSION_GSSAPI
*/
const CURL_VERSION_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
* @var int
* @cvalue CURLOPT_PINNEDPUBLICKEY
*/
const CURLOPT_PINNEDPUBLICKEY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072800 /* Available since 7.40.0 */
/**
* @var int
* @cvalue CURLOPT_UNIX_SOCKET_PATH
Expand All@@ -2567,17 +2544,13 @@
* @cvalue CURL_VERSION_UNIX_SOCKETS
*/
const CURL_VERSION_UNIX_SOCKETS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072900 /* Available since 7.41.0 */
/**
* @var int
* @cvalue CURLOPT_SSL_VERIFYSTATUS
*/
const CURLOPT_SSL_VERIFYSTATUS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072a00 /* Available since 7.42.0 */
/**
* @var int
* @cvalue CURLOPT_PATH_AS_IS
Expand All@@ -2588,9 +2561,7 @@
* @cvalue CURLOPT_SSL_FALSESTART
*/
const CURLOPT_SSL_FALSESTART = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072b00 /* Available since 7.43.0 */
/**
* @var int
* @cvalue CURL_HTTP_VERSION_2
Expand DownExpand Up@@ -2628,25 +2599,19 @@
* @cvalue CURLPIPE_MULTIPLEX
*/
const CURLPIPE_MULTIPLEX = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072c00 /* Available since 7.44.0 */
/**
* @var int
* @cvalue CURLSSLOPT_NO_REVOKE
*/
const CURLSSLOPT_NO_REVOKE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072d00 /* Available since 7.45.0 */
/**
* @var int
* @cvalue CURLOPT_DEFAULT_PROTOCOL
*/
const CURLOPT_DEFAULT_PROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072e00 /* Available since 7.46.0 */
/**
* @var int
* @cvalue CURLOPT_STREAM_WEIGHT
Expand All@@ -2667,9 +2632,7 @@
* @cvalue CURL_PUSH_DENY
*/
const CURL_PUSH_DENY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072f00 /* Available since 7.47.0 */
/**
* @var int
* @cvalue CURL_HTTP_VERSION_2TLS
Expand All@@ -2680,17 +2643,13 @@
* @cvalue CURL_VERSION_PSL
*/
const CURL_VERSION_PSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073000 /* Available since 7.48.0 */
/**
* @var int
* @cvalue CURLOPT_TFTP_NO_OPTIONS
*/
const CURLOPT_TFTP_NO_OPTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073100 /* Available since 7.49.0 */
/**
* @var int
* @cvalue CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE
Expand All@@ -2706,17 +2665,13 @@
* @cvalue CURLOPT_TCP_FASTOPEN
*/
const CURLOPT_TCP_FASTOPEN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073200 /* Available since 7.50.0 */
/**
* @var int
* @cvalue CURLINFO_HTTP_VERSION
*/
const CURLINFO_HTTP_VERSION = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073300 /* Available since 7.51.0 */
/**
* @var int
* @cvalue CURLE_WEIRD_SERVER_REPLY
Expand All@@ -2727,9 +2682,7 @@
* @cvalue CURLOPT_KEEP_SENDING_ON_ERROR
*/
const CURLOPT_KEEP_SENDING_ON_ERROR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073400 /* Available since 7.52.0 */
/**
* @var int
* @cvalue CURL_SSLVERSION_TLSv1_3
Expand DownExpand Up@@ -2850,9 +2803,7 @@
* @cvalue CURLPROXY_HTTPS
*/
const CURLPROXY_HTTPS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073500 /* Available since 7.53.0 */
/**
* @var int
* @cvalue CURL_MAX_READ_SIZE
Expand All@@ -2863,9 +2814,7 @@
* @cvalue CURLOPT_ABSTRACT_UNIX_SOCKET
*/
const CURLOPT_ABSTRACT_UNIX_SOCKET = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073600 /* Available since 7.54.0 */
/**
* @var int
* @cvalue CURL_SSLVERSION_MAX_DEFAULT
Expand DownExpand Up@@ -2901,17 +2850,13 @@
* @cvalue CURLOPT_SUPPRESS_CONNECT_HEADERS
*/
const CURLOPT_SUPPRESS_CONNECT_HEADERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073601 /* Available since 7.54.1 */
/**
* @var int
* @cvalue CURLAUTH_GSSAPI
*/
const CURLAUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073700 /* Available since 7.55.0 */
/**
* @var int
* @cvalue CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
Expand DownExpand Up@@ -2952,9 +2897,7 @@
* @cvalue CURLOPT_SOCKS5_AUTH
*/
const CURLOPT_SOCKS5_AUTH = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073800 /* Available since 7.56.0 */
/**
* @var int
* @cvalue CURLOPT_SSH_COMPRESSION
Expand All@@ -2965,9 +2908,7 @@
* @cvalue CURL_VERSION_MULTI_SSL
*/
const CURL_VERSION_MULTI_SSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073900 /* Available since 7.57.0 */
/**
* @var int
* @cvalue CURL_VERSION_BROTLI
Expand All@@ -2978,17 +2919,13 @@
* @cvalue CURL_LOCK_DATA_CONNECT
*/
const CURL_LOCK_DATA_CONNECT = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073a00 /* Available since 7.58.0 */
/**
* @var int
* @cvalue CURLSSH_AUTH_GSSAPI
*/
const CURLSSH_AUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073b00 /* Available since 7.59.0 */
/**
* @var int
* @cvalue CURLINFO_FILETIME_T
Expand All@@ -3004,9 +2941,7 @@
* @cvalue CURLOPT_TIMEVALUE_LARGE
*/
const CURLOPT_TIMEVALUE_LARGE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073c00 /* Available since 7.60.0 */
/**
* @var int
* @cvalue CURLOPT_DNS_SHUFFLE_ADDRESSES
Expand All@@ -3017,9 +2952,7 @@
* @cvalue CURLOPT_HAPROXYPROTOCOL
*/
const CURLOPT_HAPROXYPROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073d00 /* Available since 7.61.0 */
/**
* @var int
* @cvalue CURL_LOCK_DATA_PSL
Expand DownExpand Up@@ -3080,7 +3013,6 @@
* @cvalue CURLOPT_TLS13_CIPHERS
*/
const CURLOPT_TLS13_CIPHERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */
/**
Expand Down
Loading
, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Girgias
merged 2 commits into

from

Jan 31, 2024
 Merged


ext/curl: Bump minimum Curl version to >= 7.61.0
#13259
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fee6760

ext/curl: Bump minimim Curl version to >= 7.61.0


Ayesh Jan 27, 2024
4cea17f

ext/curl: Update libcurl ver comparison preprocessors to contain huma…


Ayesh Jan 29, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
NEWS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Core:

Curl:
 . Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)
 . Bumped required libcurl version to 7.61.0. (Ayesh)

Date:
 . Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)
Expand Down

3 changes: 3 additions & 0 deletions
UPGRADING

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,9 @@ PDO_SQLITE:
9. Other Changes to Extensions
========================================

- Curl:
 . The Curl extension now requires at least libcurl 7.61.0.

- Intl:
 . The class constants are typed now.

Expand Down

2 changes: 1 addition & 1 deletion
ext/curl/config.m4

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ PHP_ARG_WITH([curl],
 [Include cURL support])])

if test "$PHP_CURL" != "no"; then
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.29.0])
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.61.0])
 PKG_CHECK_VAR([CURL_FEATURES], [libcurl], [supported_features])

 PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
Expand Down

68 changes: 0 additions & 68 deletions
ext/curl/curl.stub.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -472,13 +472,11 @@
 * @cvalue CURLOPT_WRITEHEADER
 */
const CURLOPT_WRITEHEADER = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072000
/**
 * @var int
 * @cvalue CURLOPT_XFERINFOFUNCTION
 */
const CURLOPT_XFERINFOFUNCTION = UNKNOWN;
#endif

/* */
/**
Expand DownExpand Up@@ -776,13 +774,11 @@
 * @cvalue CURLE_SSL_PEER_CERTIFICATE
 */
const CURLE_SSL_PEER_CERTIFICATE = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
 * @var int
 * @cvalue CURLE_SSL_PINNEDPUBKEYNOTMATCH
 */
const CURLE_SSL_PINNEDPUBKEYNOTMATCH = UNKNOWN;
#endif
/**
 * @var int
 * @cvalue CURLE_TELNET_OPTION_SYNTAX
Expand DownExpand Up@@ -998,13 +994,11 @@
 * @cvalue CURLM_OUT_OF_MEMORY
 */
const CURLM_OUT_OF_MEMORY = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072001 /* Available since 7.32.1 */
/**
 * @var int
 * @cvalue CURLM_ADDED_ALREADY
 */
const CURLM_ADDED_ALREADY = UNKNOWN;
#endif

/* Curl proxy constants */
/**
Expand DownExpand Up@@ -2385,7 +2379,6 @@
 */
const CURLSSH_AUTH_AGENT = UNKNOWN;

#if LIBCURL_VERSION_NUM >= 0x071e00 /* Available since 7.30.0 */
/**
 * @var int
 * @cvalue CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE
Expand All@@ -2411,17 +2404,13 @@
 * @cvalue CURLMOPT_MAX_TOTAL_CONNECTIONS
 */
const CURLMOPT_MAX_TOTAL_CONNECTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x071f00 /* Available since 7.31.0 */
/**
 * @var int
 * @cvalue CURLOPT_SASL_IR
 */
const CURLOPT_SASL_IR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072100 /* Available since 7.33.0 */
/**
 * @var int
 * @cvalue CURLOPT_DNS_INTERFACE
Expand DownExpand Up@@ -2453,9 +2442,7 @@
 * @cvalue CURL_VERSION_HTTP2
 */
const CURL_VERSION_HTTP2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
/**
 * @var int
 * @cvalue CURLOPT_LOGIN_OPTIONS
Expand All@@ -2477,9 +2464,7 @@
 * @cvalue CURL_SSLVERSION_TLSv1_2
 */
const CURL_SSLVERSION_TLSv1_2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072400 /* Available since 7.36.0 */
/**
 * @var int
 * @cvalue CURLOPT_EXPECT_100_TIMEOUT_MS
Expand All@@ -2495,9 +2480,7 @@
 * @cvalue CURLOPT_SSL_ENABLE_NPN
 */
const CURLOPT_SSL_ENABLE_NPN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072500 /* Available since 7.37.0 */
/**
 * @var int
 * @cvalue CURLHEADER_SEPARATE
Expand All@@ -2518,9 +2501,7 @@
 * @cvalue CURLOPT_PROXYHEADER
 */
const CURLOPT_PROXYHEADER = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072600 /* Available since 7.38.0 */
/**
 * @var int
 * @cvalue CURLAUTH_NEGOTIATE
Expand All@@ -2531,17 +2512,13 @@
 * @cvalue CURL_VERSION_GSSAPI
 */
const CURL_VERSION_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
 * @var int
 * @cvalue CURLOPT_PINNEDPUBLICKEY
 */
const CURLOPT_PINNEDPUBLICKEY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072800 /* Available since 7.40.0 */
/**
 * @var int
 * @cvalue CURLOPT_UNIX_SOCKET_PATH
Expand All@@ -2567,17 +2544,13 @@
 * @cvalue CURL_VERSION_UNIX_SOCKETS
 */
const CURL_VERSION_UNIX_SOCKETS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072900 /* Available since 7.41.0 */
/**
 * @var int
 * @cvalue CURLOPT_SSL_VERIFYSTATUS
 */
const CURLOPT_SSL_VERIFYSTATUS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072a00 /* Available since 7.42.0 */
/**
 * @var int
 * @cvalue CURLOPT_PATH_AS_IS
Expand All@@ -2588,9 +2561,7 @@
 * @cvalue CURLOPT_SSL_FALSESTART
 */
const CURLOPT_SSL_FALSESTART = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072b00 /* Available since 7.43.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2
Expand DownExpand Up@@ -2628,25 +2599,19 @@
 * @cvalue CURLPIPE_MULTIPLEX
 */
const CURLPIPE_MULTIPLEX = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072c00 /* Available since 7.44.0 */
/**
 * @var int
 * @cvalue CURLSSLOPT_NO_REVOKE
 */
const CURLSSLOPT_NO_REVOKE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072d00 /* Available since 7.45.0 */
/**
 * @var int
 * @cvalue CURLOPT_DEFAULT_PROTOCOL
 */
const CURLOPT_DEFAULT_PROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072e00 /* Available since 7.46.0 */
/**
 * @var int
 * @cvalue CURLOPT_STREAM_WEIGHT
Expand All@@ -2667,9 +2632,7 @@
 * @cvalue CURL_PUSH_DENY
 */
const CURL_PUSH_DENY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072f00 /* Available since 7.47.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2TLS
Expand All@@ -2680,17 +2643,13 @@
 * @cvalue CURL_VERSION_PSL
 */
const CURL_VERSION_PSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073000 /* Available since 7.48.0 */
/**
 * @var int
 * @cvalue CURLOPT_TFTP_NO_OPTIONS
 */
const CURLOPT_TFTP_NO_OPTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073100 /* Available since 7.49.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE
Expand All@@ -2706,17 +2665,13 @@
 * @cvalue CURLOPT_TCP_FASTOPEN
 */
const CURLOPT_TCP_FASTOPEN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073200 /* Available since 7.50.0 */
/**
 * @var int
 * @cvalue CURLINFO_HTTP_VERSION
 */
const CURLINFO_HTTP_VERSION = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073300 /* Available since 7.51.0 */
/**
 * @var int
 * @cvalue CURLE_WEIRD_SERVER_REPLY
Expand All@@ -2727,9 +2682,7 @@
 * @cvalue CURLOPT_KEEP_SENDING_ON_ERROR
 */
const CURLOPT_KEEP_SENDING_ON_ERROR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073400 /* Available since 7.52.0 */
/**
 * @var int
 * @cvalue CURL_SSLVERSION_TLSv1_3
Expand DownExpand Up@@ -2850,9 +2803,7 @@
 * @cvalue CURLPROXY_HTTPS
 */
const CURLPROXY_HTTPS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073500 /* Available since 7.53.0 */
/**
 * @var int
 * @cvalue CURL_MAX_READ_SIZE
Expand All@@ -2863,9 +2814,7 @@
 * @cvalue CURLOPT_ABSTRACT_UNIX_SOCKET
 */
const CURLOPT_ABSTRACT_UNIX_SOCKET = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073600 /* Available since 7.54.0 */
/**
 * @var int
 * @cvalue CURL_SSLVERSION_MAX_DEFAULT
Expand DownExpand Up@@ -2901,17 +2850,13 @@
 * @cvalue CURLOPT_SUPPRESS_CONNECT_HEADERS
 */
const CURLOPT_SUPPRESS_CONNECT_HEADERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073601 /* Available since 7.54.1 */
/**
 * @var int
 * @cvalue CURLAUTH_GSSAPI
 */
const CURLAUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073700 /* Available since 7.55.0 */
/**
 * @var int
 * @cvalue CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
Expand DownExpand Up@@ -2952,9 +2897,7 @@
 * @cvalue CURLOPT_SOCKS5_AUTH
 */
const CURLOPT_SOCKS5_AUTH = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073800 /* Available since 7.56.0 */
/**
 * @var int
 * @cvalue CURLOPT_SSH_COMPRESSION
Expand All@@ -2965,9 +2908,7 @@
 * @cvalue CURL_VERSION_MULTI_SSL
 */
const CURL_VERSION_MULTI_SSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073900 /* Available since 7.57.0 */
/**
 * @var int
 * @cvalue CURL_VERSION_BROTLI
Expand All@@ -2978,17 +2919,13 @@
 * @cvalue CURL_LOCK_DATA_CONNECT
 */
const CURL_LOCK_DATA_CONNECT = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073a00 /* Available since 7.58.0 */
/**
 * @var int
 * @cvalue CURLSSH_AUTH_GSSAPI
 */
const CURLSSH_AUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073b00 /* Available since 7.59.0 */
/**
 * @var int
 * @cvalue CURLINFO_FILETIME_T
Expand All@@ -3004,9 +2941,7 @@
 * @cvalue CURLOPT_TIMEVALUE_LARGE
 */
const CURLOPT_TIMEVALUE_LARGE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073c00 /* Available since 7.60.0 */
/**
 * @var int
 * @cvalue CURLOPT_DNS_SHUFFLE_ADDRESSES
Expand All@@ -3017,9 +2952,7 @@
 * @cvalue CURLOPT_HAPROXYPROTOCOL
 */
const CURLOPT_HAPROXYPROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073d00 /* Available since 7.61.0 */
/**
 * @var int
 * @cvalue CURL_LOCK_DATA_PSL
Expand DownExpand Up@@ -3080,7 +3013,6 @@
 * @cvalue CURLOPT_TLS13_CIPHERS
 */
const CURLOPT_TLS13_CIPHERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */
/**
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Girgias
merged 2 commits into

from

Jan 31, 2024
 Merged


ext/curl: Bump minimum Curl version to >= 7.61.0
#13259
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fee6760

ext/curl: Bump minimim Curl version to >= 7.61.0


Ayesh Jan 27, 2024
4cea17f

ext/curl: Update libcurl ver comparison preprocessors to contain huma…


Ayesh Jan 29, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
NEWS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Core:

Curl:
 . Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)
 . Bumped required libcurl version to 7.61.0. (Ayesh)

Date:
 . Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)
Expand Down

3 changes: 3 additions & 0 deletions
UPGRADING

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,9 @@ PDO_SQLITE:
9. Other Changes to Extensions
========================================

- Curl:
 . The Curl extension now requires at least libcurl 7.61.0.

- Intl:
 . The class constants are typed now.

Expand Down

2 changes: 1 addition & 1 deletion
ext/curl/config.m4

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ PHP_ARG_WITH([curl],
 [Include cURL support])])

if test "$PHP_CURL" != "no"; then
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.29.0])
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.61.0])
 PKG_CHECK_VAR([CURL_FEATURES], [libcurl], [supported_features])

 PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
Expand Down

68 changes: 0 additions & 68 deletions
ext/curl/curl.stub.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -472,13 +472,11 @@
 * @cvalue CURLOPT_WRITEHEADER
 */
const CURLOPT_WRITEHEADER = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072000
/**
 * @var int
 * @cvalue CURLOPT_XFERINFOFUNCTION
 */
const CURLOPT_XFERINFOFUNCTION = UNKNOWN;
#endif

/* */
/**
Expand DownExpand Up@@ -776,13 +774,11 @@
 * @cvalue CURLE_SSL_PEER_CERTIFICATE
 */
const CURLE_SSL_PEER_CERTIFICATE = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
 * @var int
 * @cvalue CURLE_SSL_PINNEDPUBKEYNOTMATCH
 */
const CURLE_SSL_PINNEDPUBKEYNOTMATCH = UNKNOWN;
#endif
/**
 * @var int
 * @cvalue CURLE_TELNET_OPTION_SYNTAX
Expand DownExpand Up@@ -998,13 +994,11 @@
 * @cvalue CURLM_OUT_OF_MEMORY
 */
const CURLM_OUT_OF_MEMORY = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072001 /* Available since 7.32.1 */
/**
 * @var int
 * @cvalue CURLM_ADDED_ALREADY
 */
const CURLM_ADDED_ALREADY = UNKNOWN;
#endif

/* Curl proxy constants */
/**
Expand DownExpand Up@@ -2385,7 +2379,6 @@
 */
const CURLSSH_AUTH_AGENT = UNKNOWN;

#if LIBCURL_VERSION_NUM >= 0x071e00 /* Available since 7.30.0 */
/**
 * @var int
 * @cvalue CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE
Expand All@@ -2411,17 +2404,13 @@
 * @cvalue CURLMOPT_MAX_TOTAL_CONNECTIONS
 */
const CURLMOPT_MAX_TOTAL_CONNECTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x071f00 /* Available since 7.31.0 */
/**
 * @var int
 * @cvalue CURLOPT_SASL_IR
 */
const CURLOPT_SASL_IR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072100 /* Available since 7.33.0 */
/**
 * @var int
 * @cvalue CURLOPT_DNS_INTERFACE
Expand DownExpand Up@@ -2453,9 +2442,7 @@
 * @cvalue CURL_VERSION_HTTP2
 */
const CURL_VERSION_HTTP2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
/**
 * @var int
 * @cvalue CURLOPT_LOGIN_OPTIONS
Expand All@@ -2477,9 +2464,7 @@
 * @cvalue CURL_SSLVERSION_TLSv1_2
 */
const CURL_SSLVERSION_TLSv1_2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072400 /* Available since 7.36.0 */
/**
 * @var int
 * @cvalue CURLOPT_EXPECT_100_TIMEOUT_MS
Expand All@@ -2495,9 +2480,7 @@
 * @cvalue CURLOPT_SSL_ENABLE_NPN
 */
const CURLOPT_SSL_ENABLE_NPN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072500 /* Available since 7.37.0 */
/**
 * @var int
 * @cvalue CURLHEADER_SEPARATE
Expand All@@ -2518,9 +2501,7 @@
 * @cvalue CURLOPT_PROXYHEADER
 */
const CURLOPT_PROXYHEADER = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072600 /* Available since 7.38.0 */
/**
 * @var int
 * @cvalue CURLAUTH_NEGOTIATE
Expand All@@ -2531,17 +2512,13 @@
 * @cvalue CURL_VERSION_GSSAPI
 */
const CURL_VERSION_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
 * @var int
 * @cvalue CURLOPT_PINNEDPUBLICKEY
 */
const CURLOPT_PINNEDPUBLICKEY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072800 /* Available since 7.40.0 */
/**
 * @var int
 * @cvalue CURLOPT_UNIX_SOCKET_PATH
Expand All@@ -2567,17 +2544,13 @@
 * @cvalue CURL_VERSION_UNIX_SOCKETS
 */
const CURL_VERSION_UNIX_SOCKETS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072900 /* Available since 7.41.0 */
/**
 * @var int
 * @cvalue CURLOPT_SSL_VERIFYSTATUS
 */
const CURLOPT_SSL_VERIFYSTATUS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072a00 /* Available since 7.42.0 */
/**
 * @var int
 * @cvalue CURLOPT_PATH_AS_IS
Expand All@@ -2588,9 +2561,7 @@
 * @cvalue CURLOPT_SSL_FALSESTART
 */
const CURLOPT_SSL_FALSESTART = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072b00 /* Available since 7.43.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2
Expand DownExpand Up@@ -2628,25 +2599,19 @@
 * @cvalue CURLPIPE_MULTIPLEX
 */
const CURLPIPE_MULTIPLEX = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072c00 /* Available since 7.44.0 */
/**
 * @var int
 * @cvalue CURLSSLOPT_NO_REVOKE
 */
const CURLSSLOPT_NO_REVOKE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072d00 /* Available since 7.45.0 */
/**
 * @var int
 * @cvalue CURLOPT_DEFAULT_PROTOCOL
 */
const CURLOPT_DEFAULT_PROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072e00 /* Available since 7.46.0 */
/**
 * @var int
 * @cvalue CURLOPT_STREAM_WEIGHT
Expand All@@ -2667,9 +2632,7 @@
 * @cvalue CURL_PUSH_DENY
 */
const CURL_PUSH_DENY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072f00 /* Available since 7.47.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2TLS
Expand All@@ -2680,17 +2643,13 @@
 * @cvalue CURL_VERSION_PSL
 */
const CURL_VERSION_PSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073000 /* Available since 7.48.0 */
/**
 * @var int
 * @cvalue CURLOPT_TFTP_NO_OPTIONS
 */
const CURLOPT_TFTP_NO_OPTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073100 /* Available since 7.49.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE
Expand All@@ -2706,17 +2665,13 @@
 * @cvalue CURLOPT_TCP_FASTOPEN
 */
const CURLOPT_TCP_FASTOPEN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073200 /* Available since 7.50.0 */
/**
 * @var int
 * @cvalue CURLINFO_HTTP_VERSION
 */
const CURLINFO_HTTP_VERSION = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073300 /* Available since 7.51.0 */
/**
 * @var int
 * @cvalue CURLE_WEIRD_SERVER_REPLY
Expand All@@ -2727,9 +2682,7 @@
 * @cvalue CURLOPT_KEEP_SENDING_ON_ERROR
 */
const CURLOPT_KEEP_SENDING_ON_ERROR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073400 /* Available since 7.52.0 */
/**
 * @var int
 * @cvalue CURL_SSLVERSION_TLSv1_3
Expand DownExpand Up@@ -2850,9 +2803,7 @@
 * @cvalue CURLPROXY_HTTPS
 */
const CURLPROXY_HTTPS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073500 /* Available since 7.53.0 */
/**
 * @var int
 * @cvalue CURL_MAX_READ_SIZE
Expand All@@ -2863,9 +2814,7 @@
 * @cvalue CURLOPT_ABSTRACT_UNIX_SOCKET
 */
const CURLOPT_ABSTRACT_UNIX_SOCKET = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073600 /* Available since 7.54.0 */
/**
 * @var int
 * @cvalue CURL_SSLVERSION_MAX_DEFAULT
Expand DownExpand Up@@ -2901,17 +2850,13 @@
 * @cvalue CURLOPT_SUPPRESS_CONNECT_HEADERS
 */
const CURLOPT_SUPPRESS_CONNECT_HEADERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073601 /* Available since 7.54.1 */
/**
 * @var int
 * @cvalue CURLAUTH_GSSAPI
 */
const CURLAUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073700 /* Available since 7.55.0 */
/**
 * @var int
 * @cvalue CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
Expand DownExpand Up@@ -2952,9 +2897,7 @@
 * @cvalue CURLOPT_SOCKS5_AUTH
 */
const CURLOPT_SOCKS5_AUTH = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073800 /* Available since 7.56.0 */
/**
 * @var int
 * @cvalue CURLOPT_SSH_COMPRESSION
Expand All@@ -2965,9 +2908,7 @@
 * @cvalue CURL_VERSION_MULTI_SSL
 */
const CURL_VERSION_MULTI_SSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073900 /* Available since 7.57.0 */
/**
 * @var int
 * @cvalue CURL_VERSION_BROTLI
Expand All@@ -2978,17 +2919,13 @@
 * @cvalue CURL_LOCK_DATA_CONNECT
 */
const CURL_LOCK_DATA_CONNECT = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073a00 /* Available since 7.58.0 */
/**
 * @var int
 * @cvalue CURLSSH_AUTH_GSSAPI
 */
const CURLSSH_AUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073b00 /* Available since 7.59.0 */
/**
 * @var int
 * @cvalue CURLINFO_FILETIME_T
Expand All@@ -3004,9 +2941,7 @@
 * @cvalue CURLOPT_TIMEVALUE_LARGE
 */
const CURLOPT_TIMEVALUE_LARGE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073c00 /* Available since 7.60.0 */
/**
 * @var int
 * @cvalue CURLOPT_DNS_SHUFFLE_ADDRESSES
Expand All@@ -3017,9 +2952,7 @@
 * @cvalue CURLOPT_HAPROXYPROTOCOL
 */
const CURLOPT_HAPROXYPROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073d00 /* Available since 7.61.0 */
/**
 * @var int
 * @cvalue CURL_LOCK_DATA_PSL
Expand DownExpand Up@@ -3080,7 +3013,6 @@
 * @cvalue CURLOPT_TLS13_CIPHERS
 */
const CURLOPT_TLS13_CIPHERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */
/**
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Girgias
merged 2 commits into

from

Jan 31, 2024
 Merged


ext/curl: Bump minimum Curl version to >= 7.61.0
#13259
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fee6760

ext/curl: Bump minimim Curl version to >= 7.61.0


Ayesh Jan 27, 2024
4cea17f

ext/curl: Update libcurl ver comparison preprocessors to contain huma…


Ayesh Jan 29, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
NEWS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Core:

Curl:
 . Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)
 . Bumped required libcurl version to 7.61.0. (Ayesh)

Date:
 . Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)
Expand Down

3 changes: 3 additions & 0 deletions
UPGRADING

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,9 @@ PDO_SQLITE:
9. Other Changes to Extensions
========================================

- Curl:
 . The Curl extension now requires at least libcurl 7.61.0.

- Intl:
 . The class constants are typed now.

Expand Down

2 changes: 1 addition & 1 deletion
ext/curl/config.m4

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ PHP_ARG_WITH([curl],
 [Include cURL support])])

if test "$PHP_CURL" != "no"; then
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.29.0])
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.61.0])
 PKG_CHECK_VAR([CURL_FEATURES], [libcurl], [supported_features])

 PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
Expand Down

68 changes: 0 additions & 68 deletions
ext/curl/curl.stub.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -472,13 +472,11 @@
 * @cvalue CURLOPT_WRITEHEADER
 */
const CURLOPT_WRITEHEADER = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072000
/**
 * @var int
 * @cvalue CURLOPT_XFERINFOFUNCTION
 */
const CURLOPT_XFERINFOFUNCTION = UNKNOWN;
#endif

/* */
/**
Expand DownExpand Up@@ -776,13 +774,11 @@
 * @cvalue CURLE_SSL_PEER_CERTIFICATE
 */
const CURLE_SSL_PEER_CERTIFICATE = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
 * @var int
 * @cvalue CURLE_SSL_PINNEDPUBKEYNOTMATCH
 */
const CURLE_SSL_PINNEDPUBKEYNOTMATCH = UNKNOWN;
#endif
/**
 * @var int
 * @cvalue CURLE_TELNET_OPTION_SYNTAX
Expand DownExpand Up@@ -998,13 +994,11 @@
 * @cvalue CURLM_OUT_OF_MEMORY
 */
const CURLM_OUT_OF_MEMORY = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072001 /* Available since 7.32.1 */
/**
 * @var int
 * @cvalue CURLM_ADDED_ALREADY
 */
const CURLM_ADDED_ALREADY = UNKNOWN;
#endif

/* Curl proxy constants */
/**
Expand DownExpand Up@@ -2385,7 +2379,6 @@
 */
const CURLSSH_AUTH_AGENT = UNKNOWN;

#if LIBCURL_VERSION_NUM >= 0x071e00 /* Available since 7.30.0 */
/**
 * @var int
 * @cvalue CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE
Expand All@@ -2411,17 +2404,13 @@
 * @cvalue CURLMOPT_MAX_TOTAL_CONNECTIONS
 */
const CURLMOPT_MAX_TOTAL_CONNECTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x071f00 /* Available since 7.31.0 */
/**
 * @var int
 * @cvalue CURLOPT_SASL_IR
 */
const CURLOPT_SASL_IR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072100 /* Available since 7.33.0 */
/**
 * @var int
 * @cvalue CURLOPT_DNS_INTERFACE
Expand DownExpand Up@@ -2453,9 +2442,7 @@
 * @cvalue CURL_VERSION_HTTP2
 */
const CURL_VERSION_HTTP2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
/**
 * @var int
 * @cvalue CURLOPT_LOGIN_OPTIONS
Expand All@@ -2477,9 +2464,7 @@
 * @cvalue CURL_SSLVERSION_TLSv1_2
 */
const CURL_SSLVERSION_TLSv1_2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072400 /* Available since 7.36.0 */
/**
 * @var int
 * @cvalue CURLOPT_EXPECT_100_TIMEOUT_MS
Expand All@@ -2495,9 +2480,7 @@
 * @cvalue CURLOPT_SSL_ENABLE_NPN
 */
const CURLOPT_SSL_ENABLE_NPN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072500 /* Available since 7.37.0 */
/**
 * @var int
 * @cvalue CURLHEADER_SEPARATE
Expand All@@ -2518,9 +2501,7 @@
 * @cvalue CURLOPT_PROXYHEADER
 */
const CURLOPT_PROXYHEADER = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072600 /* Available since 7.38.0 */
/**
 * @var int
 * @cvalue CURLAUTH_NEGOTIATE
Expand All@@ -2531,17 +2512,13 @@
 * @cvalue CURL_VERSION_GSSAPI
 */
const CURL_VERSION_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
 * @var int
 * @cvalue CURLOPT_PINNEDPUBLICKEY
 */
const CURLOPT_PINNEDPUBLICKEY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072800 /* Available since 7.40.0 */
/**
 * @var int
 * @cvalue CURLOPT_UNIX_SOCKET_PATH
Expand All@@ -2567,17 +2544,13 @@
 * @cvalue CURL_VERSION_UNIX_SOCKETS
 */
const CURL_VERSION_UNIX_SOCKETS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072900 /* Available since 7.41.0 */
/**
 * @var int
 * @cvalue CURLOPT_SSL_VERIFYSTATUS
 */
const CURLOPT_SSL_VERIFYSTATUS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072a00 /* Available since 7.42.0 */
/**
 * @var int
 * @cvalue CURLOPT_PATH_AS_IS
Expand All@@ -2588,9 +2561,7 @@
 * @cvalue CURLOPT_SSL_FALSESTART
 */
const CURLOPT_SSL_FALSESTART = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072b00 /* Available since 7.43.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2
Expand DownExpand Up@@ -2628,25 +2599,19 @@
 * @cvalue CURLPIPE_MULTIPLEX
 */
const CURLPIPE_MULTIPLEX = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072c00 /* Available since 7.44.0 */
/**
 * @var int
 * @cvalue CURLSSLOPT_NO_REVOKE
 */
const CURLSSLOPT_NO_REVOKE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072d00 /* Available since 7.45.0 */
/**
 * @var int
 * @cvalue CURLOPT_DEFAULT_PROTOCOL
 */
const CURLOPT_DEFAULT_PROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072e00 /* Available since 7.46.0 */
/**
 * @var int
 * @cvalue CURLOPT_STREAM_WEIGHT
Expand All@@ -2667,9 +2632,7 @@
 * @cvalue CURL_PUSH_DENY
 */
const CURL_PUSH_DENY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072f00 /* Available since 7.47.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2TLS
Expand All@@ -2680,17 +2643,13 @@
 * @cvalue CURL_VERSION_PSL
 */
const CURL_VERSION_PSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073000 /* Available since 7.48.0 */
/**
 * @var int
 * @cvalue CURLOPT_TFTP_NO_OPTIONS
 */
const CURLOPT_TFTP_NO_OPTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073100 /* Available since 7.49.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE
Expand All@@ -2706,17 +2665,13 @@
 * @cvalue CURLOPT_TCP_FASTOPEN
 */
const CURLOPT_TCP_FASTOPEN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073200 /* Available since 7.50.0 */
/**
 * @var int
 * @cvalue CURLINFO_HTTP_VERSION
 */
const CURLINFO_HTTP_VERSION = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073300 /* Available since 7.51.0 */
/**
 * @var int
 * @cvalue CURLE_WEIRD_SERVER_REPLY
Expand All@@ -2727,9 +2682,7 @@
 * @cvalue CURLOPT_KEEP_SENDING_ON_ERROR
 */
const CURLOPT_KEEP_SENDING_ON_ERROR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073400 /* Available since 7.52.0 */
/**
 * @var int
 * @cvalue CURL_SSLVERSION_TLSv1_3
Expand DownExpand Up@@ -2850,9 +2803,7 @@
 * @cvalue CURLPROXY_HTTPS
 */
const CURLPROXY_HTTPS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073500 /* Available since 7.53.0 */
/**
 * @var int
 * @cvalue CURL_MAX_READ_SIZE
Expand All@@ -2863,9 +2814,7 @@
 * @cvalue CURLOPT_ABSTRACT_UNIX_SOCKET
 */
const CURLOPT_ABSTRACT_UNIX_SOCKET = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073600 /* Available since 7.54.0 */
/**
 * @var int
 * @cvalue CURL_SSLVERSION_MAX_DEFAULT
Expand DownExpand Up@@ -2901,17 +2850,13 @@
 * @cvalue CURLOPT_SUPPRESS_CONNECT_HEADERS
 */
const CURLOPT_SUPPRESS_CONNECT_HEADERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073601 /* Available since 7.54.1 */
/**
 * @var int
 * @cvalue CURLAUTH_GSSAPI
 */
const CURLAUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073700 /* Available since 7.55.0 */
/**
 * @var int
 * @cvalue CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
Expand DownExpand Up@@ -2952,9 +2897,7 @@
 * @cvalue CURLOPT_SOCKS5_AUTH
 */
const CURLOPT_SOCKS5_AUTH = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073800 /* Available since 7.56.0 */
/**
 * @var int
 * @cvalue CURLOPT_SSH_COMPRESSION
Expand All@@ -2965,9 +2908,7 @@
 * @cvalue CURL_VERSION_MULTI_SSL
 */
const CURL_VERSION_MULTI_SSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073900 /* Available since 7.57.0 */
/**
 * @var int
 * @cvalue CURL_VERSION_BROTLI
Expand All@@ -2978,17 +2919,13 @@
 * @cvalue CURL_LOCK_DATA_CONNECT
 */
const CURL_LOCK_DATA_CONNECT = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073a00 /* Available since 7.58.0 */
/**
 * @var int
 * @cvalue CURLSSH_AUTH_GSSAPI
 */
const CURLSSH_AUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073b00 /* Available since 7.59.0 */
/**
 * @var int
 * @cvalue CURLINFO_FILETIME_T
Expand All@@ -3004,9 +2941,7 @@
 * @cvalue CURLOPT_TIMEVALUE_LARGE
 */
const CURLOPT_TIMEVALUE_LARGE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073c00 /* Available since 7.60.0 */
/**
 * @var int
 * @cvalue CURLOPT_DNS_SHUFFLE_ADDRESSES
Expand All@@ -3017,9 +2952,7 @@
 * @cvalue CURLOPT_HAPROXYPROTOCOL
 */
const CURLOPT_HAPROXYPROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073d00 /* Available since 7.61.0 */
/**
 * @var int
 * @cvalue CURL_LOCK_DATA_PSL
Expand DownExpand Up@@ -3080,7 +3013,6 @@
 * @cvalue CURLOPT_TLS13_CIPHERS
 */
const CURLOPT_TLS13_CIPHERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */
/**
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Girgias
merged 2 commits into

from

Jan 31, 2024
 Merged


ext/curl: Bump minimum Curl version to >= 7.61.0
#13259
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fee6760

ext/curl: Bump minimim Curl version to >= 7.61.0


Ayesh Jan 27, 2024
4cea17f

ext/curl: Update libcurl ver comparison preprocessors to contain huma…


Ayesh Jan 29, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
NEWS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Core:

Curl:
 . Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)
 . Bumped required libcurl version to 7.61.0. (Ayesh)

Date:
 . Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)
Expand Down

3 changes: 3 additions & 0 deletions
UPGRADING

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,9 @@ PDO_SQLITE:
9. Other Changes to Extensions
========================================

- Curl:
 . The Curl extension now requires at least libcurl 7.61.0.

- Intl:
 . The class constants are typed now.

Expand Down

2 changes: 1 addition & 1 deletion
ext/curl/config.m4

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ PHP_ARG_WITH([curl],
 [Include cURL support])])

if test "$PHP_CURL" != "no"; then
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.29.0])
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.61.0])
 PKG_CHECK_VAR([CURL_FEATURES], [libcurl], [supported_features])

 PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
Expand Down

68 changes: 0 additions & 68 deletions
ext/curl/curl.stub.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -472,13 +472,11 @@
 * @cvalue CURLOPT_WRITEHEADER
 */
const CURLOPT_WRITEHEADER = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072000
/**
 * @var int
 * @cvalue CURLOPT_XFERINFOFUNCTION
 */
const CURLOPT_XFERINFOFUNCTION = UNKNOWN;
#endif

/* */
/**
Expand DownExpand Up@@ -776,13 +774,11 @@
 * @cvalue CURLE_SSL_PEER_CERTIFICATE
 */
const CURLE_SSL_PEER_CERTIFICATE = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
 * @var int
 * @cvalue CURLE_SSL_PINNEDPUBKEYNOTMATCH
 */
const CURLE_SSL_PINNEDPUBKEYNOTMATCH = UNKNOWN;
#endif
/**
 * @var int
 * @cvalue CURLE_TELNET_OPTION_SYNTAX
Expand DownExpand Up@@ -998,13 +994,11 @@
 * @cvalue CURLM_OUT_OF_MEMORY
 */
const CURLM_OUT_OF_MEMORY = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072001 /* Available since 7.32.1 */
/**
 * @var int
 * @cvalue CURLM_ADDED_ALREADY
 */
const CURLM_ADDED_ALREADY = UNKNOWN;
#endif

/* Curl proxy constants */
/**
Expand DownExpand Up@@ -2385,7 +2379,6 @@
 */
const CURLSSH_AUTH_AGENT = UNKNOWN;

#if LIBCURL_VERSION_NUM >= 0x071e00 /* Available since 7.30.0 */
/**
 * @var int
 * @cvalue CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE
Expand All@@ -2411,17 +2404,13 @@
 * @cvalue CURLMOPT_MAX_TOTAL_CONNECTIONS
 */
const CURLMOPT_MAX_TOTAL_CONNECTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x071f00 /* Available since 7.31.0 */
/**
 * @var int
 * @cvalue CURLOPT_SASL_IR
 */
const CURLOPT_SASL_IR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072100 /* Available since 7.33.0 */
/**
 * @var int
 * @cvalue CURLOPT_DNS_INTERFACE
Expand DownExpand Up@@ -2453,9 +2442,7 @@
 * @cvalue CURL_VERSION_HTTP2
 */
const CURL_VERSION_HTTP2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
/**
 * @var int
 * @cvalue CURLOPT_LOGIN_OPTIONS
Expand All@@ -2477,9 +2464,7 @@
 * @cvalue CURL_SSLVERSION_TLSv1_2
 */
const CURL_SSLVERSION_TLSv1_2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072400 /* Available since 7.36.0 */
/**
 * @var int
 * @cvalue CURLOPT_EXPECT_100_TIMEOUT_MS
Expand All@@ -2495,9 +2480,7 @@
 * @cvalue CURLOPT_SSL_ENABLE_NPN
 */
const CURLOPT_SSL_ENABLE_NPN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072500 /* Available since 7.37.0 */
/**
 * @var int
 * @cvalue CURLHEADER_SEPARATE
Expand All@@ -2518,9 +2501,7 @@
 * @cvalue CURLOPT_PROXYHEADER
 */
const CURLOPT_PROXYHEADER = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072600 /* Available since 7.38.0 */
/**
 * @var int
 * @cvalue CURLAUTH_NEGOTIATE
Expand All@@ -2531,17 +2512,13 @@
 * @cvalue CURL_VERSION_GSSAPI
 */
const CURL_VERSION_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
 * @var int
 * @cvalue CURLOPT_PINNEDPUBLICKEY
 */
const CURLOPT_PINNEDPUBLICKEY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072800 /* Available since 7.40.0 */
/**
 * @var int
 * @cvalue CURLOPT_UNIX_SOCKET_PATH
Expand All@@ -2567,17 +2544,13 @@
 * @cvalue CURL_VERSION_UNIX_SOCKETS
 */
const CURL_VERSION_UNIX_SOCKETS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072900 /* Available since 7.41.0 */
/**
 * @var int
 * @cvalue CURLOPT_SSL_VERIFYSTATUS
 */
const CURLOPT_SSL_VERIFYSTATUS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072a00 /* Available since 7.42.0 */
/**
 * @var int
 * @cvalue CURLOPT_PATH_AS_IS
Expand All@@ -2588,9 +2561,7 @@
 * @cvalue CURLOPT_SSL_FALSESTART
 */
const CURLOPT_SSL_FALSESTART = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072b00 /* Available since 7.43.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2
Expand DownExpand Up@@ -2628,25 +2599,19 @@
 * @cvalue CURLPIPE_MULTIPLEX
 */
const CURLPIPE_MULTIPLEX = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072c00 /* Available since 7.44.0 */
/**
 * @var int
 * @cvalue CURLSSLOPT_NO_REVOKE
 */
const CURLSSLOPT_NO_REVOKE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072d00 /* Available since 7.45.0 */
/**
 * @var int
 * @cvalue CURLOPT_DEFAULT_PROTOCOL
 */
const CURLOPT_DEFAULT_PROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072e00 /* Available since 7.46.0 */
/**
 * @var int
 * @cvalue CURLOPT_STREAM_WEIGHT
Expand All@@ -2667,9 +2632,7 @@
 * @cvalue CURL_PUSH_DENY
 */
const CURL_PUSH_DENY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072f00 /* Available since 7.47.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2TLS
Expand All@@ -2680,17 +2643,13 @@
 * @cvalue CURL_VERSION_PSL
 */
const CURL_VERSION_PSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073000 /* Available since 7.48.0 */
/**
 * @var int
 * @cvalue CURLOPT_TFTP_NO_OPTIONS
 */
const CURLOPT_TFTP_NO_OPTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073100 /* Available since 7.49.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE
Expand All@@ -2706,17 +2665,13 @@
 * @cvalue CURLOPT_TCP_FASTOPEN
 */
const CURLOPT_TCP_FASTOPEN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073200 /* Available since 7.50.0 */
/**
 * @var int
 * @cvalue CURLINFO_HTTP_VERSION
 */
const CURLINFO_HTTP_VERSION = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073300 /* Available since 7.51.0 */
/**
 * @var int
 * @cvalue CURLE_WEIRD_SERVER_REPLY
Expand All@@ -2727,9 +2682,7 @@
 * @cvalue CURLOPT_KEEP_SENDING_ON_ERROR
 */
const CURLOPT_KEEP_SENDING_ON_ERROR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073400 /* Available since 7.52.0 */
/**
 * @var int
 * @cvalue CURL_SSLVERSION_TLSv1_3
Expand DownExpand Up@@ -2850,9 +2803,7 @@
 * @cvalue CURLPROXY_HTTPS
 */
const CURLPROXY_HTTPS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073500 /* Available since 7.53.0 */
/**
 * @var int
 * @cvalue CURL_MAX_READ_SIZE
Expand All@@ -2863,9 +2814,7 @@
 * @cvalue CURLOPT_ABSTRACT_UNIX_SOCKET
 */
const CURLOPT_ABSTRACT_UNIX_SOCKET = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073600 /* Available since 7.54.0 */
/**
 * @var int
 * @cvalue CURL_SSLVERSION_MAX_DEFAULT
Expand DownExpand Up@@ -2901,17 +2850,13 @@
 * @cvalue CURLOPT_SUPPRESS_CONNECT_HEADERS
 */
const CURLOPT_SUPPRESS_CONNECT_HEADERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073601 /* Available since 7.54.1 */
/**
 * @var int
 * @cvalue CURLAUTH_GSSAPI
 */
const CURLAUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073700 /* Available since 7.55.0 */
/**
 * @var int
 * @cvalue CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
Expand DownExpand Up@@ -2952,9 +2897,7 @@
 * @cvalue CURLOPT_SOCKS5_AUTH
 */
const CURLOPT_SOCKS5_AUTH = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073800 /* Available since 7.56.0 */
/**
 * @var int
 * @cvalue CURLOPT_SSH_COMPRESSION
Expand All@@ -2965,9 +2908,7 @@
 * @cvalue CURL_VERSION_MULTI_SSL
 */
const CURL_VERSION_MULTI_SSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073900 /* Available since 7.57.0 */
/**
 * @var int
 * @cvalue CURL_VERSION_BROTLI
Expand All@@ -2978,17 +2919,13 @@
 * @cvalue CURL_LOCK_DATA_CONNECT
 */
const CURL_LOCK_DATA_CONNECT = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073a00 /* Available since 7.58.0 */
/**
 * @var int
 * @cvalue CURLSSH_AUTH_GSSAPI
 */
const CURLSSH_AUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073b00 /* Available since 7.59.0 */
/**
 * @var int
 * @cvalue CURLINFO_FILETIME_T
Expand All@@ -3004,9 +2941,7 @@
 * @cvalue CURLOPT_TIMEVALUE_LARGE
 */
const CURLOPT_TIMEVALUE_LARGE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073c00 /* Available since 7.60.0 */
/**
 * @var int
 * @cvalue CURLOPT_DNS_SHUFFLE_ADDRESSES
Expand All@@ -3017,9 +2952,7 @@
 * @cvalue CURLOPT_HAPROXYPROTOCOL
 */
const CURLOPT_HAPROXYPROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073d00 /* Available since 7.61.0 */
/**
 * @var int
 * @cvalue CURL_LOCK_DATA_PSL
Expand DownExpand Up@@ -3080,7 +3013,6 @@
 * @cvalue CURLOPT_TLS13_CIPHERS
 */
const CURLOPT_TLS13_CIPHERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */
/**
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Girgias
merged 2 commits into

from

Jan 31, 2024
 Merged


ext/curl: Bump minimum Curl version to >= 7.61.0
#13259
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fee6760

ext/curl: Bump minimim Curl version to >= 7.61.0


Ayesh Jan 27, 2024
4cea17f

ext/curl: Update libcurl ver comparison preprocessors to contain huma…


Ayesh Jan 29, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
NEWS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Core:

Curl:
 . Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)
 . Bumped required libcurl version to 7.61.0. (Ayesh)

Date:
 . Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)
Expand Down

3 changes: 3 additions & 0 deletions
UPGRADING

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,9 @@ PDO_SQLITE:
9. Other Changes to Extensions
========================================

- Curl:
 . The Curl extension now requires at least libcurl 7.61.0.

- Intl:
 . The class constants are typed now.

Expand Down

2 changes: 1 addition & 1 deletion
ext/curl/config.m4

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ PHP_ARG_WITH([curl],
 [Include cURL support])])

if test "$PHP_CURL" != "no"; then
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.29.0])
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.61.0])
 PKG_CHECK_VAR([CURL_FEATURES], [libcurl], [supported_features])

 PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
Expand Down

68 changes: 0 additions & 68 deletions
ext/curl/curl.stub.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -472,13 +472,11 @@
 * @cvalue CURLOPT_WRITEHEADER
 */
const CURLOPT_WRITEHEADER = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072000
/**
 * @var int
 * @cvalue CURLOPT_XFERINFOFUNCTION
 */
const CURLOPT_XFERINFOFUNCTION = UNKNOWN;
#endif

/* */
/**
Expand DownExpand Up@@ -776,13 +774,11 @@
 * @cvalue CURLE_SSL_PEER_CERTIFICATE
 */
const CURLE_SSL_PEER_CERTIFICATE = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
 * @var int
 * @cvalue CURLE_SSL_PINNEDPUBKEYNOTMATCH
 */
const CURLE_SSL_PINNEDPUBKEYNOTMATCH = UNKNOWN;
#endif
/**
 * @var int
 * @cvalue CURLE_TELNET_OPTION_SYNTAX
Expand DownExpand Up@@ -998,13 +994,11 @@
 * @cvalue CURLM_OUT_OF_MEMORY
 */
const CURLM_OUT_OF_MEMORY = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072001 /* Available since 7.32.1 */
/**
 * @var int
 * @cvalue CURLM_ADDED_ALREADY
 */
const CURLM_ADDED_ALREADY = UNKNOWN;
#endif

/* Curl proxy constants */
/**
Expand DownExpand Up@@ -2385,7 +2379,6 @@
 */
const CURLSSH_AUTH_AGENT = UNKNOWN;

#if LIBCURL_VERSION_NUM >= 0x071e00 /* Available since 7.30.0 */
/**
 * @var int
 * @cvalue CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE
Expand All@@ -2411,17 +2404,13 @@
 * @cvalue CURLMOPT_MAX_TOTAL_CONNECTIONS
 */
const CURLMOPT_MAX_TOTAL_CONNECTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x071f00 /* Available since 7.31.0 */
/**
 * @var int
 * @cvalue CURLOPT_SASL_IR
 */
const CURLOPT_SASL_IR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072100 /* Available since 7.33.0 */
/**
 * @var int
 * @cvalue CURLOPT_DNS_INTERFACE
Expand DownExpand Up@@ -2453,9 +2442,7 @@
 * @cvalue CURL_VERSION_HTTP2
 */
const CURL_VERSION_HTTP2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
/**
 * @var int
 * @cvalue CURLOPT_LOGIN_OPTIONS
Expand All@@ -2477,9 +2464,7 @@
 * @cvalue CURL_SSLVERSION_TLSv1_2
 */
const CURL_SSLVERSION_TLSv1_2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072400 /* Available since 7.36.0 */
/**
 * @var int
 * @cvalue CURLOPT_EXPECT_100_TIMEOUT_MS
Expand All@@ -2495,9 +2480,7 @@
 * @cvalue CURLOPT_SSL_ENABLE_NPN
 */
const CURLOPT_SSL_ENABLE_NPN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072500 /* Available since 7.37.0 */
/**
 * @var int
 * @cvalue CURLHEADER_SEPARATE
Expand All@@ -2518,9 +2501,7 @@
 * @cvalue CURLOPT_PROXYHEADER
 */
const CURLOPT_PROXYHEADER = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072600 /* Available since 7.38.0 */
/**
 * @var int
 * @cvalue CURLAUTH_NEGOTIATE
Expand All@@ -2531,17 +2512,13 @@
 * @cvalue CURL_VERSION_GSSAPI
 */
const CURL_VERSION_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
 * @var int
 * @cvalue CURLOPT_PINNEDPUBLICKEY
 */
const CURLOPT_PINNEDPUBLICKEY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072800 /* Available since 7.40.0 */
/**
 * @var int
 * @cvalue CURLOPT_UNIX_SOCKET_PATH
Expand All@@ -2567,17 +2544,13 @@
 * @cvalue CURL_VERSION_UNIX_SOCKETS
 */
const CURL_VERSION_UNIX_SOCKETS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072900 /* Available since 7.41.0 */
/**
 * @var int
 * @cvalue CURLOPT_SSL_VERIFYSTATUS
 */
const CURLOPT_SSL_VERIFYSTATUS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072a00 /* Available since 7.42.0 */
/**
 * @var int
 * @cvalue CURLOPT_PATH_AS_IS
Expand All@@ -2588,9 +2561,7 @@
 * @cvalue CURLOPT_SSL_FALSESTART
 */
const CURLOPT_SSL_FALSESTART = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072b00 /* Available since 7.43.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2
Expand DownExpand Up@@ -2628,25 +2599,19 @@
 * @cvalue CURLPIPE_MULTIPLEX
 */
const CURLPIPE_MULTIPLEX = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072c00 /* Available since 7.44.0 */
/**
 * @var int
 * @cvalue CURLSSLOPT_NO_REVOKE
 */
const CURLSSLOPT_NO_REVOKE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072d00 /* Available since 7.45.0 */
/**
 * @var int
 * @cvalue CURLOPT_DEFAULT_PROTOCOL
 */
const CURLOPT_DEFAULT_PROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072e00 /* Available since 7.46.0 */
/**
 * @var int
 * @cvalue CURLOPT_STREAM_WEIGHT
Expand All@@ -2667,9 +2632,7 @@
 * @cvalue CURL_PUSH_DENY
 */
const CURL_PUSH_DENY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072f00 /* Available since 7.47.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2TLS
Expand All@@ -2680,17 +2643,13 @@
 * @cvalue CURL_VERSION_PSL
 */
const CURL_VERSION_PSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073000 /* Available since 7.48.0 */
/**
 * @var int
 * @cvalue CURLOPT_TFTP_NO_OPTIONS
 */
const CURLOPT_TFTP_NO_OPTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073100 /* Available since 7.49.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE
Expand All@@ -2706,17 +2665,13 @@
 * @cvalue CURLOPT_TCP_FASTOPEN
 */
const CURLOPT_TCP_FASTOPEN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073200 /* Available since 7.50.0 */
/**
 * @var int
 * @cvalue CURLINFO_HTTP_VERSION
 */
const CURLINFO_HTTP_VERSION = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073300 /* Available since 7.51.0 */
/**
 * @var int
 * @cvalue CURLE_WEIRD_SERVER_REPLY
Expand All@@ -2727,9 +2682,7 @@
 * @cvalue CURLOPT_KEEP_SENDING_ON_ERROR
 */
const CURLOPT_KEEP_SENDING_ON_ERROR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073400 /* Available since 7.52.0 */
/**
 * @var int
 * @cvalue CURL_SSLVERSION_TLSv1_3
Expand DownExpand Up@@ -2850,9 +2803,7 @@
 * @cvalue CURLPROXY_HTTPS
 */
const CURLPROXY_HTTPS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073500 /* Available since 7.53.0 */
/**
 * @var int
 * @cvalue CURL_MAX_READ_SIZE
Expand All@@ -2863,9 +2814,7 @@
 * @cvalue CURLOPT_ABSTRACT_UNIX_SOCKET
 */
const CURLOPT_ABSTRACT_UNIX_SOCKET = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073600 /* Available since 7.54.0 */
/**
 * @var int
 * @cvalue CURL_SSLVERSION_MAX_DEFAULT
Expand DownExpand Up@@ -2901,17 +2850,13 @@
 * @cvalue CURLOPT_SUPPRESS_CONNECT_HEADERS
 */
const CURLOPT_SUPPRESS_CONNECT_HEADERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073601 /* Available since 7.54.1 */
/**
 * @var int
 * @cvalue CURLAUTH_GSSAPI
 */
const CURLAUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073700 /* Available since 7.55.0 */
/**
 * @var int
 * @cvalue CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
Expand DownExpand Up@@ -2952,9 +2897,7 @@
 * @cvalue CURLOPT_SOCKS5_AUTH
 */
const CURLOPT_SOCKS5_AUTH = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073800 /* Available since 7.56.0 */
/**
 * @var int
 * @cvalue CURLOPT_SSH_COMPRESSION
Expand All@@ -2965,9 +2908,7 @@
 * @cvalue CURL_VERSION_MULTI_SSL
 */
const CURL_VERSION_MULTI_SSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073900 /* Available since 7.57.0 */
/**
 * @var int
 * @cvalue CURL_VERSION_BROTLI
Expand All@@ -2978,17 +2919,13 @@
 * @cvalue CURL_LOCK_DATA_CONNECT
 */
const CURL_LOCK_DATA_CONNECT = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073a00 /* Available since 7.58.0 */
/**
 * @var int
 * @cvalue CURLSSH_AUTH_GSSAPI
 */
const CURLSSH_AUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073b00 /* Available since 7.59.0 */
/**
 * @var int
 * @cvalue CURLINFO_FILETIME_T
Expand All@@ -3004,9 +2941,7 @@
 * @cvalue CURLOPT_TIMEVALUE_LARGE
 */
const CURLOPT_TIMEVALUE_LARGE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073c00 /* Available since 7.60.0 */
/**
 * @var int
 * @cvalue CURLOPT_DNS_SHUFFLE_ADDRESSES
Expand All@@ -3017,9 +2952,7 @@
 * @cvalue CURLOPT_HAPROXYPROTOCOL
 */
const CURLOPT_HAPROXYPROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073d00 /* Available since 7.61.0 */
/**
 * @var int
 * @cvalue CURL_LOCK_DATA_PSL
Expand DownExpand Up@@ -3080,7 +3013,6 @@
 * @cvalue CURLOPT_TLS13_CIPHERS
 */
const CURLOPT_TLS13_CIPHERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */
/**
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Girgias
merged 2 commits into

from

Jan 31, 2024
 Merged


ext/curl: Bump minimum Curl version to >= 7.61.0
#13259
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fee6760

ext/curl: Bump minimim Curl version to >= 7.61.0


Ayesh Jan 27, 2024
4cea17f

ext/curl: Update libcurl ver comparison preprocessors to contain huma…


Ayesh Jan 29, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
NEWS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Core:

Curl:
 . Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)
 . Bumped required libcurl version to 7.61.0. (Ayesh)

Date:
 . Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)
Expand Down

3 changes: 3 additions & 0 deletions
UPGRADING

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,9 @@ PDO_SQLITE:
9. Other Changes to Extensions
========================================

- Curl:
 . The Curl extension now requires at least libcurl 7.61.0.

- Intl:
 . The class constants are typed now.

Expand Down

2 changes: 1 addition & 1 deletion
ext/curl/config.m4

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ PHP_ARG_WITH([curl],
 [Include cURL support])])

if test "$PHP_CURL" != "no"; then
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.29.0])
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.61.0])
 PKG_CHECK_VAR([CURL_FEATURES], [libcurl], [supported_features])

 PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
Expand Down

68 changes: 0 additions & 68 deletions
ext/curl/curl.stub.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -472,13 +472,11 @@
 * @cvalue CURLOPT_WRITEHEADER
 */
const CURLOPT_WRITEHEADER = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072000
/**
 * @var int
 * @cvalue CURLOPT_XFERINFOFUNCTION
 */
const CURLOPT_XFERINFOFUNCTION = UNKNOWN;
#endif

/* */
/**
Expand DownExpand Up@@ -776,13 +774,11 @@
 * @cvalue CURLE_SSL_PEER_CERTIFICATE
 */
const CURLE_SSL_PEER_CERTIFICATE = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
 * @var int
 * @cvalue CURLE_SSL_PINNEDPUBKEYNOTMATCH
 */
const CURLE_SSL_PINNEDPUBKEYNOTMATCH = UNKNOWN;
#endif
/**
 * @var int
 * @cvalue CURLE_TELNET_OPTION_SYNTAX
Expand DownExpand Up@@ -998,13 +994,11 @@
 * @cvalue CURLM_OUT_OF_MEMORY
 */
const CURLM_OUT_OF_MEMORY = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072001 /* Available since 7.32.1 */
/**
 * @var int
 * @cvalue CURLM_ADDED_ALREADY
 */
const CURLM_ADDED_ALREADY = UNKNOWN;
#endif

/* Curl proxy constants */
/**
Expand DownExpand Up@@ -2385,7 +2379,6 @@
 */
const CURLSSH_AUTH_AGENT = UNKNOWN;

#if LIBCURL_VERSION_NUM >= 0x071e00 /* Available since 7.30.0 */
/**
 * @var int
 * @cvalue CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE
Expand All@@ -2411,17 +2404,13 @@
 * @cvalue CURLMOPT_MAX_TOTAL_CONNECTIONS
 */
const CURLMOPT_MAX_TOTAL_CONNECTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x071f00 /* Available since 7.31.0 */
/**
 * @var int
 * @cvalue CURLOPT_SASL_IR
 */
const CURLOPT_SASL_IR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072100 /* Available since 7.33.0 */
/**
 * @var int
 * @cvalue CURLOPT_DNS_INTERFACE
Expand DownExpand Up@@ -2453,9 +2442,7 @@
 * @cvalue CURL_VERSION_HTTP2
 */
const CURL_VERSION_HTTP2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
/**
 * @var int
 * @cvalue CURLOPT_LOGIN_OPTIONS
Expand All@@ -2477,9 +2464,7 @@
 * @cvalue CURL_SSLVERSION_TLSv1_2
 */
const CURL_SSLVERSION_TLSv1_2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072400 /* Available since 7.36.0 */
/**
 * @var int
 * @cvalue CURLOPT_EXPECT_100_TIMEOUT_MS
Expand All@@ -2495,9 +2480,7 @@
 * @cvalue CURLOPT_SSL_ENABLE_NPN
 */
const CURLOPT_SSL_ENABLE_NPN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072500 /* Available since 7.37.0 */
/**
 * @var int
 * @cvalue CURLHEADER_SEPARATE
Expand All@@ -2518,9 +2501,7 @@
 * @cvalue CURLOPT_PROXYHEADER
 */
const CURLOPT_PROXYHEADER = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072600 /* Available since 7.38.0 */
/**
 * @var int
 * @cvalue CURLAUTH_NEGOTIATE
Expand All@@ -2531,17 +2512,13 @@
 * @cvalue CURL_VERSION_GSSAPI
 */
const CURL_VERSION_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
 * @var int
 * @cvalue CURLOPT_PINNEDPUBLICKEY
 */
const CURLOPT_PINNEDPUBLICKEY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072800 /* Available since 7.40.0 */
/**
 * @var int
 * @cvalue CURLOPT_UNIX_SOCKET_PATH
Expand All@@ -2567,17 +2544,13 @@
 * @cvalue CURL_VERSION_UNIX_SOCKETS
 */
const CURL_VERSION_UNIX_SOCKETS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072900 /* Available since 7.41.0 */
/**
 * @var int
 * @cvalue CURLOPT_SSL_VERIFYSTATUS
 */
const CURLOPT_SSL_VERIFYSTATUS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072a00 /* Available since 7.42.0 */
/**
 * @var int
 * @cvalue CURLOPT_PATH_AS_IS
Expand All@@ -2588,9 +2561,7 @@
 * @cvalue CURLOPT_SSL_FALSESTART
 */
const CURLOPT_SSL_FALSESTART = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072b00 /* Available since 7.43.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2
Expand DownExpand Up@@ -2628,25 +2599,19 @@
 * @cvalue CURLPIPE_MULTIPLEX
 */
const CURLPIPE_MULTIPLEX = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072c00 /* Available since 7.44.0 */
/**
 * @var int
 * @cvalue CURLSSLOPT_NO_REVOKE
 */
const CURLSSLOPT_NO_REVOKE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072d00 /* Available since 7.45.0 */
/**
 * @var int
 * @cvalue CURLOPT_DEFAULT_PROTOCOL
 */
const CURLOPT_DEFAULT_PROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072e00 /* Available since 7.46.0 */
/**
 * @var int
 * @cvalue CURLOPT_STREAM_WEIGHT
Expand All@@ -2667,9 +2632,7 @@
 * @cvalue CURL_PUSH_DENY
 */
const CURL_PUSH_DENY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072f00 /* Available since 7.47.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2TLS
Expand All@@ -2680,17 +2643,13 @@
 * @cvalue CURL_VERSION_PSL
 */
const CURL_VERSION_PSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073000 /* Available since 7.48.0 */
/**
 * @var int
 * @cvalue CURLOPT_TFTP_NO_OPTIONS
 */
const CURLOPT_TFTP_NO_OPTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073100 /* Available since 7.49.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE
Expand All@@ -2706,17 +2665,13 @@
 * @cvalue CURLOPT_TCP_FASTOPEN
 */
const CURLOPT_TCP_FASTOPEN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073200 /* Available since 7.50.0 */
/**
 * @var int
 * @cvalue CURLINFO_HTTP_VERSION
 */
const CURLINFO_HTTP_VERSION = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073300 /* Available since 7.51.0 */
/**
 * @var int
 * @cvalue CURLE_WEIRD_SERVER_REPLY
Expand All@@ -2727,9 +2682,7 @@
 * @cvalue CURLOPT_KEEP_SENDING_ON_ERROR
 */
const CURLOPT_KEEP_SENDING_ON_ERROR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073400 /* Available since 7.52.0 */
/**
 * @var int
 * @cvalue CURL_SSLVERSION_TLSv1_3
Expand DownExpand Up@@ -2850,9 +2803,7 @@
 * @cvalue CURLPROXY_HTTPS
 */
const CURLPROXY_HTTPS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073500 /* Available since 7.53.0 */
/**
 * @var int
 * @cvalue CURL_MAX_READ_SIZE
Expand All@@ -2863,9 +2814,7 @@
 * @cvalue CURLOPT_ABSTRACT_UNIX_SOCKET
 */
const CURLOPT_ABSTRACT_UNIX_SOCKET = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073600 /* Available since 7.54.0 */
/**
 * @var int
 * @cvalue CURL_SSLVERSION_MAX_DEFAULT
Expand DownExpand Up@@ -2901,17 +2850,13 @@
 * @cvalue CURLOPT_SUPPRESS_CONNECT_HEADERS
 */
const CURLOPT_SUPPRESS_CONNECT_HEADERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073601 /* Available since 7.54.1 */
/**
 * @var int
 * @cvalue CURLAUTH_GSSAPI
 */
const CURLAUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073700 /* Available since 7.55.0 */
/**
 * @var int
 * @cvalue CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
Expand DownExpand Up@@ -2952,9 +2897,7 @@
 * @cvalue CURLOPT_SOCKS5_AUTH
 */
const CURLOPT_SOCKS5_AUTH = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073800 /* Available since 7.56.0 */
/**
 * @var int
 * @cvalue CURLOPT_SSH_COMPRESSION
Expand All@@ -2965,9 +2908,7 @@
 * @cvalue CURL_VERSION_MULTI_SSL
 */
const CURL_VERSION_MULTI_SSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073900 /* Available since 7.57.0 */
/**
 * @var int
 * @cvalue CURL_VERSION_BROTLI
Expand All@@ -2978,17 +2919,13 @@
 * @cvalue CURL_LOCK_DATA_CONNECT
 */
const CURL_LOCK_DATA_CONNECT = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073a00 /* Available since 7.58.0 */
/**
 * @var int
 * @cvalue CURLSSH_AUTH_GSSAPI
 */
const CURLSSH_AUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073b00 /* Available since 7.59.0 */
/**
 * @var int
 * @cvalue CURLINFO_FILETIME_T
Expand All@@ -3004,9 +2941,7 @@
 * @cvalue CURLOPT_TIMEVALUE_LARGE
 */
const CURLOPT_TIMEVALUE_LARGE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073c00 /* Available since 7.60.0 */
/**
 * @var int
 * @cvalue CURLOPT_DNS_SHUFFLE_ADDRESSES
Expand All@@ -3017,9 +2952,7 @@
 * @cvalue CURLOPT_HAPROXYPROTOCOL
 */
const CURLOPT_HAPROXYPROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073d00 /* Available since 7.61.0 */
/**
 * @var int
 * @cvalue CURL_LOCK_DATA_PSL
Expand DownExpand Up@@ -3080,7 +3013,6 @@
 * @cvalue CURLOPT_TLS13_CIPHERS
 */
const CURLOPT_TLS13_CIPHERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */
/**
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Girgias
merged 2 commits into

from

Jan 31, 2024
 Merged


ext/curl: Bump minimum Curl version to >= 7.61.0
#13259
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
fee6760

ext/curl: Bump minimim Curl version to >= 7.61.0


Ayesh Jan 27, 2024
4cea17f

ext/curl: Update libcurl ver comparison preprocessors to contain huma…


Ayesh Jan 29, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
NEWS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Core:

Curl:
 . Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)
 . Bumped required libcurl version to 7.61.0. (Ayesh)

Date:
 . Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)
Expand Down

3 changes: 3 additions & 0 deletions
UPGRADING

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,9 @@ PDO_SQLITE:
9. Other Changes to Extensions
========================================

- Curl:
 . The Curl extension now requires at least libcurl 7.61.0.

- Intl:
 . The class constants are typed now.

Expand Down

2 changes: 1 addition & 1 deletion
ext/curl/config.m4

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ PHP_ARG_WITH([curl],
 [Include cURL support])])

if test "$PHP_CURL" != "no"; then
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.29.0])
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.61.0])
 PKG_CHECK_VAR([CURL_FEATURES], [libcurl], [supported_features])

 PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
Expand Down

68 changes: 0 additions & 68 deletions
ext/curl/curl.stub.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -472,13 +472,11 @@
 * @cvalue CURLOPT_WRITEHEADER
 */
const CURLOPT_WRITEHEADER = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072000
/**
 * @var int
 * @cvalue CURLOPT_XFERINFOFUNCTION
 */
const CURLOPT_XFERINFOFUNCTION = UNKNOWN;
#endif

/* */
/**
Expand DownExpand Up@@ -776,13 +774,11 @@
 * @cvalue CURLE_SSL_PEER_CERTIFICATE
 */
const CURLE_SSL_PEER_CERTIFICATE = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
 * @var int
 * @cvalue CURLE_SSL_PINNEDPUBKEYNOTMATCH
 */
const CURLE_SSL_PINNEDPUBKEYNOTMATCH = UNKNOWN;
#endif
/**
 * @var int
 * @cvalue CURLE_TELNET_OPTION_SYNTAX
Expand DownExpand Up@@ -998,13 +994,11 @@
 * @cvalue CURLM_OUT_OF_MEMORY
 */
const CURLM_OUT_OF_MEMORY = UNKNOWN;
#if LIBCURL_VERSION_NUM >= 0x072001 /* Available since 7.32.1 */
/**
 * @var int
 * @cvalue CURLM_ADDED_ALREADY
 */
const CURLM_ADDED_ALREADY = UNKNOWN;
#endif

/* Curl proxy constants */
/**
Expand DownExpand Up@@ -2385,7 +2379,6 @@
 */
const CURLSSH_AUTH_AGENT = UNKNOWN;

#if LIBCURL_VERSION_NUM >= 0x071e00 /* Available since 7.30.0 */
/**
 * @var int
 * @cvalue CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE
Expand All@@ -2411,17 +2404,13 @@
 * @cvalue CURLMOPT_MAX_TOTAL_CONNECTIONS
 */
const CURLMOPT_MAX_TOTAL_CONNECTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x071f00 /* Available since 7.31.0 */
/**
 * @var int
 * @cvalue CURLOPT_SASL_IR
 */
const CURLOPT_SASL_IR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072100 /* Available since 7.33.0 */
/**
 * @var int
 * @cvalue CURLOPT_DNS_INTERFACE
Expand DownExpand Up@@ -2453,9 +2442,7 @@
 * @cvalue CURL_VERSION_HTTP2
 */
const CURL_VERSION_HTTP2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
/**
 * @var int
 * @cvalue CURLOPT_LOGIN_OPTIONS
Expand All@@ -2477,9 +2464,7 @@
 * @cvalue CURL_SSLVERSION_TLSv1_2
 */
const CURL_SSLVERSION_TLSv1_2 = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072400 /* Available since 7.36.0 */
/**
 * @var int
 * @cvalue CURLOPT_EXPECT_100_TIMEOUT_MS
Expand All@@ -2495,9 +2480,7 @@
 * @cvalue CURLOPT_SSL_ENABLE_NPN
 */
const CURLOPT_SSL_ENABLE_NPN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072500 /* Available since 7.37.0 */
/**
 * @var int
 * @cvalue CURLHEADER_SEPARATE
Expand All@@ -2518,9 +2501,7 @@
 * @cvalue CURLOPT_PROXYHEADER
 */
const CURLOPT_PROXYHEADER = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072600 /* Available since 7.38.0 */
/**
 * @var int
 * @cvalue CURLAUTH_NEGOTIATE
Expand All@@ -2531,17 +2512,13 @@
 * @cvalue CURL_VERSION_GSSAPI
 */
const CURL_VERSION_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
/**
 * @var int
 * @cvalue CURLOPT_PINNEDPUBLICKEY
 */
const CURLOPT_PINNEDPUBLICKEY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072800 /* Available since 7.40.0 */
/**
 * @var int
 * @cvalue CURLOPT_UNIX_SOCKET_PATH
Expand All@@ -2567,17 +2544,13 @@
 * @cvalue CURL_VERSION_UNIX_SOCKETS
 */
const CURL_VERSION_UNIX_SOCKETS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072900 /* Available since 7.41.0 */
/**
 * @var int
 * @cvalue CURLOPT_SSL_VERIFYSTATUS
 */
const CURLOPT_SSL_VERIFYSTATUS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072a00 /* Available since 7.42.0 */
/**
 * @var int
 * @cvalue CURLOPT_PATH_AS_IS
Expand All@@ -2588,9 +2561,7 @@
 * @cvalue CURLOPT_SSL_FALSESTART
 */
const CURLOPT_SSL_FALSESTART = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072b00 /* Available since 7.43.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2
Expand DownExpand Up@@ -2628,25 +2599,19 @@
 * @cvalue CURLPIPE_MULTIPLEX
 */
const CURLPIPE_MULTIPLEX = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072c00 /* Available since 7.44.0 */
/**
 * @var int
 * @cvalue CURLSSLOPT_NO_REVOKE
 */
const CURLSSLOPT_NO_REVOKE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072d00 /* Available since 7.45.0 */
/**
 * @var int
 * @cvalue CURLOPT_DEFAULT_PROTOCOL
 */
const CURLOPT_DEFAULT_PROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072e00 /* Available since 7.46.0 */
/**
 * @var int
 * @cvalue CURLOPT_STREAM_WEIGHT
Expand All@@ -2667,9 +2632,7 @@
 * @cvalue CURL_PUSH_DENY
 */
const CURL_PUSH_DENY = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x072f00 /* Available since 7.47.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2TLS
Expand All@@ -2680,17 +2643,13 @@
 * @cvalue CURL_VERSION_PSL
 */
const CURL_VERSION_PSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073000 /* Available since 7.48.0 */
/**
 * @var int
 * @cvalue CURLOPT_TFTP_NO_OPTIONS
 */
const CURLOPT_TFTP_NO_OPTIONS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073100 /* Available since 7.49.0 */
/**
 * @var int
 * @cvalue CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE
Expand All@@ -2706,17 +2665,13 @@
 * @cvalue CURLOPT_TCP_FASTOPEN
 */
const CURLOPT_TCP_FASTOPEN = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073200 /* Available since 7.50.0 */
/**
 * @var int
 * @cvalue CURLINFO_HTTP_VERSION
 */
const CURLINFO_HTTP_VERSION = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073300 /* Available since 7.51.0 */
/**
 * @var int
 * @cvalue CURLE_WEIRD_SERVER_REPLY
Expand All@@ -2727,9 +2682,7 @@
 * @cvalue CURLOPT_KEEP_SENDING_ON_ERROR
 */
const CURLOPT_KEEP_SENDING_ON_ERROR = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073400 /* Available since 7.52.0 */
/**
 * @var int
 * @cvalue CURL_SSLVERSION_TLSv1_3
Expand DownExpand Up@@ -2850,9 +2803,7 @@
 * @cvalue CURLPROXY_HTTPS
 */
const CURLPROXY_HTTPS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073500 /* Available since 7.53.0 */
/**
 * @var int
 * @cvalue CURL_MAX_READ_SIZE
Expand All@@ -2863,9 +2814,7 @@
 * @cvalue CURLOPT_ABSTRACT_UNIX_SOCKET
 */
const CURLOPT_ABSTRACT_UNIX_SOCKET = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073600 /* Available since 7.54.0 */
/**
 * @var int
 * @cvalue CURL_SSLVERSION_MAX_DEFAULT
Expand DownExpand Up@@ -2901,17 +2850,13 @@
 * @cvalue CURLOPT_SUPPRESS_CONNECT_HEADERS
 */
const CURLOPT_SUPPRESS_CONNECT_HEADERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073601 /* Available since 7.54.1 */
/**
 * @var int
 * @cvalue CURLAUTH_GSSAPI
 */
const CURLAUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073700 /* Available since 7.55.0 */
/**
 * @var int
 * @cvalue CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
Expand DownExpand Up@@ -2952,9 +2897,7 @@
 * @cvalue CURLOPT_SOCKS5_AUTH
 */
const CURLOPT_SOCKS5_AUTH = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073800 /* Available since 7.56.0 */
/**
 * @var int
 * @cvalue CURLOPT_SSH_COMPRESSION
Expand All@@ -2965,9 +2908,7 @@
 * @cvalue CURL_VERSION_MULTI_SSL
 */
const CURL_VERSION_MULTI_SSL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073900 /* Available since 7.57.0 */
/**
 * @var int
 * @cvalue CURL_VERSION_BROTLI
Expand All@@ -2978,17 +2919,13 @@
 * @cvalue CURL_LOCK_DATA_CONNECT
 */
const CURL_LOCK_DATA_CONNECT = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073a00 /* Available since 7.58.0 */
/**
 * @var int
 * @cvalue CURLSSH_AUTH_GSSAPI
 */
const CURLSSH_AUTH_GSSAPI = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073b00 /* Available since 7.59.0 */
/**
 * @var int
 * @cvalue CURLINFO_FILETIME_T
Expand All@@ -3004,9 +2941,7 @@
 * @cvalue CURLOPT_TIMEVALUE_LARGE
 */
const CURLOPT_TIMEVALUE_LARGE = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073c00 /* Available since 7.60.0 */
/**
 * @var int
 * @cvalue CURLOPT_DNS_SHUFFLE_ADDRESSES
Expand All@@ -3017,9 +2952,7 @@
 * @cvalue CURLOPT_HAPROXYPROTOCOL
 */
const CURLOPT_HAPROXYPROTOCOL = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073d00 /* Available since 7.61.0 */
/**
 * @var int
 * @cvalue CURL_LOCK_DATA_PSL
Expand DownExpand Up@@ -3080,7 +3013,6 @@
 * @cvalue CURLOPT_TLS13_CIPHERS
 */
const CURLOPT_TLS13_CIPHERS = UNKNOWN;
#endif

#if LIBCURL_VERSION_NUM >= 0x073E00 /* Available since 7.62.0 */
/**
Expand Down
Loading