com doc/ja: Fix #80677: session.cookie_samesite missing from INI list: appendices/ini.list.xml referen ce/session/ini.xml
[email protected] (Yoshinari Takaoka) Thu, 28 Jan 2021 15:04:58 +0000
| Newsgroups | php.doc.ja |
|---|---|
| Message-ID | <[email protected]> |
Commit: 9a8028fd30b434c99175c724efc61d1dc1a78c22 Author: Yoshinari Takaoka <[email protected]> Fri, 29 Jan 2021 00:04:58 +0900 Parents: 56f4c00333fa6ab034c6ffee79ddc11f3e2ee636 Branches: master Link: http://git.php.net/?p=doc/ja.git;a=commitdiff;h=9a8028fd30b434c99175c724efc61d1dc1a78c22 Log: Fix #80677: session.cookie_samesite missing from INI list We should not duplicate the info in the general INI list, but rather include it from the session configuration. While we're at it, we remove obsolete changelog entries, fix the wording ("as of" instead of "since"), and remove the url_rewriter.tags entry from the session configuration page. Bugs: https://bugs.php.net/80677 Changed paths: M appendices/ini.list.xml M reference/session/ini.xml
diff_9a8028fd30b434c99175c724efc61d1dc1a78c22.txt
(text/plain, 12.7 KB)
diff --git a/appendices/ini.list.xml b/appendices/ini.list.xml
index 77d84fdefd..0966e38e4d 100644
--- a/appendices/ini.list.xml
+++ b/appendices/ini.list.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 1fb41f1900406a130e59f37d6e66538a64048524 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 7dc5a6466b5c49cd712fc19a520f106b4d2d1110 Maintainer: takagi Status: ready -->
<!-- CREDITS: hirokawa,shimooka,mumumu -->
<section xml:id="ini.list" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -1935,204 +1935,7 @@
PHP 7.1.0 までは、デフォルト値は 17 でした。
</entry>
</row>
- <row>
- <entry><link linkend="ini.session.auto-start">session.auto_start</link></entry>
- <entry>"0"</entry>
- <entry>PHP_INI_PERDIR</entry>
- <entry>PHP <= 5.4.19 および PHP <= 5.5.1 では PHP_INI_ALL。</entry>
- </row>
- <row>
- <entry><link linkend="ini.session.cache-expire">session.cache_expire</link></entry>
- <entry>"180"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
- <entry><link linkend="ini.session.cache-limiter">session.cache_limiter</link></entry>
- <entry>"nocache"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
- <entry><link linkend="ini.session.cookie-domain">session.cookie_domain</link></entry>
- <entry>""</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
- <entry><link linkend="ini.session.cookie-httponly">session.cookie_httponly</link></entry>
- <entry>""</entry>
- <entry>PHP_INI_ALL</entry>
- <entry>PHP 5.2.0 以降で利用可能。</entry>
- </row>
- <row>
- <entry><link linkend="ini.session.cookie-lifetime">session.cookie_lifetime</link></entry>
- <entry>"0"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
- <entry><link linkend="ini.session.cookie-path">session.cookie_path</link></entry>
- <entry>"/"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
- <entry><link linkend="ini.session.cookie-secure">session.cookie_secure</link></entry>
- <entry>""</entry>
- <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>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>PHP 7.1.0 で削除。</entry>
- </row>
- <row>
- <entry><link linkend="ini.session.gc-divisor">session.gc_divisor</link></entry>
- <entry>"100"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
- <entry><link linkend="ini.session.gc-maxlifetime">session.gc_maxlifetime</link></entry>
- <entry>"1440"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
- <entry><link linkend="ini.session.gc-probability">session.gc_probability</link></entry>
- <entry>"1"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
- <entry><link linkend="ini.session.sid-bits-per-character">session.sid_bits_per_character</link></entry>
- <entry>"4"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry>PHP 7.1.0 以降で利用可能。</entry>
- </row>
- <row>
- <entry><link linkend="ini.session.sid-length">session.sid_length</link></entry>
- <entry>"32"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry>PHP 7.1.0 以降で利用可能。</entry>
- </row>
- <row>
- <entry><link linkend="ini.session.hash-bits-per-character">session.hash_bits_per_character</link></entry>
- <entry>"5"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry>PHP 7.1.0 で削除。</entry>
- </row>
- <row>
- <entry><link linkend="ini.session.hash-function">session.hash_function</link></entry>
- <entry>"0"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry>PHP 7.1.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>PHP 7.0.0 以降で利用可能。</entry>
- </row>
- <row>
- <entry><link linkend="ini.session.name">session.name</link></entry>
- <entry>"PHPSESSID"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
- <entry><link linkend="ini.session.referer-check">session.referer_check</link></entry>
- <entry>""</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
- <entry><link linkend="ini.session.save-handler">session.save_handler</link></entry>
- <entry>"files"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
- <entry><link linkend="ini.session.save-path">session.save_path</link></entry>
- <entry>""</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
- <entry><link linkend="ini.session.serialize-handler">session.serialize_handler</link></entry>
- <entry>"php"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></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>PHP 5.4.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>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>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>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>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>PHP 5.4.0 以降で利用可能。</entry>
- </row>
- <row>
- <entry><link linkend="ini.session.use-strict-mode">session.use_strict_mode</link></entry>
- <entry>"0"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry>PHP 5.5.2 以降で利用可能。</entry>
- </row>
- <row>
- <entry><link linkend="ini.session.use-cookies">session.use_cookies</link></entry>
- <entry>"1"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
- <entry><link linkend="ini.session.use-only-cookies">session.use_only_cookies</link></entry>
- <entry>"1"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
- <entry><link linkend="ini.session.use-trans-sid">session.use_trans_sid</link></entry>
- <entry>"0"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('session.configuration.list')/*)" />
<row>
<entry>session_pgsql.create_table</entry>
<entry>"1"</entry>
diff --git a/reference/session/ini.xml b/reference/session/ini.xml
index 5290c0ad53..7fe7ec85e5 100644
--- a/reference/session/ini.xml
+++ b/reference/session/ini.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: f3d6ada6156b28791a28efebe2e5c070159c3a94 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 7dc5a6466b5c49cd712fc19a520f106b4d2d1110 Maintainer: hirokawa Status: ready -->
<!-- CREDITS: shimooka,takagi,mumumu -->
<section xml:id="session.configuration" xmlns="http://docbook.org/ns/docbook">
&reftitle.runtime;
@@ -17,7 +17,7 @@
<entry>&Changelog;</entry>
</row>
</thead>
- <tbody>
+ <tbody xml:id="session.configuration.list">
<row>
<entry><link linkend="ini.session.save-path">session.save_path</link></entry>
<entry>""</entry>
@@ -94,7 +94,7 @@
<entry><link linkend="ini.session.cookie-httponly">session.cookie_httponly</link></entry>
<entry>""</entry>
<entry>PHP_INI_ALL</entry>
- <entry>PHP 5.2.0 から利用可能</entry>
+ <entry></entry>
</row>
<row>
<entry><link linkend="ini.session.cookie-samesite">session.cookie_samesite</link></entry>
@@ -106,7 +106,7 @@
<entry><link linkend="ini.session.use-strict-mode">session.use_strict_mode</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>PHP 5.5.2 から利用可能</entry>
+ <entry></entry>
</row>
<row>
<entry><link linkend="ini.session.use-cookies">session.use_cookies</link></entry>
@@ -169,64 +169,46 @@
<entry>PHP 7.1.0 から利用可能</entry>
</row>
<row>
- <entry><link linkend="ini.session.hash-function">session.hash_function</link></entry>
- <entry>"0"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry>PHP 5.0.0 から利用可能。PHP 7.1.0 で削除されました。</entry>
- </row>
- <row>
- <entry><link linkend="ini.session.hash-bits-per-character">session.hash_bits_per_character</link></entry>
- <entry>"4"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry>PHP 5.0.0 から利用可能。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>PHP 5.4.0 から利用可能</entry>
+ <entry></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>PHP 5.4.0 から利用可能</entry>
+ <entry></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>PHP 5.4.0 から利用可能</entry>
+ <entry></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>PHP 5.4.0 から利用可能</entry>
+ <entry></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>PHP 5.4.0 から利用可能</entry>
+ <entry></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>PHP 5.4.0 から利用可能</entry>
+ <entry></entry>
</row>
<row>
<entry><link linkend="ini.session.lazy-write">session.lazy_write</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>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>PHP 7.1.0 以降は、セッションではこの項目を使いません。</entry>
+ <entry></entry>
</row>
<row>
<entry><link linkend="ini.session.hash-function">session.hash_function</link></entry>