Skip to content

Commit da9f47d

Browse files
mowangjuanzimowangjuanzi
committed
Update install/bc/curl/datetime
1 parent 8385f3c commit da9f47d

File tree

8 files changed

+277
-77
lines changed

8 files changed

+277
-77
lines changed

‎install/ini.xml

Lines changed: 12 additions & 19 deletions
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: d5d10b38b4395e77827b04d5290bb137bd3872b4 Maintainer: dallas Status: ready -->
3+
<!-- EN-Revision: 9ab074d32484672f93e5d822f42fb94ae9088207 Maintainer: dallas Status: ready -->
44
<!-- CREDITS: mowangjuanzi -->
55
<chapter xml:id="configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
66
<title>运行时配置</title>
@@ -84,20 +84,20 @@
8484
&php.ini;，如果存在的话。
8585
</para>
8686
</note>
87-
<para>
88-
在 &php.ini; 中可以使用环境变量，如下示例：
89-
</para>
90-
<para>
91-
<example>
92-
<title>&php.ini; 中的环境变量</title>
93-
<programlisting role="ini">
87+
<simpara>
88+
可以在如下所示的 &php.ini; 配置值中引用环境变量。自 PHP 8.3.0 起，可以指定一个后备值，当引用的变量未定义时使用该值。
89+
</simpara>
90+
<example>
91+
<title>&php.ini; 中的环境变量</title>
92+
<programlisting role="ini">
9493
<![CDATA[
9594
; PHP_MEMORY_LIMIT 来自于环境变量的值
9695
memory_limit = ${PHP_MEMORY_LIMIT}
96+
; 如果 PHP_MAX_EXECUTION_TIME 未定义，将回退到 30
97+
max_execution_time = ${PHP_MAX_EXECUTION_TIME:-30}
9798
]]>
98-
</programlisting>
99-
</example>
100-
</para>
99+
</programlisting>
100+
</example>
101101
<para>
102102
由扩展库处理的 &php.ini; 指令，其文档分别在各扩展库的页面。<link
103103
linkend="ini">内核配置选项</link>见附录。不过也许不是所有的 PHP
@@ -107,7 +107,7 @@ memory_limit = ${PHP_MEMORY_LIMIT}
107107
</para>
108108
<para>
109109
<example>
110-
<title>&php.ini; 例子</title>
110+
<title>&php.ini; 示例</title>
111111
<programlisting role="ini">
112112
<![CDATA[
113113
; any text on a line after an unquoted semicolon (;) is ignored
@@ -125,13 +125,6 @@ include_path = ".:/usr/local/lib/php"
125125
include_path = ".;c:\php\lib"
126126
]]>
127127
</programlisting>
128-
129-
130-
131-
132-
133-
134-
135128
<!-- TODO: add more details about values and expressions -->
136129
</example>
137130
</para>

‎language-snippets.ent

Lines changed: 41 additions & 2 deletions
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: ddb05f8827151e25dd1c3e058f95f6c024bc881b Maintainer: Gregory Status: ready -->
3+
<!-- EN-Revision: ed1aff13602c94f86344bdd7c4fbc31f5a71bf84 Maintainer: Gregory Status: ready -->
44
<!-- CREDITS: dallas, mowangjuanzi, Luffy -->
55
<!-- 请保持此文件与英文文件中相应的每个 ENTITY 行号一一对应以便于对照，修改与更新！ -->
66

@@ -1820,9 +1820,15 @@ It is strongly recommended to avoid timezone abbreviations.
18201820
<!ENTITY haru.error '<para xmlns="http://docbook.org/ns/docbook">发生错误时抛出 <classname>HaruException</classname> 异常。</para>'>
18211821

18221822
<!-- ODBC -->
1823-
<!ENTITY odbc.connection.id '<para xmlns="http://docbook.org/ns/docbook">ODBC 连接标识符，详见
1823+
<!ENTITY odbc.connection.id '<para xmlns="http://docbook.org/ns/docbook">ODBC 连接对象，详见
18241824
<function>odbc_connect</function>。</para>'>
18251825

1826+
<!ENTITY odbc.result.object 'ODBC 结果对象'>
1827+
1828+
<!ENTITY odbc.result.object-return '返回 ODBC 结果对象'>
1829+
1830+
<!ENTITY odbc.result.object-return-falseforfailure '&odbc.result.object-return;&return.falseforfailure;。'>
1831+
18261832
<!ENTITY odbc.parameter.catalog 'The catalog (&apos;qualifier&apos; in ODBC 2 parlance).'>
18271833

