gecko/netwerk/base/src
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
NetUtil.jsm Bug 532147 - NetUtil.asyncFetch should take an nsIURI, string, nsIFile, or nsIChannel 2009-12-15 23:33:08 -08:00
nsAsyncStreamCopier.cpp backout Bug 559927 since suspect of causing a Windows necko test failure 2010-04-29 13:27:10 +02:00
nsAsyncStreamCopier.h Bug 470716. Make the close-on-completion behavior of nsAsyncStreamCopier configurable. r+sr=bzbarsky. 2009-03-30 15:10:13 -04:00
nsAuthInformationHolder.cpp
nsAuthInformationHolder.h
nsAutodialMaemo.cpp Bug 495674: Internet connection should be initiated if needed [r=biesi] 2009-11-18 10:20:45 -05:00
nsAutodialMaemo.h Bug 495674: Internet connection should be initiated if needed [r=biesi] 2009-11-18 10:20:45 -05:00
nsAutodialWin.cpp Bug 504025 - [windows x64] casting pointer to long is illegal on win64; don't cast HANDLE to UINT either; r=doug.turner sr=cbiesinger 2009-08-09 00:50:36 +02:00
nsAutodialWin.h Bug 488140 - rename the class in nsAutodial and friends to be consistent. r=jduell, sr=stuart 2009-04-13 21:41:33 -07:00
nsAutodialWinCE.cpp Bug 490663 - Autodialer does not work on proxied connections. r=blassey, sr=vlad 2009-07-08 10:52:45 -07:00
nsAutodialWinCE.h Bug 488140 - rename the class in nsAutodial and friends to be consistent. r=jduell, sr=stuart 2009-04-13 21:41:33 -07:00
nsBase64Encoder.cpp
nsBase64Encoder.h
nsBaseChannel.cpp # User Michal Novotny <michal.novotny@gmail.com> 2010-05-21 14:03:02 -07:00
nsBaseChannel.h # User Michal Novotny <michal.novotny@gmail.com> 2010-05-21 14:03:02 -07:00
nsBaseContentStream.cpp
nsBaseContentStream.h
nsBufferedStreams.cpp
nsBufferedStreams.h
nsChannelClassifier.cpp # User Michal Novotny <michal.novotny@gmail.com> 2010-05-21 14:03:02 -07:00
nsChannelClassifier.h # User Michal Novotny <michal.novotny@gmail.com> 2010-05-21 14:03:02 -07:00
nsDirectoryIndexStream.cpp
nsDirectoryIndexStream.h
nsDNSPrefetch.cpp Fixing bug 488162. Disable prefetches on proxy config and pref, r+sr=bzbarsky@mit.edu 2009-05-06 14:26:33 -07:00
nsDNSPrefetch.h
nsDownloader.cpp
nsDownloader.h
nsFileStreams.cpp Bug 507312 - nsFileInputStream::available() throws for files >= 4,294,967,295 bytes (4 GB). r=cbiesinger 2009-09-16 14:50:32 +09:00
nsFileStreams.h
nsIncrementalDownload.cpp Bug 560095 - Use mozilla::services::GetObserverService(). r=biesi,dveditz,gavin,josh,jst,mrbkap,roc,sdwilsh,shaver,sicking,smontagu,surkov 2010-04-29 18:59:13 +02:00
nsInputStreamChannel.cpp
nsInputStreamChannel.h
nsInputStreamPump.cpp Bug 506041 Part 2: Correct misspellings in source code 2010-05-13 14:19:50 +02:00
nsInputStreamPump.h
nsIOService.cpp m-c to e10 merge 2010-05-24 17:45:59 +03:00
nsIOService.h Bug 552829 - e10s - Online and offline events. Quick define fix. 2010-05-11 13:22:34 -04:00
nsIOThreadPool.cpp Bug 560095 - Use mozilla::services::GetObserverService(). r=biesi,dveditz,gavin,josh,jst,mrbkap,roc,sdwilsh,shaver,sicking,smontagu,surkov 2010-04-29 18:59:13 +02:00
nsIOThreadPool.h
nsLoadGroup.cpp
nsLoadGroup.h
nsMIMEInputStream.cpp
nsMIMEInputStream.h
nsNativeConnectionHelper.cpp Bug 495674: Internet connection should be initiated if needed [r=biesi] 2009-11-18 10:20:45 -05:00
nsNativeConnectionHelper.h
nsNetSegmentUtils.h Bug 545869 - Remove small buffer #defines and use preferences. r=honza 2010-04-20 09:32:28 -07:00
nsNetStrings.cpp 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
nsPACMan.cpp Bug 563274 - Overhaul nsIPrompt-related prompting code. r=gavin, sr=bs 2010-06-16 17:06:17 -07:00
nsPACMan.h
nsProtocolProxyService.cpp Bug 472529, websockets (netwerk patch), r=smaug+biesi 2010-06-17 21:33:42 +03:00
nsProtocolProxyService.h Bug 472529, websockets (netwerk patch), r=smaug+biesi 2010-06-17 21:33:42 +03:00
nsProxyAutoConfig.js Bug 386635 - Automatically wrap sandboxes in security wrappers to make them easier to use safely. r=jst 2010-02-11 17:04:41 -08:00
nsProxyInfo.cpp
nsProxyInfo.h
nsRequestObserverProxy.cpp Bug 504025 - [windows x64] casting pointer to long is illegal on win64; cast to PRUptrdiff for printing out pointers; r=cbiesinger 2009-08-09 00:50:42 +02:00
nsRequestObserverProxy.h
nsSerializationHelper.cpp Bug 409500. Compute the right output length for our base64 decoding. r=jduell 2009-09-18 14:53:17 -04:00
nsSerializationHelper.h
nsServerSocket.cpp Replace direct instantiations of nsRunnableMethod with calls to the templatized NS_NewRunnableMethod function (part 3/3 of bug 558498). r=dwitte sr=dbaron 2010-04-20 16:21:35 -07:00
nsServerSocket.h
nsSimpleNestedURI.cpp Bug 571619 Drop support for aggregation with nsSimpleURI so that we can inherit nsSimpleNestedURI from it correctly r=biesi 2010-06-12 21:40:05 +01:00
nsSimpleNestedURI.h Bug 571619 Drop support for aggregation with nsSimpleURI so that we can inherit nsSimpleNestedURI from it correctly r=biesi 2010-06-12 21:40:05 +01:00
nsSimpleStreamListener.cpp
nsSimpleStreamListener.h
nsSimpleURI.cpp Bug 571619 Drop support for aggregation with nsSimpleURI so that we can inherit nsSimpleNestedURI from it correctly r=biesi 2010-06-12 21:40:05 +01:00
nsSimpleURI.h Bug 571619 Drop support for aggregation with nsSimpleURI so that we can inherit nsSimpleNestedURI from it correctly r=biesi 2010-06-12 21:40:05 +01:00
nsSocketTransport2.cpp 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
nsSocketTransport2.h 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
nsSocketTransportService2.cpp Bug 560647 - add startup timeline instrumentation; r=vlad 2010-05-19 19:22:19 -04:00
nsSocketTransportService2.h
nsStandardURL.cpp Merged m-c 2010-05-13 18:04:53 -05:00
nsStandardURL.h Bug 541174 - e10s HTTP: Improve how URIs are serialized (part1). r=dwitte 2010-04-09 18:26:36 +12:00
nsStreamListenerTee.cpp Bug 513074 - remove sync writes from current cache, r=biesi,michal.novotny sr=bzbarsky 2010-02-23 10:13:18 -08:00
nsStreamListenerTee.h Bug 513074 - remove sync writes from current cache, r=biesi,michal.novotny sr=bzbarsky 2010-02-23 10:13:18 -08:00
nsStreamLoader.cpp Bug 533079 Actually land patch addressing review comments from bug 507970 a=shaver r=biesi 2009-12-07 10:49:46 +00:00
nsStreamLoader.h Bug 533079 Actually land patch addressing review comments from bug 507970 a=shaver r=biesi 2009-12-07 10:49:46 +00:00
nsStreamTransportService.cpp Bug 560095 - Use mozilla::services::GetObserverService(). r=biesi,dveditz,gavin,josh,jst,mrbkap,roc,sdwilsh,shaver,sicking,smontagu,surkov 2010-04-29 18:59:13 +02:00
nsStreamTransportService.h
nsSyncStreamListener.cpp Bug 545869 - Remove small buffer #defines and use preferences. r=honza 2010-04-20 09:32:28 -07:00
nsSyncStreamListener.h
nsTransportUtils.cpp
nsTransportUtils.h
nsUnicharStreamLoader.cpp
nsUnicharStreamLoader.h
nsURIChecker.cpp
nsURIChecker.h
nsURLHelper.cpp Bug 522025 - Incessant slew of GetURLSpecFromFile warnings. r=taras 2009-10-16 16:59:02 -07:00
nsURLHelper.h Bug 522025 - Incessant slew of GetURLSpecFromFile warnings. r=taras 2009-10-16 16:59:02 -07:00
nsURLHelperOS2.cpp Bug 510991 - NS_GetURLSpecFromFile does a stat(). r=biesi 2009-10-06 15:43:59 +02:00
nsURLHelperOSX.cpp Bug 510991 - NS_GetURLSpecFromFile does a stat(). r=biesi 2009-10-06 15:43:59 +02:00
nsURLHelperUnix.cpp Bug 510991 - NS_GetURLSpecFromFile does a stat(). r=biesi 2009-10-06 15:43:59 +02:00
nsURLHelperWin.cpp Bug 510991 - NS_GetURLSpecFromFile does a stat(). r=biesi 2009-10-06 15:43:59 +02:00
nsURLParsers.cpp Bug 479485 - Invalid port numbers cause default port to be used, should fail to load, r=bzbarsky 2009-09-28 17:10:34 +02:00
nsURLParsers.h bug 491801 the no_auth URLparser needs to enforce no_auth, r=jduell, sr=biesi 2009-05-16 20:21:35 -07:00