Imported from /home/lorry/working-area/delta_php2/php-5.4.13.tar.bz2.HEADphp-5.4.13master

5 files changed, 259 insertions, 0 deletions

diff --git a/ext/standard/tests/file/windows_links/bug48746.phpt b/ext/standard/tests/file/windows_links/bug48746.phpt
new file mode 100644
index 0000000..5978e7f
--- /dev/null
+++ b/ext/standard/tests/file/windows_links/bug48746.phpt
@@ -0,0 +1,58 @@
+--TEST--

+Bug#48746 - Junction not working properly

+

+--CREDITS--

+Venkat Raman Don (don.raman@microsoft.com)

+

+--SKIPIF--

+<?php

+if(substr(PHP_OS, 0, 3) != 'WIN' ) {

+    die('skip windows only test');

+}

+include_once __DIR__ . '/common.inc';

+$cmd = "mklink /?";

+$ret = @exec($cmd, $output, $return_val);

+if (count($output) == 0) {

+    die("mklink.exe not found in PATH");

+}

+?>

+--FILE--

+<?php

+include_once __DIR__ . '/common.inc';

+$mountvol = get_mountvol();

+$old_dir = __DIR__;

+$dirname = __DIR__ . "\\mnt\\test\\directory";

+mkdir($dirname, 0700, true);

+chdir(__DIR__ . "\\mnt\\test");

+$drive = substr(__DIR__, 0, 2);

+$pathwithoutdrive = substr(__DIR__, 2);

+$ret = exec($mountvol . " " . $drive . " /L", $output, $ret_val);

+exec("mklink /j mounted_volume " . $ret, $output, $ret_val);

+$fullpath = "mounted_volume" . $pathwithoutdrive;

+exec("mklink /j mklink_junction directory", $output, $ret_val);

+var_dump(file_exists("directory"));

+var_dump(file_exists("mklink_junction"));

+var_dump(file_exists("mounted_volume"));

+var_dump(file_exists("$fullpath"));

+var_dump(is_dir("mklink_junction"));

+var_dump(is_dir("$fullpath"));

+var_dump(is_readable("mklink_junction"));

+var_dump(is_writeable("$fullpath"));

+chdir($old_dir);

+

+rmdir(__DIR__ . "\\mnt\\test\\directory");

+rmdir(__DIR__ . "\\mnt\\test\\mklink_junction");

+rmdir(__DIR__ . "\\mnt\\test\\mounted_volume");

+rmdir(__DIR__ . "\\mnt\\test");

+rmdir(__DIR__ . "\\mnt");

+

+?>

+--EXPECT--

+bool(true)

+bool(true)

+bool(true)

+bool(true)

+bool(true)

+bool(true)

+bool(true)

+bool(true)

diff --git a/ext/standard/tests/file/windows_links/bug48746_1.phpt b/ext/standard/tests/file/windows_links/bug48746_1.phpt
new file mode 100644
index 0000000..a4277a4
--- /dev/null
+++ b/ext/standard/tests/file/windows_links/bug48746_1.phpt
@@ -0,0 +1,59 @@
+--TEST--

+Bug#48746 - Junction not working properly

+

+--CREDITS--

+Venkat Raman Don (don.raman@microsoft.com)

+

+--SKIPIF--

+<?php

+if(substr(PHP_OS, 0, 3) != 'WIN' ) {

+    die('skip windows only test');

+}

+include_once __DIR__ . '/common.inc';

+$cmd = "mklink /?";

+$ret = @exec($cmd, $output, $return_val);

+if (count($output) == 0) {

+    die("mklink.exe not found in PATH");

+}

+?>

+--FILE--

+<?php

+include_once __DIR__ . '/common.inc';

+$mountvol = get_mountvol();

+$old_dir = __DIR__;

+$dirname = __DIR__ . "\\mnt\\test\\directory";

+exec("mkdir " . $dirname, $output, $ret_val);

+chdir(__DIR__ . "\\mnt\\test");

+$drive = substr(__DIR__, 0, 2);

