cvs: phpdoc /en/reference/info ini.xml
| From: | Lucas Nealan | Date: | Wed, 20 Aug 2008 08:41:10 +0000 |
| Subject: | cvs: phpdoc /en/reference/info ini.xml | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-2064@lists.php.net to get a copy of this message | ||
lucas Wed Aug 20 08:41:10 2008 UTC
Modified files:
/phpdoc/en/reference/info ini.xml
Log:
add information about max_execution_time having a default setting of 0 in sapi/cli. > clean
some language referring to sapi timeouts
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/info/ini.xml?r1=1.22&r2=1.23&diff_format=u
Index: phpdoc/en/reference/info/ini.xml
diff -u phpdoc/en/reference/info/ini.xml:1.22 phpdoc/en/reference/info/ini.xml:1.23
--- phpdoc/en/reference/info/ini.xml:1.22 Sun May 11 01:54:19 2008
+++ phpdoc/en/reference/info/ini.xml Wed Aug 20 08:41:10 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
<section xml:id="info.configuration" xmlns="http://docbook.org/ns/docbook">
&reftitle.runtime;
&extension.runtime;
@@ -188,7 +188,9 @@
This sets the maximum time in seconds a script is allowed to
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>. When running PHP
+ from the <link linkend="features.commandline">command
+ line</link> the default setting is <literal>0</literal>.
</para>
<para>
The maximum execution time is not affected by system calls,
@@ -202,9 +204,11 @@
by changing the time limit in the &php.ini;.
</para>
<para>
- Your web server can have other timeouts. E.g. Apache has
- <literal>Timeout</literal> directive, IIS has CGI timeout function, both
- default to 300 seconds. See the web server documentation for meaning of it.
+ Your web server can have other timeout configurations that may
+ also interrupt PHP execution. Apache has a
+ <literal>Timeout</literal> directive and IIS has a CGI timeout
+ function. Both default to 300 seconds. See your web server
+ documentation for specific details.
</para>
</listitem>
</varlistentry>