18281834
<!ENTITY odbc.parameter.schema 'The schema (&apos;owner&apos; in ODBC 2 parlance).'>
@@ -1833,6 +1839,39 @@ It is strongly recommended to avoid timezone abbreviations.
18331839

18341840
<!ENTITY odbc.result.driver-specific 'Drivers can report additional columns.'>
18351841

1842+
<!ENTITY odbc.changelog.connection-param '<row xmlns="http://docbook.org/ns/docbook">
1843+
<entry>8.4.0</entry>
1844+
<entry>
1845+
<parameter>odbc</parameter> 现在需要 <classname>Odbc\Connection</classname>
1846+
实例；之前需要 <type>resource</type>。
1847+
</entry>
1848+
</row>'>
1849+
1850+
<!ENTITY odbc.changelog.connection-return '&odbc.changelog.connection-param;
1851+
<row xmlns="http://docbook.org/ns/docbook">
1852+
<entry>8.4.0</entry>
1853+
<entry>
1854+
此函数现在返回 <classname>Odbc\Connection</classname> 实例；之前返回
1855+
<type>resource</type>。
1856+
</entry>
1857+
</row>'>
1858+
1859+
<!ENTITY odbc.changelog.result-param '<row xmlns="http://docbook.org/ns/docbook">
1860+
<entry>8.4.0</entry>
1861+
<entry>
1862+
<parameter>statement</parameter> 现在需要 <classname>Odbc\Result</classname>
1863+
实例；之前需要 <type>resource</type>。
1864+
</entry>
1865+
</row>'>
1866+
1867+
<!ENTITY odbc.changelog.result-return '<row xmlns="http://docbook.org/ns/docbook">
1868+
<entry>8.4.0</entry>
1869+
<entry>
1870+
此函数现在返回 <classname>Odbc\Result</classname>
1871+
实例；之前返回 <type>resource</type>。
1872+
</entry>
1873+
</row>'>
1874+
18361875
<!-- OAUTH -->
18371876
<!ENTITY oauth.callback.error '如回调函数无法被调用或未被指定，会引发一个
18381877
<constant xmlns="http://docbook.org/ns/docbook">E_ERROR</constant> 级别的错误。'>

‎reference/bc/functions/bcdiv.xml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 87f32875a189be7ee2a8487c0db3958579e4ce72 Maintainer: jakquan Status: ready -->
3+
<!-- EN-Revision: ddb05f8827151e25dd1c3e058f95f6c024bc881b Maintainer: jakquan Status: ready -->
44
<!-- CREDITS: mowangjuanzi -->
5-
<refentry xml:id="function.bcdiv" xmlns="http://docbook.org/ns/docbook">
5+
<refentry xml:id="function.bcdiv" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
66
<refnamediv>
77
<refname>bcdiv</refname>
88
<refpurpose>两个任意精度的数字除法计算</refpurpose>
@@ -16,9 +16,9 @@
1616
<methodparam><type>string</type><parameter>num2</parameter></methodparam>
1717
<methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>scale</parameter><initializer>&null;</initializer></methodparam>
1818
</methodsynopsis>
19-
<para>
19+
<simpara>
2020
<parameter>num1</parameter> 除以 <parameter>num2</parameter>。
21-
</para>
21+
</simpara>
2222
</refsect1>
2323

2424
<refsect1 role="parameters">
@@ -54,14 +54,8 @@
5454
</refsect1>
5555

5656
<refsect1 role="errors">
57-
&reftitle.errors;
58-
<para>
59-
函数在下列情况会抛出 <exceptionname>ValueError</exceptionname>：
60-
<simplelist>
61-
<member><parameter>num1</parameter> 或 <parameter>num2</parameter> 不是格式正确的 BCMath 数字字符串</member>
62-
<member><parameter>scale</parameter> 超出有效范围</member>
63-
</simplelist>
64-
</para>
57+
<!-- Include standard ValueErrors for num1, num2, and scale, this includes the title -->
58+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.bcadd')/db:refsect1[@role='errors']/*)" />
6559
<simpara>
6660
如果 <parameter>num2</parameter> 为 <literal>0</literal>，此函数会抛出 <exceptionname>DivisionByZeroError</exceptionname> 异常。
6761
</simpara>
@@ -87,7 +81,7 @@
8781
<row>
8882
<entry>8.0.0</entry>
8983
<entry>
90-
现在，除以 0 会引发 <exceptionname>DivisionByZeroError</exceptionname> 异常，而不是返回 &null;。
84+
现在，除以 <literal>0</literal> 会引发 <exceptionname>DivisionByZeroError</exceptionname> 异常，而不是返回 &null;。
9185
</entry>
9286
</row>
9387
</tbody>