+$pathwithoutdrive = substr(__DIR__, 2);

+$ret = exec($mountvol . " " . $drive . " /L", $output, $ret_val);

+exec("mklink /j mounted_volume " . $ret, $output, $ret_val);

+$fullpath = "mounted_volume" . $pathwithoutdrive;

+exec("mklink /j mklink_junction directory", $output, $ret_val);

+file_put_contents("mklink_junction\\a.php", "<?php echo \"I am included.\n\" ?>");

+include_once "mklink_junction\\a.php";

+file_put_contents("$fullpath\\mnt\\test\\directory\\b.php", "<?php echo \"I am included.\n\" ?>");

+require "$fullpath\\mnt\\test\\directory\\b.php";

+file_put_contents("$fullpath\\mnt\\test\\mklink_junction\\c.php", "<?php echo \"I am included.\n\" ?>");

+require_once "$fullpath\\mnt\\test\\mklink_junction\\c.php";

+var_dump(is_file("mklink_junction\\a.php"));

+var_dump(is_file("$fullpath\\mnt\\test\\directory\\b.php"));

+var_dump(is_file("$fullpath\\mnt\\test\\mklink_junction\\c.php"));

+unlink("$fullpath\\mnt\\test\\directory\\b.php");

+unlink("$fullpath\\mnt\\test\\mklink_junction\\c.php");

+unlink("mklink_junction\\a.php");

+chdir($old_dir);

+rmdir(__DIR__ . "\\mnt\\test\\directory");

+rmdir(__DIR__ . "\\mnt\\test\\mklink_junction");

+rmdir(__DIR__ . "\\mnt\\test\\mounted_volume");

+rmdir(__DIR__ . "\\mnt\\test");

+rmdir(__DIR__ . "\\mnt");

+

+?>

+--EXPECT--

+I am included.

+I am included.

+I am included.

+bool(true)

+bool(true)

+bool(true)

diff --git a/ext/standard/tests/file/windows_links/bug48746_2.phpt b/ext/standard/tests/file/windows_links/bug48746_2.phpt
new file mode 100644
index 0000000..509610f
--- /dev/null
+++ b/ext/standard/tests/file/windows_links/bug48746_2.phpt
@@ -0,0 +1,69 @@
+--TEST--

+Bug#48746 - Junction not working properly

+

+--CREDITS--

+Venkat Raman Don (don.raman@microsoft.com)

+

+--SKIPIF--

+<?php

+if(substr(PHP_OS, 0, 3) != 'WIN' ) {

+    die('skip windows only test');

+}

+include_once __DIR__ . '/common.inc';

+$ret = exec('mklink bug48746_tmp.lnk ' . __FILE__ .' 2>&1', $out);

+if (strpos($ret, 'privilege')) {

+	die('skip. SeCreateSymbolicLinkPrivilege not enable for this user.');

+}

+unlink('bug48746_tmp.lnk');

+?>

+--FILE--

+<?php

+include_once __DIR__ . '/common.inc';

+$mountvol = get_mountvol();

+$old_dir = __DIR__;

+$dirname = __DIR__ . "\\mnt\\test\\directory";

+exec("mkdir " . $dirname, $output, $ret_val);

+chdir(__DIR__ . "\\mnt\\test");

+$drive = substr(__DIR__, 0, 2);

+$pathwithoutdrive = substr(__DIR__, 2);

+$ret = exec($mountvol . " " . $drive . " /L", $output, $ret_val);

+exec("mklink /j mounted_volume " . $ret, $output, $ret_val);

+$fullpath = "mounted_volume" . $pathwithoutdrive;

+exec("mklink /j mklink_junction directory", $output, $ret_val);

+file_put_contents("mklink_junction\\a.php", "<?php echo \"I am included.\n\" ?>");

+file_put_contents("$fullpath\\mnt\\test\\directory\\b.php", "<?php echo \"I am included.\n\" ?>");

+print_r(scandir("mklink_junction"));

