| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2017 eyeo GmbH | 3 * Copyright (C) 2006-2017 eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 result.status = AdblockPlus::WebRequest::NS_ERROR_CONNECTION_REFUSED; | 60 result.status = AdblockPlus::WebRequest::NS_ERROR_CONNECTION_REFUSED; |
| 61 result.responseStatus = 0; | 61 result.responseStatus = 0; |
| 62 return result; | 62 return result; |
| 63 } | 63 } |
| 64 | 64 |
| 65 void Run() | 65 void Run() |
| 66 { | 66 { |
| 67 AdblockPlus::ServerResponse result = jsEngine->IsConnectionAllowed() ? | 67 AdblockPlus::ServerResponse result = jsEngine->IsConnectionAllowed() ? |
| 68 jsEngine->GetWebRequest()->GET(url, headers) : NotAllowedResponse(); | 68 jsEngine->GetWebRequest()->GET(url, headers) : NotAllowedResponse(); |
| 69 | 69 |
| 70 AdblockPlus::JsContext context(jsEngine); | 70 AdblockPlus::JsContext context(*jsEngine); |
| 71 | 71 |
| 72 auto resultObject = jsEngine->NewObject(); | 72 auto resultObject = jsEngine->NewObject(); |
| 73 resultObject.SetProperty("status", result.status); | 73 resultObject.SetProperty("status", result.status); |
| 74 resultObject.SetProperty("responseStatus", result.responseStatus); | 74 resultObject.SetProperty("responseStatus", result.responseStatus); |
| 75 resultObject.SetProperty("responseText", result.responseText); | 75 resultObject.SetProperty("responseText", result.responseText); |
| 76 | 76 |
| 77 auto headersObject = jsEngine->NewObject(); | 77 auto headersObject = jsEngine->NewObject(); |
| 78 for (const auto& header : result.responseHeaders) | 78 for (const auto& header : result.responseHeaders) |
| 79 { | 79 { |
| 80 headersObject.SetProperty(header.first, header.second); | 80 headersObject.SetProperty(header.first, header.second); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 return v8::Undefined(); | 114 return v8::Undefined(); |
| 115 } | 115 } |
| 116 } | 116 } |
| 117 | 117 |
| 118 AdblockPlus::JsValue& AdblockPlus::WebRequestJsObject::Setup( | 118 AdblockPlus::JsValue& AdblockPlus::WebRequestJsObject::Setup( |
| 119 AdblockPlus::JsEngine& jsEngine, AdblockPlus::JsValue& obj) | 119 AdblockPlus::JsEngine& jsEngine, AdblockPlus::JsValue& obj) |
| 120 { | 120 { |
| 121 obj.SetProperty("GET", jsEngine.NewCallback(::GETCallback)); | 121 obj.SetProperty("GET", jsEngine.NewCallback(::GETCallback)); |
| 122 return obj; | 122 return obj; |
| 123 } | 123 } |
| OLD | NEW |