summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-05-29 10:25:25 (GMT)
committerAnatoliy Belsky <ab@php.net>2012-05-29 10:25:25 (GMT)
commitdffbc98239a3d10250627a0b08eecce1d8f93460 (patch)
tree559153a577c263d7e6d248f264c5122758d2b905 /sapi
parentfde8762e9034f006826bec12bc6c0aac6b450055 (diff)
parentc4f9b01422e8aa892624e811b9b329519185bcb4 (diff)
downloadphp-dffbc98239a3d10250627a0b08eecce1d8f93460.tar.gz
Merge branch 'PHP-5.4'
* PHP-5.4: (21 commits) Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt fix unchecked emalloc add CVE add bug 62146 add bug #62082 sync with HEAD sync with HEAD Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests) Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests) Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) - Fixed bug #62160 (Add process.priority to set nice(2) priorities) - Fixed bug #62160 (Add process.priority to set nice(2) priorities) - add missing headers to avoid warnings - add missing headers to avoid warnings - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start) ... Conflicts: NEWS
Diffstat (limited to 'sapi')
-rw-r--r--sapi/cli/tests/bug61546.phpt11
1 files changed, 10 insertions, 1 deletions
diff --git a/sapi/cli/tests/bug61546.phpt b/sapi/cli/tests/bug61546.phpt
index 2cd690f..071edb7 100644
--- a/sapi/cli/tests/bug61546.phpt
+++ b/sapi/cli/tests/bug61546.phpt
@@ -2,13 +2,22 @@
Bug #61546 (functions related to current script failed when chdir() in cli sapi)
--FILE--
<?php
+// reference doc for getmyinode() on php.net states that it returns an integer or FALSE on error
+// on Windows, getmyinode() returns 0 which normally casts to FALSE
+// however, the implementation of getmyinode() (in pageinfo.c) returns an explicit FALSE in the
+// event that the internal page_inode structure is less than 0, otherwise it returns the long value
+// of page_inode. therefore, an explicit 0 should be a passing value for this test.
+//
+// the ext/standard/tests/file/statpage.phpt test also tests getmyinode() returns an integer and will
+// pass even if that integer is 0. on Windows, the getmyinode() call in statpage.phpt returns 0 and
+// passes on Windows.
$php = getenv("TEST_PHP_EXECUTABLE");
$test_code = <<<PHP
<?php
chdir('..');
var_dump(get_current_user() != "");
chdir('..');
-var_dump(getmyinode() != false);
+var_dump(getmyinode() !== false);
var_dump(getlastmod() != false);
PHP;