Skip to content

Commit cc3b902

Browse files
committed
ext/curl: Update stub CURLOPT_ENCODING @cvalue to CURLOPT_ACCEPT_ENCODING
In Curl 7.21.6, the `CURLOPT_ENCODING` constant was renamed to `CURLOPT_ACCEPT_ENCODING`. `CURLOPT_ENCODING` is deprecated from Curl 7.21.6. It still provides `CURLOPT_ENCODING` from `CURLOPT_ACCEPT_ENCODING` for backward compatibility. However, now that PHP requires Curl 7.61, we can safely use the new `CURLOPT_ACCEPT_ENCODING` constant.
1 parent 6083a2e commit cc3b902

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

NEWS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ PHP NEWS
77
. Fixed bug GH-15644 (Asymmetric visibility doesn't work with hooks). (ilutov)
88
. Implemented lazy objects RFC. (Arnaud)
99

10+
- Curl:
11+
. Added CURLOPT_SERVER_RESPONSE_TIMEOUT, which was formerly known as
12+
CURLOPT_FTP_RESPONSE_TIMEOUT. (Ayesh Karunaratne)
13+
1014
- DOM:
1115
. Fixed bug GH-13988 (Storing DOMElement consume 4 times more memory in
1216
PHP 8.1 than in PHP 8.0). (nielsdos)
@@ -32,10 +36,6 @@ PHP NEWS
3236
EAI_SYSTEM not found). (nielsdos)
3337
. Implemented asymmetric visibility for properties. (ilutov)
3438

35-
- Curl:
36-
. Added CURLOPT_SERVER_RESPONSE_TIMEOUT, which was formerly known as
37-
CURLOPT_FTP_RESPONSE_TIMEOUT. (Ayesh Karunaratne)
38-
3939
- Date:
4040
. Fixed bug GH-13773 (DatePeriod not taking into account microseconds for end
4141
date). (Mark Bennewitz, Derick)

ext/curl/curl.stub.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@
8484
const CURLOPT_EGDSOCKET = UNKNOWN;
8585
/**
8686
* @var int
87-
* @cvalue CURLOPT_ENCODING
87+
* @cvalue CURLOPT_ACCEPT_ENCODING
88+
* @alias CURLOPT_ACCEPT_ENCODING
8889
*/
8990
const CURLOPT_ENCODING = UNKNOWN;
9091
/**

ext/curl/curl_arginfo.h

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)