Print out include_path in include/require failures

diff --git a/main/main.c b/main/main.c
index 8f3e41ae7f1652a5d2c8aed14085cab01ce79ecc..d7aa597033f7e7537ecd2734725532077754caea 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -560,11 +560,17 @@ static void php_message_handler_for_zend(long message, void *data)
                                PG(track_vars) = 1;
                        }
                        break;
-               case ZMSG_FAILED_INCLUDE_FOPEN:
-                       php3_error(E_WARNING, "Failed opening '%s' for inclusion", php3_strip_url_passwd((char *) data));
+               case ZMSG_FAILED_INCLUDE_FOPEN: {
+                               PLS_FETCH();
+
+                               php3_error(E_WARNING, "Failed opening '%s' for inclusion (include_path='%s')", php3_strip_url_passwd((char *) data), PG(include_path));
+                       }
                        break;
-               case ZMSG_FAILED_REQUIRE_FOPEN:
-                       php3_error(E_COMPILE_ERROR, "Failed opening required '%s'", php3_strip_url_passwd((char *) data));
+               case ZMSG_FAILED_REQUIRE_FOPEN: {
+                               PLS_FETCH();
+
+                               php3_error(E_COMPILE_ERROR, "Failed opening required '%s' (include_path='%s')", php3_strip_url_passwd((char *) data), PG(include_path));
+                       }
                        break;
                case ZMSG_FAILED_HIGHLIGHT_FOPEN:
                        php3_error(E_WARNING, "Failed opening '%s' for highlighting", php3_strip_url_passwd((char *) data));