summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--sapi/apache/php_apache.c15
2 files changed, 16 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index ce8123ee22..e282067b11 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2004, PHP 5.1.0
+- Add apache_reset_timeout() Apache1 function. (Rasmus)
- Make request start time be available via $_SERVER['REQUEST_TIME']. (Ilia)
- Allow gettimeofday() return a float if optional argument is specified. (Ilia)
- Added sqlite_fetch_column_types() 3rd argument for arrays. (Ilia)
diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index a52e95d19b..6f98f3ecc9 100644
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -47,6 +47,7 @@ PHP_FUNCTION(apache_child_terminate);
PHP_FUNCTION(apache_setenv);
PHP_FUNCTION(apache_get_version);
PHP_FUNCTION(apache_get_modules);
+PHP_FUNCTION(apache_reset_timeout);
PHP_MINFO_FUNCTION(apache);
@@ -536,6 +537,20 @@ PHP_FUNCTION(apache_get_modules)
}
/* }}} */
+/* {{{ proto array apache_reset_timeout(void)
+ Reset the Apache write timer */
+PHP_FUNCTION(apache_reset_timeout)
+{
+ if (PG(safe_mode)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot reset the Apache timeout in safe mode");
+ RETURN_FALSE;
+ }
+
+ ap_reset_timeout((request_rec *)SG(server_context));
+ RETURN_TRUE;
+}
+/* }}} */
+
/*
* Local variables:
* tab-width: 4