nlopess Wed Feb 4 12:47:00 2004 EDT
Modified files:
/phpdoc/en/reference/info ini.xml
/phpdoc/en/reference/info/functions set-time-limit.xml
Log:
fix #24323
added max_inout_time
http://cvs.php.net/diff.php/phpdoc/en/reference/info/ini.xml?r1=1.7&r2=1.8&ty=u
Index: phpdoc/en/reference/info/ini.xml
diff -u phpdoc/en/reference/info/ini.xml:1.7 phpdoc/en/reference/info/ini.xml:1.8
--- phpdoc/en/reference/info/ini.xml:1.7 Wed May 14 23:13:06 2003
+++ phpdoc/en/reference/info/ini.xml Wed Feb 4 12:46:59 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<section id="info.configuration">
&reftitle.runtime;
&extension.runtime;
@@ -51,6 +51,11 @@
<entry>PHP_INI_ALL</entry>
</row>
<row>
+ <entry>max_input_time</entry>
+ <entry>"60"</entry>
+ <entry>PHP_INI_ALL</entry>
+ </row>
+ <row>
<entry>magic_quotes_gpc</entry>
<entry>"1"</entry>
<entry>PHP_INI_PERDIR|PHP_INI_SYSTEM</entry>
@@ -171,7 +176,7 @@
</para>
<para>
The maximum execution time is not affected by system calls,
- the <function>sleep</function> function, etc. Please see the
+ stream operations etc. Please see the
<function>set_time_limit</function> function for more
details.
</para>
@@ -183,6 +188,20 @@
</listitem>
</varlistentry>
+ <varlistentry id="ini.max-input-time">
+ <term>
+ <parameter>max_input_time</parameter>
+ <type>integer</type>
+ </term>
+ <listitem>
+ <para>
+ This sets the maximum time in seconds a script is allowed to
+ receive input data, like POST, GET and file uploads. The default setting
+ is <literal>60</literal>.
+ </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="ini.magic-quotes-gpc">
<term>
<parameter>magic_quotes_gpc</parameter>
http://cvs.php.net/diff.php/phpdoc/en/reference/info/functions/set-time-limit.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/reference/info/functions/set-time-limit.xml
diff -u phpdoc/en/reference/info/functions/set-time-limit.xml:1.6
phpdoc/en/reference/info/functions/set-time-limit.xml:1.7
--- phpdoc/en/reference/info/functions/set-time-limit.xml:1.6 Thu Dec 18 06:47:08
2003
+++ phpdoc/en/reference/info/functions/set-time-limit.xml Wed Feb 4 12:47:00
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/info.xml, last change in rev 1.72 -->
<refentry id="function.set-time-limit">
<refnamediv>
@@ -41,12 +41,16 @@
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.
+ such as system calls using <function>system</function>, stream
+ operations, database queries, etc. is not included when determining the
+ maximum time that the script has been running.
</para>
</note>
+ <simpara>
+ See also: <link
+ linkend="ini.max-execution-time">max_execution_time</link> and <link
+ linkend="ini.max-input-time">max_input_time</link> ini directives.
+ </simpara>
</refsect1>
</refentry>
