wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 1095859 - proxy tweak r=valentin.gosu

Browse Source
This commit is contained in:
Patrick McManus 2014-11-17 13:27:12 -05:00
parent b262d6289f
commit 162eb6fd39
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
netwerk/protocol/http/nsHttpChannel.cpp
View File

@ -1438,7 +1438,15 @@ nsHttpChannel::ProcessResponse()
// notify "http-on-examine-response" observers
gHttpHandler->OnExamineResponse(this);
SetCookie(mResponseHead->PeekHeader(nsHttp::Set_Cookie));
// Cookies and Alt-Service should not be handled on proxy failure either.
// This would be consolidated with ProcessSecurityHeaders but it should
// happen after OnExamineResponse.
if (!mTransaction->ProxyConnectFailed() && (httpStatus != 407)) {
SetCookie(mResponseHead->PeekHeader(nsHttp::Set_Cookie));
if (httpStatus < 500) {
ProcessAltService();
}
}
// handle unused username and password in url (see bug 232567)
if (httpStatus != 401 && httpStatus != 407) {
@ -1454,10 +1462,6 @@ nsHttpChannel::ProcessResponse()
LOG((" continuation state has been reset"));
}
if (httpStatus < 500) {
ProcessAltService();
}
bool successfulReval = false;
// handle different server response categories. Note that we handle

29
netwerk/test/unit/test_auth_proxy.js
View File

@ -172,6 +172,12 @@ var listener = {
// If we expect 200, the request should have succeeded
do_check_eq(this.expectedCode == 200, request.requestSucceeded);
var cookie = "";
try {
cookie = request.getRequestHeader("Cookie");
} catch (e) { }
do_check_eq(cookie, "");
} catch (e) {
do_throw("Unexpected exception: " + e);
}
@ -261,6 +267,25 @@ function test_all_ok() {
do_test_pending();
}
function test_proxy_407_cookie() {
var chan = makeChan();
chan.notificationCallbacks = new Requestor(FLAG_RETURN_FALSE, 0);
chan.setRequestHeader("X-Set-407-Cookie", "1", false);
listener.expectedCode = 407; // Proxy Unauthorized
chan.asyncOpen(listener, null);
do_test_pending();
}
function test_proxy_200_cookie() {
var chan = makeChan();
chan.notificationCallbacks = new Requestor(0, 0);
chan.setRequestHeader("X-Set-407-Cookie", "1", false);
listener.expectedCode = 200; // OK
chan.asyncOpen(listener, null);
do_test_pending();
}
function test_host_returnfalse() {
dump("\ntest: host returnfalse\n");
var chan = makeChan();
@ -301,6 +326,7 @@ function test_proxy_wrongpw_host_returnfalse() {
}
var tests = [test_proxy_returnfalse, test_proxy_wrongpw, test_all_ok,
test_proxy_407_cookie, test_proxy_200_cookie,
test_host_returnfalse, test_host_wrongpw,
test_proxy_wrongpw_host_wrongpw, test_proxy_wrongpw_host_returnfalse];
@ -331,6 +357,9 @@ function proxyAuthHandler(metadata, response) {
"Unauthorized by HTTP proxy");
response.setHeader("Proxy-Authenticate",
'Basic realm="' + realm + '"', false);
if (metadata.hasHeader("X-Set-407-Cookie")) {
response.setHeader("Set-Cookie", "chewy", false);
}
body = "failed";
response.bodyOutputStream.write(body, body.length);
}