nlopess         Sat Aug  7 15:03:34 2004 EDT

  Modified files:              
    /phpdoc/en  language-snippets.ent 
    /phpdoc/en/install/windows  apache1.xml apache2.xml iis.xml 
                                omnihttpd.xml xitami.xml 
    /phpdoc/en/install/unix     commandline.xml 
  Log:
  fix #25120: warning about CGI installs
  
http://cvs.php.net/diff.php/phpdoc/en/language-snippets.ent?r1=1.116&r2=1.117&ty=u
Index: phpdoc/en/language-snippets.ent
diff -u phpdoc/en/language-snippets.ent:1.116 phpdoc/en/language-snippets.ent:1.117
--- phpdoc/en/language-snippets.ent:1.116       Sat Aug  7 04:21:09 2004
+++ phpdoc/en/language-snippets.ent     Sat Aug  7 15:03:34 2004
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.116 $ -->
+<!-- $Revision: 1.117 $ -->
 <!-- Keep 'em sorted -->
 
 
@@ -107,6 +107,11 @@
 linkend="ref.yaz">YAZ</link> or <link
 linkend="ref.cyrus">Cyrus</link> extensions.  This is due to the fact that they
 both share the same internal symbol.</simpara></warning>'>
+
+<!ENTITY warn.instal.cgi '<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>'>
 
 <!ENTITY note.magicquotes.gpc '<note><title>directive note: magic_quotes_gpc
 </title><para>The PHP directive <link linkend="ini.magic-quotes-gpc">
http://cvs.php.net/diff.php/phpdoc/en/install/windows/apache1.xml?r1=1.7&r2=1.8&ty=u
Index: phpdoc/en/install/windows/apache1.xml
diff -u phpdoc/en/install/windows/apache1.xml:1.7 
phpdoc/en/install/windows/apache1.xml:1.8
--- phpdoc/en/install/windows/apache1.xml:1.7   Thu Aug  5 08:53:24 2004
+++ phpdoc/en/install/windows/apache1.xml       Sat Aug  7 15:03:34 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
    <sect1 id="install.windows.apache1">
     <title>Apache 1.3.x on Microsft Windows</title>
     <para>
@@ -78,17 +78,7 @@
       also to substitute the <filename>c:/php/</filename> for your actual path to
       PHP.
      </para>
-
-     <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>
-    
+     &warn.instal.cgi;
      <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.
http://cvs.php.net/diff.php/phpdoc/en/install/windows/apache2.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/install/windows/apache2.xml
diff -u phpdoc/en/install/windows/apache2.xml:1.6 
phpdoc/en/install/windows/apache2.xml:1.7
--- phpdoc/en/install/windows/apache2.xml:1.6   Mon Aug  2 17:33:03 2004
+++ phpdoc/en/install/windows/apache2.xml       Sat Aug  7 15:03:34 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
    <sect1 id="install.windows.apache2">
     <title>Apache 2.0.x on Microsoft Windows</title>
     <para>
@@ -71,6 +71,7 @@
        </programlisting>
       </example>
      </para>
+     &warn.instal.cgi;
     </sect2>
     
     <sect2 id="install.windows.apache2.module">
http://cvs.php.net/diff.php/phpdoc/en/install/windows/iis.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/install/windows/iis.xml
diff -u phpdoc/en/install/windows/iis.xml:1.4 phpdoc/en/install/windows/iis.xml:1.5
--- phpdoc/en/install/windows/iis.xml:1.4       Thu Aug  5 08:53:24 2004
+++ phpdoc/en/install/windows/iis.xml   Sat Aug  7 15:03:34 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <sect1 id="install.windows.iis">
    <title>Microsoft IIS / PWS</title>
    <para>
@@ -18,6 +18,7 @@
      directive needs to be set to <literal>0</literal>.
     </para>
    </note>
+   &warn.instal.cgi;
 
    <sect2 id="install.windows.iis.iis3">
     <title>Windows and PWS/IIS 3</title>
http://cvs.php.net/diff.php/phpdoc/en/install/windows/omnihttpd.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/install/windows/omnihttpd.xml
diff -u phpdoc/en/install/windows/omnihttpd.xml:1.2 
phpdoc/en/install/windows/omnihttpd.xml:1.3
--- phpdoc/en/install/windows/omnihttpd.xml:1.2 Thu Aug  5 08:44:24 2004
+++ phpdoc/en/install/windows/omnihttpd.xml     Sat Aug  7 15:03:34 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <sect1 id="install.windows.omnihttpd">
    <title>OmniHTTPd Server</title>
    <para>
@@ -12,6 +12,7 @@
      installation steps</link> first!
     </para>
    </note>
+   &warn.instal.cgi;
    <simpara>
     You need to complete the following steps to make PHP
     work with OmniHTTPd. This is a CGI executable setup.
http://cvs.php.net/diff.php/phpdoc/en/install/windows/xitami.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/install/windows/xitami.xml
diff -u phpdoc/en/install/windows/xitami.xml:1.5 
phpdoc/en/install/windows/xitami.xml:1.6
--- phpdoc/en/install/windows/xitami.xml:1.5    Sat Aug  7 13:25:46 2004
+++ phpdoc/en/install/windows/xitami.xml        Sat Aug  7 15:03:34 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
    <sect1 id="install.windows.xitami">
     <title>Xitami on Microsoft Windows</title>
     <para>
@@ -28,7 +28,7 @@
       directive.
      </para>
     </note>
-
+    &warn.instal.cgi;
     <para>
      <itemizedlist>
       <listitem>
http://cvs.php.net/diff.php/phpdoc/en/install/unix/commandline.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/install/unix/commandline.xml
diff -u phpdoc/en/install/unix/commandline.xml:1.1 
phpdoc/en/install/unix/commandline.xml:1.2
--- phpdoc/en/install/unix/commandline.xml:1.1  Tue Jun  8 17:47:58 2004
+++ phpdoc/en/install/unix/commandline.xml      Sat Aug  7 15:03:34 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
   <sect1 id="install.unix.commandline">
    <title>CGI and commandline setups</title>
    <para>
@@ -9,10 +9,9 @@
     server PHP has module support for, you should generally go for
     that solution for performance reasons.  However, the CGI version
     enables users to run different PHP-enabled pages under
-    different user-ids.  Please make sure you read through the <link
-    linkend="security.index">Security chapter</link> if you are going to
-    run PHP as a CGI.
+    different user-ids.
    </para>
+   &warn.instal.cgi;
    <para>
     As of PHP 4.3.0, some important additions have happened to PHP.  A new
     SAPI named CLI also exists and it has the same name as the CGI binary.

Reply via email to