The branch, master has been updated via f05a988b86049fae9eadfa0c1f29cb020d332930 (commit) via 1baf5c7e4c8e24ad049061b142a1889cc687eaec (commit) from f79a619326dea60ffd8bab3a3b22791143c65df9 (commit)
- Log ----------------------------------------------------------------- commit f05a988b86049fae9eadfa0c1f29cb020d332930 Author: Michal Čihař mcihar@suse.cz Date: Wed Jun 15 15:50:56 2011 +0200
Whitespace cleanup
commit 1baf5c7e4c8e24ad049061b142a1889cc687eaec Author: Michal Čihař mcihar@suse.cz Date: Wed Jun 15 15:50:49 2011 +0200
Send correct mime type (the reply is actually HTML)
-----------------------------------------------------------------------
Summary of changes: server_status.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server_status.php b/server_status.php index 7db187b..2f06abd 100644 --- a/server_status.php +++ b/server_status.php @@ -27,7 +27,7 @@ if (isset($_REQUEST['ajax_request'])) { header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past header_remove('Last-Modified'); // Send correct charset - header('Content-Type: text/javascript; charset=UTF-8'); + header('Content-Type: text/html; charset=UTF-8');
if (isset($_REQUEST["query_chart"])) { exit(createQueryChart()); @@ -52,10 +52,10 @@ if (isset($_REQUEST['ajax_request'])) { exit(json_encode($ret)); case 'traffic': $traffic = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="Bytes_received" OR Variable_name="Bytes_sent"', 0, 1); - + $ret = Array('x'=>(microtime(true)*1000),'y_sent'=>$traffic['Bytes_sent'],'y_received'=>$traffic['Bytes_received']); exit(json_encode($ret)); - + } } }
hooks/post-receive
-
Michal Čihař