Browse Source

I think its fixed

BigDave 4 years ago
parent
commit
063a5cffb7
Signed by untrusted user: BigDave GPG Key ID: 2787C0A942BB86EC
  1. 5
      test.php
  2. 5
      test2.php
  3. 3
      test3.php
  4. 2
      vfs.c
  5. 2
      vm.c

5
test.php

@ -0,0 +1,5 @@
<?php
echo __FILE__ . ' - ' . __LINE__ . PHP_EOL;
require_once('test2.php');
echo __FILE__ . ' - ' . __LINE__ . PHP_EOL;
?>

5
test2.php

@ -0,0 +1,5 @@
<?php
echo __FILE__ . ' - ' . __LINE__ . PHP_EOL;
require_once('test3.php');
echo __FILE__ . ' - ' . __LINE__ . PHP_EOL;
?>

3
test3.php

@ -0,0 +1,3 @@
<?php
echo __FILE__ . ' - ' . __LINE__;
?>

2
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;
}

2
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 */

Loading…
Cancel
Save