gecko-dev/netwerk/dns
Jason Duell 386a098a89 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
..
Makefile.in Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
effective_tld_names.dat Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nameprep.c Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nameprep_template.c Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nameprepdata.c Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nsDNSService2.cpp Bug 472529, websockets (netwerk patch), r=smaug+biesi 2010-06-17 21:33:42 +03:00
nsDNSService2.h Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nsEffectiveTLDService.cpp Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nsEffectiveTLDService.h Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nsHostResolver.cpp Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nsHostResolver.h Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nsIDNKitInterface.h Merging with M-C. 2010-06-07 13:38:02 -07:00
nsIDNSListener.idl Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nsIDNSRecord.idl Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nsIDNSRequest.idl Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nsIDNSService.idl Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nsIDNService.cpp Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nsIDNService.h Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nsIEffectiveTLDService.idl Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nsIIDNService.idl Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
nsPIDNSService.idl Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
prepare_tlds.py Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
punycode.c Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
punycode.h Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00
race.c Bug 542222 - Reduce recursion in netwerk makefiles. 2010-06-05 21:18:12 -04:00