From f736e8d6c8c23d96d27a5035a0bbaeaecad35083 Mon Sep 17 00:00:00 2001
From: Nuno Lopes <nlopess@php.net>
Date: Wed, 4 Feb 2004 17:47:00 +0000
Subject: [PATCH] fix #24323 added max_inout_time

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@150510 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/info/functions/set-time-limit.xml | 14 ++++++++-----
 reference/info/ini.xml                      | 23 +++++++++++++++++++--
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/reference/info/functions/set-time-limit.xml b/reference/info/functions/set-time-limit.xml
index 66ed3acab0..eef37c8f43 100644
--- a/reference/info/functions/set-time-limit.xml
+++ b/reference/info/functions/set-time-limit.xml
@@ -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>
 
diff --git a/reference/info/ini.xml b/reference/info/ini.xml
index c16482d87f..e5852242ea 100644
--- a/reference/info/ini.xml
+++ b/reference/info/ini.xml
@@ -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;
@@ -50,6 +50,11 @@
      <entry>"30"</entry>
      <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>
@@ -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>