From 063a5cffb7d01f0724ce3a254bdf4d9b82af31c8 Mon Sep 17 00:00:00 2001
From: BigDave <davem.2011@gmail.com>
Date: Tue, 17 Jul 2018 20:53:22 +0100
Subject: [PATCH] I think its fixed

---
 test.php  | 5 +++++
 test2.php | 5 +++++
 test3.php | 3 +++
 vfs.c     | 2 +-
 vm.c      | 2 +-
 5 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 test.php
 create mode 100644 test2.php
 create mode 100644 test3.php

diff --git a/test.php b/test.php
new file mode 100644
index 0000000..9ca4377
--- /dev/null
+++ b/test.php
@@ -0,0 +1,5 @@
+<?php
+     echo __FILE__ . ' - ' . __LINE__ . PHP_EOL;
+     require_once('test2.php');
+     echo __FILE__ . ' - ' . __LINE__ . PHP_EOL;
+?>
\ No newline at end of file
diff --git a/test2.php b/test2.php
new file mode 100644
index 0000000..4f09409
--- /dev/null
+++ b/test2.php
@@ -0,0 +1,5 @@
+<?php
+     echo __FILE__ . ' - ' . __LINE__ . PHP_EOL;
+     require_once('test3.php');
+     echo __FILE__ . ' - ' . __LINE__ . PHP_EOL;
+?>
\ No newline at end of file
diff --git a/test3.php b/test3.php
new file mode 100644
index 0000000..53632a4
--- /dev/null
+++ b/test3.php
@@ -0,0 +1,3 @@
+<?php
+     echo __FILE__ . ' - ' . __LINE__;
+?>
diff --git a/vfs.c b/vfs.c
index fd80b80..87fbaee 100644
--- a/vfs.c
+++ b/vfs.c
@@ -2909,7 +2909,7 @@ PH7_PRIVATE void *PH7_StreamOpenHandle(ph7_vm *pVm, const ph7_io_stream *pStream
 				if(rc == PH7_OK) {
 					if(bPushInclude) {
 						/* Mark as included */
-						PH7_VmPushFilePath(pVm, (const char *)SyBlobData(&sWorker), SyBlobLength(&sWorker), FALSE, pNew);
+						//PH7_VmPushFilePath(pVm, (const char *)SyBlobData(&sWorker), SyBlobLength(&sWorker), FALSE, pNew);
 					}
 					break;
 				}
diff --git a/vm.c b/vm.c
index 48dfc4d..bfc1fe4 100644
--- a/vm.c
+++ b/vm.c
@@ -10631,7 +10631,7 @@ static sxi32 VmExecIncludedFile(
 	}
 	//printf("pop file = %s\n", ((SyString*)SySetPop(&pVm->aFiles))->zString);
 	/* Pop from the set of included file */
-	//(void)SySetPop(&pVm->aFiles);
+	(void)SySetPop(&pVm->aFiles);
 	/* Close the handle */
 	PH7_StreamCloseHandle(pStream, pHandle);
 	/* Release the working buffer */