3 Commits

Author	SHA1	Message	Date
Jason Duell	d194b9d486	Merge from m-c. ... Fair amount of merge conflicts. Biggest item was changes to nsHttpChannel from web sockets changes. Other likely suspects if things are borken: nsFrameLoader.cpp: - nsFrameLoader::EnsureMessageManager: pass "this" (orig e10s code) or nsnull (m-c) to local process call to new nsFrameMessageManager(), callback arg? Smaug said null. - only calling SetCallBackData for local case. also +r smaug. nsPrefBranch.cpp had fairly extensive merge conflicts. nsChromeRegistry had lots of changes. Dougt did most of the non-necko changes (thanks). --HG-- rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h	2010-06-22 17:33:57 -07:00
Benjamin Stover	b0870bf399	Bug 570867 - e10s http: add cookies to request in child, not parent [r=dwitte]	2010-06-15 16:07:10 -07:00
Doug Turner	be96d6cdaf	Fixup to http after the necko-file-move ... --HG-- rename : netwerk/protocol/http/src/HttpBaseChannel.cpp => netwerk/protocol/http/HttpBaseChannel.cpp rename : netwerk/protocol/http/src/HttpBaseChannel.h => netwerk/protocol/http/HttpBaseChannel.h rename : netwerk/protocol/http/src/HttpChannelChild.cpp => netwerk/protocol/http/HttpChannelChild.cpp rename : netwerk/protocol/http/src/HttpChannelChild.h => netwerk/protocol/http/HttpChannelChild.h rename : netwerk/protocol/http/src/HttpChannelParent.cpp => netwerk/protocol/http/HttpChannelParent.cpp rename : netwerk/protocol/http/src/HttpChannelParent.h => netwerk/protocol/http/HttpChannelParent.h rename : netwerk/protocol/http/src/PHttpChannel.ipdl => netwerk/protocol/http/PHttpChannel.ipdl rename : netwerk/protocol/http/src/PHttpChannelParams.h => netwerk/protocol/http/PHttpChannelParams.h rename : netwerk/protocol/http/src/ipdl.mk => netwerk/protocol/http/ipdl.mk	2010-06-07 14:40:08 -07:00