Skip to content

Commit f89c71b

Browse files
authored
Sync session, spl (#943)
1 parent aa763d3 commit f89c71b

File tree

8 files changed

+62
-41
lines changed

8 files changed

+62
-41
lines changed

reference/reflection/reflectionmethod/construct.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: ec2fe9a592f794978114ef5021db9f1d00c2e05d Maintainer: 谢毅斌 Status: ready -->
4-
<!-- CREDITS: mowangjuanzi -->
3+
<!-- EN-Revision: 790f63af6521908477b285ff753e454e118bb989 Maintainer: 谢毅斌 Status: ready -->
4+
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="reflectionmethod.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
<refnamediv>
77
<refname>ReflectionMethod::__construct</refname>
@@ -20,6 +20,12 @@
2020
<modifier>public</modifier> <methodname>ReflectionMethod::__construct</methodname>
2121
<methodparam><type>string</type><parameter>classMethod</parameter></methodparam>
2222
</constructorsynopsis>
23+
<warning>
24+
<simpara>
25+
从 PHP 8.4.0 开始,替代签名已被弃用,请使用
26+
<methodname>ReflectionMethod::createFromMethodName</methodname> 代替。
27+
</simpara>
28+
</warning>
2329
<para>
2430
构造新的 <classname>ReflectionMethod</classname>。
2531
</para>

reference/session/ini.xml

Lines changed: 3 additions & 3 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: be3a4367c932abe7cc2d1297f9c983daad1c204f Maintainer: HonestQiao Status: ready -->
3+
<!-- EN-Revision: 4841e3291543ae71e747f8448463c801b8a28e42 Maintainer: HonestQiao Status: ready -->
44
<!-- CREDITS: Luffy -->
55
<section xml:id="session.configuration" xmlns="http://docbook.org/ns/docbook">
66
&reftitle.runtime;
@@ -160,13 +160,13 @@
160160
<entry><link linkend="ini.session.sid-length">session.sid_length</link></entry>
161161
<entry>"32"</entry>
162162
<entry><constant>INI_ALL</constant></entry>
163-
<entry>自 PHP 7.1.0 起有效。</entry>
163+
<entry>自 PHP 7.1.0 起有效。自 PHP 8.4.0 起已废弃。</entry>
164164
</row>
165165
<row>
166166
<entry><link linkend="ini.session.sid-bits-per-character">session.sid_bits_per_character</link></entry>
167167
<entry>"4"</entry>
168168
<entry><constant>INI_ALL</constant></entry>
169-
<entry>自 PHP 7.1.0 起有效。</entry>
169+
<entry>自 PHP 7.1.0 起有效。自 PHP 8.4.0 起已废弃。</entry>
170170
</row>
171171
<row>
172172
<entry><link linkend="ini.session.upload-progress.enabled">session.upload_progress.enabled</link></entry>

reference/session/security.xml

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: ccb379494533c9b7d63a81f0221231a9e526eee9 Maintainer: yuanyuqiang Status: ready -->
4-
<!-- CREDITS: mowangjuanzi -->
3+
<!-- EN-Revision: 55e0481a24fd4d7db21b62f1885973edbca25e60 Maintainer: yuanyuqiang Status: ready -->
4+
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<chapter xml:id="session.security" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
<title>会话和安全</title>
77
<para>
@@ -710,29 +710,6 @@
710710
</para>
711711
</listitem>
712712

713-
<listitem>
714-
<para>
715-
<link linkend="ini.session.sid-length">session.sid_length</link>="48"
716-
</para>
717-
<para>
718-
(PHP 7.1.0 及更高版本)更长的会话 ID 可以得到更高的安全强度。
719-
建议开发者将会话 ID 的长度设置为不低于 32 个字符。
720-
当 <link linkend="ini.session.sid-bits-per-character">session.sid_bits_per_character</link>="5" 时,
721-
会话 ID 至少需要 26 个字符。
722-
</para>
723-
</listitem>
724-
725-
<listitem>
726-
<para>
727-
<link linkend="ini.session.sid-bits-per-character">session.sid_bits_per_character</link>="6"
728-
</para>
729-
<para>
730-
(PHP 7.1.0 及更高版本)
731-
即使会话 ID 的长度设定不变,
732-
更高的会话 ID 比特位设置也会产生安全性更高的会话 ID。
733-
</para>
734-
</listitem>
735-
736713
<listitem>
737714
<para>
738715
<link linkend="ini.session.hash-function">session.hash_function</link>="sha256"

reference/sockets/functions/socket-create-listen.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: e50e79746736dbdfbabe9bd3566793b3ddf38f58 Maintainer: songmeifeng Status: ready -->
3+
<!-- EN-Revision: 0e097419a847a077c7d8a74ebc5237ba9d8ddc90 Maintainer: songmeifeng Status: ready -->
44
<!-- CREDITS: Luffy -->
55
<refentry xml:id="function.socket-create-listen" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -69,6 +69,13 @@
6969
</row>
7070
</thead>
7171
<tbody>
72+
<row>
73+
<entry>8.4.0</entry>
74+
<entry>
75+
默认值现在是 <constant>SOMAXCONN</constant>。
76+
之前是 <literal>128</literal>。
77+
</entry>
78+
</row>
7279
<row>
7380
<entry>8.0.0</entry>
7481
<entry>

reference/spl/functions/spl-autoload-call.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version='1.0' encoding='utf-8'?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 60809ebcf7d0c261b2f00e093e4fab70326ffc7b Maintainer: Altair Status: ready -->
4-
<!-- CREDITS: mowangjuanzi -->
3+
<!-- EN-Revision: afb063c84d5d707ae329cd94474eee42a6fa82ff Maintainer: Altair Status: ready -->
4+
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.spl-autoload-call" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
77
<refname>spl_autoload_call</refname>
@@ -14,7 +14,7 @@
1414
<methodparam><type>string</type><parameter>class</parameter></methodparam>
1515
</methodsynopsis>
1616
<para>
17-
该函数可用于使用已注册的 __autoload 函数手动搜索类或接口
17+
此函数可以用来使用已注册的 __autoload() 函数手动搜索类、接口、trait 或枚举
1818
</para>
1919
</refsect1>
2020

reference/spl/functions/spl-autoload.xml

Lines changed: 4 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: 450d2085da9bba991afb9c68d9c94fc06a67a8a7 Maintainer: Altair Status: ready -->
3+
<!-- EN-Revision: 87ea6d1675fe601a5dddf4538a465c3af664cd10 Maintainer: Altair Status: ready -->
44
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.spl-autoload" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -29,7 +29,9 @@
2929
<term><parameter>class</parameter></term>
3030
<listitem>
3131
<para>
32-
已实例化的类(和命名空间)的名字。
32+
正在实例化的类的名称。
33+
在调用该函数时,将类名与命名空间一起传递给参数。
34+
<parameter>class</parameter> 不包含完全限定标识符的前导反斜杠。
3335
</para>
3436
</listitem>
3537
</varlistentry>

reference/stream/functions/stream-context-set-option.xml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 7aa6a0cc6631fc1c67a24e3ede9db849e420a4e5 Maintainer: zhoumengkang Status: ready -->
4-
<!-- CREDITS: her-cat -->
3+
<!-- EN-Revision: d5859815063bb6d3a0953c773920ce7425cf912e Maintainer: zhoumengkang Status: ready -->
4+
<!-- CREDITS: her-cat, Luffy -->
55
<refentry xml:id="function.stream-context-set-option" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
77
<refname>stream_context_set_option</refname>
@@ -17,11 +17,14 @@
1717
<methodparam><type>string</type><parameter>option</parameter></methodparam>
1818
<methodparam><type>mixed</type><parameter>value</parameter></methodparam>
1919
</methodsynopsis>
20+
<para>
21+
自 PHP 8.4.0 起,下面的替代签名已被弃用,请使用 <function>stream_context_set_options</function> 代替。
2022
<methodsynopsis>
2123
<type>bool</type><methodname>stream_context_set_option</methodname>
2224
<methodparam><type>resource</type><parameter>stream_or_context</parameter></methodparam>
2325
<methodparam><type>array</type><parameter>options</parameter></methodparam>
2426
</methodsynopsis>
27+
</para>
2528
<simpara>
2629
给指定的上下文设置参数。参数 <parameter>value</parameter>
2730
是设置 <parameter>wrapper</parameter> 的 <parameter>option</parameter> 参数的值。
@@ -93,6 +96,29 @@
9396
</para>
9497
</refsect1><!-- }}} -->
9598

