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
..
Makefile.in	m-c to e10 merge	2010-05-24 17:45:59 +03:00
netCore.h
nsASocketHandler.h	Bug 506041 Part 2: Correct misspellings in source code	2010-05-13 14:19:50 +02:00
nsChannelProperties.h	Bug 515797: Allow necko to create channels that are aware of Content Security Policy. r=jduell, sr=biesi	2010-04-10 16:08:21 -04:00
nsIApplicationCache.idl	Bug 442810 - update ui for app cache changes. r=gavin, r=honzab, sr=bz	2009-02-22 11:09:10 -08:00
nsIApplicationCacheChannel.idl	Bug 461325: Cache implicit entries when the manifest is not changed. r=dcamp, sr=biesi	2008-11-05 16:01:08 -08:00
nsIApplicationCacheContainer.idl	Bug 442806: Use seperate, versioned caches for offline apps. r+sr=bz	2008-08-26 16:09:02 -07:00
nsIApplicationCacheService.idl	Bug 526230 - nsIApplicationCacheService::getGroups count outparam should be optional. r=honzab	2009-11-04 20:23:20 +01:00
nsIAsyncStreamCopier.idl	Bug 470716. Make the close-on-completion behavior of nsAsyncStreamCopier configurable. r+sr=bzbarsky.	2009-03-30 15:10:13 -04:00
nsIAuthInformation.idl	nsIAuthPrompt2: add PREVIOUS_FAILED, bug 521467, r=biesi, sr=bz	2010-02-12 17:55:11 +01:00
nsIAuthModule.idl
nsIAuthPrompt2.idl	Bug 475053 - Implement asyncPromptAuth to fix multiple password prompt overlap, r=bzbarsky+dolske	2009-07-20 20:29:41 +02:00
nsIAuthPrompt.idl	Bug 472824 promptPassword should unescape user names before use. r=dolkse,sr=mconnor	2009-01-15 13:16:34 +00:00
nsIAuthPromptAdapterFactory.idl
nsIAuthPromptCallback.idl
nsIAuthPromptProvider.idl
nsIBufferedStreams.idl
nsIByteRangeRequest.idl
nsICachingChannel.idl	Bug 445544: Navigating away from an offline app fails. r=honzab, r+sr=bz	2008-11-04 02:20:27 -08:00
nsICancelable.idl
nsIChannel.idl	# User Michal Novotny <michal.novotny@gmail.com>	2010-05-21 14:03:02 -07:00
nsIChannelEventSink.idl
nsIChannelPolicy.idl	Bug 515797: Allow necko to create channels that are aware of Content Security Policy. r=jduell, sr=biesi	2010-04-10 16:08:21 -04:00
nsIContentSniffer.idl
nsICryptoFIPSInfo.idl
nsICryptoHash.idl	Bug 473236 - Remove executable bit from files that don't need it. (Only changes file mode -- no code changes.) r=bsmedberg	2009-01-21 22:55:08 -08:00
nsICryptoHMAC.idl	Bug 419794 - "work out key API for nsICryptoHMAC" (API use nsIKeyObject + fix nsKeyModule + nsICryptoHMAC usage fix) [p=honzab@allpeers.com (Honza Bambas [mayhemer]) r=rrelyea sr=dveditz a=blocking1.9+]	2008-03-18 12:45:40 -07:00
nsIDownloader.idl
nsIEncodedChannel.idl
nsIExternalProtocolHandler.idl
nsIFileStreams.idl
nsIFileURL.idl
nsIIncrementalDownload.idl
nsIInputStreamChannel.idl
nsIInputStreamPump.idl
nsIIOService2.idl
nsIIOService.idl	Bug 522025 - Incessant slew of GetURLSpecFromFile warnings. r=taras	2009-10-16 16:59:02 -07:00
nsIIPCSerializable.idl	Bug 541174 - e10s HTTP: Improve how URIs are serialized (part1). r=dwitte	2010-04-09 18:26:36 +12:00
nsILoadGroup.idl
nsIMIMEInputStream.idl
nsIMultiPartChannel.idl
nsINestedURI.idl
nsINetUtil.idl	Bug 408599 Expose nsSimpleNestedURI to XPCOM r=biesi sr=bz	2009-08-23 23:48:07 +01:00
nsINetworkLinkService.idl
nsINSSErrorsService.idl	Attempting to fix tinderbox bustage from bug 378241	2007-12-04 11:38:27 -08:00
nsIPermission.idl	Bug 519263 - Session and time-based expiration for permissions in permissions manager. r=dwitte,	2009-10-16 14:01:04 -07:00
nsIPermissionManager.idl	Bug 519263 - Session and time-based expiration for permissions in permissions manager. r=dwitte,	2009-10-16 14:01:04 -07:00
nsIPrivateBrowsingService.idl	Bug 460086 - Library context menu for history items should include "Delete all data to <domain>"	2008-11-05 03:24:22 -05:00
nsIProgressEventSink.idl
nsIPrompt.idl
nsIProtocolHandler.idl	Bug 543870: Implement File.url. r=bz sr=jst	2010-03-02 23:51:09 -08:00
nsIProtocolProxyCallback.idl
nsIProtocolProxyFilter.idl
nsIProtocolProxyService2.idl
nsIProtocolProxyService.idl	Bug 472529, websockets (netwerk patch), r=smaug+biesi	2010-06-17 21:33:42 +03:00
nsIProxiedChannel.idl
nsIProxiedProtocolHandler.idl
nsIProxyAutoConfig.idl
nsIProxyInfo.idl
nsIRandomGenerator.idl	Bug 369428 - nsExternalAppHandler::SetUpTempFile uses a poor source of randomness, resulting in predictable filenames. r=kaie, sr=rrelyea, a=blocking1.9	2007-10-12 15:48:07 -07:00
nsIRequest.idl	Implement cookieless requests for Access-Control. b=389508 r=biesi sr=jst	2008-09-30 17:52:52 -07:00
nsIRequestObserver.idl
nsIRequestObserverProxy.idl
nsIResumableChannel.idl
nsISecretDecoderRing.idl
nsISecureBrowserUI.idl
nsISecurityEventSink.idl
nsISecurityInfoProvider.idl	Bug 455367. Don't just assume that all image loads get data; ask imagelib instead. r=kaie, r=joedrew, sr=jst	2009-02-16 09:11:30 -05:00
nsIServerSocket.idl
nsISimpleStreamListener.idl
nsISocketTransport.idl	Bug 529921 browser part. Implement core support for RFC-2597/2598/3168 Quality-of-Service (DSCP) marking. r=biesi	2010-06-02 22:25:01 -04:00
nsISocketTransportService.idl	followup to bug 418535, add comments about which threads nsISocketTransportService functions can be called on patch by Florian Quèze <florian@queze.net> r+sr=biesi	2008-03-18 14:00:53 -07:00
nsIStandardURL.idl
nsIStreamListener.idl
nsIStreamListenerTee.idl	Bug 513074 - remove sync writes from current cache, r=biesi,michal.novotny sr=bzbarsky	2010-02-23 10:13:18 -08:00
nsIStreamLoader.idl	Bug 533079 Actually land patch addressing review comments from bug 507970 a=shaver r=biesi	2009-12-07 10:49:46 +00:00
nsIStreamTransportService.idl
nsISyncStreamListener.idl
nsISystemProxySettings.idl	Bug 66057 - "Proxy: $http_proxy should influence proxy settings" [p=roc@ocallahan.org (Robert O'Callahan [roc]) / diane@ghic.org (Diane Trout) / ventnor.bugzilla@yahoo.com.au (Michael Ventnor) r=josh r+sr=biesi a1.9=damons]	2008-01-29 07:58:38 -08:00
nsITraceableChannel.idl	Bug 430155. New nsHttpChannel interface to allow examination of HTTP data before it is passed to the channel's creator. r=biesi, sr=bzbarsky	2008-08-25 13:21:28 -04:00
nsITransport.idl
nsIUnicharStreamListener.idl
nsIUnicharStreamLoader.idl
nsIUploadChannel2.idl	Fixing bug 491201. Adding ability for XMLHttpRequest.send() to accept a File object. r+sr=jonas@sicking.cc, r=cbiesinger@gmail.com	2009-09-08 16:29:41 -07:00
nsIUploadChannel.idl
nsIURI.idl	Fixing comments to match reality. No bug.	2009-02-23 15:59:26 -05:00
nsIURIChecker.idl	Bug 506041 Part 2: Correct misspellings in source code	2010-05-13 14:19:50 +02:00
nsIURIClassifier.idl	# User Michal Novotny <michal.novotny@gmail.com>	2010-05-21 14:03:02 -07:00
nsIURIWithPrincipal.idl	Bug 543870: Implement File.url. r=bz sr=jst	2010-03-02 23:51:09 -08:00
nsIURL.idl	Bug 553970 - Fix nsIURL::GetRelativeSpec documentation. r=biesi	2010-03-22 13:29:51 -07:00
nsIURLParser.idl
nsNetError.h	Bug 506041 Part 2: Correct misspellings in source code	2010-05-13 14:19:50 +02:00
nsNetStrings.h	Bug 515797: Allow necko to create channels that are aware of Content Security Policy. r=jduell, sr=biesi	2010-04-10 16:08:21 -04:00
nsNetUtil.h	Bug 536273 - e10s HTTP: get POSTs working. r=jduell	2010-05-30 15:30:28 -07:00
nsPISocketTransportService.idl	Bug 454990. On Windows, increase the size of our TCP send window to 128KB, from the default of 8KB. The value is already 128KB on other OSes, and it appears that other browsers on Windows change the default in the same way. r=jduell, r+sr=bzbarsky.	2009-02-09 12:31:44 -05:00
nsReadLine.h	Make NS_ReadLine() not lie about having more data when the stream ends in \r\n. b=397850 r+sr=cbiesinger a=blocking1.9	2008-01-15 02:22:58 -08:00
nsURIHashKey.h	Bug 348748 - Replace all instances of NS_STATIC_CAST and friends with C++ casts (and simultaneously bitrot nearly every patch in existence). r=bsmedberg on the script that did this. Tune in next time for Macro Wars: Episode II: Attack on the LL_* Macros.	2007-07-08 00:08:04 -07:00
security-prefs.js	Bug 549641, Firefox raises alarm (in error console) about SSL servers being vulnerable to CVE-2009-3555	2010-05-03 13:34:16 +02:00