nlopess Sat Jun 5 05:27:18 2004 EDT
Modified files:
/phpdoc/en/install/windows apache2.xml
Log:
fix instructions for PHP 5
http://cvs.php.net/diff.php/phpdoc/en/install/windows/apache2.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/install/windows/apache2.xml
diff -u phpdoc/en/install/windows/apache2.xml:1.3
phpdoc/en/install/windows/apache2.xml:1.4
--- phpdoc/en/install/windows/apache2.xml:1.3 Fri Jun 4 16:29:35 2004
+++ phpdoc/en/install/windows/apache2.xml Sat Jun 5 05:27:17 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<sect1 id="install.windows.apache2">
<title>Apache 2.0.x on Microsoft Windows</title>
<para>
@@ -49,11 +49,16 @@
configuration file to set up the CGI binary:
<example>
<title>PHP and Apache 2.0 as CGI</title>
- <programlisting role="apache">
+ <programlisting role="apache-conf">
<![CDATA[
ScriptAlias /php/ "c:/php/"
AddType application/x-httpd-php .php
+
+# For PHP 4
Action application/x-httpd-php "/php/php.exe"
+
+# For PHP 5
+Action application/x-httpd-php "/php/php-cgi.exe"
]]>
</programlisting>
</example>
@@ -77,14 +82,14 @@
PHP module for Apache 2.0:
<example>
<title>PHP and Apache 2.0 as Module</title>
- <programlisting role="apache">
+ <programlisting role="apache-conf">
<![CDATA[
# For PHP 4 do something like this:
LoadModule php4_module "c:/php/sapi/php4apache2.dll"
AddType application/x-httpd-php .php
# For PHP 5 do something like this:
-LoadModule php5_module "c:/php/sapi/php5apache2.dll"
+LoadModule php5_module "c:/php/php5apache2.dll"
AddType application/x-httpd-php .php
]]>
</programlisting>
@@ -96,7 +101,7 @@
path to PHP in the above examples. Take care to use
either <filename>php4apache2.dll</filename> or
<filename>php5apache2.dll</filename> in your LoadModule directive and
- <emphasis>not</emphasis><filename>php4apache.dll</filename> or
+ <emphasis>not</emphasis> <filename>php4apache.dll</filename> or
<filename>php5apache.dll</filename> as the latter ones are designed to
run with <link linkend="install.windows.apache1">Apache 1.3.x</link>.
</simpara>