99+
<refsect1 role="changelog">
100+
&reftitle.changelog;
101+
<informaltable>
102+
<tgroup cols="2">
103+
<thead>
104+
<row>
105+
<entry>&Version;</entry>
106+
<entry>&Description;</entry>
107+
</row>
108+
</thead>
109+
<tbody>
110+
<row>
111+
<entry>8.4.0</entry>
112+
<entry>
113+
替代的双参数签名已被弃用。
114+
请使用 <function>stream_context_set_options</function> 代替。
115+
</entry>
116+
</row>
117+
</tbody>
118+
</tgroup>
119+
</informaltable>
120+
</refsect1>
121+
96122
</refentry>
97123

98124
<!-- Keep this comment at the end of the file

reference/zlib/setup.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: a0ae28d3bc85f927c22649ebd9a590b921534b7d Maintainer: mowangjuanzi Status: ready -->
3+
<!-- EN-Revision: 6bb12514da39d010f2f0beb025dab9ec2459af51 Maintainer: mowangjuanzi Status: ready -->
4+
<!-- CREDITS: Luffy -->
45
<chapter xml:id="zlib.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
56
&reftitle.setup;
67

78
<!-- {{{ Requirements -->
89
<section xml:id="zlib.requirements">
910
&reftitle.required;
1011
<para>
11-
该模块使用 Jean-loup Gailly 和 Mark Adler 的 <link xlink:href="&url.zlib;">zlib</link>
12-
的函数。此模块必须使用 &gt;= 1.2.0.4 的 zlib 版本。
12+
该模块依赖于 <link xlink:href="&url.zlib;">zlib</link> 的函数,
13+
由 Jean-loup Gailly 和 Mark Adler 开发。
14+
从 PHP 8.4.0 开始,所需的最低 zlib 版本为 1.2.11。
15+
在 PHP 8.4.0 之前,所需的最低 zlib 版本为 1.2.0.4。
1316
</para>
1417
</section>
1518
<!-- }}} -->

0 commit comments

Comments
 (0)