Merged changed from master branch, disabled ARE rules by default.

2015-07-27 10:44:51 +02:00
parent c84e1b88ac fa2f175400
commit bdecbd21a0
109 changed files with 2084 additions and 469 deletions
--- a/core/main/client/net.js
+++ b/core/main/client/net.js
@@ -270,6 +270,7 @@ beef.net = {
                response.status_code = jqXHR.status;
                response.status_text = textStatus;
                response.duration = (end_time - start_time);
+                response.port_status = "open";
            },
            complete: function (jqXHR, textStatus) {
                response.status_code = jqXHR.status;
@@ -286,7 +287,7 @@ beef.net = {
                    response.port_status = "open";
                }
            }
-        }).done(function () {
+        }).always(function () {
                if (callback != null) {
                    callback(response);
                }