cvs: /php4 main.c
| From: | Stig Bakken | Date: | Tue, 31 Aug 1999 15:39:16 +0000 |
| Subject: | cvs: /php4 main.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-3913@lists.php.net to get a copy of this message | ||
ssb Tue Aug 31 11:39:16 1999 EDT
Modified files:
/php4 main.c
Log:
fix for bug #2165
Index: php4/main.c
diff -u php4/main.c:1.104 php4/main.c:1.105
--- php4/main.c:1.104 Sat Aug 28 10:00:44 1999
+++ php4/main.c Tue Aug 31 11:39:13 1999
@@ -19,7 +19,7 @@
*/
-/* $Id: main.c,v 1.104 1999/08/28 14:00:44 sas Exp $ */
+/* $Id: main.c,v 1.105 1999/08/31 15:39:13 ssb Exp $ */
#include <stdio.h>
@@ -459,14 +459,15 @@
}
+static long php_timeout_seconds;
-
#ifdef HAVE_SETITIMER
static void php3_timeout(int dummy)
{
PLS_FETCH();
- php_error(E_ERROR, "Maximum execution time of %s seconds exceeded",
INI_STR("max_execution_time"));
+ php_error(E_ERROR, "Maximum execution time of %d second%s exceeded",
+ php_timeout_seconds, php_timeout_seconds == 1 ? "" : "s");
}
#endif
@@ -485,6 +486,7 @@
t_r.it_value.tv_sec = seconds;
t_r.it_value.tv_usec = t_r.it_interval.tv_sec = t_r.it_interval.tv_usec = 0;
+ php_timeout_seconds = seconds;
setitimer(ITIMER_PROF, &t_r, NULL);
signal(SIGPROF, php3_timeout);
# endif