com doc/zh: Remove docs about NSAPI see https://github.com/ php/doc-en/commit/d278431ef5e561787 093a7b2679327a615b09367 #diff-27cbc06c46cafe41bebbcae98567a 9dbdea42565f65b61b34b9042a1 2b00ac2b: appendices/configure/servers.xml appe ndices/ini.list.xml install/unix/index.xml install/wi ndows/legacy/index.xml language-snippets.ent reference/ apache/functions/apache-child-terminate.xml reference/apach e/functions/apache-request-headers.xml reference/apache/f
[email protected] (Dai Jie) Thu, 14 Jan 2021 10:37:31 +0000
| Newsgroups | php.doc.zh |
|---|---|
| Message-ID | <[email protected]> |
Commit: 8a8635cdc31d6ae4e05b45f3fa1ccd341b3d2e25 Author: daijie <[email protected]> Thu, 14 Jan 2021 17:50:49 +0800 Parents: 397eff79fc3b09029a8a69a7f7a3a85e6f83c17f Branches: master Link: http://git.php.net/?p=doc/zh.git;a=commitdiff;h=8a8635cdc31d6ae4e05b45f3fa1ccd341b3d2e25 Log: Remove docs about NSAPI see https://github.com/php/doc-en/commit/d278431ef5e561787093a7b2679327a615b09367#diff-27cbc06c46cafe41bebbcae98567a9dbdea42565f65b61b34b9042a12b00ac2b Changed paths: M appendices/configure/servers.xml M appendices/ini.list.xml M install/unix/index.xml M install/windows/legacy/index.xml M language-snippets.ent M reference/apache/functions/apache-child-terminate.xml M reference/apache/functions/apache-request-headers.xml M reference/apache/functions/apache-response-headers.xml M reference/info/functions/php-sapi-name.xml
diff_8a8635cdc31d6ae4e05b45f3fa1ccd341b3d2e25.txt
(text/plain, 14.2 KB)
diff --git a/appendices/configure/servers.xml b/appendices/configure/servers.xml
index 56a54256..5c49d7e4 100644
--- a/appendices/configure/servers.xml
+++ b/appendices/configure/servers.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- $Author$ -->
-<!-- EN-Revision: e443388d4249fea383d6ec2d1a338be220cf95ee Maintainer: Avenger Status: ready -->
+<!-- EN-Revision: d278431ef5e561787093a7b2679327a615b09367 Maintainer: Avenger Status: ready -->
<sect3 xml:id="configure.options.servers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>SAPI 选项</title>
<para>
@@ -90,17 +90,6 @@
</listitem>
</varlistentry>
-
- <varlistentry xml:id="configure.with-nsapi">
- <term>
- <option role="configure">--with-nsapi=DIR</option>
- </term>
- <listitem>
- <para>
- 指定 Netscape/iPlanet/SunONE 的安装目录。
- </para>
- </listitem>
- </varlistentry>
<varlistentry xml:id="configure.with-servlet">
<term>
<option role="configure">--with-servlet[=DIR]</option>
diff --git a/appendices/ini.list.xml b/appendices/ini.list.xml
index 9bfda041..213ed531 100644
--- a/appendices/ini.list.xml
+++ b/appendices/ini.list.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- $Author$ -->
-<!-- EN-Revision: 027f187b3ed8cdec60db6f83baf8f62b536d1101 Maintainer: Avenger Status: ready -->
+<!-- EN-Revision: d278431ef5e561787093a7b2679327a615b09367 Maintainer: Avenger Status: ready -->
<section xml:id="ini.list" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>&php.ini; 配置选项列表</title>
@@ -1500,12 +1500,6 @@
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqlnd-qc.configuration.list')/*)" />
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqlnd-uh.configuration.list')/*)" />
<row>
- <entry><link linkend="ini.nsapi.read-timeout">nsapi.read_timeout</link></entry>
- <entry>"60"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry>从 PHP 4.3.3 起可用。</entry>
- </row>
- <row>
<entry><link linkend="ini.oci8.connection-class">oci8.connection_class</link></entry>
<entry>""</entry>
<entry>PHP_INI_ALL</entry>
diff --git a/install/unix/index.xml b/install/unix/index.xml
index 3b23336e..af6d60da 100644
--- a/install/unix/index.xml
+++ b/install/unix/index.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: dcd5448282973a659f62e4240fb6e50aae0eb78b Maintainer: dallas Status: ready -->
+<!-- EN-Revision: d278431ef5e561787093a7b2679327a615b09367 Maintainer: dallas Status: ready -->
<chapter xml:id="install.unix" xmlns="http://docbook.org/ns/docbook">
<title>Unix 系统下的安装</title>
@@ -41,7 +41,7 @@
<itemizedlist>
<listitem>
<simpara>
- autoconf: 2.13+ (for PHP < 5.4.0), 2.59+ (for PHP >= 5.4.0), 2.64+ (for PHP >= 7.2.0)
+ autoconf: 2.59+ (for PHP >= 7.0.0), 2.64+ (for PHP >= 7.2.0)
</simpara>
</listitem>
<listitem>
@@ -56,12 +56,7 @@
</listitem>
<listitem>
<simpara>
- re2c: 版本 0.13.4 或更高
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- flex: 版本 2.5.4(PHP <= 5.2)
+ re2c: 版本 0.13.4+(PHP > 7.0.0), 0.13.7+ (PHP > 8.0.0)
</simpara>
</listitem>
<listitem>
@@ -71,23 +66,6 @@
<itemizedlist>
<listitem>
<simpara>
- PHP 5.4: 1.28, 1.35, 1.75, 1.875, 2.0, 2.1, 2.2, 2.3, 2.4, 2.4.1,
- 2.4.2, 2.4.3, 2.5, 2.5.1, 2.6, 2.6.1, 2.6.2, 2.6.4
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- PHP 5.5: 2.4, 2.4.1, 2.4.2, 2.4.3, 2.5, 2.5.1, 2.6, 2.6.1, 2.6.2,
- 2.6.3, 2.6.4, 2.6.5, 2.7
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- PHP 5.6: >= 2.4, < 3.0
- </simpara>
- </listitem>
- <listitem>
- <simpara>
PHP 7.0 - 7.3: 2.4 或更高 (包含 Bison 3.x)
</simpara>
</listitem>
@@ -134,7 +112,6 @@
&install.unix.apache2;
&install.unix.nginx;
&install.unix.lighttpd-14;
- &install.unix.sun;
&install.unix.litespeed;
&install.unix.commandline;
<!-- operating system specific nodes -->
diff --git a/install/windows/legacy/index.xml b/install/windows/legacy/index.xml
index 509adcd6..34784dc6 100644
--- a/install/windows/legacy/index.xml
+++ b/install/windows/legacy/index.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision: 344637 $ -->
-<!-- EN-Revision: c5ef51c6cc3d3cbc6e3749f6e11b6fb1d2fc0cf3 Maintainer: Avenger Status: ready -->
+<!-- EN-Revision: d278431ef5e561787093a7b2679327a615b09367 Maintainer: Avenger Status: ready -->
<sect1 xml:id="install.windows.legacy.index" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>旧版本 Windows 支持</title>
<para>
@@ -38,7 +38,6 @@
&install.windows.legacy.iis7;
&install.windows.legacy.apache1;
&install.windows.legacy.apache2;
- &install.windows.legacy.sun;
&install.windows.legacy.sambar;
&install.windows.legacy.xitami;
&install.windows.legacy.building;
diff --git a/language-snippets.ent b/language-snippets.ent
index 47f840b3..9b9635c8 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -1617,7 +1617,7 @@ result</parameter></term><listitem><para>由 <function>fbsql_query</function>
<!-- GMP Notes -->
<!ENTITY gmp.return '<classname xmlns="http://docbook.org/ns/docbook">GMP</classname> 对象。'>
-<!ENTITY gmp.parameter '<classname>GMP</classname> 对象或 &integer; ,或数字&string;。</para>'>
+<!ENTITY gmp.parameter '<para xmlns="http://docbook.org/ns/docbook"><classname>GMP</classname> 对象或 &integer; ,或数字&string;。</para>'>
<!-- MySQLi Notes -->
<!ENTITY mysqli.result.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>
diff --git a/reference/apache/functions/apache-child-terminate.xml b/reference/apache/functions/apache-child-terminate.xml
index 20ba4e77..051b9492 100644
--- a/reference/apache/functions/apache-child-terminate.xml
+++ b/reference/apache/functions/apache-child-terminate.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- $Author$ -->
-<!-- EN-Revision: 84b8fca68fc762fefe85acde180a38b2e77a28b9 Maintainer: dallas Status: ready -->
+<!-- EN-Revision: d278431ef5e561787093a7b2679327a615b09367 Maintainer: dallas Status: ready -->
<refentry xml:id="function.apache-child-terminate" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>apache_child_terminate</refname>
@@ -11,7 +11,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <type>bool</type><methodname>apache_child_terminate</methodname>
+ <type>void</type><methodname>apache_child_terminate</methodname>
<void/>
</methodsynopsis>
<para>
@@ -19,40 +19,15 @@
将把运行当前 PHP 请求的 Apache 子进程注册为终止状态,一旦结束
PHP 代码的运行此进程将终止。可以用在占用大量内存的脚本后面来终止该进程,因为通常内存只在内部释放而不会还给操作系统。
</para>
- </refsect1>
-
- <refsect1 role="returnvalues">
- &reftitle.returnvalues;
<para>
- 如果 PHP 以 Apache 1 模块方式运行,且 Apache
- 的版本是非多线程的,以及激活了 PHP 指令.
- <link linkend="ini.child-terminate">child_terminate</link>,则返回
- &true;。如果不满足上述条件则返回 &false; 并生成一条
- <constant>E_WARNING</constant> 级的错误信息。
+ 在 Apache 和 FastCGI 网页服务器中运行。
</para>
</refsect1>
- <refsect1 role="changelog">
- &reftitle.changelog;
+ <refsect1 role="returnvalues">
+ &reftitle.returnvalues;
<para>
- <informaltable>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>&Version;</entry>
- <entry>&Description;</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>5.4.0</entry>
- <entry>
- 该函数目前也可以用于FastCGI模式了。以前,它仅在PHP作为Apapche的模块安装时支持。
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
+ &return.void;
</para>
</refsect1>
diff --git a/reference/apache/functions/apache-request-headers.xml b/reference/apache/functions/apache-request-headers.xml
index 664937b9..78257b92 100644
--- a/reference/apache/functions/apache-request-headers.xml
+++ b/reference/apache/functions/apache-request-headers.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 515b45e67644ecb6b3958ed86c540481a0da0398 Maintainer: hytest Status: ready -->
+<!-- EN-Revision: d278431ef5e561787093a7b2679327a615b09367 Maintainer: hytest Status: ready -->
<!-- Reviewed: no -->
<!-- splitted from ./en/functions/apache.xml, last change in rev 1.2 -->
@@ -17,7 +17,8 @@
<void/>
</methodsynopsis>
<para>
- 获取当前请求的所有请求头信息
+ 获取当前请求的所有请求头信息。
+ 可在 Apache、FastCGI、CLI、FPM 模式下运行。
</para>
</refsect1>
@@ -25,7 +26,7 @@
&reftitle.returnvalues;
<para>
包含当前请求所有头信息的数组,失败返回
- &false; 。
+ &false;。
</para>
</refsect1>
@@ -41,18 +42,12 @@
</row>
</thead>
<tbody>
- <row>
- <entry>5.5.7</entry>
- <entry>
- 此函数可用于 CLI server。
- </entry>
- </row>
- <row>
- <entry>5.4.0</entry>
- <entry>
- 此函数可用于 FastCGI。 此前仅在PHP以 Apache 模块方式运行时支持。
- </entry>
- </row>
+ <row>
+ <entry>7.3.0</entry>
+ <entry>
+ 此函数可用于 FPM SAPI 模式。
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
diff --git a/reference/apache/functions/apache-response-headers.xml b/reference/apache/functions/apache-response-headers.xml
index 67393012..dc6191a4 100644
--- a/reference/apache/functions/apache-response-headers.xml
+++ b/reference/apache/functions/apache-response-headers.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 515b45e67644ecb6b3958ed86c540481a0da0398 Maintainer: hytest Status: ready -->
+<!-- EN-Revision: d278431ef5e561787093a7b2679327a615b09367 Maintainer: hytest Status: ready -->
<!-- Reviewed: no -->
<!-- splitted from ./en/functions/apache.xml, last change in rev 1.2 -->
@@ -13,11 +13,11 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <type>array</type><methodname>apache_response_headers</methodname>
- <void/>
+ <type class="union"><type>array</type><type>false</type></type><methodname>apache_response_headers</methodname> <void/>
</methodsynopsis>
<para>
获得全部 HTTP 响应头信息。
+ 可在 Apache、FastCGI、CLI、FPM 模式下运行。
</para>
</refsect1>
@@ -27,42 +27,6 @@
成功时返回包含全部 Apache 响应头信息的数组,&return.falseforfailure;.
</para>
</refsect1>
-
- <refsect1 role="changelog">
- &reftitle.changelog;
- <para>
- <informaltable>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>&Version;</entry>
- <entry>&Description;</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>5.5.7</entry>
- <entry>
- 此函数可用于 CLI server.
- </entry>
- </row>
- <row>
- <entry>5.4.0</entry>
- <entry>
- 此函数可用于 FastCGI。 此前仅在PHP以 Apache 模块方式运行时支持。
- </entry>
- </row>
- <row>
- <entry>4.3.3</entry>
- <entry>
-
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </para>
- </refsect1>
<refsect1 role="examples">
&reftitle.examples;
diff --git a/reference/info/functions/php-sapi-name.xml b/reference/info/functions/php-sapi-name.xml
index 096e5705..2551958d 100644
--- a/reference/info/functions/php-sapi-name.xml
+++ b/reference/info/functions/php-sapi-name.xml
@@ -12,7 +12,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <type>string</type><methodname>php_sapi_name</methodname>
+ <type class="union"><type>string</type><type>false</type></type><methodname>php_sapi_name</methodname>
<void/>
</methodsynopsis>
<simpara>
@@ -25,19 +25,17 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- 返回接口类型的小写字符串。
+ 返回接口类型的小写字符串, &return.falseforfailure;。
</para>
<para>
尽管不够全面,可能返回的值包括了
- <literal>aolserver</literal>、<literal>apache</literal>、
- <literal>apache2filter</literal>、<literal>apache2handler</literal>、
- <literal>caudium</literal>、<literal>cgi</literal> (直到 PHP 5.3),
+ <literal>apache</literal>、
+ <literal>apache2handler</literal>、
+ <literal>cgi</literal> (直到 PHP 5.3),
<literal>cgi-fcgi</literal>、<literal>cli</literal>、 <literal>cli-server</literal>、
- <literal>continuity</literal>、<literal>embed</literal>、<literal>fpm-fcgi</literal>、
- <literal>isapi</literal>、<literal>litespeed</literal>、
- <literal>milter</literal>、<literal>nsapi</literal>、
- <literal>phttpd</literal>、<literal>pi3web</literal>、<literal>roxen</literal>、
- <literal>thttpd</literal>、<literal>tux</literal> 和 <literal>webjames</literal>。
+ <literal>embed</literal>、<literal>fpm-fcgi</literal>、
+ <literal>litespeed</literal>、
+ <literal>nsapi</literal>、<literal>phpdbg</literal>。
</para>
</refsect1>
@@ -76,7 +74,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
<tip>
<title>一个潜在的疑难问题</title>
<para>
- 定义的 <acronym>SAPI</acronym> 可能不够明显,比如它可能定义为 <literal>apache2handler</literal> 或 <literal>apache2filter</literal>,而不是 <literal>apache</literal>
+ 定义的 <acronym>SAPI</acronym> 可能不够明显,比如它可能定义为 <literal>apache2handler</literal>,而不是 <literal>apache</literal>。
</para>
</tip>
</refsect1>