CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-06-01 18:10:17 +12:00
Code Issues Releases Wiki Activity

support ping request type explicitly

Browse source
This commit is contained in:
gorhill 2015-04-19 16:30:28 -04:00
parent 595de33e83
commit c1314e496b
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
platform/chromium/vapi-background.js
View file

@ -693,11 +693,18 @@ vAPI.net.registerListeners = function() {
details.tabId = details.tabId.toString();
details.hostname = µmuri.hostnameFromURI(details.url);
// The rest of the function code is to normalize type
// The rest of the function code is to normalize request type
if ( details.type !== 'other' ) {
return;
}
if ( details.requestHeaders instanceof HTTPRequestHeaders ) {
if ( details.requestHeaders.getHeader('ping-to') !== '' ) {
details.type = 'ping';
return;
}
}
var tail = µmuri.path.slice(-6);
var pos = tail.lastIndexOf('.');
@ -751,8 +758,8 @@ vAPI.net.registerListeners = function() {
var onBeforeSendHeadersClient = this.onBeforeSendHeaders.callback;
var onBeforeSendHeaders = function(details) {
normalizeRequestDetails(details);
details.requestHeaders = httpRequestHeadersFactory(details.requestHeaders);
normalizeRequestDetails(details);
var result = onBeforeSendHeadersClient(details);
if ( typeof result === 'object' ) {
return result;

15
src/js/traffic.js
View file

@ -399,7 +399,7 @@ var onBeforeSendHeadersHandler = function(details) {
var requestURL = details.url;
var requestType = requestTypeNormalizer[details.type] || 'other';
if ( requestType === 'other' ) {
if ( requestType === 'ping' ) {
var linkAuditor = details.requestHeaders.getHeader('ping-to');
if ( linkAuditor !== '' ) {
var block = µm.userSettings.processHyperlinkAuditing;
@ -704,15 +704,16 @@ var headerIndexFromName = function(headerName, headers) {
/******************************************************************************/
var requestTypeNormalizer = {
'main_frame' : 'doc',
'sub_frame' : 'frame',
'stylesheet' : 'css',
'script' : 'script',
'font' : 'css',
'image' : 'image',
'main_frame' : 'doc',
'object' : 'plugin',
'xmlhttprequest': 'xhr',
'other' : 'other',
'font' : 'css'
'ping' : 'ping',
'script' : 'script',
'stylesheet' : 'css',
'sub_frame' : 'frame',
'xmlhttprequest': 'xhr'
};
/******************************************************************************/