aharvey Thu, 02 Dec 2010 03:26:37 +
Revision: http://svn.php.net/viewvc?view=revision&revision=305899
Log:
Minimal fix for bug #53440 (INSTALL file refers to php.ini-dist, should refer
to php.ini-production). There are a lot more issues with the INSTALL file,
though, which I'll file another bug for.
Bug: http://bugs.php.net/53440 (Assigned) INSTALL file refers to php.ini-dist,
should refer to php.ini-production
Changed paths:
U php/php-src/branches/PHP_5_3/INSTALL
U php/php-src/trunk/INSTALL
Modified: php/php-src/branches/PHP_5_3/INSTALL
===
--- php/php-src/branches/PHP_5_3/INSTALL2010-12-02 02:43:25 UTC (rev
305898)
+++ php/php-src/branches/PHP_5_3/INSTALL2010-12-02 03:26:37 UTC (rev
305899)
@@ -279,8 +279,16 @@
it is your first install then you need to "make install" as well)
13. cd ../php-5.x.y
-14. cp php.ini-dist /usr/local/lib/php.ini
+14. The PHP distribution provides two sample php.ini files, you can use them
+by
+ cp php.ini-development /usr/local/lib/php.ini
+or
+ cp php.ini-production /usr/local/lib/php.ini
+
+If you choose one of these php.ini files be certain to read the list
+of changes within, as they affect how PHP behaves.
+
15. You can edit /usr/local/lib/php.ini file to set PHP options.
Edit your httpd.conf or srm.conf file and add:
AddType application/x-httpd-php .php
@@ -451,15 +459,19 @@
13. Setup your php.ini
-cp php.ini-dist /usr/local/lib/php.ini
+The PHP distribution provides two sample php.ini files, you can use them
+by
+ cp php.ini-development /usr/local/lib/php.ini
+or
+ cp php.ini-production /usr/local/lib/php.ini
+If you choose one of these php.ini files be certain to read the list
+of changes within, as they affect how PHP behaves.
+
You may edit your .ini file to set PHP options. If you prefer having
php.ini in another location, use --with-config-file-path=/some/path in
step 10.
-If you instead choose php.ini-recommended, be certain to read the list
-of changes within, as they affect how PHP behaves.
-
14. Edit your httpd.conf to load the PHP module. The path on the right hand
side of the LoadModule statement must point to the path of the PHP
module on your system. The make install from above may have already
@@ -858,7 +870,7 @@
Example 2-6. OpenBSD Package Install Example
# pkg_add php4-core-4.3.8.tgz
# /usr/local/sbin/phpxs -s
-# cp /usr/local/share/doc/php4/php.ini-recommended /var/www/conf/php.ini
+# cp /usr/local/share/doc/php4/php.ini-development /var/www/conf/php.ini
(add in mysql)
# pkg_add php4-mysql-4.3.8.tgz
# /usr/local/sbin/phpxs -a mysql
@@ -1242,10 +1254,10 @@
back to the root of the Apache source directory and run the above
configure command again. That'll bring the link table up to date.
Run make and make install again.
-7. Copy and rename the php.ini-dist file to your bin directory from
- your PHP 4 source directory: cp php.ini-dist /usr/local/bin/php.ini
- or (if your don't have a local directory) cp php.ini-dist
- /usr/bin/php.ini.
+7. Copy and rename the php.ini-development or php.ini-production file to
+ your bin directory from your PHP 4 source directory:
+ cp php.ini-development /usr/local/bin/php.ini or (if your don't have a
+ local directory) cp php.ini-development /usr/bin/php.ini.
__
Compiling for MacOS X Client
@@ -1735,8 +1747,8 @@
example, set it with something like:
--with-config-file-path=/etc
- And then you would copy php.ini-dist from the distribution to
- /etc/php.ini and edit it to make any local changes you want.
+ And then you would copy php.ini-development or php.ini-production from the
+ distribution to /etc/php.ini and edit it to make any local changes you want.
--with-config-file-scan-dir=PATH
On Windows the default path for the php.ini file is the Windows
Modified: php/php-src/trunk/INSTALL
===
--- php/php-src/trunk/INSTALL 2010-12-02 02:43:25 UTC (rev 305898)
+++ php/php-src/trunk/INSTALL 2010-12-02 03:26:37 UTC (rev 305899)
@@ -279,8 +279,16 @@
it is your first install then you need to "make install" as well)
13. cd ../php-5.x.y
-14. cp php.ini-dist /usr/local/lib/php.ini
+14. The PHP distribution provides two sample php.ini files, you can use them
+by
+ cp php.ini-development /usr/local/lib/php.ini
+or
+ cp php.ini-production /usr/local/lib/php.ini
+
+If you choose one of these php.ini files be certain to read the list
+of changes within, as they affect how PHP behaves.
+
15. You can edit /usr/local/lib/php.ini file to set PHP options.
Edit your httpd.conf or srm.conf file and add:
