", 0);
- xdebug_str_add(&str, xdebug_sprintf("| %d | ", fnr), 1);
- xdebug_str_add(&str, xdebug_sprintf("%0.6f | ", i->time - XG(start_time)), 1);
-#if MEMORY_LIMIT
- xdebug_str_add(&str, xdebug_sprintf("%lu | ", i->memory), 1);
-#endif
- xdebug_str_add(&str, "", 0);
- for (j = 0; j < i->level - 1; j++) {
- xdebug_str_add(&str, " ", 0);
- }
- xdebug_str_add(&str, "-> | ", 0);
-
- tmp_name = xdebug_show_fname(i->function, 0, 0 TSRMLS_CC);
- xdebug_str_add(&str, xdebug_sprintf("%s(", tmp_name), 1);
- xdfree(tmp_name);
-
- if (i->include_filename) {
- xdebug_str_add(&str, i->include_filename, 0);
- }
-
- xdebug_str_add(&str, xdebug_sprintf(") | %s:%d | ", i->filename, i->lineno), 1);
- xdebug_str_add(&str, "
\n", 0);
-
- return str.d;
-}
-
-
-static char* return_trace_stack_frame_begin(function_stack_entry* i, int fnr TSRMLS_DC)
-{
- switch (XG(trace_format)) {
- case 0:
- return return_trace_stack_frame_begin_normal(i TSRMLS_CC);
- case 1:
- return return_trace_stack_frame_begin_computerized(i, fnr);
- case 2:
- return return_trace_stack_frame_begin_html(i, fnr TSRMLS_CC);
- default:
- return xdstrdup("");
- }
-}
-
-
-static char* return_trace_stack_frame_end(function_stack_entry* i, int fnr TSRMLS_DC)
-{
- switch (XG(trace_format)) {
- case 1:
- return return_trace_stack_frame_end_computerized(i, fnr);
- default:
- return xdstrdup("");
- }
-}
-
-static void xdebug_do_jit(TSRMLS_D)
-{
- if (!XG(remote_enabled) && XG(remote_enable) && (XG(remote_mode) == XDEBUG_JIT)) {
- if (XG(remote_connect_back)) {
- zval **remote_addr = NULL;
- zend_hash_find(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), "REMOTE_ADDR", 12, (void**)&remote_addr);
- XG(context).socket = xdebug_create_socket(Z_STRVAL_PP(remote_addr), XG(remote_port));
- } else {
- XG(context).socket = xdebug_create_socket(XG(remote_host), XG(remote_port));
- }
- if (XG(context).socket >= 0) {
- XG(remote_enabled) = 0;
-
- /* Get handler from mode */
- XG(context).handler = xdebug_handler_get(XG(remote_handler));
- if (!XG(context).handler) {
- zend_error(E_WARNING, "The remote debug handler '%s' is not supported.", XG(remote_handler));
- } else if (!XG(context).handler->remote_init(&(XG(context)), XDEBUG_JIT)) {
- /* The request could not be started, ignore it then */
- } else {
- /* All is well, turn off script time outs */
- zend_alter_ini_entry("max_execution_time", sizeof("max_execution_time"), "0", strlen("0"), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
- XG(remote_enabled) = 1;
- }
- }
- }
-}
-
-void xdebug_throw_exception_hook(zval *exception TSRMLS_DC)
-{
- zval *message, *file, *line, *xdebug_message_trace, *previous_exception;
- zend_class_entry *default_ce, *exception_ce;
- xdebug_brk_info *extra_brk_info;
- char *exception_trace;
- xdebug_str tmp_str = { 0, 0, NULL };
-
- if (!exception) {
- return;
- }
-
- default_ce = zend_exception_get_default(TSRMLS_C);
- exception_ce = zend_get_class_entry(exception TSRMLS_CC);
-
- message = zend_read_property(default_ce, exception, "message", sizeof("message")-1, 0 TSRMLS_CC);
- file = zend_read_property(default_ce, exception, "file", sizeof("file")-1, 0 TSRMLS_CC);
- line = zend_read_property(default_ce, exception, "line", sizeof("line")-1, 0 TSRMLS_CC);
-
- if (Z_TYPE_P(message) != IS_STRING || Z_TYPE_P(file) != IS_STRING || Z_TYPE_P(line) != IS_LONG) {
- php_error(E_ERROR, "Your exception class uses incorrect types for common properties: 'message' and 'file' need to be a string and 'line' needs to be an integer.");
- }
-
-#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION >= 6
- previous_exception = zend_read_property(default_ce, exception, "previous", sizeof("previous")-1, 1 TSRMLS_CC);
- if (previous_exception && Z_TYPE_P(previous_exception) != IS_NULL) {
- xdebug_message_trace = zend_read_property(default_ce, previous_exception, "xdebug_message", sizeof("xdebug_message")-1, 1 TSRMLS_CC);
- if (xdebug_message_trace && Z_TYPE_P(xdebug_message_trace) != IS_NULL) {
- xdebug_str_add(&tmp_str, Z_STRVAL_P(xdebug_message_trace), 0);
- }
- }
-#endif
- if (!PG(html_errors)) {
- xdebug_str_addl(&tmp_str, "\n", 1, 0);
- }
- xdebug_append_error_description(&tmp_str, PG(html_errors), exception_ce->name, Z_STRVAL_P(message), Z_STRVAL_P(file), Z_LVAL_P(line) TSRMLS_CC);
- xdebug_append_printable_stack(&tmp_str, PG(html_errors) TSRMLS_CC);
- exception_trace = tmp_str.d;
- zend_update_property_string(default_ce, exception, "xdebug_message", sizeof("xdebug_message")-1, exception_trace TSRMLS_CC);
-
- if (XG(last_exception_trace)) {
- xdfree(XG(last_exception_trace));
- }
- XG(last_exception_trace) = exception_trace;
-
- if (XG(show_ex_trace)) {
- if (PG(log_errors)) {
- log_stack(exception_ce->name, Z_STRVAL_P(message), Z_STRVAL_P(file), Z_LVAL_P(line) TSRMLS_CC);
- }
- if (PG(display_errors)) {
- php_printf("%s", exception_trace);
- }
- }
-
- /* Start JIT if requested and not yet enabled */
- xdebug_do_jit(TSRMLS_C);
-
- if (XG(remote_enabled)) {
- /* Check if we have a breakpoint on this exception */
- if (xdebug_hash_find(XG(context).exception_breakpoints, exception_ce->name, strlen(exception_ce->name), (void *) &extra_brk_info)) {
- if (handle_hit_value(extra_brk_info)) {
- if (!XG(context).handler->remote_breakpoint(&(XG(context)), XG(stack), Z_STRVAL_P(file), Z_LVAL_P(line), XDEBUG_BREAK, exception_ce->name, Z_STRVAL_P(message))) {
- XG(remote_enabled) = 0;
- }
- }
- }
- }
-}
-
/* Opcode handler for exit, to be able to clean up the profiler */
int xdebug_exit_handler(ZEND_OPCODE_HANDLER_ARGS)
{
@@ -2623,175 +1338,7 @@
return ZEND_USER_OPCODE_DISPATCH;
}
-/* Error callback for formatting stack traces */
-void xdebug_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args)
-{
- char *buffer, *error_type_str;
- int buffer_len;
- xdebug_brk_info *extra_brk_info = NULL;
- error_handling_t error_handling;
- zend_class_entry *exception_class;
- TSRMLS_FETCH();
-
- buffer_len = vspprintf(&buffer, PG(log_errors_max_len), format, args);
-
- error_type_str = xdebug_error_type(type);
-
- /* Store last error message for error_get_last() */
- if (PG(last_error_message)) {
- free(PG(last_error_message));
- }
- if (PG(last_error_file)) {
- free(PG(last_error_file));
- }
-#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION >= 6
- PG(last_error_type) = type;
-#endif
- PG(last_error_message) = strdup(buffer);
- PG(last_error_file) = strdup(error_filename);
- PG(last_error_lineno) = error_lineno;
-
-#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3) || PHP_MAJOR_VERSION >= 6
- error_handling = EG(error_handling);
- exception_class = EG(exception_class);
-#else
- error_handling = PG(error_handling);
- exception_class = PG(exception_class);
-#endif
- /* according to error handling mode, suppress error, throw exception or show it */
- if (error_handling != EH_NORMAL && EG(in_execution)) {
- switch (type) {
- case E_CORE_ERROR:
- case E_COMPILE_ERROR:
- case E_PARSE:
- /* fatal errors are real errors and cannot be made exceptions */
- break;
- case E_STRICT:
- /* for the sake of BC to old damaged code */
- break;
- case E_NOTICE:
- case E_USER_NOTICE:
- /* notices are no errors and are not treated as such like E_WARNINGS */
- break;
- default:
- /* throw an exception if we are in EH_THROW mode
- * but DO NOT overwrite a pending exception
- */
- if (error_handling == EH_THROW && !EG(exception)) {
- zend_throw_error_exception(exception_class, buffer, 0, type TSRMLS_CC);
- }
- efree(buffer);
- return;
- }
- }
-
- if (EG(error_reporting) & type) {
- /* Log to logger */
- if (PG(log_errors)) {
-
-#ifdef PHP_WIN32
- if (type==E_CORE_ERROR || type==E_CORE_WARNING) {
- MessageBox(NULL, buffer, error_type_str, MB_OK|ZEND_SERVICE_MB_STYLE);
- }
-#endif
- log_stack(error_type_str, buffer, error_filename, error_lineno TSRMLS_CC);
- }
-
- /* Display errors */
- if (PG(display_errors)) {
- char *printable_stack;
-
- /* We need to see if we have an uncaught exception fatal error now */
- if (type == E_ERROR && strncmp(buffer, "Uncaught exception", 18) == 0) {
- xdebug_str str = {0, 0, NULL};
- char *tmp_buf, *p;
-
- /* find first new line */
- p = strchr(buffer, '\n');
- /* find last quote */
- p = ((char *) zend_memrchr(buffer, '\'', p - buffer)) + 1;
- /* Create new buffer */
- tmp_buf = calloc(p - buffer + 1, 1);
- strncpy(tmp_buf, buffer, p - buffer );
-
- /* Append error */
- xdebug_append_error_head(&str, PG(html_errors) TSRMLS_CC);
- xdebug_append_error_description(&str, PG(html_errors), error_type_str, tmp_buf, error_filename, error_lineno TSRMLS_CC);
- xdebug_append_printable_stack(&str, PG(html_errors) TSRMLS_CC);
- xdebug_str_add(&str, XG(last_exception_trace), 0);
- xdebug_append_error_footer(&str, PG(html_errors));
- php_printf("%s", str.d);
-
- xdfree(str.d);
- free(tmp_buf);
- } else {
- printable_stack = get_printable_stack(PG(html_errors), error_type_str, buffer, error_filename, error_lineno TSRMLS_CC);
- php_printf("%s", printable_stack);
- xdfree(printable_stack);
- }
- }
- if (XG(do_collect_errors)) {
- char *printable_stack;
- printable_stack = get_printable_stack(PG(html_errors), error_type_str, buffer, error_filename, error_lineno TSRMLS_CC);
- xdebug_llist_insert_next(XG(collected_errors), XDEBUG_LLIST_TAIL(XG(collected_errors)), printable_stack);
- }
- }
-
- /* Start JIT if requested and not yet enabled */
- xdebug_do_jit(TSRMLS_C);
-
- /* Check for the pseudo exceptions to allow breakpoints on PHP error statuses */
- if (XG(remote_enabled) && XG(breakpoints_allowed)) {
- if (xdebug_hash_find(XG(context).exception_breakpoints, error_type_str, strlen(error_type_str), (void *) &extra_brk_info)) {
- if (handle_hit_value(extra_brk_info)) {
- if (!XG(context).handler->remote_breakpoint(&(XG(context)), XG(stack), error_filename, error_lineno, XDEBUG_BREAK, error_type_str, buffer)) {
- XG(remote_enabled) = 0;
- }
- }
- }
- }
- xdfree(error_type_str);
-
- /* Bail out if we can't recover */
- switch (type) {
- case E_CORE_ERROR:
- /* no break - intentionally */
- case E_ERROR:
-#if PHP_VERSION_ID >= 50200
- case E_RECOVERABLE_ERROR:
-#endif
- /*case E_PARSE: the parser would return 1 (failure), we can bail out nicely */
- case E_COMPILE_ERROR:
- case E_USER_ERROR:
- EG(exit_status) = 255;
-#if HAVE_PHP_MEMORY_USAGE
- /* restore memory limit */
-# if PHP_VERSION_ID >= 50200
- zend_set_memory_limit(PG(memory_limit));
-# else
- AG(memory_limit) = PG(memory_limit);
-# endif
-#endif
- zend_objects_store_mark_destructed(&EG(objects_store) TSRMLS_CC);
- zend_bailout();
- return;
- }
-
- if (PG(track_errors) && EG(active_symbol_table)) {
- zval *tmp;
-
- ALLOC_ZVAL(tmp);
- INIT_PZVAL(tmp);
- Z_STRVAL_P(tmp) = (char *) estrndup(buffer, buffer_len);
- Z_STRLEN_P(tmp) = buffer_len;
- Z_TYPE_P(tmp) = IS_STRING;
- zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) & tmp, sizeof(zval *), NULL);
- }
-
- efree(buffer);
-}
-
/* {{{ zend_op_array srm_compile_file (file_handle, type)
* This function provides a hook for the execution of bananas */
zend_op_array *xdebug_compile_file(zend_file_handle *file_handle, int type TSRMLS_DC)
@@ -2820,222 +1367,7 @@
return SAPI_HEADER_ADD;
}
-/* {{{ proto integet xdebug_get_stack_depth()
- Returns the stack depth */
-PHP_FUNCTION(xdebug_get_stack_depth)
-{
- /* We substract one so that the function call to xdebug_get_stack_depth()
- * is not part of the returned depth. */
- RETURN_LONG(XG(stack)->size - 1);
-}
-/* {{{ proto array xdebug_get_function_stack()
- Returns an array representing the current stack */
-PHP_FUNCTION(xdebug_get_function_stack)
-{
- xdebug_llist_element *le;
- int j;
- unsigned int k;
- zval *frame;
- zval *params;
- char *argument;
-
- array_init(return_value);
- le = XDEBUG_LLIST_HEAD(XG(stack));
-
- for (k = 0; k < XG(stack)->size - 1; k++, le = XDEBUG_LLIST_NEXT(le)) {
- function_stack_entry *i = XDEBUG_LLIST_VALP(le);
-
- if (i->function.function) {
- if (strcmp(i->function.function, "xdebug_get_function_stack") == 0) {
- return;
- }
- }
-
- /* Initialize frame array */
- MAKE_STD_ZVAL(frame);
- array_init(frame);
-
- /* Add data */
- if (i->function.function) {
- add_assoc_string_ex(frame, "function", sizeof("function"), i->function.function, 1);
- }
- if (i->function.class) {
- add_assoc_string_ex(frame, "class", sizeof("class"), i->function.class, 1);
- }
- add_assoc_string_ex(frame, "file", sizeof("file"), i->filename, 1);
- add_assoc_long_ex(frame, "line", sizeof("line"), i->lineno);
-
- /* Add parameters */
- MAKE_STD_ZVAL(params);
- array_init(params);
- for (j = 0; j < i->varc; j++) {
- if (i->var[j].addr) {
- argument = xdebug_get_zval_value(i->var[j].addr, 0, NULL);
- } else {
- argument = xdstrdup("");
- }
- if (i->var[j].name) {
- add_assoc_string_ex(params, i->var[j].name, strlen(i->var[j].name) + 1, argument, 1);
- } else {
- add_index_string(params, j, argument, 1);
- }
- xdfree(argument);
- }
- add_assoc_zval_ex(frame, "params", sizeof("params"), params);
-
- if (i->include_filename) {
- add_assoc_string_ex(frame, "include_filename", sizeof("include_filename"), i->include_filename, 1);
- }
-
- add_next_index_zval(return_value, frame);
- }
-}
-/* }}} */
-
-static void attach_used_var_names(void *return_value, xdebug_hash_element *he)
-{
- char *name = (char*) he->ptr;
-
- add_next_index_string(return_value, name, 1);
-}
-
-/* {{{ proto array xdebug_print_function_stack([string message])
- Displays a stack trace */
-PHP_FUNCTION(xdebug_print_function_stack)
-{
- char *message = NULL;
- int message_len;
- function_stack_entry *i;
- char *tmp;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &message, &message_len) == FAILURE) {
- return;
- }
-
- i = xdebug_get_stack_frame(0 TSRMLS_CC);
- if (message) {
- tmp = get_printable_stack(PG(html_errors), "Xdebug", message, i->filename, i->lineno TSRMLS_CC);
- } else {
- tmp = get_printable_stack(PG(html_errors), "Xdebug", "user triggered", i->filename, i->lineno TSRMLS_CC);
- }
- php_printf("%s", tmp);
- xdfree(tmp);
-}
-/* }}} */
-
-/* {{{ proto array xdebug_get_formatted_function_stack()
- Displays a stack trace */
-PHP_FUNCTION(xdebug_get_formatted_function_stack)
-{
- function_stack_entry *i;
- char *tmp;
-
- i = xdebug_get_stack_frame(0 TSRMLS_CC);
- tmp = get_printable_stack(PG(html_errors), "Xdebug", "user triggered", i->filename, i->lineno TSRMLS_CC);
- RETVAL_STRING(tmp, 1);
- xdfree(tmp);
-}
-/* }}} */
-
-/* {{{ proto array xdebug_get_declared_vars()
- Returns an array representing the current stack */
-PHP_FUNCTION(xdebug_get_declared_vars)
-{
- xdebug_llist_element *le;
- function_stack_entry *i;
- xdebug_hash *tmp_hash;
-
- array_init(return_value);
- le = XDEBUG_LLIST_TAIL(XG(stack));
- le = XDEBUG_LLIST_PREV(le);
- i = XDEBUG_LLIST_VALP(le);
-
- /* Add declared vars */
- if (i->used_vars) {
- tmp_hash = xdebug_used_var_hash_from_llist(i->used_vars);
- xdebug_hash_apply(tmp_hash, (void *) return_value, attach_used_var_names);
- xdebug_hash_destroy(tmp_hash);
- }
-}
-/* }}} */
-
-/* {{{ proto string xdebug_call_class()
- Returns the name of the calling class */
-PHP_FUNCTION(xdebug_call_class)
-{
- function_stack_entry *i;
- long depth = 0;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &depth) == FAILURE) {
- return;
- }
- i = xdebug_get_stack_frame(2 + depth TSRMLS_CC);
- if (i) {
- RETURN_STRING(i->function.class ? i->function.class : "", 1);
- } else {
- RETURN_FALSE;
- }
-}
-/* }}} */
-
-/* {{{ proto string xdebug_call_function()
- Returns the function name from which the current function was called from. */
-PHP_FUNCTION(xdebug_call_function)
-{
- function_stack_entry *i;
- long depth = 0;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &depth) == FAILURE) {
- return;
- }
- i = xdebug_get_stack_frame(2 + depth TSRMLS_CC);
- if (i) {
- RETURN_STRING(i->function.function ? i->function.function : "{}", 1);
- } else {
- RETURN_FALSE;
- }
-}
-/* }}} */
-
-/* {{{ proto string xdebug_call_line()
- Returns the line number where the current function was called from. */
-PHP_FUNCTION(xdebug_call_line)
-{
- function_stack_entry *i;
- long depth = 0;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &depth) == FAILURE) {
- return;
- }
- i = xdebug_get_stack_frame(1 + depth TSRMLS_CC);
- if (i) {
- RETURN_LONG(i->lineno);
- } else {
- RETURN_FALSE;
- }
-}
-/* }}} */
-
-/* {{{ proto int xdebug_call_file()
- Returns the filename where the current function was called from. */
-PHP_FUNCTION(xdebug_call_file)
-{
- function_stack_entry *i;
- long depth = 0;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &depth) == FAILURE) {
- return;
- }
- i = xdebug_get_stack_frame(1 + depth TSRMLS_CC);
- if (i) {
- RETURN_STRING(i->filename, 1);
- } else {
- RETURN_FALSE;
- }
-}
-/* }}} */
-
/* {{{ proto void xdebug_set_time_limit(void)
Dummy function to prevent time limit from being set within the script */
PHP_FUNCTION(xdebug_set_time_limit)
@@ -3240,142 +1572,7 @@
xdebug_llist_empty(XG(headers), NULL);
}
-PHP_FUNCTION(xdebug_start_trace)
-{
- char *fname = NULL;
- int fname_len = 0;
- char *trace_fname;
- long options = 0;
- if (XG(do_trace) == 0) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &fname, &fname_len, &options) == FAILURE) {
- return;
- }
-
- if ((trace_fname = xdebug_start_trace(fname, options TSRMLS_CC)) != NULL) {
- XG(do_trace) = 1;
- RETVAL_STRING(trace_fname, 1);
- xdfree(trace_fname);
- return;
- } else {
- php_error(E_NOTICE, "Trace could not be started");
- }
-
- XG(do_trace) = 0;
- RETURN_FALSE;
- } else {
- php_error(E_NOTICE, "Function trace already started");
- RETURN_FALSE;
- }
-}
-
-char* xdebug_start_trace(char* fname, long options TSRMLS_DC)
-{
- char *str_time;
- char *filename;
- char *tmp_fname = NULL;
-
- if (fname && strlen(fname)) {
- filename = xdstrdup(fname);
- } else {
- if (!strlen(XG(trace_output_name)) ||
- xdebug_format_output_filename(&fname, XG(trace_output_name), NULL) <= 0
- ) {
- /* Invalid or empty xdebug.trace_output_name */
- return NULL;
- }
- filename = xdebug_sprintf("%s/%s", XG(trace_output_dir), fname);
- }
- if (options & XDEBUG_TRACE_OPTION_APPEND) {
- XG(trace_file) = xdebug_fopen(filename, "a", "xt", (char**) &tmp_fname);
- } else {
- XG(trace_file) = xdebug_fopen(filename, "w", "xt", (char**) &tmp_fname);
- }
- xdfree(filename);
- if (options & XDEBUG_TRACE_OPTION_COMPUTERIZED) {
- XG(trace_format) = 1;
- }
- if (options & XDEBUG_TRACE_OPTION_HTML) {
- XG(trace_format) = 2;
- }
- if (XG(trace_file)) {
- if (XG(trace_format) == 1) {
- fprintf(XG(trace_file), "Version: %s\n", XDEBUG_VERSION);
- fprintf(XG(trace_file), "File format: 2\n");
- }
- if (XG(trace_format) == 0 || XG(trace_format) == 1) {
- str_time = xdebug_get_time();
- fprintf(XG(trace_file), "TRACE START [%s]\n", str_time);
- xdfree(str_time);
- }
- if (XG(trace_format) == 2) {
- fprintf(XG(trace_file), "