summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-09-15 05:58:00 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-09-15 05:58:00 +0000
commita5c4926ea152da65eed97a27518c011fc24940a5 (patch)
tree4c6822e397f4b69b82eae384bd7e171aed953a88 /usr
parentfad39ea2db1f077219e6d3b188311cd9e17eea5e (diff)
downloadpfsense-a5c4926ea152da65eed97a27518c011fc24940a5.zip
pfsense-a5c4926ea152da65eed97a27518c011fc24940a5.tar.gz
Move connection aborted check up further
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/javascript/index/sajax.js4
-rwxr-xr-xusr/local/www/sajax/index.sajax.php6
2 files changed, 7 insertions, 3 deletions
diff --git a/usr/local/www/javascript/index/sajax.js b/usr/local/www/javascript/index/sajax.js
index 715418d..e21cd9a 100644
--- a/usr/local/www/javascript/index/sajax.js
+++ b/usr/local/www/javascript/index/sajax.js
@@ -1,3 +1,7 @@
+if(Connection_Aborted()) {
+ exit;
+}
+
function updateMeters()
{
x_cpu_usage(updateCPU);
diff --git a/usr/local/www/sajax/index.sajax.php b/usr/local/www/sajax/index.sajax.php
index 2dcbad7..a9d1f9d 100755
--- a/usr/local/www/sajax/index.sajax.php
+++ b/usr/local/www/sajax/index.sajax.php
@@ -1,11 +1,11 @@
#!/usr/local/bin/php
<?
- require("../includes/sajax.class.php");
- require("../includes/functions.inc.php");
-
if(Connection_Aborted()) {
exit;
}
+
+ require("../includes/sajax.class.php");
+ require("../includes/functions.inc.php");
$oSajax = new sajax();
$oSajax->sajax_export("mem_usage","cpu_usage","get_uptime","get_pfstate", "get_temp");
OpenPOWER on IntegriCloud