vrana Wed Apr 27 04:48:12 2005 EDT
Modified files:
/phpdoc/en/install ini.xml
/phpdoc/en/install/windows manual.xml
Log:
Possible locations of php.ini (bug #21783)
http://cvs.php.net/diff.php/phpdoc/en/install/ini.xml?r1=1.8&r2=1.9&ty=u
Index: phpdoc/en/install/ini.xml
diff -u phpdoc/en/install/ini.xml:1.8 phpdoc/en/install/ini.xml:1.9
--- phpdoc/en/install/ini.xml:1.8 Tue Apr 26 12:21:17 2005
+++ phpdoc/en/install/ini.xml Wed Apr 27 04:48:11 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<chapter id="configuration">
<title>Runtime Configuration</title>
@@ -15,14 +15,46 @@
every invocation.
</simpara>
<para>
- The default location of &php.ini; is a compile time option (see the <link
- linkend="faq.installation.phpini">FAQ</link> entry), but can be changed
- for the <acronym>CGI</acronym> and <acronym>CLI</acronym> version with the
- <literal>-c</literal> command line switch, see the chapter about using
- PHP from the <link
- linkend="features.commandline">command line</link>. You can also use the
- environment variable <varname>PHPRC</varname> for an additional path to
- search for a &php.ini; file.
+ &php.ini; is searched in these locations (in order):
+ <itemizedlist>
+ <listitem>
+ <para>
+ SAPI module specific location (<literal>PHPIniDir</literal> directive
+ in Apache 2, <literal>-c</literal> command line option in CGI and CLI,
+ <literal>php_ini</literal> parameter in NSAPI,
+ <literal>PHP_INI_PATH</literal> environment variable in THTTPD)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>HKEY_LOCAL_MACHINE\SOFTWARE\PHP\IniFilePath</literal>
+ (Windows Registry location)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The <varname>PHPRC</varname> environment variable
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Current working directory (for CLI)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The web server's directory (for SAPI modules), or directory of PHP
+ (otherwise in Windows)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Windows directory (<filename class="directory">C:\windows</filename>
+ or <filename class="directory">C:\winnt</filename>) (for Windows), or
+ <literal>--with-config-file-path</literal> compile time option
+ </para>
+ </listitem>
+ </itemizedlist>
</para>
<para>
If <filename>php-SAPI.ini</filename> exists (where SAPI is used SAPI, so
the
http://cvs.php.net/diff.php/phpdoc/en/install/windows/manual.xml?r1=1.17&r2=1.18&ty=u
Index: phpdoc/en/install/windows/manual.xml
diff -u phpdoc/en/install/windows/manual.xml:1.17
phpdoc/en/install/windows/manual.xml:1.18
--- phpdoc/en/install/windows/manual.xml:1.17 Tue Apr 5 13:24:04 2005
+++ phpdoc/en/install/windows/manual.xml Wed Apr 27 04:48:12 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.18 $ -->
<sect1 id="install.windows.manual">
<title>Manual Installation Steps</title>
@@ -307,37 +307,8 @@
manually yourself. If you would like to achieve the best security, then
this is the way for you, although PHP works fine with these default ini
files. Copy your chosen ini-file to a directory that PHP is able to find
- and rename it to &php.ini;. PHP searches for &php.ini; in the following
- locations (in order):
- <itemizedlist>
- <listitem>
- <para>
- PHPIniDir directive (Apache 2 module only)
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>HKEY_LOCAL_MACHINE\SOFTWARE\PHP\IniFilePath</literal>
- </para>
- </listitem>
- <listitem>
- <para>
- The <varname>PHPRC</varname> environment variable
- </para>
- </listitem>
- <listitem>
- <para>
- Directory of PHP (for CLI), or the web server's directory (for
- SAPI modules)
- </para>
- </listitem>
- <listitem>
- <para>
- Windows directory (<filename class="directory">C:\windows</filename>
- or <filename class="directory">C:\winnt</filename>)
- </para>
- </listitem>
- </itemizedlist>
+ and rename it to &php.ini;. PHP searches for &php.ini; in the locations
+ described in <xref linkend="configuration.file"/> section.
</para>
<para>
If you are running Apache 2, the simpler option is to use the PHPIniDir
