com doc/ru: Обновлен ие до англи йской верси и: language/context/http.xml reference/errorfunc/f unctions/error-log.xml
reference/gearman/gearmanjob/unique .xml reference/info/functions/getenv.xml reference/open ssl/configure.xml
reference/openssl/functions/openssl-get-c ipher-methods.xml reference/openssl/functions/openssl-x5 09-read.xml reference/openssl/setup.xml reference/u
rl/functions/http-build-query.xml
| From: | Sergey Panteleev | Date: | Thu, 18 Feb 2021 06:40:39 +0000 |
| Subject: | com doc/ru: Обновлен ие до англи йской верси и: language/context/http.xml reference/errorfunc/f unctions/error-log.xml reference/gearman/gearmanjob/unique .xml reference/info/functions/getenv.xml reference/open ssl/configure.xml reference/openssl/functions/openssl-get-c ipher-methods.xml reference/openssl/functions/openssl-x5 09-read.xml reference/openssl/setup.xml reference/u rl/functions/http-build-query.xml |
||
| Groups: | php.doc.ru | ||
| Request: | Send a blank email to doc-ru+get-8808@lists.php.net to get a copy of this message | ||
Commit: 2b31b162f1f141d14298c243103ee201a1c58192
Author: Sergey Panteleev <sergey@php.net> Thu, 18 Feb 2021 09:40:39 +0300
Parents: 3fb87fa79fa93cde41e823507a4321e779c31c15
Branches: master
Link: http://git.php.net/?p=doc/ru.git;a=commitdiff;h=2b31b162f1f141d14298c243103ee201a1c58192
Log:
Обновление до английской версии
Changed paths:
M language/context/http.xml
M reference/errorfunc/functions/error-log.xml
M reference/gearman/gearmanjob/unique.xml
M reference/info/functions/getenv.xml
M reference/openssl/configure.xml
M reference/openssl/functions/openssl-get-cipher-methods.xml
M reference/openssl/functions/openssl-x509-read.xml
M reference/openssl/setup.xml
M reference/url/functions/http-build-query.xml
diff --git a/language/context/http.xml b/language/context/http.xml index c11845747..e12299702 100644 --- a/language/context/http.xml +++ b/language/context/http.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: a8aca5fb3fa39285aa22a856cffcb2bbedc15d5b Maintainer: mch Status: ready --> +<!-- EN-Revision: 4dfe5cc41eabcfb5b7eb7afa194ce078ad4e1bf4 Maintainer: mch Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="context.http" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion"> @@ -45,7 +45,10 @@ Дополнительные заголовки для отправки вместе с запросом. Значения в этой опции будут переопределять другие значения (такие как <literal>User-agent:</literal>, <literal>Host:</literal> - и <literal>Authentication:</literal>). + и <literal>Authentication:</literal>), даже + при следующих переадресациях <literal>Location:</literal>. + Таким образом, не рекомендуется устанавливать заголовок <literal>Host:</literal>, + если включён параметр <parameter>follow_location</parameter>. </para> </listitem> </varlistentry> diff --git a/reference/errorfunc/functions/error-log.xml b/reference/errorfunc/functions/error-log.xml index 0914c52d2..ccc50c291 100644 --- a/reference/errorfunc/functions/error-log.xml +++ b/reference/errorfunc/functions/error-log.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 9af43469f46843451955b8926fe470a9f3d45034 Maintainer: mch Status: ready --> +<!-- EN-Revision: 471f9f42cd9206eff6326b2cc6e159f8a0e096e2 Maintainer: mch Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="function.error-log" xmlns="http://docbook.org/ns/docbook"> @@ -118,6 +118,8 @@ &reftitle.returnvalues; <para> &return.success; + Если <parameter>message_type</parameter> равен нулю, функция всегда возвращает &true;, + независимо от того, может ли ошибка логироваться или нет. </para> </refsect1> diff --git a/reference/gearman/gearmanjob/unique.xml b/reference/gearman/gearmanjob/unique.xml index 78da5a427..02e369f18 100644 --- a/reference/gearman/gearmanjob/unique.xml +++ b/reference/gearman/gearmanjob/unique.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 552b2b938cc6f2e33001916ec6391931a663936f Maintainer: tmn Status: ready --> +<!-- EN-Revision: 775a32bbe02de24dbccf3baf9240f331b4fafa20 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="gearmanjob.unique" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> diff --git a/reference/info/functions/getenv.xml b/reference/info/functions/getenv.xml index a4af10cbc..e979e814b 100644 --- a/reference/info/functions/getenv.xml +++ b/reference/info/functions/getenv.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 4fa631348e0ed69ffefe7481ca7591ce98d6c498 Maintainer: tmn Status: ready --> +<!-- EN-Revision: be008069ebffcdc7ac4c290becc4d455093fb218 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="function.getenv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -13,7 +13,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <type>string</type><methodname>getenv</methodname> + <type class="union"><type>string</type><type>false</type></type><methodname>getenv</methodname> <methodparam><type>string</type><parameter>varname</parameter></methodparam> <methodparam choice="opt"><type>bool</type><parameter>local_only</parameter><initializer>&false;</initializer></methodparam> </methodsynopsis> diff --git a/reference/openssl/configure.xml b/reference/openssl/configure.xml index e585bcb39..27f8e8c7f 100644 --- a/reference/openssl/configure.xml +++ b/reference/openssl/configure.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 9e4c917c09b4eed089d61074189ef81934a9dd23 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 102518ddc226f465c8f8e90794b5bde7b9cf8b26 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <section xml:id="openssl.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -62,7 +62,7 @@ месте и задать путь к нему через переменные окружения, что полезно при использовании виртуальных хостов. Обратите внимание, что путь по умолчанию можно переопределить в скрипте используя параметр - <parameter>configargs</parameter> функции, которой требуется этот файл. + <parameter>options</parameter> функции, которой требуется этот файл. </simpara> <caution> <simpara> diff --git a/reference/openssl/functions/openssl-get-cipher-methods.xml b/reference/openssl/functions/openssl-get-cipher-methods.xml index 356c95fd5..91af59262 100644 --- a/reference/openssl/functions/openssl-get-cipher-methods.xml +++ b/reference/openssl/functions/openssl-get-cipher-methods.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: b8758b0605e80c4e3610137b7502a6abeea5c69b Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: ec4849a7581aaefbb105ca7b13d78eb8ab0217e2 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> - <refentry xml:id="function.openssl-get-cipher-methods" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>openssl_get_cipher_methods</refname> @@ -42,6 +41,9 @@ &reftitle.returnvalues; <para> Массив (<type>array</type>) доступных методов шифрования. + Обратите внимание, что до OpenSSL 1.1.1 методы шифрования возвращались + в верхнем и нижнем регистре; с OpenSSL 1.1.1 возвращаются + только строчные варианты. </para> </refsect1> @@ -81,72 +83,133 @@ print_r($cipher_aliases); <![CDATA[ Array ( - [0] => AES-128-CBC - [1] => AES-128-CFB - [2] => AES-128-CFB1 - [3] => AES-128-CFB8 - [5] => AES-128-OFB - [6] => AES-192-CBC - [7] => AES-192-CFB - [8] => AES-192-CFB1 - [9] => AES-192-CFB8 - [11] => AES-192-OFB - [12] => AES-256-CBC - [13] => AES-256-CFB - [14] => AES-256-CFB1 - [15] => AES-256-CFB8 - [17] => AES-256-OFB - [18] => BF-CBC - [19] => BF-CFB - [21] => BF-OFB - [22] => CAST5-CBC - [23] => CAST5-CFB - [25] => CAST5-OFB - [41] => IDEA-CBC - [42] => IDEA-CFB - [44] => IDEA-OFB - [53] => aes-128-cbc - [54] => aes-128-cfb - [55] => aes-128-cfb1 - [56] => aes-128-cfb8 - [58] => aes-128-ofb - [59] => aes-192-cbc - [60] => aes-192-cfb - [61] => aes-192-cfb1 - [62] => aes-192-cfb8 - [64] => aes-192-ofb - [65] => aes-256-cbc - [66] => aes-256-cfb - [67] => aes-256-cfb1 - [68] => aes-256-cfb8 - [70] => aes-256-ofb - [71] => bf-cbc - [72] => bf-cfb - [74] => bf-ofb - [75] => cast5-cbc - [76] => cast5-cfb - [78] => cast5-ofb - [94] => idea-cbc - [95] => idea-cfb - [97] => idea-ofb + [0] => aes-128-cbc + [1] => aes-128-cbc-hmac-sha1 + [2] => aes-128-cbc-hmac-sha256 + [3] => aes-128-ccm + [4] => aes-128-cfb + [5] => aes-128-cfb1 + [6] => aes-128-cfb8 + [7] => aes-128-ctr + [9] => aes-128-gcm + [10] => aes-128-ocb + [11] => aes-128-ofb + [12] => aes-128-xts + [13] => aes-192-cbc + [14] => aes-192-ccm + [15] => aes-192-cfb + [16] => aes-192-cfb1 + [17] => aes-192-cfb8 + [18] => aes-192-ctr + [20] => aes-192-gcm + [21] => aes-192-ocb + [22] => aes-192-ofb + [23] => aes-256-cbc + [24] => aes-256-cbc-hmac-sha1 + [25] => aes-256-cbc-hmac-sha256 + [26] => aes-256-ccm + [27] => aes-256-cfb + [28] => aes-256-cfb1 + [29] => aes-256-cfb8 + [30] => aes-256-ctr + [32] => aes-256-gcm + [33] => aes-256-ocb + [34] => aes-256-ofb + [35] => aes-256-xts + [36] => aria-128-cbc + [37] => aria-128-ccm + [38] => aria-128-cfb + [39] => aria-128-cfb1 + [40] => aria-128-cfb8 + [41] => aria-128-ctr + [43] => aria-128-gcm + [44] => aria-128-ofb + [45] => aria-192-cbc + [46] => aria-192-ccm + [47] => aria-192-cfb + [48] => aria-192-cfb1 + [49] => aria-192-cfb8 + [50] => aria-192-ctr + [52] => aria-192-gcm + [53] => aria-192-ofb + [54] => aria-256-cbc + [55] => aria-256-ccm + [56] => aria-256-cfb + [57] => aria-256-cfb1 + [58] => aria-256-cfb8 + [59] => aria-256-ctr + [61] => aria-256-gcm + [62] => aria-256-ofb + [63] => bf-cbc + [64] => bf-cfb + [66] => bf-ofb + [67] => camellia-128-cbc + [68] => camellia-128-cfb + [69] => camellia-128-cfb1 + [70] => camellia-128-cfb8 + [71] => camellia-128-ctr + [73] => camellia-128-ofb + [74] => camellia-192-cbc + [75] => camellia-192-cfb + [76] => camellia-192-cfb1 + [77] => camellia-192-cfb8 + [78] => camellia-192-ctr + [80] => camellia-192-ofb + [81] => camellia-256-cbc + [82] => camellia-256-cfb + [83] => camellia-256-cfb1 + [84] => camellia-256-cfb8 + [85] => camellia-256-ctr + [87] => camellia-256-ofb + [88] => cast5-cbc + [89] => cast5-cfb + [91] => cast5-ofb + [92] => chacha20 + [93] => chacha20-poly1305 + [111] => id-aes128-CCM + [112] => id-aes128-GCM + [113] => id-aes128-wrap + [114] => id-aes128-wrap-pad + [115] => id-aes192-CCM + [116] => id-aes192-GCM + [117] => id-aes192-wrap + [118] => id-aes192-wrap-pad + [119] => id-aes256-CCM + [120] => id-aes256-GCM + [121] => id-aes256-wrap + [122] => id-aes256-wrap-pad + [124] => idea-cbc + [125] => idea-cfb + [127] => idea-ofb + [137] => seed-cbc + [138] => seed-cfb + [140] => seed-ofb + [141] => sm4-cbc + [142] => sm4-cfb + [143] => sm4-ctr + [145] => sm4-ofb ) Array ( - [18] => AES128 - [19] => AES192 - [20] => AES256 - [21] => BF - [26] => CAST - [27] => CAST-cbc - [50] => IDEA - [82] => aes128 - [83] => aes192 - [84] => aes256 - [85] => bf - [90] => blowfish - [91] => cast - [92] => cast-cbc - [115] => idea + [36] => aes128 + [37] => aes128-wrap + [38] => aes192 + [39] => aes192-wrap + [40] => aes256 + [41] => aes256-wrap + [69] => aria128 + [70] => aria192 + [71] => aria256 + [72] => bf + [77] => blowfish + [99] => camellia128 + [100] => camellia192 + [101] => camellia256 + [102] => cast + [103] => cast-cbc + [146] => idea + [164] => seed + [169] => sm4 ) ]]> @@ -165,7 +228,6 @@ Array </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/openssl/functions/openssl-x509-read.xml b/reference/openssl/functions/openssl-x509-read.xml index 34dfab27b..f4bd0d5f2 100644 --- a/reference/openssl/functions/openssl-x509-read.xml +++ b/reference/openssl/functions/openssl-x509-read.xml @@ -1,23 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: d1e3ea622e5d4f542cd36eca59a9f22aa0142633 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> - -<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openssl-x509-read"> +<refentry xml:id="function.openssl-x509-read" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>openssl_x509_read</refname> - <refpurpose>Получить идентификатор ресурса для сертификата X.509</refpurpose> + <refpurpose>Разобрать сертификат X.509 и вернуть для него объект</refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <type class="union"><type>resource</type><type>false</type></type><methodname>openssl_x509_read</methodname> - <methodparam><type>mixed</type><parameter>x509certdata</parameter></methodparam> + <type class="union"><type>OpenSSLCertificate</type><type>false</type></type><methodname>openssl_x509_read</methodname> + <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam> </methodsynopsis> <para> <function>openssl_x509_read</function> извлекает сертификат из - <parameter>x509certdata</parameter> и возвращает идентификатор ресурса для него. + <parameter>certificate</parameter> и возвращает объект <classname>OpenSSLCertificate</classname> для него. </para> </refsect1> @@ -26,7 +25,7 @@ <para> <variablelist> <varlistentry> - <term><parameter>x509certdata</parameter></term> + <term><parameter>certificate</parameter></term> <listitem> <para> Сертификат X509. Список корректных значений смотрите на странице <link linkend="openssl.certparams">Параметры ключей и сертификатов</link>. @@ -40,12 +39,41 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - Возвращает идентификатор ресурса сертификата&return.falseforfailure;. + Возвращает объект <classname>OpenSSLCertificate</classname> в случае успешного выполнения, &return.falseforfailure;. </para> </refsect1> -</refentry> + <refsect1 role="changelog"> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.0</entry> + <entry> + В случае успешного выполнения возвращает экземпляр <classname>OpenSSLCertificate</classname>; + ранее возвращался ресурс (&resource;) типа <literal>OpenSSL X.509</literal>. + </entry> + </row> + <row> + <entry>8.0.0</entry> + <entry> + <parameter>certificate</parameter> теперь принимает экземпляр <classname>OpenSSLCertificate</classname>; + ранее принимался ресурс (&resource;) типа <literal>OpenSSL X.509</literal>. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/openssl/setup.xml b/reference/openssl/setup.xml index fcdcc26f8..58cc1e1c5 100644 --- a/reference/openssl/setup.xml +++ b/reference/openssl/setup.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: f01c45244d2ab24abd72ac6416435a2ca1601b82 Maintainer: aur Status: ready --> +<!-- EN-Revision: d1e3ea622e5d4f542cd36eca59a9f22aa0142633 Maintainer: aur Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> - <chapter xml:id="openssl.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.setup; @@ -38,16 +37,17 @@ <section xml:id="openssl.resources"> &reftitle.resources; <para> - В модуле OpenSSL определены три типа ресурсов. - Первый - идентификатор pkey (открытый или закрытый ключ). - Второй - один из идентификаторов сертификата X509. - Третий - идентификатор CSR (запрос на подпись сертификата). + До PHP 8.0.0 в модуле OpenSSL было определено 3 типа ресурсов: + <simplelist> + <member><literal>OpenSSL ключ</literal></member> + <member><literal>OpenSSL X.509</literal></member> + <member><literal>OpenSSL X.509 CSR</literal></member> + </simplelist> </para> </section> <!-- }}} --> </chapter> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/url/functions/http-build-query.xml b/reference/url/functions/http-build-query.xml index fb17ac4f9..fcf083379 100644 --- a/reference/url/functions/http-build-query.xml +++ b/reference/url/functions/http-build-query.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: be5b0f33a18415823da76389915b49aae4ee6835 Maintainer: aur Status: ready --> +<!-- EN-Revision: ea70bbb2cb1c1233b1349ad405b93e7a593fdb4f Maintainer: aur Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="function.http-build-query" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -12,10 +12,10 @@ &reftitle.description; <methodsynopsis> <type>string</type><methodname>http_build_query</methodname> - <methodparam><type>mixed</type><parameter>query_data</parameter></methodparam> + <methodparam><type>mixed</type><parameter>data</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>numeric_prefix</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>arg_separator</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>enc_type</parameter><initializer><constant>PHP_QUERY_RFC1738</constant></initializer></methodparam> + <methodparam choice="opt"><type>int</type><parameter>encoding_type</parameter><initializer><constant>PHP_QUERY_RFC1738</constant></initializer></methodparam> </methodsynopsis> <para> Генерирует URL-кодированную строку запроса из предоставленного ассоциативного (или @@ -28,18 +28,18 @@ <para> <variablelist> <varlistentry> - <term><parameter>query_data</parameter></term> + <term><parameter>data</parameter></term> <listitem> <para> Может быть массив или объект, содержащий свойства. </para> <para> - Если <parameter>query_data</parameter> массив, то он может быть + Если <parameter>data</parameter> массив, то он может быть простой одномерной структурой или массивом массивов (который, в свою очередь, может содержать другие массивы). </para> <para> - Если <parameter>query_data</parameter> объект, тогда только общедоступные + Если <parameter>data</parameter> объект, тогда только общедоступные свойства будут включены в результат. </para> </listitem> @@ -68,13 +68,13 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>enc_type</parameter></term> + <term><parameter>encoding_type</parameter></term> <listitem> <para> По умолчанию <constant>PHP_QUERY_RFC1738</constant>. </para> <para> - Если <parameter>enc_type</parameter> равен <constant>PHP_QUERY_RFC1738</constant>, + Если <parameter>encoding_type</parameter> равен <constant>PHP_QUERY_RFC1738</constant>, тогда кодирование осуществляется по <link xlink:href="&url.rfc;1738">RFC 1738</link> и типу контента <literal>application/x-www-form-urlencoded</literal>, что подразумевает, что пробелы кодируются как символы "плюс" (<literal>+</literal>). @@ -248,7 +248,6 @@ pub=publicParent&pub_bar%5Bpub%5D=publicChild </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml
diff --git a/language/context/http.xml b/language/context/http.xml index c11845747..e12299702 100644 --- a/language/context/http.xml +++ b/language/context/http.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: a8aca5fb3fa39285aa22a856cffcb2bbedc15d5b Maintainer: mch Status: ready --> +<!-- EN-Revision: 4dfe5cc41eabcfb5b7eb7afa194ce078ad4e1bf4 Maintainer: mch Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="context.http" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion"> @@ -45,7 +45,10 @@ Дополнительные заголовки для отправки вместе с запросом. Значения в этой опции будут переопределять другие значения (такие как <literal>User-agent:</literal>, <literal>Host:</literal> - и <literal>Authentication:</literal>). + и <literal>Authentication:</literal>), даже + при следующих переадресациях <literal>Location:</literal>. + Таким образом, не рекомендуется устанавливать заголовок <literal>Host:</literal>, + если включён параметр <parameter>follow_location</parameter>. </para> </listitem> </varlistentry> diff --git a/reference/errorfunc/functions/error-log.xml b/reference/errorfunc/functions/error-log.xml index 0914c52d2..ccc50c291 100644 --- a/reference/errorfunc/functions/error-log.xml +++ b/reference/errorfunc/functions/error-log.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 9af43469f46843451955b8926fe470a9f3d45034 Maintainer: mch Status: ready --> +<!-- EN-Revision: 471f9f42cd9206eff6326b2cc6e159f8a0e096e2 Maintainer: mch Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="function.error-log" xmlns="http://docbook.org/ns/docbook"> @@ -118,6 +118,8 @@ &reftitle.returnvalues; <para> &return.success; + Если <parameter>message_type</parameter> равен нулю, функция всегда возвращает &true;, + независимо от того, может ли ошибка логироваться или нет. </para> </refsect1> diff --git a/reference/gearman/gearmanjob/unique.xml b/reference/gearman/gearmanjob/unique.xml index 78da5a427..02e369f18 100644 --- a/reference/gearman/gearmanjob/unique.xml +++ b/reference/gearman/gearmanjob/unique.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 552b2b938cc6f2e33001916ec6391931a663936f Maintainer: tmn Status: ready --> +<!-- EN-Revision: 775a32bbe02de24dbccf3baf9240f331b4fafa20 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="gearmanjob.unique" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> diff --git a/reference/info/functions/getenv.xml b/reference/info/functions/getenv.xml index a4af10cbc..e979e814b 100644 --- a/reference/info/functions/getenv.xml +++ b/reference/info/functions/getenv.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 4fa631348e0ed69ffefe7481ca7591ce98d6c498 Maintainer: tmn Status: ready --> +<!-- EN-Revision: be008069ebffcdc7ac4c290becc4d455093fb218 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="function.getenv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -13,7 +13,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <type>string</type><methodname>getenv</methodname> + <type class="union"><type>string</type><type>false</type></type><methodname>getenv</methodname> <methodparam><type>string</type><parameter>varname</parameter></methodparam> <methodparam choice="opt"><type>bool</type><parameter>local_only</parameter><initializer>&false;</initializer></methodparam> </methodsynopsis> diff --git a/reference/openssl/configure.xml b/reference/openssl/configure.xml index e585bcb39..27f8e8c7f 100644 --- a/reference/openssl/configure.xml +++ b/reference/openssl/configure.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 9e4c917c09b4eed089d61074189ef81934a9dd23 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 102518ddc226f465c8f8e90794b5bde7b9cf8b26 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <section xml:id="openssl.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -62,7 +62,7 @@ месте и задать путь к нему через переменные окружения, что полезно при использовании виртуальных хостов. Обратите внимание, что путь по умолчанию можно переопределить в скрипте используя параметр - <parameter>configargs</parameter> функции, которой требуется этот файл. + <parameter>options</parameter> функции, которой требуется этот файл. </simpara> <caution> <simpara> diff --git a/reference/openssl/functions/openssl-get-cipher-methods.xml b/reference/openssl/functions/openssl-get-cipher-methods.xml index 356c95fd5..91af59262 100644 --- a/reference/openssl/functions/openssl-get-cipher-methods.xml +++ b/reference/openssl/functions/openssl-get-cipher-methods.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: b8758b0605e80c4e3610137b7502a6abeea5c69b Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: ec4849a7581aaefbb105ca7b13d78eb8ab0217e2 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> - <refentry xml:id="function.openssl-get-cipher-methods" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>openssl_get_cipher_methods</refname> @@ -42,6 +41,9 @@ &reftitle.returnvalues; <para> Массив (<type>array</type>) доступных методов шифрования. + Обратите внимание, что до OpenSSL 1.1.1 методы шифрования возвращались + в верхнем и нижнем регистре; с OpenSSL 1.1.1 возвращаются + только строчные варианты. </para> </refsect1> @@ -81,72 +83,133 @@ print_r($cipher_aliases); <![CDATA[ Array ( - [0] => AES-128-CBC - [1] => AES-128-CFB - [2] => AES-128-CFB1 - [3] => AES-128-CFB8 - [5] => AES-128-OFB - [6] => AES-192-CBC - [7] => AES-192-CFB - [8] => AES-192-CFB1 - [9] => AES-192-CFB8 - [11] => AES-192-OFB - [12] => AES-256-CBC - [13] => AES-256-CFB - [14] => AES-256-CFB1 - [15] => AES-256-CFB8 - [17] => AES-256-OFB - [18] => BF-CBC - [19] => BF-CFB - [21] => BF-OFB - [22] => CAST5-CBC - [23] => CAST5-CFB - [25] => CAST5-OFB - [41] => IDEA-CBC - [42] => IDEA-CFB - [44] => IDEA-OFB - [53] => aes-128-cbc - [54] => aes-128-cfb - [55] => aes-128-cfb1 - [56] => aes-128-cfb8 - [58] => aes-128-ofb - [59] => aes-192-cbc - [60] => aes-192-cfb - [61] => aes-192-cfb1 - [62] => aes-192-cfb8 - [64] => aes-192-ofb - [65] => aes-256-cbc - [66] => aes-256-cfb - [67] => aes-256-cfb1 - [68] => aes-256-cfb8 - [70] => aes-256-ofb - [71] => bf-cbc - [72] => bf-cfb - [74] => bf-ofb - [75] => cast5-cbc - [76] => cast5-cfb - [78] => cast5-ofb - [94] => idea-cbc - [95] => idea-cfb - [97] => idea-ofb + [0] => aes-128-cbc + [1] => aes-128-cbc-hmac-sha1 + [2] => aes-128-cbc-hmac-sha256 + [3] => aes-128-ccm + [4] => aes-128-cfb + [5] => aes-128-cfb1 + [6] => aes-128-cfb8 + [7] => aes-128-ctr + [9] => aes-128-gcm + [10] => aes-128-ocb + [11] => aes-128-ofb + [12] => aes-128-xts + [13] => aes-192-cbc + [14] => aes-192-ccm + [15] => aes-192-cfb + [16] => aes-192-cfb1 + [17] => aes-192-cfb8 + [18] => aes-192-ctr + [20] => aes-192-gcm + [21] => aes-192-ocb + [22] => aes-192-ofb + [23] => aes-256-cbc + [24] => aes-256-cbc-hmac-sha1 + [25] => aes-256-cbc-hmac-sha256 + [26] => aes-256-ccm + [27] => aes-256-cfb + [28] => aes-256-cfb1 + [29] => aes-256-cfb8 + [30] => aes-256-ctr + [32] => aes-256-gcm + [33] => aes-256-ocb + [34] => aes-256-ofb + [35] => aes-256-xts + [36] => aria-128-cbc + [37] => aria-128-ccm + [38] => aria-128-cfb + [39] => aria-128-cfb1 + [40] => aria-128-cfb8 + [41] => aria-128-ctr + [43] => aria-128-gcm + [44] => aria-128-ofb + [45] => aria-192-cbc + [46] => aria-192-ccm + [47] => aria-192-cfb + [48] => aria-192-cfb1 + [49] => aria-192-cfb8 + [50] => aria-192-ctr + [52] => aria-192-gcm + [53] => aria-192-ofb + [54] => aria-256-cbc + [55] => aria-256-ccm + [56] => aria-256-cfb + [57] => aria-256-cfb1 + [58] => aria-256-cfb8 + [59] => aria-256-ctr + [61] => aria-256-gcm + [62] => aria-256-ofb + [63] => bf-cbc + [64] => bf-cfb + [66] => bf-ofb + [67] => camellia-128-cbc + [68] => camellia-128-cfb + [69] => camellia-128-cfb1 + [70] => camellia-128-cfb8 + [71] => camellia-128-ctr + [73] => camellia-128-ofb + [74] => camellia-192-cbc + [75] => camellia-192-cfb + [76] => camellia-192-cfb1 + [77] => camellia-192-cfb8 + [78] => camellia-192-ctr + [80] => camellia-192-ofb + [81] => camellia-256-cbc + [82] => camellia-256-cfb + [83] => camellia-256-cfb1 + [84] => camellia-256-cfb8 + [85] => camellia-256-ctr + [87] => camellia-256-ofb + [88] => cast5-cbc + [89] => cast5-cfb + [91] => cast5-ofb + [92] => chacha20 + [93] => chacha20-poly1305 + [111] => id-aes128-CCM + [112] => id-aes128-GCM + [113] => id-aes128-wrap + [114] => id-aes128-wrap-pad + [115] => id-aes192-CCM + [116] => id-aes192-GCM + [117] => id-aes192-wrap + [118] => id-aes192-wrap-pad + [119] => id-aes256-CCM + [120] => id-aes256-GCM + [121] => id-aes256-wrap + [122] => id-aes256-wrap-pad + [124] => idea-cbc + [125] => idea-cfb + [127] => idea-ofb + [137] => seed-cbc + [138] => seed-cfb + [140] => seed-ofb + [141] => sm4-cbc + [142] => sm4-cfb + [143] => sm4-ctr + [145] => sm4-ofb ) Array ( - [18] => AES128 - [19] => AES192 - [20] => AES256 - [21] => BF - [26] => CAST - [27] => CAST-cbc - [50] => IDEA - [82] => aes128 - [83] => aes192 - [84] => aes256 - [85] => bf - [90] => blowfish - [91] => cast - [92] => cast-cbc - [115] => idea + [36] => aes128 + [37] => aes128-wrap + [38] => aes192 + [39] => aes192-wrap + [40] => aes256 + [41] => aes256-wrap + [69] => aria128 + [70] => aria192 + [71] => aria256 + [72] => bf + [77] => blowfish + [99] => camellia128 + [100] => camellia192 + [101] => camellia256 + [102] => cast + [103] => cast-cbc + [146] => idea + [164] => seed + [169] => sm4 ) ]]> @@ -165,7 +228,6 @@ Array </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/openssl/functions/openssl-x509-read.xml b/reference/openssl/functions/openssl-x509-read.xml index 34dfab27b..f4bd0d5f2 100644 --- a/reference/openssl/functions/openssl-x509-read.xml +++ b/reference/openssl/functions/openssl-x509-read.xml @@ -1,23 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: d1e3ea622e5d4f542cd36eca59a9f22aa0142633 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> - -<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openssl-x509-read"> +<refentry xml:id="function.openssl-x509-read" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>openssl_x509_read</refname> - <refpurpose>Получить идентификатор ресурса для сертификата X.509</refpurpose> + <refpurpose>Разобрать сертификат X.509 и вернуть для него объект</refpurpose> </refnamediv> <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <type class="union"><type>resource</type><type>false</type></type><methodname>openssl_x509_read</methodname> - <methodparam><type>mixed</type><parameter>x509certdata</parameter></methodparam> + <type class="union"><type>OpenSSLCertificate</type><type>false</type></type><methodname>openssl_x509_read</methodname> + <methodparam><type class="union"><type>OpenSSLCertificate</type><type>string</type></type><parameter>certificate</parameter></methodparam> </methodsynopsis> <para> <function>openssl_x509_read</function> извлекает сертификат из - <parameter>x509certdata</parameter> и возвращает идентификатор ресурса для него. + <parameter>certificate</parameter> и возвращает объект <classname>OpenSSLCertificate</classname> для него. </para> </refsect1> @@ -26,7 +25,7 @@ <para> <variablelist> <varlistentry> - <term><parameter>x509certdata</parameter></term> + <term><parameter>certificate</parameter></term> <listitem> <para> Сертификат X509. Список корректных значений смотрите на странице <link linkend="openssl.certparams">Параметры ключей и сертификатов</link>. @@ -40,12 +39,41 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - Возвращает идентификатор ресурса сертификата&return.falseforfailure;. + Возвращает объект <classname>OpenSSLCertificate</classname> в случае успешного выполнения, &return.falseforfailure;. </para> </refsect1> -</refentry> + <refsect1 role="changelog"> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.0</entry> + <entry> + В случае успешного выполнения возвращает экземпляр <classname>OpenSSLCertificate</classname>; + ранее возвращался ресурс (&resource;) типа <literal>OpenSSL X.509</literal>. + </entry> + </row> + <row> + <entry>8.0.0</entry> + <entry> + <parameter>certificate</parameter> теперь принимает экземпляр <classname>OpenSSLCertificate</classname>; + ранее принимался ресурс (&resource;) типа <literal>OpenSSL X.509</literal>. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/openssl/setup.xml b/reference/openssl/setup.xml index fcdcc26f8..58cc1e1c5 100644 --- a/reference/openssl/setup.xml +++ b/reference/openssl/setup.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: f01c45244d2ab24abd72ac6416435a2ca1601b82 Maintainer: aur Status: ready --> +<!-- EN-Revision: d1e3ea622e5d4f542cd36eca59a9f22aa0142633 Maintainer: aur Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> - <chapter xml:id="openssl.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.setup; @@ -38,16 +37,17 @@ <section xml:id="openssl.resources"> &reftitle.resources; <para> - В модуле OpenSSL определены три типа ресурсов. - Первый - идентификатор pkey (открытый или закрытый ключ). - Второй - один из идентификаторов сертификата X509. - Третий - идентификатор CSR (запрос на подпись сертификата). + До PHP 8.0.0 в модуле OpenSSL было определено 3 типа ресурсов: + <simplelist> + <member><literal>OpenSSL ключ</literal></member> + <member><literal>OpenSSL X.509</literal></member> + <member><literal>OpenSSL X.509 CSR</literal></member> + </simplelist> </para> </section> <!-- }}} --> </chapter> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/url/functions/http-build-query.xml b/reference/url/functions/http-build-query.xml index fb17ac4f9..fcf083379 100644 --- a/reference/url/functions/http-build-query.xml +++ b/reference/url/functions/http-build-query.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: be5b0f33a18415823da76389915b49aae4ee6835 Maintainer: aur Status: ready --> +<!-- EN-Revision: ea70bbb2cb1c1233b1349ad405b93e7a593fdb4f Maintainer: aur Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="function.http-build-query" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -12,10 +12,10 @@ &reftitle.description; <methodsynopsis> <type>string</type><methodname>http_build_query</methodname> - <methodparam><type>mixed</type><parameter>query_data</parameter></methodparam> + <methodparam><type>mixed</type><parameter>data</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>numeric_prefix</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>arg_separator</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>enc_type</parameter><initializer><constant>PHP_QUERY_RFC1738</constant></initializer></methodparam> + <methodparam choice="opt"><type>int</type><parameter>encoding_type</parameter><initializer><constant>PHP_QUERY_RFC1738</constant></initializer></methodparam> </methodsynopsis> <para> Генерирует URL-кодированную строку запроса из предоставленного ассоциативного (или @@ -28,18 +28,18 @@ <para> <variablelist> <varlistentry> - <term><parameter>query_data</parameter></term> + <term><parameter>data</parameter></term> <listitem> <para> Может быть массив или объект, содержащий свойства. </para> <para> - Если <parameter>query_data</parameter> массив, то он может быть + Если <parameter>data</parameter> массив, то он может быть простой одномерной структурой или массивом массивов (который, в свою очередь, может содержать другие массивы). </para> <para> - Если <parameter>query_data</parameter> объект, тогда только общедоступные + Если <parameter>data</parameter> объект, тогда только общедоступные свойства будут включены в результат. </para> </listitem> @@ -68,13 +68,13 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>enc_type</parameter></term> + <term><parameter>encoding_type</parameter></term> <listitem> <para> По умолчанию <constant>PHP_QUERY_RFC1738</constant>. </para> <para> - Если <parameter>enc_type</parameter> равен <constant>PHP_QUERY_RFC1738</constant>, + Если <parameter>encoding_type</parameter> равен <constant>PHP_QUERY_RFC1738</constant>, тогда кодирование осуществляется по <link xlink:href="&url.rfc;1738">RFC 1738</link> и типу контента <literal>application/x-www-form-urlencoded</literal>, что подразумевает, что пробелы кодируются как символы "плюс" (<literal>+</literal>). @@ -248,7 +248,6 @@ pub=publicParent&pub_bar%5Bpub%5D=publicChild </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml