Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
10ae5b4b
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
10ae5b4b
编写于
11月 29, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "don't use XHR when having a proxy configured"
This reverts commit
406833f6
.
上级
406833f6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
22 deletion
+5
-22
src/vs/platform/request/electron-browser/requestService.ts
src/vs/platform/request/electron-browser/requestService.ts
+4
-21
src/vs/platform/request/node/requestService.ts
src/vs/platform/request/node/requestService.ts
+1
-1
未找到文件。
src/vs/platform/request/electron-browser/requestService.ts
浏览文件 @
10ae5b4b
...
...
@@ -8,26 +8,14 @@ import { TPromise } from 'vs/base/common/winjs.base';
import
{
IRequestOptions
,
IRequestContext
,
IRequestFunction
}
from
'
vs/base/node/request
'
;
import
{
Readable
}
from
'
stream
'
;
import
{
RequestService
as
NodeRequestService
}
from
'
vs/platform/request/node/requestService
'
;
import
{
IHTTPConfiguration
}
from
'
vs/platform/request/node/request
'
;
/**
* This service exposes the `request` API, while using the global
* or configured proxy settings.
*/
export
class
RequestService
extends
NodeRequestService
{
private
_useXhrRequest
=
true
;
protected
configure
(
config
:
IHTTPConfiguration
)
{
this
.
_useXhrRequest
=
!
config
.
http
.
proxy
;
}
request
(
options
:
IRequestOptions
):
TPromise
<
IRequestContext
>
{
if
(
this
.
_useXhrRequest
)
{
return
super
.
request
(
options
,
xhrRequest
);
}
else
{
return
super
.
request
(
options
);
}
return
super
.
request
(
options
,
xhrRequest
);
}
}
...
...
@@ -83,18 +71,13 @@ export const xhrRequest: IRequestFunction = (options: IRequestOptions): TPromise
});
};
// --- header utils
const
unsafeHeaders
=
Object
.
create
(
null
);
unsafeHeaders
[
'
User-Agent
'
]
=
true
;
unsafeHeaders
[
'
Content-Length
'
]
=
true
;
unsafeHeaders
[
'
Accept-Encoding
'
]
=
true
;
function
setRequestHeaders
(
xhr
:
XMLHttpRequest
,
options
:
IRequestOptions
):
void
{
if
(
options
.
headers
)
{
for
(
let
k
in
options
.
headers
)
{
if
(
!
unsafeHeaders
[
k
])
{
try
{
xhr
.
setRequestHeader
(
k
,
options
.
headers
[
k
]);
}
catch
(
e
)
{
console
.
warn
(
e
);
}
}
}
...
...
src/vs/platform/request/node/requestService.ts
浏览文件 @
10ae5b4b
...
...
@@ -36,7 +36,7 @@ export class RequestService implements IRequestService {
this
.
configure
(
e
.
config
);
}
pr
otected
configure
(
config
:
IHTTPConfiguration
)
{
pr
ivate
configure
(
config
:
IHTTPConfiguration
)
{
this
.
proxyUrl
=
config
.
http
&&
config
.
http
.
proxy
;
this
.
strictSSL
=
config
.
http
&&
config
.
http
.
proxyStrictSSL
;
this
.
authorization
=
config
.
http
&&
config
.
http
.
proxyAuthorization
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录