Skip to content

Commit 003899b

Browse files
natsuki-engryoukidearitai
natsuki-engr
and
youkidearitai
authored
[PHP 8.4] Curl new options and constants #4069 を取り込み (#308)
* constants.xml * constants_curl_getinfo.xml(全体が未翻訳なので追加部分も一旦原文まま) * curl-getinfo.xml * curl-setopt.xml * curl-version.xml * setup.xml * リビジョンの更新 --------- Co-authored-by: tekimen <[email protected]>
1 parent 2fcfd76 commit 003899b

File tree

7 files changed

+94
-6
lines changed

7 files changed

+94
-6
lines changed

‎language/predefined/sensitiveparametervalue/construct.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: ce78d59569fcae6286c46abe1b781a0b6fc594c0 Maintainer: mumumu Status: ready -->
3+
<!-- EN-Revision: c29164e0e6db5f24c46d8f98d520003cfde9d1fa Maintainer: mumumu Status: ready -->
44
<refentry xml:id="sensitiveparametervalue.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
55
<refnamediv>
66
<refname>SensitiveParameterValue::__construct</refname>

‎reference/curl/constants.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,6 +1397,28 @@
13971397
</simpara>
13981398
</listitem>
13991399
</varlistentry>
1400+
<varlistentry xml:id="constant.curl-http-version-3">
1401+
<term>
1402+
<constant>CURL_HTTP_VERSION_3</constant>
1403+
(<type>int</type>)
1404+
</term>
1405+
<listitem>
1406+
<simpara>
1407+
Available as of PHP 8.4.0 and cURL 7.66.0.
1408+
</simpara>
1409+
</listitem>
1410+
</varlistentry>
1411+
<varlistentry xml:id="constant.curl-http-version-3only">
1412+
<term>
1413+
<constant>CURL_HTTP_VERSION_3ONLY</constant>
1414+
(<type>int</type>)
1415+
</term>
1416+
<listitem>
1417+
<simpara>
1418+
Available as of PHP 8.4.0 and cURL 7.88.0.
1419+
</simpara>
1420+
</listitem>
1421+
</varlistentry>
14001422
<varlistentry xml:id="constant.curl-http-version-none">
14011423
<term>
14021424
<constant>CURL_HTTP_VERSION_NONE</constant>
@@ -2307,6 +2329,28 @@
23072329
</simpara>
23082330
</listitem>
23092331
</varlistentry>
2332+
<varlistentry xml:id="constant.curl-prereqfunc-ok">
2333+
<term>
2334+
<constant>CURL_PREREQFUNC_OK</constant>
2335+
(<type>int</type>)
2336+
</term>
2337+
<listitem>
2338+
<simpara>
2339+
Available as of PHP 8.4.0 and cURL 7.80.0.
2340+
</simpara>
2341+
</listitem>
2342+
</varlistentry>
2343+
<varlistentry xml:id="constant.curl-prereqfunc-abort">
2344+
<term>
2345+
<constant>CURL_PREREQFUNC_ABORT</constant>
2346+
(<type>int</type>)
2347+
</term>
2348+
<listitem>
2349+
<simpara>
2350+
Available as of PHP 8.4.0 and cURL 7.80.0.
2351+
</simpara>
2352+
</listitem>
2353+
</varlistentry>
23102354
</variablelist>
23112355
&reference.curl.constants-curl-setopt;
23122356
&reference.curl.constants-curl-share-setopt;

‎reference/curl/constants_curl_getinfo.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 8ff19ed3d6cc23f8349f589d09736a859c0aa2e3 Maintainer: mumumu Status: working -->
3+
<!-- EN-Revision: c29164e0e6db5f24c46d8f98d520003cfde9d1fa Maintainer: mumumu Status: working -->
44
<variablelist xml:id="constant.curl-getinfo.constants" role="constant_list">
55
<title><function>curl_getinfo</function></title>
66
<varlistentry xml:id="constant.curlinfo-appconnect-time">
@@ -778,4 +778,16 @@
778778
</simpara>
779779
</listitem>
780780
</varlistentry>
781+
<varlistentry xml:id="constant.curlinfo-posttransfer-time-t">
782+
<term>
783+
<constant>CURLINFO_POSTTRANSFER_TIME_T</constant>
784+
(<type>int</type>)
785+
</term>
786+
<listitem>
787+
<simpara>
788+
Time it took from the start until the last byte is sent, in microseconds.
789+
Available as of PHP 8.4.0 and cURL 8.10.0
790+
</simpara>
791+
</listitem>
792+
</varlistentry>
781793
</variablelist>

