svn: /phpdoc/de/trunk/ appendices/ini.xml reference/mysqli/ini.xml

wiesemann                                Mon, 07 Dec 2009 21:47:41 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=291838

Log:
fix build

Changed paths:
    U   phpdoc/de/trunk/appendices/ini.xml
    U   phpdoc/de/trunk/reference/mysqli/ini.xml

Modified: phpdoc/de/trunk/appendices/ini.xml
===================================================================
--- phpdoc/de/trunk/appendices/ini.xml	2009-12-07 21:27:21 UTC (rev 291837)
+++ phpdoc/de/trunk/appendices/ini.xml	2009-12-07 21:47:41 UTC (rev 291838)
@@ -3829,6 +3829,50 @@
        </listitem>
       </varlistentry>

+     <varlistentry xml:id="ini.disable-functions">
+      <term>
+       <parameter>disable_functions</parameter>
+       <type>string</type>
+      </term>
+      <listitem>
+       <simpara>
+        This directive allows you to disable certain functions for
+        <link linkend="security">security</link> reasons. It takes
+        on a comma-delimited list of function names. disable_functions
+        is not affected by <link linkend="ini.safe-mode">Safe Mode</link>.
+       </simpara>
+       <simpara>
+        This directive must be set in &php.ini; For example, you
+        cannot set this in &httpd.conf;.
+       </simpara>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry xml:id="ini.disable-classes">
+      <term>
+       <parameter>disable_classes</parameter>
+       <type>string</type>
+      </term>
+      <listitem>
+       <simpara>
+        This directive allows you to disable certain classes for
+        <link linkend="security">security</link> reasons.  It takes
+        on a comma-delimited list of class names.  disable_classes
+        is not affected by <link linkend="ini.safe-mode">Safe Mode</link>.
+       </simpara>
+       <simpara>
+        This directive must be set in &php.ini;  For example, you
+        cannot set this in &httpd.conf;.
+       </simpara>
+       <note>
+        <title>Availability note</title>
+        <simpara>
+         This directive became available in PHP 4.3.2
+        </simpara>
+       </note>
+      </listitem>
+     </varlistentry>
+
       <varlistentry xml:id="ini.zend.ze1-compatibility-mode">
        <term>
         <parameter>zend.ze1_compatibility_mode</parameter>
@@ -4660,6 +4704,70 @@
        </listitem>
       </varlistentry>

+     <varlistentry xml:id="ini.open-basedir">
+      <term>
+       <parameter>open_basedir</parameter>
+       <type>string</type>
+      </term>
+      <listitem>
+       <para>
+        Limit the files that can be opened by PHP to the specified
+        directory-tree, including the file itself.  This directive
+        is <emphasis>NOT</emphasis> affected by whether Safe Mode is
+        turned On or Off.
+       </para>
+       <para>
+        When a script tries to open a file with, for example,
+        <function>fopen</function> or <function>gzopen</function>,
+        the location of the file is checked. When the file is outside the
+        specified directory-tree, PHP will refuse to open it. All symbolic
+        links are resolved, so it's not possible to avoid this restriction
+        with a symlink. If the file doesn't exist then the symlink couldn't be
+        resolved and the filename is compared to (a resolved)
+        <option>open_basedir</option>.
+       </para>
+       <para>
+        The special value <systemitem class="filesystem">.</systemitem>
+        indicates that the working directory of the script will be used as the
+        base-directory. This is, however, a little dangerous as the working directory
+        of the script can easily be changed with <function>chdir</function>.
+       </para>
+       <para>
+        In <filename>httpd.conf</filename>, <option>open_basedir</option> can be turned off
+        (e.g. for some virtual hosts)
+        <link linkend="configuration.changes.apache">the same way</link> as
+        any other configuration directive with "<literal>php_admin_value open_basedir
+        none</literal>".
+       </para>
+       <para>
+        Under Windows, separate the directories with a semicolon. On all
+        other systems, separate the directories with a colon. As an Apache
+        module, <option>open_basedir</option> paths from parent directories are now
+        automatically inherited.
+       </para>
+       <para>
+         The restriction specified with <option>open_basedir</option> is actually a
+         prefix, not a directory name.  This means that "<literal>open_basedir
+         = /dir/incl</literal>" also allows access to "<literal>/dir/include</literal>" and
+         "<literal>/dir/incls</literal>" if they exist. When you want to restrict access
+         to only the specified directory, end with a slash. For example:
+         <literal>open_basedir = /dir/incl/</literal>
+       </para>
+       <para>
+        The default is to allow all files to be opened.
+       </para>
+       <note>
+        <para>
+         As of PHP 5.3.0 open_basedir can be tightened at run-time. This means
+         that if open_basedir is set to <literal>/www/</literal> in &php.ini;
+         a script can tighten the configuration to
+         <literal>/www/tmp/</literal> at run-time with
+         <function>ini_set</function>
+        </para>
+       </note>
+      </listitem>
+     </varlistentry>
+
       <varlistentry xml:id="ini.doc-root">
        <term>
         <parameter>doc_root</parameter>

Modified: phpdoc/de/trunk/reference/mysqli/ini.xml
===================================================================
--- phpdoc/de/trunk/reference/mysqli/ini.xml	2009-12-07 21:27:21 UTC (rev 291837)
+++ phpdoc/de/trunk/reference/mysqli/ini.xml	2009-12-07 21:47:41 UTC (rev 291838)
@@ -188,7 +188,20 @@
     </para>
    </listitem>
   </varlistentry>
- </variablelist>
+
+  <varlistentry xml:id="ini.mysqli.reconnect">
+   <term>
+    <parameter>mysqli.reconnect</parameter>
+    <type>integer</type>
+   </term>
+   <listitem>
+    <para>
+     Automatischer Neuaufbau der Verbindung, falls die Verbindung getrennt wird.
+    </para>
+   </listitem>
+  </varlistentry>
+
+  </variablelist>
  </para>
 </section>