Skip to content

[PHP 8.4] Curl new options and constants #4069 を取り込み #308

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
merged 9 commits into from
Aug 5, 2025
Merged

[PHP 8.4] Curl new options and constants #4069 を取り込み #308

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4103014
constants.xml
natsuki-engr Jul 15, 2025
b07a10f
constants_curl_getinfo.xml(全体が未翻訳なので追加部分も一旦原文まま)
natsuki-engr Jul 15, 2025
0c8012d
curl-getinfo.xml
natsuki-engr Jul 15, 2025
410af9a
curl-setopt.xml
natsuki-engr Jul 18, 2025
8d66250
curl-version.xml
natsuki-engr Jul 18, 2025
8bc8656
setup.xml
natsuki-engr Jul 18, 2025
8348ae2
Merge branch 'php:master' into php84_curl_opt_const
natsuki-engr Jul 21, 2025
b2a8c80
リビジョンの更新
natsuki-engr Jul 25, 2025
027895f
Update setup.xml
youkidearitai Aug 5, 2025
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
2 changes: 1 addition & 1 deletion language/predefined/sensitiveparametervalue/construct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: ce78d59569fcae6286c46abe1b781a0b6fc594c0 Maintainer: mumumu Status: ready -->
<!-- EN-Revision: c29164e0e6db5f24c46d8f98d520003cfde9d1fa Maintainer: mumumu Status: ready -->
<refentry xml:id="sensitiveparametervalue.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>SensitiveParameterValue::__construct</refname>
Expand Down
44 changes: 44 additions & 0 deletions reference/curl/constants.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1397,6 +1397,28 @@
</simpara>
</listitem>
</varlistentry>
<varlistentry xml:id="constant.curl-http-version-3">
<term>
<constant>CURL_HTTP_VERSION_3</constant>
(<type>int</type>)
</term>
<listitem>
<simpara>
Available as of PHP 8.4.0 and cURL 7.66.0.
</simpara>
</listitem>
</varlistentry>
<varlistentry xml:id="constant.curl-http-version-3only">
<term>
<constant>CURL_HTTP_VERSION_3ONLY</constant>
(<type>int</type>)
</term>
<listitem>
<simpara>
Available as of PHP 8.4.0 and cURL 7.88.0.
</simpara>
</listitem>
</varlistentry>
<varlistentry xml:id="constant.curl-http-version-none">
<term>
<constant>CURL_HTTP_VERSION_NONE</constant>
Expand Down Expand Up @@ -2307,6 +2329,28 @@
</simpara>
</listitem>
</varlistentry>
<varlistentry xml:id="constant.curl-prereqfunc-ok">
<term>
<constant>CURL_PREREQFUNC_OK</constant>
(<type>int</type>)
</term>
<listitem>
<simpara>
Available as of PHP 8.4.0 and cURL 7.80.0.
</simpara>
</listitem>
</varlistentry>
<varlistentry xml:id="constant.curl-prereqfunc-abort">
<term>
<constant>CURL_PREREQFUNC_ABORT</constant>
(<type>int</type>)
</term>
<listitem>
<simpara>
Available as of PHP 8.4.0 and cURL 7.80.0.
</simpara>
</listitem>
</varlistentry>
</variablelist>
&reference.curl.constants-curl-setopt;
&reference.curl.constants-curl-share-setopt;
Expand Down
14 changes: 13 additions & 1 deletion reference/curl/constants_curl_getinfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 8ff19ed3d6cc23f8349f589d09736a859c0aa2e3 Maintainer: mumumu Status: working -->
<!-- EN-Revision: c29164e0e6db5f24c46d8f98d520003cfde9d1fa Maintainer: mumumu Status: working -->
<variablelist xml:id="constant.curl-getinfo.constants" role="constant_list">
<title><function>curl_getinfo</function></title>
<varlistentry xml:id="constant.curlinfo-appconnect-time">
Expand Down Expand Up @@ -778,4 +778,16 @@
</simpara>
</listitem>
</varlistentry>
<varlistentry xml:id="constant.curlinfo-posttransfer-time-t">
<term>
<constant>CURLINFO_POSTTRANSFER_TIME_T</constant>
(<type>int</type>)
</term>
<listitem>
<simpara>
Time it took from the start until the last byte is sent, in microseconds.
Available as of PHP 8.4.0 and cURL 8.10.0
</simpara>
</listitem>
</varlistentry>
</variablelist>
13 changes: 12 additions & 1 deletion reference/curl/functions/curl-getinfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 56171c30f4f4bb558537d9f5b400f21fdd2ebee8 Maintainer: hirokawa Status: ready -->
<!-- EN-Revision: c29164e0e6db5f24c46d8f98d520003cfde9d1fa Maintainer: hirokawa Status: ready -->
<!-- Reviewed: no -->
<!-- CREDITS: takagi,mumumu -->
<refentry xml:id="function.curl-getinfo" xmlns="http://docbook.org/ns/docbook">
Expand Down Expand Up @@ -183,6 +183,11 @@
をコールしたときに <constant>CURLINFO_HEADER_OUT</constant> を設定した場合のみです)
</simpara>
</listitem>
<listitem>
<simpara>
"posttransfer_time_us" (PHP 8.4.0 以降かつ cURL 8.10.0 以降で利用可能。)
</simpara>
</listitem>
</itemizedlist>
プライベートデータはこの連想配列には含まれず、<constant>CURLINFO_PRIVATE</constant> オプションで個別に取得しなければいけないことに注意しましょう。
</para>
Expand All @@ -200,6 +205,12 @@
</row>
</thead>
<tbody>
<row>
<entry>8.4.0</entry>
<entry>
定数 <constant>CURLINFO_POSTTRANSFER_TIME_T</constant> と <literal>posttransfer_time_us</literal> が追加されました。(Curl 8.10.0 以降).
</entry>
</row>
<row>
<entry>8.3.0</entry>
<entry>
Expand Down
9 changes: 8 additions & 1 deletion reference/curl/functions/curl-setopt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 56171c30f4f4bb558537d9f5b400f21fdd2ebee8 Maintainer: takagi Status: ready -->
<!-- EN-Revision: c29164e0e6db5f24c46d8f98d520003cfde9d1fa Maintainer: takagi Status: ready -->
<!-- CREDITS: hirokawa,mumumu -->
<refentry xml:id="function.curl-setopt" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -68,6 +68,13 @@
</row>
</thead>
<tbody>
<row>
<entry>8.4.0</entry>
<entry>
<constant>CURLOPT_DNS_USE_GLOBAL_CACHE</constant> は意味を成さず、
スレッドセーフな PHP ビルドで有効にしても警告は表示されなくなりました。
</entry>
</row>
&curl.changelog.handle-param;
<row>
<entry>7.3.15, 7.4.3</entry>
Expand Down
15 changes: 14 additions & 1 deletion reference/curl/functions/curl-version.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 89ae180a851621c308f0ea4604ff2e919aa57a7f Maintainer: hirokawa Status: ready -->
<!-- EN-Revision: c29164e0e6db5f24c46d8f98d520003cfde9d1fa Maintainer: hirokawa Status: ready -->
<!-- CREDITS: shimooka,mumumu -->
<refentry xml:id="function.curl-version" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -73,6 +73,13 @@
<entry>protocols</entry>
<entry>cURL がサポートするプロトコル名の配列</entry>
</row>
<row>
<entry>feature_list</entry>
<entry>
全ての既知のcURL機能の連想配列と、それらがサポートされている(&true;)
もしくはサポートされていない(&false;) かどうかを示す値
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
Expand All @@ -90,6 +97,12 @@
</row>
</thead>
<tbody>
<row>
<entry>8.4.0</entry>
<entry>
<literal>features_list</literal> が追加されました。
</entry>
</row>
<row>
<entry>8.0.0</entry>
<entry>
Expand Down
3 changes: 2 additions & 1 deletion reference/curl/setup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: b08895614bbc3bfb0273a41c29eda921161538c7 Maintainer: takagi Status: ready -->
<!-- EN-Revision: c29164e0e6db5f24c46d8f98d520003cfde9d1fa Maintainer: takagi Status: ready -->
<!-- CREDITS: shimooka,hirokawa,mumumu -->

<chapter xml:id="curl.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
Expand All @@ -15,6 +15,7 @@
libcurl 7.10.5 以降が必要です。
PHP 7.3.0 以降では、7.15.5 以降が必要です。
PHP 8.0.0 以降では、7.29.0 以降が必要です。
PHP 8..0 以降では、7.61.0 以降が必要です。
Copy link
Contributor

Choose a reason for hiding this comment

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

レビュー遅くなってしまってすみません。
ここの部分ですが、原文では「As of PHP 8.4.0, version 7.61.0 or later is required.」となってますね。
ですのでPHP 8.4.0以降ではが正しいかなと思いました。

Copy link
Contributor

Choose a reason for hiding this comment

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

こちらで修正しました！

</para>
</section>
<!-- }}} -->
Expand Down