goba Fri Jun 4 06:30:07 2004 EDT
Modified files:
/phpdoc/en/install problems.xml
/phpdoc/en/install/macos client.xml index.xml packages.xml
server.xml
/phpdoc/en/install/windows apache1.xml apache2.xml extensions.xml
index.xml installer.xml
Log:
reviewing IDs, fixing intro text for MacOS installations, splitting syntax highlight
info to the CGI and SAPI part of the Apache 1 docs, adding sections for the CGI and
SAPI part so users will be able to identify what they are interested in really
http://cvs.php.net/diff.php/phpdoc/en/install/problems.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/install/problems.xml
diff -u phpdoc/en/install/problems.xml:1.1 phpdoc/en/install/problems.xml:1.2
--- phpdoc/en/install/problems.xml:1.1 Thu Jun 3 18:45:11 2004
+++ phpdoc/en/install/problems.xml Fri Jun 4 06:30:06 2004
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<chapter id="install.problems">
<title>Problems?</title>
- <sect1>
+ <sect1 id="install.problems.faq">
<title>Read the FAQ</title>
<simpara>
Some problems are more common than others. The most
@@ -13,7 +13,7 @@
</simpara>
</sect1>
- <sect1 id="install.otherproblems">
+ <sect1 id="install.problems.support">
<title>Other problems</title>
<simpara>
@@ -37,7 +37,7 @@
</simpara>
</sect1>
- <sect1 id="install.bugreports">
+ <sect1 id="install.problems.bugs">
<title>Bug reports</title>
<simpara>
If you think you have found a bug in PHP, please report it. The
http://cvs.php.net/diff.php/phpdoc/en/install/macos/client.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/install/macos/client.xml
diff -u phpdoc/en/install/macos/client.xml:1.3 phpdoc/en/install/macos/client.xml:1.4
--- phpdoc/en/install/macos/client.xml:1.3 Thu Jun 3 19:44:55 2004
+++ phpdoc/en/install/macos/client.xml Fri Jun 4 06:30:07 2004
@@ -1,17 +1,22 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<sect1 id="install.macosx.client">
- <title>Compiling for MacOS X client</title>
+ <title>Compiling for MacOS X Client</title>
+
+ <!-- TODO: verify these instructions (the wget URL below does not seem to work for
me)
+ Goba - June 04. 2004. -->
+
<simpara>
- Those tips are graciously provided by <ulink url="&url.macosx;">Marc
Liyanage</ulink>.
- </simpara>
- <simpara>
- The PHP module for the Apache web server included in Mac OS X.
- This version includes support for the MySQL and PostgreSQL databases.
- </simpara>
- <simpara>
- NOTE: Be careful when you do this, you could screw up your Apache web server!
+ The following instructions will help you install a PHP module for the Apache
+ web server included in MacOS X. This version includes support for the MySQL
+ and PostgreSQL databases. These instructions are graciously provided by
+ <ulink url="&url.macosx;">Marc Liyanage</ulink>.
</simpara>
+ <warning>
+ <para>
+ Be careful when you do this, you could screw up your Apache web server!
+ </para>
+ </warning>
<para>
Do this to install:
<orderedlist>
http://cvs.php.net/diff.php/phpdoc/en/install/macos/index.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/install/macos/index.xml
diff -u phpdoc/en/install/macos/index.xml:1.3 phpdoc/en/install/macos/index.xml:1.4
--- phpdoc/en/install/macos/index.xml:1.3 Thu Jun 3 19:45:15 2004
+++ phpdoc/en/install/macos/index.xml Fri Jun 4 06:30:07 2004
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<chapter id="install.macosx">
<title>Installation on Mac OS X</title>
<para>
This section contains notes and hints specific to installing
- PHP on Mac OS X.
+ PHP on Mac OS X. There are two slightly different versions of
+ Mac OS X, Client and Server, our manual deals with installing
+ PHP on both systems. Note that PHP is not available for MacOS
+ 9 and earlier versions.
</para>
&install.macosx.packages;
&install.macosx.server;
http://cvs.php.net/diff.php/phpdoc/en/install/macos/packages.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/install/macos/packages.xml
diff -u phpdoc/en/install/macos/packages.xml:1.3
phpdoc/en/install/macos/packages.xml:1.4
--- phpdoc/en/install/macos/packages.xml:1.3 Thu Jun 3 19:45:15 2004
+++ phpdoc/en/install/macos/packages.xml Fri Jun 4 06:30:07 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<sect1 id="install.macosx.packages">
<title>Using Packages</title>
<simpara>
@@ -12,6 +12,9 @@
checking whether somebody has already built a packaged
version of PHP with the features you need.
</simpara>
+
+ <!-- TODO: list some packages here, if possible -->
+
</sect1>
<!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/phpdoc/en/install/macos/server.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/install/macos/server.xml
diff -u phpdoc/en/install/macos/server.xml:1.3 phpdoc/en/install/macos/server.xml:1.4
--- phpdoc/en/install/macos/server.xml:1.3 Thu Jun 3 19:45:15 2004
+++ phpdoc/en/install/macos/server.xml Fri Jun 4 06:30:07 2004
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<sect1 id="install.macosx.server">
<title>Compiling for OS X Server</title>
- <simpara>
- There are two slightly different versions of Mac OS X, client and
- server. The following is for OS X Server.
- </simpara>
- <formalpara id="install.macosx.compile.example">
- <title>Mac OS X server install</title>
+
+ <formalpara id="install.macosx.server.compile">
+ <title>Mac OS X Server install</title>
<para>
<orderedlist>
<listitem>
@@ -34,7 +31,7 @@
</listitem>
<listitem>
<para>
- If you want the compiler to do some optimization., you may also want to
+ If you want the compiler to do some optimization, you may also want to
add this line:
<programlisting role="shell">
<![CDATA[
@@ -86,11 +83,11 @@
--activate-module=src/modules/php4/libphp4.a
]]>
</programlisting>
- You may get a message telling you that libmodphp4.a is out of date. If
- so, go to the <filename class="directory">src/modules/php4</filename>
- directory inside your apache source directory and run this command:
+ You may get a message telling you that <filename>libmodphp4.a</filename> is
+ out of date. If so, go to the <filename
class="directory">src/modules/php4</filename>
+ directory inside your Apache source directory and run this command:
<command>ranlib libmodphp4.a</command>. Then go back to the root of the
- apache source directory and run the above <command>configure</command>
+ Apache source directory and run the above <command>configure</command>
command again. That'll bring the link table up to date. Run
<command>make</command> and <command>make install</command> again.
</para>
http://cvs.php.net/diff.php/phpdoc/en/install/windows/apache1.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/install/windows/apache1.xml
diff -u phpdoc/en/install/windows/apache1.xml:1.1
phpdoc/en/install/windows/apache1.xml:1.2
--- phpdoc/en/install/windows/apache1.xml:1.1 Thu Jun 3 18:45:11 2004
+++ phpdoc/en/install/windows/apache1.xml Fri Jun 4 06:30:07 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<sect1 id="install.windows.apache1">
<title>Apache 1.3.x on Microsft Windows</title>
<para>
@@ -11,10 +11,10 @@
<simpara>
There are two ways to set up PHP to work with Apache 1.3.x
- on Windows. One is to use the CGI binary (php.exe),
+ on Windows. One is to use the CGI binary (<filename>php.exe</filename>),
the other is to use the Apache module DLL. In either case
- you need to stop the Apache server, and edit your
- &httpd.conf; to configure Apache to work with PHP.
+ you need to edit your &httpd.conf; to configure Apache to
+ work with PHP, and then restart the server.
</simpara>
<simpara>
It is worth noting here that now the SAPI module has been
@@ -24,99 +24,129 @@
<simpara>
Although there can be a few variations of configuring PHP
under Apache, these are simple enough to be used by the
- newcomer. Please consult the Apache Docs for further
+ newcomer. Please consult the Apache Documentation for further
configuration directives.
</simpara>
- <para>
- If you unziped the PHP package to <filename>c:\php\</filename> as described
- in the <link linkend="install.windows.manual">Manual
- Installation Steps</link> section, you need to insert
- these lines to your Apache configuration file to set
- up the CGI binary:
- <itemizedlist>
- <listitem>
- <simpara>
- <literal>
- ScriptAlias /php/ "c:/php/"
- </literal>
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- <literal>
- AddType application/x-httpd-php .php .phtml
- </literal>
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- <literal>
- Action application/x-httpd-php "/php/php.exe"
- </literal>
- </simpara>
- </listitem>
- </itemizedlist>
- Note that the second line in the list above can be found
- in the actual versions of &httpd.conf;, but it is commented out. Remember
- also to substitute the <filename>c:/php/</filename> for your actual path to
- PHP.
+ <sect2 id="install.windows.apache1.cgi">
+ <title>Installing as a CGI binary</title>
+
+ <para>
+ If you unziped the PHP package to <filename>c:\php\</filename> as described
+ in the <link linkend="install.windows.manual">Manual
+ Installation Steps</link> section, you need to insert
+ these lines to your Apache configuration file to set
+ up the CGI binary:
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ <literal>
+ ScriptAlias /php/ "c:/php/"
+ </literal>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ <literal>
+ AddType application/x-httpd-php .php .phtml
+ </literal>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ <literal>
+ Action application/x-httpd-php "/php/php.exe"
+ </literal>
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ Note that the second line in the list above can be found
+ in the actual versions of &httpd.conf;, but it is commented out. Remember
+ also to substitute the <filename>c:/php/</filename> for your actual path to
+ PHP.
</para>
- <warning>
+ <warning>
+ <para>
+ By using the CGI setup, your server is open
+ to several possible attacks. Please read
+ our <link linkend="security.cgi-bin">CGI security
+ section</link> to learn how to defend yourself from
+ those attacks.
+ </para>
+ </warning>
+
+ <simpara>
+ If you would like to present PHP source files syntax highlighted, there
+ is no such convinient option as with the module version of PHP.
+ If you chose to configure Apache to use PHP as a CGI binary, you
+ will need to use the <function>show_source</function> function. To
+ do this simply create a PHP script file and add this code:
+ <literal><?php show_source("original_php_script.php"); ?></literal>.
+ Substitute <filename>original_php_script.php</filename> with
+ the name of the file you wish to show the source of.
+ </simpara>
+ </sect2>
+
+ <sect2 id="install.windows.apache1.cgi">
+ <title>Installing as an Apache module</title>
+
<para>
- By using the CGI setup, your server is open
- to several possible attacks. Please read
- our <link linkend="security.cgi-bin">CGI security
- section</link> to learn how to defend yourself from attacks.
+ If you would like to use PHP as a module in Apache, be sure to copy
+ <filename>php4ts.dll</filename> to the <filename>windows/system</filename>
+ (for Windows 9x/Me), <filename>winnt/system32</filename> (for Windows
+ NT/2000) or <filename>windows/system32</filename> (for Windows XP)
+ directory, overwriting any older file. Then you should add the following
+ lines to your Apache &httpd.conf; file:
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ Open &httpd.conf; with your favorite editor and locate the
+ <literal>LoadModule</literal> directive and add the following line
+ <emphasis>at the end</emphasis> of the list for PHP 4:
+ <literal>LoadModule php4_module "c:/php/sapi/php4apache.dll"</literal>
+ or the following for PHP 5:
+ <literal>LoadModule php5_module "c:/php/sapi/php5apache.dll"</literal>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ You may find after using the Windows installer for Apache that you need
+ to define the <literal>AddModule</literal> directive for
+ <filename>mod_php4.c</filename>. This is especially important if the
+ <literal>ClearModuleList</literal> directive is defined, which you will
+ find by scrolling down a few lines. You will see a list of
+ <literal>AddModule</literal> entries, add the following line
+ <emphasis>at the end</emphasis> of the list:
+ <literal>AddModule mod_php4.c</literal> For PHP 5, instead use
+ <literal>AddModule mod_php5.c</literal>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Search for a phrase similar to
+ <literal># AddType allows you to tweak mime.types</literal>. You will
+ see some <literal>AddType</literal> entries, add the following line
+ <emphasis>at the end</emphasis> of the list:
+ <literal>AddType application/x-httpd-php .php</literal>.
+ You can choose any extension you want to parse through PHP here. .php
+ is simply the one we suggest. You can even include .html, and .php3
+ can be added for backwards compatibility.
+ </simpara>
+ </listitem>
+ </itemizedlist>
</para>
- </warning>
-
- <para>
- If you would like to use PHP as a module in Apache, be sure to copy
- <filename>php4ts.dll</filename> to the <filename>windows/system</filename>
- (for Windows 9x/Me), <filename>winnt/system32</filename> (for Windows
- NT/2000) or <filename>windows/system32</filename> (for Windows XP)
- directory, overwriting any older file. Then you should add the following
- lines to your Apache &httpd.conf; file:
- <itemizedlist>
- <listitem>
- <simpara>
- Open &httpd.conf; with your favorite editor and locate the
- <literal>LoadModule</literal> directive and add the following line
- <emphasis>at the end</emphasis> of the list for PHP 4:
- <literal>LoadModule php4_module "c:/php/sapi/php4apache.dll"</literal>
- or the following for PHP 5:
- <literal>LoadModule php5_module "c:/php/sapi/php5apache.dll"</literal>
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- You may find after using the Windows installer for Apache that you need
- to define the <literal>AddModule</literal> directive for
- <filename>mod_php4.c</filename>. This is especially important if the
- <literal>ClearModuleList</literal> directive is defined, which you will
- find by scrolling down a few lines. You will see a list of
- <literal>AddModule</literal> entries, add the following line
- <emphasis>at the end</emphasis> of the list:
- <literal>AddModule mod_php4.c</literal> For PHP 5, instead use
- <literal>AddModule mod_php5.c</literal>
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- Search for a phrase similar to
- <literal># AddType allows you to tweak mime.types</literal>. You will
- see some <literal>AddType</literal> entries, add the following line
- <emphasis>at the end</emphasis> of the list:
- <literal>AddType application/x-httpd-php .php</literal>.
- You can choose any extension you want to parse through PHP here. .php
- is simply the one we suggest. You can even include .html, and .php3
- can be added for backwards compatibility.
- </simpara>
- </listitem>
- </itemizedlist>
- </para>
+
+ <simpara>
+ If you would like to use the source code highlighting feature, you need
+ to add the following line to your &httpd.conf;:
+ <literal>AddType application/x-httpd-php-source .phps</literal>.
+ This should be inserted at the same place where you inserted
+ <literal>AddType application/x-httpd-php .php</literal> above). With
+ this setup, all files served with the <literal>.phps</literal> extension
+ will be syntax highlighted for the browser.
+ </simpara>
+ </sect2>
<simpara>
After changing the configuration file, remember to restart the server, for
@@ -125,33 +155,16 @@
Service, or use your regular shortcuts.
</simpara>
- <simpara>
- There are two ways you can use the source code highlighting feature,
- however their ability to work depends on your installation. If you have
- configured Apache to use PHP as an SAPI module, then by adding the
- following line to your &httpd.conf; (at the same place you inserted
- <literal>AddType application/x-httpd-php .php</literal>, see above) you can
- use this feature:
- <literal>AddType application/x-httpd-php-source .phps</literal>.
- </simpara>
- <simpara>
- If you chose to configure Apache to use PHP as a CGI binary, you
- will need to use the <function>show_source</function> function. To
- do this simply create a PHP script file and add this code:
- <literal><?php show_source ("original_php_script.php"); ?></literal>.
- Substitute <literal>original_php_script.php</literal> with
- the name of the file you wish to show the source of.
- </simpara>
-
<note>
<simpara>
- On Win-Apache all backslashes in a path statement such
- as "c:\directory\file.ext", must be converted to
- forward slashes, as "c:/directory/file.ext".
+ Remember that when adding path values in the Apache configuration
+ files on Windows, all backslashes such as
+ <filename>c:\directory\file.ext</filename>
+ must be converted to forward slashes, as
+ <filename>c:/directory/file.ext</filename>.
</simpara>
</note>
- </sect2>
- </sect1>
+ </sect1>
<!-- Keep this comment at the end of the file
Local variables:
http://cvs.php.net/diff.php/phpdoc/en/install/windows/apache2.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/install/windows/apache2.xml
diff -u phpdoc/en/install/windows/apache2.xml:1.1
phpdoc/en/install/windows/apache2.xml:1.2
--- phpdoc/en/install/windows/apache2.xml:1.1 Thu Jun 3 18:45:11 2004
+++ phpdoc/en/install/windows/apache2.xml Fri Jun 4 06:30:07 2004
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<sect1 id="install.windows.apache2">
<title>Apache 2.0.x on Microsoft Windows</title>
<para>
This section contains notes and hints specific to Apache 2.0.x installs
of PHP on Microsoft Windows systems. We also
have <link linkend="install.windows.apache1">instructions and notes
- for Apache 1.3.x on a separate page</link>.
+ for Apache 1.3.x users on a separate page</link>.
</para>
<warning>
<para>
@@ -14,11 +14,11 @@
environment neither on Unix nor on Windows.
</para>
</warning>
- <para>
- You are highly encouraged to take a look at the
- <ulink url="&url.apache2.docs;">Apache Documentation</ulink> to get
- a basic understanding of the Apache 2.0.x Server.
- </para>
+ <para>
+ You are highly encouraged to take a look at the
+ <ulink url="&url.apache2.docs;">Apache Documentation</ulink> to get
+ a basic understanding of the Apache 2.0.x Server.
+ </para>
<sect2 id="compat.apache2">
<title>PHP and Apache 2.0.x compatibility notes</title>
http://cvs.php.net/diff.php/phpdoc/en/install/windows/extensions.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/install/windows/extensions.xml
diff -u phpdoc/en/install/windows/extensions.xml:1.1
phpdoc/en/install/windows/extensions.xml:1.2
--- phpdoc/en/install/windows/extensions.xml:1.1 Thu Jun 3 18:45:11 2004
+++ phpdoc/en/install/windows/extensions.xml Fri Jun 4 06:30:07 2004
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<sect1 id="install.windows.extensions">
- <title>Installation of Windows extensions</title>
+ <title>Installation of extensions on Windows</title>
<para>
After installing PHP and a webserver on Windows, you will probably want to
install some extensions for added functionality. You can choose which
@@ -21,7 +21,7 @@
<emphasis>built in</emphasis>. You don't need to load any additional
extensions in order to use these functions. See your distributions
<filename>README.txt</filename> or <filename>install.txt</filename>
- or <link linkend ="install.extensions.overview">this table</link>
+ or <link linkend ="install.windows.extensions.overview">this table</link>
for a list of built in modules.
</para>
</note>
@@ -98,7 +98,7 @@
<para>
The following table describes some of the extensions available and required
additional dlls.
- <table id="install.extensions.overview">
+ <table id="install.windows.extensions.overview">
<title>PHP Extensions</title>
<tgroup cols="3">
<thead>
http://cvs.php.net/diff.php/phpdoc/en/install/windows/index.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/install/windows/index.xml
diff -u phpdoc/en/install/windows/index.xml:1.2 phpdoc/en/install/windows/index.xml:1.3
--- phpdoc/en/install/windows/index.xml:1.2 Fri Jun 4 05:43:10 2004
+++ phpdoc/en/install/windows/index.xml Fri Jun 4 06:30:07 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<chapter id="install.windows">
<title>Installation on Windows systems</title>
<para>
http://cvs.php.net/diff.php/phpdoc/en/install/windows/installer.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/install/windows/installer.xml
diff -u phpdoc/en/install/windows/installer.xml:1.1
phpdoc/en/install/windows/installer.xml:1.2
--- phpdoc/en/install/windows/installer.xml:1.1 Thu Jun 3 18:45:11 2004
+++ phpdoc/en/install/windows/installer.xml Fri Jun 4 06:30:07 2004
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<sect1 id="install.windows.installer">
<title>Windows InstallShield</title>
<para>
- The Windows PHP installer is available from the downloads page at
+ The Windows PHP installer is available from the downloads page at
<ulink url="&url.php.downloads;">&url.php.downloads;</ulink>. This
installs the <emphasis>CGI version</emphasis> of <literal>PHP</literal>
and, for IIS, PWS, and Xitami, configures the web server as well.
