danbeck         Wed Jun 27 05:52:38 2001 EDT

  Modified files:              
    /phpdoc/en/chapters config.xml 
    /phpdoc/en/functions        info.xml 
  Log:
  documented issue in bug #5827
  
Index: phpdoc/en/chapters/config.xml
diff -u phpdoc/en/chapters/config.xml:1.14 phpdoc/en/chapters/config.xml:1.15
--- phpdoc/en/chapters/config.xml:1.14  Tue Jun 19 22:08:13 2001
+++ phpdoc/en/chapters/config.xml       Wed Jun 27 05:52:38 2001
@@ -476,9 +476,15 @@
        <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>
Index: phpdoc/en/functions/info.xml
diff -u phpdoc/en/functions/info.xml:1.51 phpdoc/en/functions/info.xml:1.52
--- phpdoc/en/functions/info.xml:1.51   Tue Jun 26 13:24:50 2001
+++ phpdoc/en/functions/info.xml        Wed Jun 27 05:52:38 2001
@@ -1390,10 +1390,10 @@
     <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 @@
      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>
 


Reply via email to