Contributions are ready for review
| From: | phpdoc at lists dot php dot net | Date: | Mon, 25 Sep 2017 12:00:03 +0000 |
| Subject: | Contributions are ready for review | ||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969386718@lists.php.net to get a copy of this message | ||
Hello PHP EN Documentation team,
There are contributions within the online editor queue for this language.
Please review, then commit or delete these patches.
Patches for review :
-----------------------
New file: en/reference/swoole/configure.xml
By: BAOKUN DOU on 2017-06-23 04:36:00
===================================================================
--- en/reference/swoole/configure.xml
+++ en/reference/swoole/configure.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 295472 $ -->
+
+<section xml:id="swoole.installation" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
+ &reftitle.install;
+
+ <para>
+ &pecl.info;
+ <link
xlink:href="&url.pecl.package;swoole">&url.pecl.package;swoole</link>
+ </para>
+</section>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
+
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=74293
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=74293
------------------------------------------------------------------
New file: en/reference/swoole/setup.xml
By: BAOKUN DOU on 2017-06-23 04:36:41
===================================================================
--- en/reference/swoole/setup.xml
+++ en/reference/swoole/setup.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 295472 $ -->
+
+<chapter xml:id="swoole.setup" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
+ &reftitle.setup;
+
+ <!-- {{{ Requirements -->
+ <section xml:id="swoole.requirements">
+ &reftitle.required;
+ &no.requirement;
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Installation -->
+ &reference.swoole.configure;
+ <!-- }}} -->
+
+ <!-- {{{ Configuration -->
+ <!-- &reference.swoole.ini; -->
+ <!-- }}} -->
+
+ <!-- {{{ Resources -->
+ <section xml:id="swoole.resources">
+ &reftitle.resources;
+ &no.resource;
+ </section>
+ <!-- }}} -->
+
+</chapter>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
+
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=74294
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=74294
------------------------------------------------------------------
New file: en/reference/swoole/book.xml
By: BAOKUN DOU on 2017-06-23 04:47:34
===================================================================
--- en/reference/swoole/book.xml
+++ en/reference/swoole/book.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 295472 $ -->
+
+<book xml:id="book.swoole" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Swoole</title>
+
+ <!-- {{{ preface -->
+ <preface xml:id="intro.swoole">
+ &reftitle.intro;
+ <para>
+ Swoole is an high-performance network communication framework uses an event-driven,
asynchronous, non-blocking I/O odel makes it scalable and efficient. It is written in C language
without 3rd party libraries.
+ </para>
+ ¬e.no-windows.extension;
+ </preface>
+ <!-- }}} -->
+
+ &reference.swoole.setup;
+ <!-- &reference.swoole.constants; -->
+ <!-- &reference.swoole.reference; -->
+
+</book>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
+
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=74292
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=74292
------------------------------------------------------------------
New file: en/reference/phpdbg/reference.xml
By: Grummfy on 2017-07-06 14:40:49
===================================================================
--- en/reference/phpdbg/reference.xml
+++ en/reference/phpdbg/reference.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 295472 $ -->
+
+<reference xml:id="ref.extname" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>PHPDbg &Functions;</title>
+
+<!-- Generally should not be used, only in rare cases where you find no other place for it.
+ <partintro>
+ <section xml:id="extname.foobar">
+ &reftitle.foobar;
+ <para>
+ Some text here.
+ </para>
+ </section>
+ </partintro>
+-->
+
+ &reference.phpdbg.entities.functions;
+
+</reference>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
+
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=74455
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=74455
------------------------------------------------------------------
New file: en/reference/phpdbg/book.xml
By: Grummfy on 2017-07-06 14:46:58
===================================================================
--- en/reference/phpdbg/book.xml
+++ en/reference/phpdbg/book.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 295472 $ -->
+
+<book xml:id="book.extname" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>PHPDbg</title>
+ <titleabbrev>PHPDbg</titleabbrev>
+
+ <!-- {{{ preface -->
+ <preface xml:id="intro.extname">
+ &reftitle.intro;
+ <para>
+ Implemented as a SAPI module, phpdbg can exert complete control over the environment without
impacting the functionality or performance of your code.
+ </para>
+ </preface>
+ <!-- }}} -->
+
+ &reference.phpdbg.setup;
+ &reference.phpdbg.cli;
+ &reference.phpdbg.reference;
+
+</book>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
+
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=74454
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=74454
------------------------------------------------------------------
New file: en/reference/phpdbg/setup.xml
By: Grummfy on 2017-07-06 14:47:12
===================================================================
--- en/reference/phpdbg/setup.xml
+++ en/reference/phpdbg/setup.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 295472 $ -->
+
+<chapter xml:id="phpdbg.setup" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
+ &reftitle.setup;
+
+ <!-- {{{ Requirements -->
+ <section xml:id="phpdbg.requirements">
+ &reftitle.required;
+ &no.requirement;
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Installation -->
+ <section xml:id="phpdbg.installation">
+ &reftitle.install;
+ &no.install;
+ </section>
+ <!-- or &reference.phpdbg.entities.configure; -->
+ <!-- }}} -->
+
+ <!-- {{{ Configuration -->
+ <section xml:id="phpdbg.configuration">
+ &reftitle.runtime;
+ &no.config;
+ </section>
+ <!-- or &reference.phpdbg.entities.ini; -->
+ <!-- }}} -->
+
+ <!-- {{{ Resources -->
+ <section xml:id="phpdbg.resources">
+ &reftitle.resources;
+ &no.resource;
+ </section>
+ <!-- }}} -->
+
+</chapter>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
+
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=74456
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=74456
------------------------------------------------------------------
New file: en/reference/phpdbg/functions/phpdbg-start-oplog.xml
By: Grummfy on 2017-07-06 15:13:23
===================================================================
--- en/reference/phpdbg/functions/phpdbg-start-oplog.xml
+++ en/reference/phpdbg/functions/phpdbg-start-oplog.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 299488 $ -->
+
+<refentry xml:id="function.phpdbg-start-oplog" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+ <refname>phpdbg_start_oplog</refname>
+ <refpurpose>Start registring code coverage</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+ &reftitle.description;
+ <methodsynopsis>
+ <type>void</type><methodname>phpdbg_start_oplog</methodname>
+ <void/>
+ </methodsynopsis>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+ &reftitle.returnvalues;
+ <para>
+ No return value.
+ </para>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=74458
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=74458
------------------------------------------------------------------
Modified: en/reference/mcrypt/constants.xml
By: leigh on 2017-01-11 07:16:44
===================================================================
--- en/reference/mcrypt/constants.xml
+++ en/reference/mcrypt/constants.xml
@@ -16,40 +16,40 @@
<listitem>
<simpara>
<constant>MCRYPT_MODE_ECB</constant> (<literal>electronic
- codebook</literal>) is suitable for random data,
- such as encrypting other keys. Since data there is short and random,
- the disadvantages of ECB have a favorable negative effect.
+ codebook</literal>) is a block cipher mode that is generally
+ unsuitable for most purposes. The use of this mode is not recommended.
</simpara>
</listitem>
<listitem>
<simpara>
<constant>MCRYPT_MODE_CBC</constant> (<literal>cipher block
- chaining</literal>) is especially suitable for
- encrypting files where the security is increased over <literal>ECB</literal>
- significantly.
+ chaining</literal>) is a block cipher mode that is significantly
+ more secure than <literal>ECB</literal> mode.
</simpara>
</listitem>
<listitem>
<simpara>
<constant>MCRYPT_MODE_CFB</constant> (<literal>cipher
- feedback</literal>) is the best mode for encrypting byte
- streams where single bytes must be encrypted.
+ feedback, in 8-bit mode</literal>) is a stream cipher mode.
+ It is recommended to use <literal>NCFB</literal> mode rather
+ than <literal>CFB</literal> mode.
</simpara>
</listitem>
<listitem>
<simpara>
<constant>MCRYPT_MODE_OFB</constant> (<literal>output feedback, in
- 8bit</literal>) is comparable to <literal>CFB</literal>, but
+ 8-bit mode</literal>) is a stream cipher mode comparable to
<literal>CFB</literal>, but
can be used in applications where error propagation cannot
- be tolerated. It's insecure (because it operates in 8bit
- mode) so it is not recommended to use it.
+ be tolerated.
+ It is recommended to use <literal>NOFB</literal> mode rather
+ than <literal>OFB</literal> mode.
</simpara>
</listitem>
<listitem>
<simpara>
<constant>MCRYPT_MODE_NOFB</constant> (<literal>output feedback,
- in nbit</literal>) is comparable to OFB, but
- more secure because it operates on the block size of the algorithm.
+ in n-bit mode</literal>) is comparable to <literal>OFB</literal> mode,
+ but operates on the full block size of the algorithm.
</simpara>
</listitem>
<listitem>
@@ -60,6 +60,25 @@
</listitem>
</itemizedlist>
</para>
+
+ <para>
+ Mcrypt supports some other modes of operation for which there are no predefined constants.
+ They can be utilised by passing a string in place of the missing constants.
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ <constant>"ctr"</constant> (<literal>counter mode</literal>)
is a stream cipher mode.
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ <constant>"ncfb"</constant> (<literal>cipher feedback,
+ in n-bit mode</literal>) is comparable to <literal>CFB</literal> mode,
+ but operates on the full block size of the algorithm.
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </para>
<para>
Some other mode and random device constants:
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=71828
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=71828
------------------------------------------------------------------
Modified: en/security/database.xml
By: on 2017-06-01 14:11:51
===================================================================
--- en/security/database.xml
+++ en/security/database.xml
@@ -73,6 +73,7 @@
to encrypt the network connection between clients and the database server.
If either of these is used, then monitoring your traffic and gaining
information about your database will be difficult for a would-be attacker.
+ Restricting Database server to accept connection/requests from a specific IP Address would
also add security. And simply limiting the connection requests from specified host IP.
</simpara>
<!--simpara>
If your database server has native SSL support, consider using <link
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=74078
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=74078
------------------------------------------------------------------
Modified: en/reference/ibase/functions/ibase-delete-user.xml
By: on 2017-07-07 04:09:46
===================================================================
--- en/reference/ibase/functions/ibase-delete-user.xml
+++ en/reference/ibase/functions/ibase-delete-user.xml
@@ -14,10 +14,32 @@
<methodparam><type>string</type><parameter>user_name</parameter></methodparam>
</methodsynopsis>
- &warn.undocumented.func;
-
</refsect1>
+ <refsect1 role="parameters">
+ &reftitle.parameters;
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>service_handle</parameter></term>
+ <listitem>
+ <para>
+ The handle on the database server service.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>user_name</parameter></term>
+ <listitem>
+ <para>
+ The login name of the user you want to delete from database.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </refsect1>
+
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=74462
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=74462
------------------------------------------------------------------
Modified: en/reference/ibase/functions/ibase-add-user.xml
By: on 2017-07-07 04:10:50
===================================================================
--- en/reference/ibase/functions/ibase-add-user.xml
+++ en/reference/ibase/functions/ibase-add-user.xml
@@ -17,7 +17,62 @@
<methodparam
choice="opt"><type>string</type><parameter>middle_name</parameter></methodparam>
<methodparam
choice="opt"><type>string</type><parameter>last_name</parameter></methodparam>
</methodsynopsis>
- &warn.undocumented.func;
+ </refsect1>
+
+ <refsect1 role="parameters">
+ &reftitle.parameters;
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>service_handle</parameter></term>
+ <listitem>
+ <para>
+ The handle on the database server service.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>user_name</parameter></term>
+ <listitem>
+ <para>
+ The login name of the new database user.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>password</parameter></term>
+ <listitem>
+ <para>
+ The user's password to use with the specified account.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>first_name</parameter></term>
+ <listitem>
+ <para>
+ The first name of the new database user.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>middle_name</parameter></term>
+ <listitem>
+ <para>
+ The middle name of the new database user.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>last_name</parameter></term>
+ <listitem>
+ <para>
+ The last name of the new database user.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
</refsect1>
<refsect1 role="returnvalues">
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=74461
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=74461
------------------------------------------------------------------
Modified: en/reference/ibase/functions/ibase-modify-user.xml
By: on 2017-07-07 04:11:50
===================================================================
--- en/reference/ibase/functions/ibase-modify-user.xml
+++ en/reference/ibase/functions/ibase-modify-user.xml
@@ -17,9 +17,64 @@
<methodparam
choice="opt"><type>string</type><parameter>middle_name</parameter></methodparam>
<methodparam
choice="opt"><type>string</type><parameter>last_name</parameter></methodparam>
</methodsynopsis>
- &warn.undocumented.func;
</refsect1>
+ <refsect1 role="parameters">
+ &reftitle.parameters;
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>service_handle</parameter></term>
+ <listitem>
+ <para>
+ The handle on the database server service.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>user_name</parameter></term>
+ <listitem>
+ <para>
+ The login name of the database user to modify.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>password</parameter></term>
+ <listitem>
+ <para>
+ The user's new password.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>first_name</parameter></term>
+ <listitem>
+ <para>
+ The user's new first name.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>middle_name</parameter></term>
+ <listitem>
+ <para>
+ The user's new middle name.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>last_name</parameter></term>
+ <listitem>
+ <para>
+ The user's new last name.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </refsect1>
+
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=74463
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=74463
------------------------------------------------------------------
Modified: en/install/ini.xml
By: on 2017-08-02 06:26:22
===================================================================
--- en/install/ini.xml
+++ en/install/ini.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 343127 $ -->
+<!-- $Revision: 341795 $ -->
<chapter xml:id="configuration" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Runtime Configuration</title>
@@ -33,7 +33,7 @@
<listitem>
<simpara>
As of PHP 5.2.0, the location of the <literal>php.ini</literal> file
- can be set for different versions of PHP. The root of the registry keys depends on 32- or
64-bitness of the installed OS and PHP.
+ can be set for different versions of PHP. The root of the registry keys dependents 32- or
64-bitness of the installed OS and PHP.
For 32-bit PHP on a 32-bit OS or a 64-bit PHP on a 64-bit OS use
<literal>[(HKEY_LOCAL_MACHINESOFTWAREPHP]</literal> for 32-bit version of PHP on a
64-bit OS use <literal>[HKEY_LOCAL_MACHINESOFTWAREWOW6432NodePHP]</literal>] instead.
For same bitness installation the following registry keys
are examined in order:
@@ -97,13 +97,13 @@
<para>
<example>
<title>&php.ini; Environment Variables</title>
- <programlisting role="ini">
+ <programlisting role="ini">
<![CDATA[
; PHP_MEMORY_LIMIT is taken from environment
memory_limit = ${PHP_MEMORY_LIMIT}
]]>
- </programlisting>
- </example>
+ </programlisting>
+ </example>
</para>
<para>
The &php.ini; directives handled by extensions are documented
@@ -145,7 +145,7 @@
</para>
<sect2 xml:id="configuration.file.scan">
<title>Scan directories</title>
-
+
<para>
It is possible to configure PHP to scan for .ini files in a directory
after reading &php.ini;. This can be done at compile time by setting the
@@ -153,7 +153,7 @@
PHP 5.2.0 and later, the scan directory can then be overridden at run time
by setting the <varname>PHP_INI_SCAN_DIR</varname> environment variable.
</para>
-
+
<para>
It is possible to scan multiple directories by separating them with the
platform-specific path separator (<literal>;</literal> on Windows, NetWare
@@ -163,7 +163,7 @@
will also scan the directory given at compile time via
<option role="configure">--with-config-file-scan-dir</option>.
</para>
-
+
<para>
Within each directory, PHP will scan all files ending in
<literal>.ini</literal> in alphabetical order. A list of the files that
@@ -171,7 +171,7 @@
<function>php_ini_scanned_files</function>, or by running PHP with the
<option>--ini</option> option.
</para>
-
+
<informalexample>
<screen>
<![CDATA[
@@ -198,7 +198,7 @@
</sect2>
<sect2 xml:id="configuration.file.changelog">
&reftitle.changelog;
-
+
<para>
<informaltable>
<tgroup cols="2">
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=74754
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=74754
------------------------------------------------------------------
Modified: en/reference/json/jsonserializable/jsonserialize.xml
By: Trent Harvey on 2017-08-21 14:06:28
===================================================================
--- en/reference/json/jsonserializable/jsonserialize.xml
+++ en/reference/json/jsonserializable/jsonserialize.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>mixed</type><methodname>JsonSerializable::jsonSerialize</methodname>
+ <modifier>public</modifier>
<type>mixed</type><methodname>JsonSerializable::jsonSerialize</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75063
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75063
------------------------------------------------------------------
Modified: en/language/predefined/arrayaccess/offsetexists.xml
By: Trent Harvey on 2017-08-21 14:14:28
===================================================================
--- en/language/predefined/arrayaccess/offsetexists.xml
+++ en/language/predefined/arrayaccess/offsetexists.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>boolean</type><methodname>ArrayAccess::offsetExists</methodname>
+ <modifier>public</modifier>
<type>boolean</type><methodname>ArrayAccess::offsetExists</methodname>
<methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75064
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75064
------------------------------------------------------------------
Modified: en/language/predefined/arrayaccess/offsetget.xml
By: Trent Harvey on 2017-08-21 14:14:31
===================================================================
--- en/language/predefined/arrayaccess/offsetget.xml
+++ en/language/predefined/arrayaccess/offsetget.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>mixed</type><methodname>ArrayAccess::offsetGet</methodname>
+ <modifier>public</modifier>
<type>mixed</type><methodname>ArrayAccess::offsetGet</methodname>
<methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75065
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75065
------------------------------------------------------------------
Modified: en/language/predefined/arrayaccess/offsetset.xml
By: Trent Harvey on 2017-08-21 14:14:46
===================================================================
--- en/language/predefined/arrayaccess/offsetset.xml
+++ en/language/predefined/arrayaccess/offsetset.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>void</type><methodname>ArrayAccess::offsetSet</methodname>
+ <modifier>public</modifier>
<type>void</type><methodname>ArrayAccess::offsetSet</methodname>
<methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
<methodparam><type>mixed</type><parameter>value</parameter></methodparam>
</methodsynopsis>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75066
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75066
------------------------------------------------------------------
Modified: en/language/predefined/arrayaccess/offsetunset.xml
By: Trent Harvey on 2017-08-21 14:14:53
===================================================================
--- en/language/predefined/arrayaccess/offsetunset.xml
+++ en/language/predefined/arrayaccess/offsetunset.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>void</type><methodname>ArrayAccess::offsetUnset</methodname>
+ <modifier>public</modifier>
<type>void</type><methodname>ArrayAccess::offsetUnset</methodname>
<methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75067
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75067
------------------------------------------------------------------
Modified: en/language/predefined/serializable/unserialize.xml
By: Trent Harvey on 2017-08-21 14:16:23
===================================================================
--- en/language/predefined/serializable/unserialize.xml
+++ en/language/predefined/serializable/unserialize.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>void</type><methodname>Serializable::unserialize</methodname>
+ <modifier>public</modifier>
<type>void</type><methodname>Serializable::unserialize</methodname>
<methodparam><type>string</type><parameter>serialized</parameter></methodparam>
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75068
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75068
------------------------------------------------------------------
Modified: en/language/predefined/serializable/serialize.xml
By: Trent Harvey on 2017-08-21 14:16:28
===================================================================
--- en/language/predefined/serializable/serialize.xml
+++ en/language/predefined/serializable/serialize.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>string</type><methodname>Serializable::serialize</methodname>
+ <modifier>public</modifier>
<type>string</type><methodname>Serializable::serialize</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75069
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75069
------------------------------------------------------------------
Modified: en/language/predefined/iterator/current.xml
By: Trent Harvey on 2017-08-21 14:17:08
===================================================================
--- en/language/predefined/iterator/current.xml
+++ en/language/predefined/iterator/current.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>mixed</type><methodname>Iterator::current</methodname>
+ <modifier>public</modifier>
<type>mixed</type><methodname>Iterator::current</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75070
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75070
------------------------------------------------------------------
Modified: en/language/predefined/iterator/key.xml
By: Trent Harvey on 2017-08-21 14:17:14
===================================================================
--- en/language/predefined/iterator/key.xml
+++ en/language/predefined/iterator/key.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>scalar</type><methodname>Iterator::key</methodname>
+ <modifier>public</modifier>
<type>scalar</type><methodname>Iterator::key</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75071
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75071
------------------------------------------------------------------
Modified: en/language/predefined/iterator/next.xml
By: Trent Harvey on 2017-08-21 14:17:22
===================================================================
--- en/language/predefined/iterator/next.xml
+++ en/language/predefined/iterator/next.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>void</type><methodname>Iterator::next</methodname>
+ <modifier>public</modifier>
<type>void</type><methodname>Iterator::next</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75072
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75072
------------------------------------------------------------------
Modified: en/language/predefined/iterator/rewind.xml
By: Trent Harvey on 2017-08-21 14:17:30
===================================================================
--- en/language/predefined/iterator/rewind.xml
+++ en/language/predefined/iterator/rewind.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>void</type><methodname>Iterator::rewind</methodname>
+ <modifier>public</modifier>
<type>void</type><methodname>Iterator::rewind</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75073
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75073
------------------------------------------------------------------
Modified: en/language/predefined/iterator/valid.xml
By: Trent Harvey on 2017-08-21 14:17:38
===================================================================
--- en/language/predefined/iterator/valid.xml
+++ en/language/predefined/iterator/valid.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>boolean</type><methodname>Iterator::valid</methodname>
+ <modifier>public</modifier>
<type>boolean</type><methodname>Iterator::valid</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75074
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75074
------------------------------------------------------------------
Modified: en/language/predefined/throwable/getcode.xml
By: Trent Harvey on 2017-08-21 14:18:57
===================================================================
--- en/language/predefined/throwable/getcode.xml
+++ en/language/predefined/throwable/getcode.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>int</type><methodname>Throwable::getCode</methodname>
+ <modifier>public</modifier>
<type>int</type><methodname>Throwable::getCode</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75075
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75075
------------------------------------------------------------------
Modified: en/language/predefined/throwable/getfile.xml
By: Trent Harvey on 2017-08-21 14:19:05
===================================================================
--- en/language/predefined/throwable/getfile.xml
+++ en/language/predefined/throwable/getfile.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>string</type><methodname>Throwable::getFile</methodname>
+ <modifier>public</modifier>
<type>string</type><methodname>Throwable::getFile</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75076
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75076
------------------------------------------------------------------
Modified: en/language/predefined/throwable/getline.xml
By: Trent Harvey on 2017-08-21 14:19:14
===================================================================
--- en/language/predefined/throwable/getline.xml
+++ en/language/predefined/throwable/getline.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>int</type><methodname>Throwable::getLine</methodname>
+ <modifier>public</modifier>
<type>int</type><methodname>Throwable::getLine</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75077
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75077
------------------------------------------------------------------
Modified: en/language/predefined/throwable/getmessage.xml
By: Trent Harvey on 2017-08-21 14:19:23
===================================================================
--- en/language/predefined/throwable/getmessage.xml
+++ en/language/predefined/throwable/getmessage.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>string</type><methodname>Throwable::getMessage</methodname>
+ <modifier>public</modifier>
<type>string</type><methodname>Throwable::getMessage</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75078
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75078
------------------------------------------------------------------
Modified: en/language/predefined/throwable/getprevious.xml
By: Trent Harvey on 2017-08-21 14:19:31
===================================================================
--- en/language/predefined/throwable/getprevious.xml
+++ en/language/predefined/throwable/getprevious.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>Throwable</type><methodname>Throwable::getPrevious</methodname>
+ <modifier>public</modifier>
<type>Throwable</type><methodname>Throwable::getPrevious</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75079
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75079
------------------------------------------------------------------
Modified: en/language/predefined/throwable/gettrace.xml
By: Trent Harvey on 2017-08-21 14:19:40
===================================================================
--- en/language/predefined/throwable/gettrace.xml
+++ en/language/predefined/throwable/gettrace.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>array</type><methodname>Throwable::getTrace</methodname>
+ <modifier>public</modifier>
<type>array</type><methodname>Throwable::getTrace</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75080
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75080
------------------------------------------------------------------
Modified: en/language/predefined/throwable/gettraceasstring.xml
By: Trent Harvey on 2017-08-21 14:19:49
===================================================================
--- en/language/predefined/throwable/gettraceasstring.xml
+++ en/language/predefined/throwable/gettraceasstring.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>string</type><methodname>Throwable::getTraceAsString</methodname>
+ <modifier>public</modifier>
<type>string</type><methodname>Throwable::getTraceAsString</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75081
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75081
------------------------------------------------------------------
Modified: en/language/predefined/throwable/tostring.xml
By: Trent Harvey on 2017-08-21 14:19:56
===================================================================
--- en/language/predefined/throwable/tostring.xml
+++ en/language/predefined/throwable/tostring.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>string</type><methodname>Throwable::__toString</methodname>
+ <modifier>public</modifier>
<type>string</type><methodname>Throwable::__toString</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75082
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75082
------------------------------------------------------------------
Modified: en/language/predefined/iteratoraggregate/getiterator.xml
By: Trent Harvey on 2017-08-21 14:20:10
===================================================================
--- en/language/predefined/iteratoraggregate/getiterator.xml
+++ en/language/predefined/iteratoraggregate/getiterator.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>abstract</modifier> <modifier>public</modifier>
<type>Traversable</type><methodname>IteratorAggregate::getIterator</methodname>
+ <modifier>public</modifier>
<type>Traversable</type><methodname>IteratorAggregate::getIterator</methodname>
<void />
</methodsynopsis>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75083
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75083
------------------------------------------------------------------
Modified: en/reference/var/functions/settype.xml
By: Siim Kallari on 2017-08-25 23:00:06
===================================================================
--- en/reference/var/functions/settype.xml
+++ en/reference/var/functions/settype.xml
@@ -5,7 +5,7 @@
<refname>settype</refname>
<refpurpose>Set the type of a variable</refpurpose>
</refnamediv>
-
+
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
@@ -18,7 +18,7 @@
<parameter>type</parameter>.
</para>
</refsect1>
-
+
<refsect1 role="parameters">
&reftitle.parameters;
<para>
@@ -79,14 +79,22 @@
</variablelist>
</para>
</refsect1>
-
+
<refsect1 role="returnvalues">
&reftitle.returnvalues;
+
+ <refsect1 role="returnvalues"><!-- {{{ -->
+ &reftitle.returnvalues;
+ <para>
+ What this function returns, first on success, then failure.
+ If simply true on success and false on failure, just use &return.success; here.
+ </para>
+ </refsect1><!-- }}} -->
<para>
- &return.success;
+ Returns true on success or emits PHP Warning on failure.
</para>
</refsect1>
-
+
<refsect1 role="examples">
&reftitle.examples;
<para>
@@ -97,16 +105,18 @@
<?php
$foo = "5bar"; // string
$bar = true; // boolean
+$baz = 123; // integer
settype($foo, "integer"); // $foo is now 5 (integer)
settype($bar, "string"); // $bar is now "1" (string)
+settype($baz, "baz"); // PHP warning: settype(): Invalid type on line 1
?>
]]>
</programlisting>
</example>
</para>
</refsect1>
-
+
<refsect1 role="notes">
&reftitle.notes;
<note>
@@ -115,7 +125,7 @@
</para>
</note>
</refsect1>
-
+
<refsect1 role="seealso">
&reftitle.seealso;
<para>
@@ -126,7 +136,7 @@
</simplelist>
</para>
</refsect1>
-
+
</refentry>
<!-- Keep this comment at the end of the file
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75108
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75108
------------------------------------------------------------------
Modified: en/reference/strings/functions/addslashes.xml
By: Stefan on 2017-08-30 10:52:32
===================================================================
--- en/reference/strings/functions/addslashes.xml
+++ en/reference/strings/functions/addslashes.xml
@@ -13,48 +13,45 @@
<methodparam><type>string</type><parameter>str</parameter></methodparam>
</methodsynopsis>
<para>
- Returns a string with backslashes before characters that need to be
- escaped. These characters are single quote (<literal>'</literal>),
- double quote (<literal>"</literal>), backslash
- (<literal></literal>) and NUL (the &null; byte).
+ Returns a string with backslashes added before characters that need to be
+ escaped. These characters are:
+ <simplelist>
+ <member>single quote (<literal>'</literal>)</member>
+ <member>double quote (<literal>"</literal>)</member>
+ <member>backslash (<literal></literal>)</member>
+ <member>NUL (the &null; byte)</member>
+ </simplelist>
</para>
<para>
- An example use of <function>addslashes</function> is when you're
- entering data into string that is evaluated by PHP. For example,
- <literal>O'Reilly</literal> is stored in $str, you need to escape
- $str. (e.g. eval("echo '".addslashes($str)."';"); )
+ A use case of <function>addslashes</function> is escaping the aforementioned
+ characters in a string that is to be evaluated by PHP:
+ <informalexample>
+ <programlisting role="php">
+<![CDATA[
+<?php
+$str = "O'Reilly?";
+eval("echo '" . addslashes($str) . "';");
+?>
+]]>
+ </programlisting>
+ </informalexample>
</para>
<para>
- To escape database parameters, DBMS specific escape function
- (e.g. <function>mysqli_real_escape_string</function> for MySQL or
- <function>pg_escape_literal</function>,
<function>pg_escape_string</function>
- for PostgreSQL) should be used for security reasons. DBMSes have
- differect escape specification for identifiers (e.g. Table name,
- field name) than parameters. Some DBMS such as PostgreSQL provides
- identifier escape
- function, <function>pg_escape_identifier</function>, but not all
- DBMS provides identifier escape API. If this is the case, refer to
- your database system manual for proper escaping method.
+ To escape database parameters, DBMS-specific escape functions
+ should be used, for security reasons. Note that DBMS can have
+ different escape functions for parameters and identifiers
+ (table names/columns etc.).
+ See the <refs>database</refs> page for a full list of supported
+ database extensions and plugins.
</para>
<para>
- If your DBMS doesn't have an escape function and the DBMS
- uses <literal></literal> to escape special chars, you might be
- able to use this function only when this escape method is adequate for
- your database. Please note that use
- of <function>addslashes</function> for database parameter escaping
- can be cause of security issues on most databases.
- </para>
- <para>
- The PHP directive <link linkend="ini.magic-quotes-gpc">
- magic_quotes_gpc</link> was <literal>on</literal> by default before
- PHP 5.4, and it essentially ran <function>addslashes</function> on
- all GET, POST, and COOKIE data. Do not
- use <function>addslashes</function> on strings that have already
- been escaped with
- <link linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link> as
you'll
- then do double escaping. The function
- <function>get_magic_quotes_gpc</function> may come in handy for
- checking this.
+ Prior to PHP 5.4.0, the PHP directive <link
linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link>
+ was <literal>on</literal> by default and it essentially ran
<function>addslashes</function>
+ on all GET, POST and COOKIE data.
+ <function>addslashes</function> must not be used on strings that have already
+ been escaped with <link
linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link>,
+ as the strings will be double escaped. <function>get_magic_quotes_gpc</function> can
be used to check
+ if <link linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link> is
<literal>on</literal>.
</para>
</refsect1>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75172
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75172
------------------------------------------------------------------
Modified: en/reference/opcache/ini.xml
By: anonymous on 2017-09-05 19:14:48
===================================================================
--- en/reference/opcache/ini.xml
+++ en/reference/opcache/ini.xml
@@ -180,6 +180,30 @@
<entry></entry>
</row>
<row>
+ <entry><link
linkend="ini.opcache.file_update_protection">opcache.file_update_protection</link></entry>
+ <entry>"2"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry><link
linkend="ini.opcache.huge_code_pages">opcache.huge_code_pages</link></entry>
+ <entry>"0"</entry>
+ <entry>PHP_INI_SYSTEM</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry><link
linkend="ini.opcache.lockfile_path">opcache.lockfile_path</link></entry>
+ <entry>"/tmp"</entry>
+ <entry>PHP_INI_SYSTEM</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry><link
linkend="ini.opcache.opt_debug_level">opcache.opt_debug_level</link></entry>
+ <entry>"0"</entry>
+ <entry>PHP_INI_SYSTEM</entry>
+ <entry></entry>
+ </row>
+ <row>
<entry><link
linkend="ini.opcache.file-cache">opcache.file_cache</link></entry>
<entry>NULL</entry>
<entry>PHP_INI_SYSTEM</entry>
@@ -621,6 +645,50 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry xml:id="ini.opcache.file_update_protection">
+ <term>
+ <parameter>opcache.file_update_protection</parameter>
+ <type>string</type>
+ </term>
+ <listitem>
+ <para>
+
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry xml:id="ini.opcache.huge_code_pages">
+ <term>
+ <parameter>opcache.huge_code_pages</parameter>
+ <type>string</type>
+ </term>
+ <listitem>
+ <para>
+
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry xml:id="ini.opcache.lockfile_path">
+ <term>
+ <parameter>opcache.lockfile_path</parameter>
+ <type>string</type>
+ </term>
+ <listitem>
+ <para>
+
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry xml:id="ini.opcache.opt_debug_level">
+ <term>
+ <parameter>opcache.opt_debug_level</parameter>
+ <type>string</type>
+ </term>
+ <listitem>
+ <para>
+
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry xml:id="ini.opcache.file-cache">
<term>
<parameter>opcache.file_cache</parameter>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75479
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75479
------------------------------------------------------------------
Modified: en/reference/iconv/configure.xml
By: Peter Kokot on 2017-09-21 14:32:27
===================================================================
--- en/reference/iconv/configure.xml
+++ en/reference/iconv/configure.xml
@@ -7,7 +7,7 @@
compiling with <option role="configure">--without-iconv</option>.
</para>
<para>
- The optional <option role="configure">--with-iconv-dir</option> directive
+ The optional <option role="configure">--with-iconv[=DIR]</option> directive
is used to specify the location of <emphasis>iconv</emphasis> on the system
that PHP is being compiled on, otherwise only the default locations are scanned.
</para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=75652
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=75652
------------------------------------------------------------------
--
https://edit.php.net/
This email is send automatically by the Php Docbook Online Editor.