From 9f540f9e097d21f500736538d653d4bd85f80a2a Mon Sep 17 00:00:00 2001
From: Yasuo Ohgaki <yohgaki@php.net>
Date: Thu, 1 Sep 2016 20:12:12 +0000
Subject: [PATCH] Reorganize ini list. Add use_strict_mode note

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@339972 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../session/functions/session-create-id.xml   |   1 +
 reference/session/ini.xml                     | 149 +++++++++---------
 2 files changed, 79 insertions(+), 71 deletions(-)

diff --git a/reference/session/functions/session-create-id.xml b/reference/session/functions/session-create-id.xml
index ea4957d520..a48819f94a 100644
--- a/reference/session/functions/session-create-id.xml
+++ b/reference/session/functions/session-create-id.xml
@@ -123,6 +123,7 @@ my_session_regenerate_id();
    <simplelist>
     <member><function>session_regenerate_id</function></member>
     <member><function>session_start</function></member>
+    <member><link linkend="ini.session.use-strict-mode">session.use_strict_mode</link></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/session/ini.xml b/reference/session/ini.xml
index 2c3553f0e3..38d63a4620 100644
--- a/reference/session/ini.xml
+++ b/reference/session/ini.xml
@@ -118,18 +118,6 @@
      <entry>PHP_INI_ALL</entry>
      <entry></entry>
     </row>
-    <row>
-     <entry><link linkend="ini.session.entropy-file">session.entropy_file</link></entry>
-     <entry>""</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Removed in PHP 7.1.0.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.session.entropy-length">session.entropy_length</link></entry>
-     <entry>"0"</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Removed in PHP 7.1.0</entry>
-    </row>
     <row>
      <entry><link linkend="ini.session.cache-limiter">session.cache_limiter</link></entry>
      <entry>"nocache"</entry>
@@ -160,24 +148,6 @@
      <entry>PHP_INI_ALL</entry>
      <entry>Available since PHP 7.1.0.</entry>
     </row>
-    <row>
-     <entry><link linkend="ini.url-rewriter.tags">url_rewriter.tags</link></entry>
-     <entry>"a=href,area=href,frame=src,form="</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since PHP 4.0.4. Since PHP 7.1.0, this INI is no longer used by session.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.session.bug-compat-42">session.bug_compat_42</link></entry>
-     <entry>"1"</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since PHP 4.3.0. Removed in PHP 5.4.0.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.session.bug-compat-warn">session.bug_compat_warn</link></entry>
-     <entry>"1"</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since PHP 4.3.0. Removed in PHP 5.4.0.</entry>
-    </row>
     <row>
      <entry><link linkend="ini.session.sid-length">session.sid_length</link></entry>
      <entry>"32"</entry>
@@ -190,6 +160,54 @@
      <entry>PHP_INI_ALL</entry>
      <entry>Available since PHP 7.1.0.</entry>
     </row>
+    <row>
+     <entry><link linkend="ini.session.upload-progress.enabled">session.upload_progress.enabled</link></entry>
+     <entry>"1"</entry>
+     <entry>PHP_INI_PERDIR</entry>
+     <entry>Available since PHP 5.4.0.</entry>
+    </row>
+    <row>
+     <entry><link linkend="ini.session.upload-progress.cleanup">session.upload_progress.cleanup</link></entry>
+     <entry>"1"</entry>
+     <entry>PHP_INI_PERDIR</entry>
+     <entry>Available since PHP 5.4.0.</entry>
+    </row>
+    <row>
+     <entry><link linkend="ini.session.upload-progress.prefix">session.upload_progress.prefix</link></entry>
+     <entry>"upload_progress_"</entry>
+     <entry>PHP_INI_PERDIR</entry>
+     <entry>Available since PHP 5.4.0.</entry>
+    </row>
+    <row>
+     <entry><link linkend="ini.session.upload-progress.name">session.upload_progress.name</link></entry>
+     <entry>"PHP_SESSION_UPLOAD_PROGRESS"</entry>
+     <entry>PHP_INI_PERDIR</entry>
+     <entry>Available since PHP 5.4.0.</entry>
+    </row>
+    <row>
+     <entry><link linkend="ini.session.upload-progress.freq">session.upload_progress.freq</link></entry>
+     <entry>"1%"</entry>
+     <entry>PHP_INI_PERDIR</entry>
+     <entry>Available since PHP 5.4.0.</entry>
+    </row>
+    <row>
+     <entry><link linkend="ini.session.upload-progress.min-freq">session.upload_progress.min_freq</link></entry>
+     <entry>"1"</entry>
+     <entry>PHP_INI_PERDIR</entry>
+     <entry>Available since PHP 5.4.0.</entry>
+    </row>
+    <row>
+     <entry><link linkend="ini.session.lazy-write">session.lazy_write</link></entry>
+     <entry>"1"</entry>
+     <entry>PHP_INI_ALL</entry>
+     <entry>Available since PHP 7.0.0.</entry>
+    </row>
+    <row>
+     <entry><link linkend="ini.url-rewriter.tags">url_rewriter.tags</link></entry>
+     <entry>"a=href,area=href,frame=src,form="</entry>
+     <entry>PHP_INI_ALL</entry>
+     <entry>Available since PHP 4.0.4. Since PHP 7.1.0, this INI is no longer used by session.</entry>
+    </row>
     <row>
      <entry><link linkend="ini.session.hash-function">session.hash_function</link></entry>
      <entry>"0"</entry>