‎reference/curl/functions/curl-getinfo.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 56171c30f4f4bb558537d9f5b400f21fdd2ebee8 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: c29164e0e6db5f24c46d8f98d520003cfde9d1fa Maintainer: hirokawa Status: ready -->
44
<!-- Reviewed: no -->
55
<!-- CREDITS: takagi,mumumu -->
66
<refentry xml:id="function.curl-getinfo" xmlns="http://docbook.org/ns/docbook">
@@ -183,6 +183,11 @@
183183
をコールしたときに <constant>CURLINFO_HEADER_OUT</constant> を設定した場合のみです)
184184
</simpara>
185185
</listitem>
186+
<listitem>
187+
<simpara>
188+
"posttransfer_time_us" (PHP 8.4.0 以降かつ cURL 8.10.0 以降で利用可能。)
189+
</simpara>
190+
</listitem>
186191
</itemizedlist>
187192
プライベートデータはこの連想配列には含まれず、<constant>CURLINFO_PRIVATE</constant> オプションで個別に取得しなければいけないことに注意しましょう。
188193
</para>
@@ -200,6 +205,12 @@
200205
</row>
201206
</thead>
202207
<tbody>
208+
<row>
209+
<entry>8.4.0</entry>
210+
<entry>
211+
定数 <constant>CURLINFO_POSTTRANSFER_TIME_T</constant> と <literal>posttransfer_time_us</literal> が追加されました。(Curl 8.10.0 以降).
212+
</entry>
213+
</row>
203214
<row>
204215
<entry>8.3.0</entry>
205216
<entry>

‎reference/curl/functions/curl-setopt.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 56171c30f4f4bb558537d9f5b400f21fdd2ebee8 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: c29164e0e6db5f24c46d8f98d520003cfde9d1fa Maintainer: takagi Status: ready -->
44
<!-- CREDITS: hirokawa,mumumu -->
55
<refentry xml:id="function.curl-setopt" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -68,6 +68,13 @@
6868
</row>
6969
</thead>
7070
<tbody>
71+
<row>
72+
<entry>8.4.0</entry>
73+
<entry>
74+
<constant>CURLOPT_DNS_USE_GLOBAL_CACHE</constant> は意味を成さず、
75+
スレッドセーフな PHP ビルドで有効にしても警告は表示されなくなりました。
76+
</entry>
77+
</row>
7178
&curl.changelog.handle-param;
7279
<row>
7380
<entry>7.3.15, 7.4.3</entry>

‎reference/curl/functions/curl-version.xml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 89ae180a851621c308f0ea4604ff2e919aa57a7f Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: c29164e0e6db5f24c46d8f98d520003cfde9d1fa Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: shimooka,mumumu -->
55
<refentry xml:id="function.curl-version" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -73,6 +73,13 @@
7373
<entry>protocols</entry>
7474
<entry>cURL がサポートするプロトコル名の配列</entry>
7575
</row>
76+
<row>
77+
<entry>feature_list</entry>
78+
<entry>
79+
全ての既知のcURL機能の連想配列と、それらがサポートされている(&true;)
80+
もしくはサポートされていない(&false;) かどうかを示す値
81+
</entry>
82+
</row>
7683
</tbody>
7784
</tgroup>
7885
</informaltable>
@@ -90,6 +97,12 @@
9097
</row>
9198
</thead>
9299
<tbody>
100+
<row>
101+
<entry>8.4.0</entry>
102+
<entry>
103+
<literal>features_list</literal> が追加されました。
104+
</entry>
105+
</row>
93106
<row>
94107
<entry>8.0.0</entry>
95108
<entry>

‎reference/curl/setup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: b08895614bbc3bfb0273a41c29eda921161538c7 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: c29164e0e6db5f24c46d8f98d520003cfde9d1fa Maintainer: takagi Status: ready -->
44
<!-- CREDITS: shimooka,hirokawa,mumumu -->
55

66
<chapter xml:id="curl.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -15,6 +15,7 @@
1515
libcurl 7.10.5 以降が必要です。
1616
PHP 7.3.0 以降では、7.15.5 以降が必要です。
1717
PHP 8.0.0 以降では、7.29.0 以降が必要です。
18+
PHP 8.4.0 以降では、7.61.0 以降が必要です。
1819
</para>
1920
</section>
2021
<!-- }}} -->

0 commit comments

Comments
 (0)