flush

[m6w6/ext-psi] / src / error.c

diff --git a/src/error.c b/src/error.c
index c92b847e3530859083ce001bcb6f24237de36db0..50ca0926346309e517e0a87d0034ce217d1fce01 100644 (file)
--- a/src/error.c
+++ b/src/error.c
@@ -23,7 +23,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
 
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 #include "data.h"
 
 /* zend_error_cb */
@@ -57,7 +61,7 @@ void psi_error_wrapper(struct psi_data *context, struct psi_token *t, int type,
        }
 
        if (t) {
-               fn = t->file;
+               fn = t->file->val;
                ln = t->line;
        } else if (zend_is_executing()) {
                fn = zend_get_executed_filename();
@@ -73,6 +77,13 @@ void psi_error_wrapper(struct psi_data *context, struct psi_token *t, int type,
        psi_verror(type, fn, ln, msg, argv);
        va_end(argv);
 
+       va_start(argv, msg);
+       psi_debug_lock(context);
+       PSI_DEBUG_PRINTV(context, msg, argv);
+       PSI_DEBUG_PRINT(context, "\n");
+       psi_debug_unlock(context);
+       va_end(argv);
+
        if (context) {
                strlcpy(context->last_error, PG(last_error_message),
                                sizeof(context->last_error));