@@ -203,47 +221,29 @@
      <entry>Available since PHP 5.0.0. Removed in PHP 7.1.0.</entry>
     </row>
     <row>
-      <entry><link linkend="ini.session.upload-progress.enabled">session.upload_progress.enabled</link></entry>
-      <entry>"1"</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry>Available since PHP 5.4.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.session.upload-progress.cleanup">session.upload_progress.cleanup</link></entry>
-      <entry>"1"</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry>Available since PHP 5.4.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.session.upload-progress.prefix">session.upload_progress.prefix</link></entry>
-      <entry>"upload_progress_"</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry>Available since PHP 5.4.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.session.upload-progress.name">session.upload_progress.name</link></entry>
-      <entry>"PHP_SESSION_UPLOAD_PROGRESS"</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry>Available since PHP 5.4.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.session.upload-progress.freq">session.upload_progress.freq</link></entry>
-      <entry>"1%"</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry>Available since PHP 5.4.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.session.upload-progress.min-freq">session.upload_progress.min_freq</link></entry>
-      <entry>"1"</entry>
-      <entry>PHP_INI_PERDIR</entry>
-      <entry>Available since PHP 5.4.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.session.lazy-write">session.lazy_write</link></entry>
-      <entry>"1"</entry>
-      <entry>PHP_INI_ALL</entry>
-      <entry>Available since PHP 7.0.0.</entry>
-     </row>
+     <entry><link linkend="ini.session.entropy-file">session.entropy_file</link></entry>
+     <entry>""</entry>
+     <entry>PHP_INI_ALL</entry>
+     <entry>Removed in PHP 7.1.0.</entry>
+    </row>
+    <row>
+     <entry><link linkend="ini.session.entropy-length">session.entropy_length</link></entry>
+     <entry>"0"</entry>
+     <entry>PHP_INI_ALL</entry>
+     <entry>Removed in PHP 7.1.0</entry>
+    </row>
+    <row>
+     <entry><link linkend="ini.session.bug-compat-42">session.bug_compat_42</link></entry>
+     <entry>"1"</entry>
+     <entry>PHP_INI_ALL</entry>
+     <entry>Available since PHP 4.3.0. Removed in PHP 5.4.0.</entry>
+    </row>
+    <row>
+     <entry><link linkend="ini.session.bug-compat-warn">session.bug_compat_warn</link></entry>
+     <entry>"1"</entry>
+     <entry>PHP_INI_ALL</entry>
+     <entry>Available since PHP 4.3.0. Removed in PHP 5.4.0.</entry>
+    </row>
    </tbody>
   </tgroup>
  </table>
@@ -540,6 +540,13 @@
      with strict mode.
      Defaults to <literal>0</literal> (disabled).
     </simpara>
+    <note>
+     <simpara>
+     Enabling <literal>session.use_strict_mode</literal> is mandatory for
+     general session security. All sites are advised to enable this. See 
+     <function>session_create_id</function> example code for more details.
+     </simpara>
+    </note>
    </listitem>
   </varlistentry>