‎reference/curl/functions/curl-multi-exec.xml

Lines changed: 43 additions & 23 deletions
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: b7f8c11e56ff1c57a2993e2ed7e5c5ace18637fd Maintainer: dallas Status: ready -->
3+
<!-- EN-Revision: 2ebb9660d47e648a28007960bf059d1f691c7f21 Maintainer: dallas Status: ready -->
44
<!-- CREDITS: mowangjuanzi -->
55
<refentry xml:id="function.curl-multi-exec" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -73,40 +73,60 @@
7373
<example>
7474
<title><function>curl_multi_exec</function> 示例</title>
7575
<para>
76-
这个范例将会创建 2 个 cURL 句柄，把它们加到批处理句柄，然后并行处理它们。
76+
此示例将为 URL 列表创建 cURL 句柄，把它们加到批处理句柄，然后并行处理它们。
7777
</para>
7878
<programlisting role="php">
7979
<![CDATA[
8080
<?php
81-
// 创建一对cURL资源
82-
$ch1 = curl_init();
83-
$ch2 = curl_init();
8481
85-
// 设置URL和相应的选项
86-
curl_setopt($ch1, CURLOPT_URL, "http://example.com/");
87-
curl_setopt($ch1, CURLOPT_HEADER, 0);
88-
curl_setopt($ch2, CURLOPT_URL, "http://www.php.net/");
89-
curl_setopt($ch2, CURLOPT_HEADER, 0);
82+
$urls = [
83+
"https://www.php.net/",
84+
"https://www.example.com/",
85+
];
9086
91-
// 创建批处理cURL句柄
9287
$mh = curl_multi_init();
88+
$map = new WeakMap();
9389
94-
// 增加2个句柄
95-
curl_multi_add_handle($mh,$ch1);
96-
curl_multi_add_handle($mh,$ch2);
90+
foreach ($urls as $url) {
91+
$ch = curl_init($url);
92+
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
93+
curl_multi_add_handle($mh, $ch);
94+
$map[$ch] = $url;
95+
}
9796
98-
// 执行批处理句柄
9997
do {
100-
$status = curl_multi_exec($mh, $active);
101-
if ($active) {
102-
// Wait a short time for more activity
103-
curl_multi_select($mh);
98+
$status = curl_multi_exec($mh, $unfinishedHandles);
99+
if ($status !== CURLM_OK) {
100+
throw new \Exception(curl_multi_strerror(curl_multi_errno($mh)));
104101
}
105-
} while ($active && $status == CURLM_OK);
106102
107-
// 关闭全部句柄
108-
curl_multi_remove_handle($mh, $ch1);
109-
curl_multi_remove_handle($mh, $ch2);
103+
while (($info = curl_multi_info_read($mh)) !== false) {
104+
if ($info['msg'] === CURLMSG_DONE) {
105+
$handle = $info['handle'];
106+
curl_multi_remove_handle($mh, $handle);
107+
$url = $map[$handle];
108+
109+
if ($info['result'] === CURLE_OK) {
110+
$statusCode = curl_getinfo($handle, CURLINFO_HTTP_CODE);
111+
112+
echo "Request to {$url} finished with HTTP status {$statusCode}:", PHP_EOL;
113+
echo curl_multi_getcontent($handle);
114+
echo PHP_EOL, PHP_EOL;
115+
} else {
116+
echo "Request to {$url} failed with error: ", PHP_EOL;
117+
echo curl_strerror($info['result']);
118+
echo PHP_EOL, PHP_EOL;
119+
}
120+
}
121+
}
122+
123+
if ($unfinishedHandles) {
124+
if (($updatedHandles = curl_multi_select($mh)) === -1) {
125+
throw new \Exception(curl_multi_strerror(curl_multi_errno($mh)));
126+
}
127+
}
128+
} while ($unfinishedHandles);
129+
110130
curl_multi_close($mh);
111131
112132
?>

0 commit comments

Comments
 (0)