From 1811650b6e18d6e2e660f30bcf3f799abe4da458 Mon Sep 17 00:00:00 2001
From: Daniel Beckham <danbeck@php.net>
Date: Wed, 27 Jun 2001 03:52:38 +0000
Subject: [PATCH] documented issue in bug #5827

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@50258 c90b9560-bf6c-de11-be94-00142212c4b1
---
 chapters/config.xml | 10 ++++++++--
 functions/info.xml  | 25 +++++++++++++++++++------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/chapters/config.xml b/chapters/config.xml
index ad8c67bd2d..c46bbdfccd 100644
--- a/chapters/config.xml
+++ b/chapters/config.xml
@@ -476,9 +476,15 @@ include_path=".;c:\www\phplib"
        <listitem>
         <para>
          This sets the maximum time in seconds a script is allowed to
-         take before it is terminated by the parser.  This helps
+         run before it is terminated by the parser.  This helps
          prevent poorly written scripts from tying up the server. The
-         default setting is <literal>30</literal>.
+         default setting is <literal>30</literal>.  
+	</para>
+	<para>
+	 The maximum execution time is not affected by system calls,
+	 the <function>sleep</function> function, etc.  Please see the
+	 <function>set_time_limit</function> function for more
+	 details.
         </para>
        </listitem>
       </varlistentry>
diff --git a/functions/info.xml b/functions/info.xml
index 25b73c0592..139de90145 100644
--- a/functions/info.xml
+++ b/functions/info.xml
@@ -1390,10 +1390,10 @@ putenv ("UNIQID=$uniqid");
     <simpara>
      Set the number of seconds a script is allowed to run.  If this is
      reached, the script returns a fatal error.  The default limit is
-     30 seconds or, if it exists, the max_execution_time value defined
-     in the <link linkend="configuration.file">configuration
-   file</link>.  If seconds is set to zero, no time limit is
-     imposed.
+     30 seconds or, if it exists, the
+     <literal>max_execution_time</literal> value defined in the <link
+     linkend="ini.max-execution-time">configuration file</link>.  If
+     seconds is set to zero, no time limit is imposed.
     </simpara>
     <simpara>
      When called, <function>set_time_limit</function> restarts the
@@ -1403,11 +1403,24 @@ putenv ("UNIQID=$uniqid");
      total of 45 seconds before timing out.
     </simpara>
     <simpara>
-     Note that <function>set_time_limit</function> has no effect when
+     <function>set_time_limit</function> has no effect when
      PHP is running in safe mode. There is no workaround other than
      turning off safe mode or changing the time limit in the <link
-   linkend="configuration.file">configuration file</link>.
+     linkend="ini.max-execution-time">configuration file</link>.
     </simpara>
+    <note>
+     <para>
+      The <function>set_time_limit</function> function and the
+      configuration directive <link
+      linkend="ini.max-execution-time">max_execution_time</link> only
+      affect the execution time of the script itself.  Any time spent
+      on activity that happens outside the execution of the script
+      such as system calls using <function>system</function>, the
+      <function>sleep</function> function, database queries, etc. is
+      not included when determining the maximum time that the script
+      has been running.
+     </para>
+    </note>
    </refsect1>
   </refentry>