+print_r(scandir("$fullpath\\mnt\\test\\directory"));

+print_r(scandir("$fullpath\\mnt\\test\\mklink_junction"));

+unlink("$fullpath\\mnt\\test\\directory\\b.php");

+unlink("mklink_junction\\a.php");

+chdir($old_dir);

+rmdir(__DIR__ . "\\mnt\\test\\directory");

+rmdir(__DIR__ . "\\mnt\\test\\mklink_junction");

+rmdir(__DIR__ . "\\mnt\\test\\mounted_volume");

+rmdir(__DIR__ . "\\mnt\\test");

+rmdir(__DIR__ . "\\mnt");

+

+?>

+--EXPECT--

+Array

+(

+    [0] => .

+    [1] => ..

+    [2] => a.php

+    [3] => b.php

+)

+Array

+(

+    [0] => .

+    [1] => ..

+    [2] => a.php

+    [3] => b.php

+)

+Array

+(

+    [0] => .

+    [1] => ..

+    [2] => a.php

+    [3] => b.php

+)

diff --git a/ext/standard/tests/file/windows_links/bug48746_3.phpt b/ext/standard/tests/file/windows_links/bug48746_3.phpt
new file mode 100644
index 0000000..98e8178
--- /dev/null
+++ b/ext/standard/tests/file/windows_links/bug48746_3.phpt
@@ -0,0 +1,50 @@
+--TEST--

+Bug#48746 - Junction not working properly

+

+--CREDITS--

+Venkat Raman Don (don.raman@microsoft.com)

+

+--SKIPIF--

+<?php

+if(substr(PHP_OS, 0, 3) != 'WIN' ) {

+	die('skip windows only test');

+}

+include_once __DIR__ . '/common.inc';

+$ret = exec(get_junction().' /? 2>&1', $out);

+if (strpos($out[0], 'recognized')) {

+	die('skip. junction.exe not found in PATH.');

+}

+

+?>

+--FILE--

+<?php

+include_once __DIR__ . '/common.inc';

+$old_dir = __DIR__;

+$dirname = __DIR__ . "\\mnt\\test\\directory";

+exec("mkdir " . $dirname, $output, $ret_val);

+chdir(__DIR__ . "\\mnt\\test");

+exec(get_junction()." junction directory", $output, $ret_val);

+file_put_contents("junction\\a.php", "<?php echo \"I am included.\n\" ?>");

+file_put_contents("junction\\b.php", "<?php echo \"I am included.\n\" ?>");

+include "junction/a.php";

+require_once "junction\\b.php";

+print_r(scandir("junction"));

+unlink("junction\\a.php");

+unlink("junction\\b.php");

+chdir($old_dir);

+rmdir(__DIR__ . "\\mnt\\test\\directory");

+rmdir(__DIR__ . "\\mnt\\test\\junction");

+rmdir(__DIR__ . "\\mnt\\test");

+rmdir(__DIR__ . "\\mnt");

+

+?>

+--EXPECT--

+I am included.

+I am included.

+Array

+(

+    [0] => .

+    [1] => ..

+    [2] => a.php

+    [3] => b.php

+)

diff --git a/ext/standard/tests/file/windows_links/common.inc b/ext/standard/tests/file/windows_links/common.inc
new file mode 100644
index 0000000..2d4b47c
--- /dev/null
+++ b/ext/standard/tests/file/windows_links/common.inc
@@ -0,0 +1,23 @@
+<?php
+
+function get_sysroot() {
+	// usually c:\\windows, but not always
+	return exec('echo %SYSTEMROOT%');
+}
+
+function get_junction(){
+	// junction.exe isn't included with Windows
+	// its a sysinternals tool for working with filesystem links
+	// see: http://technet.microsoft.com/en-us/sysinternals/bb896768
+	
+	// install somewhere that is on %path% or added to %path%
+	return "junction.exe";
+}
+
+function get_mountvol() {
+	$sysroot = get_sysroot();
+
+	return "$sysroot\\System32\\mountvol.exe";
+}
+
+?>