mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-07 22:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Accept header now overridable

Browse Source
This commit is contained in:
Gregory Schier 2017-11-12 18:35:01 +00:00
parent 7bf8edbc91
commit 41e903714b
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/misc.js
View File

@ -63,6 +63,10 @@ export function hasUserAgentHeader<T: Header> (headers: Array<T>): boolean {
return filterHeaders(headers, 'user-agent').length > 0;
}
export function hasAcceptEncodingHeader<T: Header> (headers: Array<T>): boolean {
return filterHeaders(headers, 'accept-encoding').length > 0;
}
export function getSetCookieHeaders<T: Header> (headers: Array<T>): Array<T> {
return filterHeaders(headers, 'set-cookie');
}

18
app/network/network.js
View File

@ -14,7 +14,7 @@ import * as models from '../models';
import * as querystring from '../common/querystring';
import * as util from '../common/misc.js';
import {AUTH_AWS_IAM, AUTH_BASIC, AUTH_DIGEST, AUTH_NETRC, AUTH_NTLM, CONTENT_TYPE_FORM_DATA, CONTENT_TYPE_FORM_URLENCODED, getAppVersion, getTempDir, STATUS_CODE_PLUGIN_ERROR} from '../common/constants';
import {describeByteSize, getContentTypeHeader, hasAuthHeader, hasContentTypeHeader, hasUserAgentHeader, setDefaultProtocol} from '../common/misc';
import {describeByteSize, getContentTypeHeader, hasAcceptEncodingHeader, hasAcceptHeader, hasAuthHeader, hasContentTypeHeader, hasUserAgentHeader, setDefaultProtocol} from '../common/misc';
import fs from 'fs';
import * as db from '../common/database';
import * as CACerts from './cacert';
@ -133,6 +133,7 @@ export function _actuallySend (
setOpt(Curl.option.TIMEOUT_MS, settings.timeout); // 0 for no timeout
setOpt(Curl.option.VERBOSE, true); // True so debug function works
setOpt(Curl.option.NOPROGRESS, false); // False so progress function works
setOpt(Curl.option.ACCEPT_ENCODING, ''); // Auto decode everything
// Set maximum amount of redirects allowed
// NOTE: Setting this to -1 breaks some versions of libcurl
@ -456,11 +457,6 @@ export function _actuallySend (
setOpt(Curl.option.POSTFIELDS, requestBody);
}
// Setup encoding settings
headers.push({name: 'Accept', value: '*/*'}); // Default to anything
headers.push({name: 'Accept-Encoding', value: ''}); // Don't auto-send this header
setOpt(Curl.option.ACCEPT_ENCODING, ''); // Auto decode everything
// Build the body
const dataBuffers = [];
let dataBuffersLength = 0;
@ -521,6 +517,16 @@ export function _actuallySend (
}
}
// Send a default Accept headers of anything
if (!hasAcceptHeader(headers)) {
headers.push({name: 'Accept', value: '*/*'}); // Default to anything
}
// Don't auto-send Accept-Encoding header
if (!hasAcceptEncodingHeader(headers)) {
headers.push({name: 'Accept-Encoding', value: ''});
}
// Set User-Agent if it't not already in headers
if (!hasUserAgentHeader(headers)) {
setOpt(Curl.option.USERAGENT, `insomnia/${getAppVersion()}`);