tony2001 Thu Jan 18 12:37:44 2007 UTC
Modified files:
/php-src/main main.c
Log:
fix fodling, mark set_time_limit() unicode safe
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.719&r2=1.720&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.719 php-src/main/main.c:1.720
--- php-src/main/main.c:1.719 Tue Jan 9 18:38:38 2007
+++ php-src/main/main.c Thu Jan 18 12:37:44 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.719 2007/01/09 18:38:38 helly Exp $ */
+/* $Id: main.c,v 1.720 2007/01/18 12:37:44 tony2001 Exp $ */
/* {{{ includes
*/
@@ -123,7 +123,6 @@
}
/* }}} */
-
/* {{{ php_disable_functions
*/
static void php_disable_functions(TSRMLS_D)
@@ -956,7 +955,7 @@
}
/* }}} */
-/* {{{ proto bool set_time_limit(int seconds)
+/* {{{ proto bool set_time_limit(int seconds) U
Sets the maximum time a script can run */
PHP_FUNCTION(set_time_limit)
{
@@ -1001,22 +1000,25 @@
}
/* }}} */
-static void stream_closer_for_zend(void *handle TSRMLS_DC)
+static void stream_closer_for_zend(void *handle TSRMLS_DC) /* {{{ */
{
php_stream_close((php_stream*)handle);
}
+/* }}} */
-static long stream_fteller_for_zend(void *handle TSRMLS_DC)
+static long stream_fteller_for_zend(void *handle TSRMLS_DC) /* {{{ */
{
return (long)php_stream_tell((php_stream*)handle);
}
+/* }}} */
-static int php_stream_open_for_zend(const char *filename, zend_file_handle
*handle TSRMLS_DC)
+static int php_stream_open_for_zend(const char *filename, zend_file_handle
*handle TSRMLS_DC) /* {{{ */
{
return php_stream_open_for_zend_ex(filename, handle,
ENFORCE_SAFE_MODE|USE_PATH|REPORT_ERRORS|STREAM_OPEN_FOR_INCLUDE TSRMLS_CC);
}
+/* }}} */
-PHPAPI int php_stream_open_for_zend_ex(const char *filename, zend_file_handle
*handle, int mode TSRMLS_DC)
+PHPAPI int php_stream_open_for_zend_ex(const char *filename, zend_file_handle
*handle, int mode TSRMLS_DC) /* {{{ */
{
php_stream *stream;
@@ -1038,6 +1040,7 @@
}
return FAILURE;
}
+/* }}} */
/* {{{ php_get_configuration_directive_for_zend
*/
@@ -1135,12 +1138,12 @@
}
/* }}} */
-
-void php_on_timeout(int seconds TSRMLS_DC)
+void php_on_timeout(int seconds TSRMLS_DC) /* {{{ */
{
PG(connection_status) |= PHP_CONNECTION_TIMEOUT;
zend_set_timeout(EG(timeout_seconds));
}
+/* }}} */
#if PHP_SIGCHILD
/* {{{ sigchld_handler
@@ -1458,7 +1461,6 @@
}
/* }}} */
-
/* {{{ php_com_initialize
*/
PHPAPI void php_com_initialize(TSRMLS_D)
@@ -1528,7 +1530,6 @@
}
/* }}} */
-
/* {{{ php_module_startup
*/
int php_module_startup(sapi_module_struct *sf, zend_module_entry
*additional_modules, uint num_additional_modules)
@@ -1856,7 +1857,6 @@
}
/* }}} */
-
/* {{{ php_execute_script
*/
PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
