CVS update: php3/functions
| From: | jim | Date: | Mon, 28 Jun 1999 19:47:32 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-7704@lists.php.net to get a copy of this message | ||
Date: Monday June 28, 1999 @ 15:47
Author: jim
Update of /repository/php3/functions
In directory php:/tmp/cvs-serv2348/functions
Modified Files:
basic_functions.c
Log Message:
Remove alarm() stuff. Too much potential for bad interactions with future Apache versions and
third-party libraries.
Index: php3/functions/basic_functions.c
diff -u php3/functions/basic_functions.c:1.269 php3/functions/basic_functions.c:1.270
--- php3/functions/basic_functions.c:1.269 Sat Jun 26 14:03:28 1999
+++ php3/functions/basic_functions.c Mon Jun 28 15:47:32 1999
@@ -28,7 +28,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.269 1999/06/26 18:03:28 jim Exp $ */
+/* $Id: basic_functions.c,v 1.270 1999/06/28 19:47:32 jim Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
@@ -336,9 +336,6 @@
PHP_FE(extract, NULL)
PHP_FE(function_exists, NULL)
-#if 0
- PHP_FE(alarm, NULL)
-#endif
{NULL, NULL, NULL}
};
@@ -619,42 +616,6 @@
RETVAL_LONG(old_error_reporting);
}
/* }}} */
-
-#if 0
-static void _php_alrm_handler(int i)
-{
- signal(SIGALRM, old_alrm_handler);
- old_alrm_handler = NULL;
-}
-
-/* {{{ proto int alarm(int seconds)
- user-level alarm() call. Returns remaining seconds */
-PHP_FUNCTION(alarm)
-{
- pval *value;
- unsigned int remaining = 0;
-
- if(ARG_COUNT(ht) != 1 || getParameters(ht, 1, &value) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- convert_to_long(value);
-
- if(value->value.lval == 0 && old_alrm_handler != NULL) {
- /* deinstall our handler */
- signal(SIGALRM, old_alrm_handler);
- old_alrm_handler = NULL;
- } else if(value->value.lval > 0 && old_alrm_handler == NULL) {
- /* install our handler, if not already installed */
- old_alrm_handler = signal(SIGALRM, _php_alrm_handler);
- }
-
- remaining = alarm(value->value.lval);
-
- RETURN_LONG(remaining);
-}
-/* }}} */
-#endif
/* {{{ proto int short_tags(int state)
Turn the short tags option on or off - returns previous state */