colder Tue Dec 19 22:47:05 2006 UTC
Modified files:
/phpdoc/en/appendices ini.xml wrappers.xml
/phpdoc/en/reference/filesystem ini.xml
Log:
Document allow_url_include properly
http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/ini.xml?r1=1.41&r2=1.42&diff_format=u
Index: phpdoc/en/appendices/ini.xml
diff -u phpdoc/en/appendices/ini.xml:1.41 phpdoc/en/appendices/ini.xml:1.42
--- phpdoc/en/appendices/ini.xml:1.41 Sat Dec 16 20:18:46 2006
+++ phpdoc/en/appendices/ini.xml Tue Dec 19 22:47:05 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.41 $ -->
+<!-- $Revision: 1.42 $ -->
<appendix id="ini">
<title>&php.ini; directives</title>
@@ -36,7 +36,7 @@
<entry>PHP_INI_ALL in PHP <= 4.3.4. Available since PHP
4.0.4.</entry>
</row>
<row>
- <entry>allow_url_include</entry>
+ <entry><link
linkend="ini.allow-url-include">allow_url_include</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_SYSTEM</entry>
<entry>Available since PHP 5.2.0.</entry>
http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/wrappers.xml?r1=1.66&r2=1.67&diff_format=u
Index: phpdoc/en/appendices/wrappers.xml
diff -u phpdoc/en/appendices/wrappers.xml:1.66
phpdoc/en/appendices/wrappers.xml:1.67
--- phpdoc/en/appendices/wrappers.xml:1.66 Sat Oct 21 22:45:08 2006
+++ phpdoc/en/appendices/wrappers.xml Tue Dec 19 22:47:05 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.66 $ -->
+<!-- $Revision: 1.67 $ -->
<appendix id="wrappers">
<title>List of Supported Protocols/Wrappers</title>
<para>
@@ -50,7 +50,7 @@
</thead>
<tbody>
<row>
- <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link>.</entry>
+ <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link></entry>
<entry>No</entry>
</row>
<row>
@@ -259,7 +259,7 @@
</thead>
<tbody>
<row>
- <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link>.</entry>
+ <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link></entry>
<entry>Yes</entry>
</row>
<row>
@@ -489,7 +489,7 @@
</thead>
<tbody>
<row>
- <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link>.</entry>
+ <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link></entry>
<entry>Yes</entry>
<entry>Yes</entry>
</row>
@@ -788,10 +788,19 @@
</thead>
<tbody>
<row>
- <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link>.</entry>
+ <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link></entry>
<entry>No</entry>
</row>
<row>
+ <entry>Restricted by <link
linkend="ini.allow-url-include">allow_url_include</link></entry>
+ <entry>
+ <literal>php://input</literal>,
+ <literal>php://stdin</literal>,
+ <literal>php://memory</literal> and
+ <literal>php://temp</literal> only.
+ </entry>
+ </row>
+ <row>
<entry>Allows Reading</entry>
<entry>
<literal>php://stdin</literal>,
@@ -894,7 +903,7 @@
</thead>
<tbody>
<row>
- <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link>.</entry>
+ <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link></entry>
<entry>No</entry>
</row>
<row>
@@ -996,6 +1005,10 @@
<entry>No</entry>
</row>
<row>
+ <entry>Restricted by <link
linkend="ini.allow-url-include">allow_url_include</link></entry>
+ <entry>Yes</entry>
+ </row>
+ <row>
<entry>Allows Reading</entry>
<entry>Yes</entry>
</row>
@@ -1099,7 +1112,7 @@
</thead>
<tbody>
<row>
- <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link>.</entry>
+ <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link></entry>
<entry>Yes</entry>
<entry>Yes</entry>
<entry>Yes</entry>
@@ -1314,7 +1327,7 @@
</thead>
<tbody>
<row>
- <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link>.</entry>
+ <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link></entry>
<entry>No</entry>
</row>
<row>
@@ -1457,7 +1470,7 @@
</thead>
<tbody>
<row>
- <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link>.</entry>
+ <entry>Restricted by <link
linkend="ini.allow-url-fopen">allow_url_fopen</link></entry>
<entry>No</entry>
</row>
<row>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/filesystem/ini.xml?r1=1.12&r2=1.13&diff_format=u
Index: phpdoc/en/reference/filesystem/ini.xml
diff -u phpdoc/en/reference/filesystem/ini.xml:1.12
phpdoc/en/reference/filesystem/ini.xml:1.13
--- phpdoc/en/reference/filesystem/ini.xml:1.12 Wed Jul 20 19:10:31 2005
+++ phpdoc/en/reference/filesystem/ini.xml Tue Dec 19 22:47:05 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<section id="filesystem.configuration">
&reftitle.runtime;
&extension.runtime;
@@ -23,6 +23,12 @@
<entry>PHP_INI_ALL in PHP <= 4.3.4. Available since PHP 4.0.4.</entry>
</row>
<row>
+ <entry>allow_url_include</entry>
+ <entry>"0"</entry>
+ <entry>PHP_INI_SYSTEM</entry>
+ <entry>Available since PHP 5.2.0.</entry>
+ </row>
+ <row>
<entry>user_agent</entry>
<entry>NULL</entry>
<entry>PHP_INI_ALL</entry>
@@ -95,6 +101,25 @@
</listitem>
</varlistentry>
+ <varlistentry id="ini.allow-url-include">
+ <term>
+ <parameter>allow_url_include</parameter>
+ <type>boolean</type>
+ </term>
+ <listitem>
+ <para>
+ This option allows the use of URL-aware fopen wrappers with the
following
+ functions: <function>include</function>,
<function>include_once</function>,
+ <function>require</function>, <function>require_once</function>.
+ </para>
+ <note>
+ <para>
+ This setting requires allow_url_fopen to be on.
+ </para>
+ </note>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="ini.user-agent">
<term>
<parameter>user_agent</parameter>
