From c3bd1e5fa7aaaec38c26e8a4afd704113a5df543 Mon Sep 17 00:00:00 2001 From: "bcoles@gmail.com" Date: Fri, 19 Aug 2011 15:28:51 +0000 Subject: [PATCH] Added "not http" to port_status as part of beef.net.request Status "open" and "closed" were added in revision 1177 Fixes issue 286 git-svn-id: https://beef.googlecode.com/svn/trunk@1215 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9 --- core/main/client/net.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/main/client/net.js b/core/main/client/net.js index af4ed6150..179af09fd 100644 --- a/core/main/client/net.js +++ b/core/main/client/net.js @@ -203,7 +203,7 @@ beef.net = { //function on failure error: function(jqXHR, textStatus, errorThrown){ var end_time = new Date().getTime(); - if (textStatus == "timeout"){response.was_timedout = true; response.port_status = "closed"; } else { response.port_status = "open"; } + if (textStatus == "timeout") { response.was_timedout = true; response.port_status = "closed"; } else if (textStatus == "parsererror") response.port_status = "not http"; else response.port_status = "open"; response.status_code = jqXHR.status; response.response_body = jqXHR.responseText; response.status_code = textStatus; @@ -242,7 +242,7 @@ beef.net = { if (cross_domain && callback != null) { response.status_code = -1; response.status_text = "crossdomain"; - response.response_body = "ERROR: Cross Domain Request"; + response.response_body = "ERROR: Cross Domain Request\n"; callback(response, requestid); return response; } @@ -291,7 +291,7 @@ beef.net = { //function on failure error: function(xhr, textStatus, errorThrown){ var end_time = new Date().getTime(); - if (textStatus == "timeout"){response.was_timedout = true; response.port_status = "closed"; } else { response.port_status = "open"; } + if (textStatus == "timeout") { response.was_timedout = true; response.port_status = "closed"; } else if (textStatus == "parsererror") response.port_status = "not http"; else response.port_status = "open"; response.response_body = xhr.responseText; response.status_code = xhr.status; response.status_text = textStatus;