Work on Debug callback.

Author: beberlei

Zend/zend.h

@@ -362,6 +362,9 @@ int zend_startup_error_notify_callbacks();
 int zend_shutdown_error_notify_callbacks();
 void zend_error_notify_all_callbacks(int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args);
 void zend_error_notify_callbacks_apply(llist_apply_func_t callback);
+#if ZEND_DEBUG
+void report_zend_debug_error_notify_cb(int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args);
+#endif
 END_EXTERN_C()
 
 #define DEBUG_BACKTRACE_PROVIDE_OBJECT (1<<0)

main/main.c

@@ -1188,6 +1188,36 @@ PHPAPI void php_html_puts(const char *str, size_t size)
 }
 /* }}} */
 
+#if ZEND_DEBUG
+/* {{{ report_zend_debug_error_notify_cb */
+void report_zend_debug_error_notify_cb(int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args)
+{
+	if (PG(report_zend_debug)) {
+		zend_bool trigger_break;
+		char *buffer;
+
+		vspprintf(&buffer, PG(log_errors_max_len), format, args);
+
+		switch (type) {
+			case E_ERROR:
+			case E_CORE_ERROR:
+			case E_COMPILE_ERROR:
+			case E_USER_ERROR:
+				trigger_break=1;
+				break;
+			default:
+				trigger_break=0;
+				break;
+		}
+
+		zend_output_debug_string(trigger_break, "%s(%" PRIu32 ") : %s", error_filename, error_lineno, buffer);
+
+		efree(buffer);
+	}
+}
+/* }}} */
+#endif
+
 /* {{{ php_error_cb
  extended error handling function */
 static ZEND_COLD void php_error_cb(int orig_type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args)
@@ -1356,24 +1386,6 @@ static ZEND_COLD void php_error_cb(int orig_type, const char *error_filename, co
 				}
 			}
 		}
-#if ZEND_DEBUG
-		if (PG(report_zend_debug)) {
-			zend_bool trigger_break;
-
-			switch (type) {
-				case E_ERROR:
-				case E_CORE_ERROR:
-				case E_COMPILE_ERROR:
-				case E_USER_ERROR:
-					trigger_break=1;
-					break;
-				default:
-					trigger_break=0;
-					break;
-			}
-			zend_output_debug_string(trigger_break, "%s(%" PRIu32 ") : %s - %s", error_filename, error_lineno, error_type_str, buffer);
-		}
-#endif
 	}
 
 	/* Bail out if we can't recover */
@@ -2136,6 +2148,10 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 	setlocale(LC_CTYPE, "");
 	zend_update_current_locale();
 
+#if ZEND_DEBUG
+	zend_register_error_notify_callback("report_zend_debug", report_zend_debug_error_notify_cb);
+#endif
+
 #if HAVE_TZSET
 	tzset();
 #endif