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 667907. For HTTP 0.9 on non-default ports, be more conservative. r=jduell

Browse Source
This commit is contained in:
Boris Zbarsky 2011-07-07 14:17:13 -04:00
parent 6311e0ed15
commit bd8923f8be
3 changed files with 86 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -649,8 +649,12 @@ nsHttpChannel::CallOnStartRequest()
mTracingEnabled = PR_FALSE;
if (mResponseHead && mResponseHead->ContentType().IsEmpty()) {
NS_ASSERTION(mConnectionInfo, "Should have connection info here");
if (!mContentTypeHint.IsEmpty())
mResponseHead->SetContentType(mContentTypeHint);
else if (mResponseHead->Version() == NS_HTTP_VERSION_0_9 &&
mConnectionInfo->Port() != mConnectionInfo->DefaultPort())
mResponseHead->SetContentType(NS_LITERAL_CSTRING(TEXT_PLAIN));
else {
// Uh-oh. We had better find out what type we are!

81
netwerk/test/unit/test_bug667907.js Normal file
View File

@ -0,0 +1,81 @@
do_load_httpd_js();
var httpserver = null;
var simplePath = "/simple";
var normalPath = "/normal";
var httpbody = "<html></html>";
var uri1 = "http://localhost:4444" + simplePath;
var uri2 = "http://localhost:4444" + normalPath;
function make_channel(url) {
var ios = Cc["@mozilla.org/network/io-service;1"].
getService(Ci.nsIIOService);
return ios.newChannel(url, "", null);
}
var listener_proto = {
QueryInterface: function(iid) {
if (iid.equals(Components.interfaces.nsIStreamListener) ||
iid.equals(Components.interfaces.nsIRequestObserver) ||
iid.equals(Components.interfaces.nsISupports))
return this;
throw Components.results.NS_ERROR_NO_INTERFACE;
},
onStartRequest: function(request, context) {
do_check_eq(request.QueryInterface(Ci.nsIChannel).contentType,
this.contentType);
request.cancel(Cr.NS_BINDING_ABORTED);
},
onDataAvailable: function(request, context, stream, offset, count) {
do_throw("Unexpected onDataAvailable");
},
onStopRequest: function(request, context, status) {
do_check_eq(status, Cr.NS_BINDING_ABORTED);
this.termination_func();
}
};
function listener(contentType, termination_func) {
this.contentType = contentType;
this.termination_func = termination_func;
}
listener.prototype = listener_proto;
function run_test()
{
httpserver = new nsHttpServer();
httpserver.registerPathHandler(simplePath, simpleHandler);
httpserver.registerPathHandler(normalPath, normalHandler);
httpserver.start(4444);
var channel = make_channel(uri1);
channel.asyncOpen(new listener("text/plain", function() {
run_test2();
}), null);
do_test_pending();
}
function run_test2()
{
var channel = make_channel(uri2);
channel.asyncOpen(new listener("text/html", function() {
httpserver.stop(do_test_finished);
}), null);
}
function simpleHandler(metadata, response)
{
response.seizePower();
response.bodyOutputStream.write(httpbody, httpbody.length);
response.finish();
}
function normalHandler(metadata, response)
{
response.bodyOutputStream.write(httpbody, httpbody.length);
response.finish();
}

1
netwerk/test/unit/xpcshell.ini
View File

@ -68,6 +68,7 @@ tail =
[test_bug659569.js]
[test_bug660066.js]
[test_bug651185.js]
[test_bug667907.js]
[test_cacheflags.js]
[test_channel_close.js]
[test_compareURIs.js]