cvs: phpdoc /en/install snippet.apache2.compat.xml /en/install/unix apache1.xml

nlopess Wed Nov 30 19:12:13 2005 EDT Modified files: /phpdoc/en/install snippet.apache2.compat.xml /phpdoc/en/install/unix apache1.xml Log: fix #35279: also refer PHP 5 http://cvs.php.net/diff.php/phpdoc/en/install/snippet.apache2.compat.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/install/snippet.apache2.compat.xml diff -u phpdoc/en/install/snippet.apache2.compat.xml:1.3 phpdoc/en/install/snippet.apache2.compat.xml:1.4 --- phpdoc/en/install/snippet.apache2.compat.xml:1.3 Thu Mar 17 11:05:11 2005 +++ phpdoc/en/install/snippet.apache2.compat.xml Wed Nov 30 19:12:10 2005 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <note> <title>PHP and Apache 2.0.x compatibility notes</title> <para> @@ -15,10 +15,10 @@ <listitem> <simpara> the latest stable development version. - Get the source code <ulink url="&url.php.snapshots;php4-latest.tar.gz"> - &url.php.snapshots;php4-latest.tar.gz</ulink> or download binaries - for Windows <ulink url="&url.php.snapshots;win32/php4-win32-latest.zip"> - &url.php.snapshots;win32/php4-win32-latest.zip</ulink>. + Get the source code <ulink url="&url.php.snapshots;php5-latest.tar.gz"> + &url.php.snapshots;php5-latest.tar.gz</ulink> or download binaries + for Windows <ulink url="&url.php.snapshots;win32/php5-win32-latest.zip"> + &url.php.snapshots;win32/php5-win32-latest.zip</ulink>. </simpara> </listitem> <listitem> http://cvs.php.net/diff.php/phpdoc/en/install/unix/apache1.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/install/unix/apache1.xml diff -u phpdoc/en/install/unix/apache1.xml:1.4 phpdoc/en/install/unix/apache1.xml:1.5 --- phpdoc/en/install/unix/apache1.xml:1.4 Mon Oct 17 08:31:32 2005 +++ phpdoc/en/install/unix/apache1.xml Wed Nov 30 19:12:13 2005 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <sect1 id="install.unix.apache"> <title>Apache 1.3.x on Unix systems</title> <para> @@ -122,23 +122,23 @@ 3. ./configure 4. cd .. -5. gunzip -c php-4.x.y.tar.gz | tar xf - -6. cd php-4.x.y +5. gunzip -c php-5.x.y.tar.gz | tar xf - +6. cd php-5.x.y 7. ./configure --with-mysql --with-apache=../apache_1.3.x 8. make 9. make install 10. cd ../apache_1.3.x -11. ./configure --prefix=/www --activate-module=src/modules/php4/libphp4.a - (The above line is correct! Yes, we know libphp4.a does not exist at this +11. ./configure --prefix=/www --activate-module=src/modules/php5/libphp5.a + (The above line is correct! Yes, we know libphp5.a does not exist at this stage. It isn't supposed to. It will be created.) 12. make (you should now have an httpd binary which you can copy to your Apache bin dir if it is your first install then you need to "make install" as well) -13. cd ../php-4.x.y +13. cd ../php-5.x.y 14. cp php.ini-dist /usr/local/lib/php.ini 15. You can edit /usr/local/lib/php.ini file to set PHP options. @@ -149,8 +149,8 @@ </example> <note> <para> - Replace <literal>php-4</literal> by <literal>php-5</literal> and - <literal>php4</literal> by <literal>php5</literal> in PHP 5. + Replace <literal>php-5</literal> by <literal>php-4</literal> and + <literal>php5</literal> by <literal>php4</literal> in PHP 4. </para> </note> @@ -203,11 +203,10 @@ </informalexample> </para> <para> - This will create a <filename>libphp4.so</filename> shared - library that is loaded into Apache using a LoadModule line in - Apache's &httpd.conf; file. The PostgreSQL - support is embedded into this <filename>libphp4.so</filename> - library. + This will create a <filename>libphp5.so</filename> (or + <filename>libphp4.so</filename> in PHP 4) shared library that is loaded + into Apache using a LoadModule line in Apache's &httpd.conf; file. The + PostgreSQL support is embedded into this library. </para> <para> <informalexample> @@ -236,15 +235,15 @@ </informalexample> </para> <para> - This will create a <filename>libmodphp4.a</filename> library, a - <filename>mod_php4.c</filename> and some accompanying files and - copy this into the <literal>src/modules/php4</literal> directory + This will create a <filename>libmodphp5.a</filename> library, a + <filename>mod_php5.c</filename> and some accompanying files and + copy this into the <literal>src/modules/php5</literal> directory in the Apache source tree. Then you compile Apache using - <literal>--activate-module=src/modules/php4/libphp4.a</literal> + <literal>--activate-module=src/modules/php5/libphp5.a</literal> and the Apache build system will create - <filename>libphp4.a</filename> and link it statically into the - <filename>httpd</filename> binary (replace <literal>php4</literal> by - <literal>php5</literal> in PHP 5). The PostgreSQL support is + <filename>libphp5.a</filename> and link it statically into the + <filename>httpd</filename> binary (replace <literal>php5</literal> by + <literal>php4</literal> in PHP 4). The PostgreSQL support is included directly into this <filename>httpd</filename> binary, so the final result here is a single <filename>httpd</filename> binary that includes all of Apache and all of PHP.