diff --git a/package.xml b/package.xml index 4e46cc933232b41974f722c58c4bd2ecc2f8fda9..27fa6b4b8c5eb82fde098019789677a51ecdd0e6 100644 --- a/package.xml +++ b/package.xml @@ -44,6 +44,7 @@ XHProf is a function-level hierarchical profiler for PHP and has a simple HTML b </stability> <license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2.0</license> <notes> +-- fix #16098: suppress notices due to use of FILE_BINARY (kannan) -- add a sanity test for timer (kannan) -- fix for compile error on debian linux (russ) </notes> diff --git a/xhprof_html/docs/index.html b/xhprof_html/docs/index.html index fd6e6db6a8a250a4267a3455a8a9869b339481fc..4e6a8adab7262c87964083e3eda7548ac904a234 100644 --- a/xhprof_html/docs/index.html +++ b/xhprof_html/docs/index.html @@ -351,7 +351,7 @@ Array ( [foo==>bar] => Array ( - [ct] => 2 # 2 calls to bar() from + [ct] => 2 # 2 calls to bar() from foo() [wt] => 27 # inclusive time in bar() when called from foo() ) @@ -767,7 +767,7 @@ Graphviz "dot" utility in your path. "dot" is a utility to draw/generate an image for a directed graph. </ul> -<li><a name="usage"><h2>Acknowledgements</h2></a> +<li><a name="credits"><h2>Acknowledgements</h2></a> <p>The HTML-based navigational interface for browsing profiler results is inspired by that of a similar tool that exists for Oracle's stored diff --git a/xhprof_lib/utils/xhprof_runs.php b/xhprof_lib/utils/xhprof_runs.php index 3f19eb7f1d728f400e8dd2b2cc806aacea0d9a3e..b95d82fd62531c1af7339ed0943c998a614b325b 100644 --- a/xhprof_lib/utils/xhprof_runs.php +++ b/xhprof_lib/utils/xhprof_runs.php @@ -116,7 +116,7 @@ class XHProfRuns_Default implements iXHProfRuns { return null; } - $contents = file_get_contents($file_name, FILE_BINARY); + $contents = file_get_contents($file_name); $run_desc = "XHProf Run (Namespace=$type)"; return unserialize($contents); }