Commit Graph

98 Commits

Author SHA1 Message Date
Gervase Markham
7994377fda Bug 576508 - rollup of changes to the Public Suffix List. a=beltzner.
--HG--
extra : rebase_source : a1e5e5a1ac16da84b2bc4c429b68bd363cc485fa
2010-09-16 18:02:54 +01:00
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
Doug Turner
ded51c1c5f Merging with M-C.
Hand merged the following files:

U chrome/src/nsChromeRegistry.cpp
U chrome/src/nsChromeRegistry.h
U content/base/src/nsFrameLoader.cpp
U content/base/src/nsFrameLoader.h
U dom/src/geolocation/nsGeolocation.cpp
U dom/src/geolocation/nsGeolocation.h
U netwerk/build/Makefile.in
U netwerk/cookie/nsCookieService.cpp
U netwerk/cookie/nsCookieService.h

--HG--
rename : extensions/cookie/test/unit/test_cookies.js => extensions/cookie/test/unit/test_cookies_thirdparty.js
rename : netwerk/cookie/src/nsCookieService.cpp => netwerk/cookie/nsCookieService.cpp
rename : netwerk/cookie/src/nsCookieService.h => netwerk/cookie/nsCookieService.h
rename : netwerk/dns/src/nsIDNKitInterface.h => netwerk/dns/nsIDNKitInterface.h
rename : netwerk/protocol/http/src/nsHttp.h => netwerk/protocol/http/nsHttp.h
rename : netwerk/protocol/http/src/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannel.cpp
rename : netwerk/protocol/http/src/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannel.h
rename : netwerk/protocol/http/src/nsHttpChunkedDecoder.h => netwerk/protocol/http/nsHttpChunkedDecoder.h
rename : netwerk/protocol/http/src/nsHttpHandler.cpp => netwerk/protocol/http/nsHttpHandler.cpp
rename : netwerk/protocol/http/src/nsHttpHeaderArray.h => netwerk/protocol/http/nsHttpHeaderArray.h
rename : netwerk/protocol/http/src/nsHttpRequestHead.h => netwerk/protocol/http/nsHttpRequestHead.h
rename : netwerk/protocol/http/src/nsHttpResponseHead.h => netwerk/protocol/http/nsHttpResponseHead.h
rename : netwerk/protocol/http/src/nsHttpTransaction.cpp => netwerk/protocol/http/nsHttpTransaction.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.cpp => netwerk/protocol/res/nsResProtocolHandler.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.h => netwerk/protocol/res/nsResProtocolHandler.h
2010-06-07 13:38:02 -07:00
Olli Pettay
58b4f71840 m-c to e10 merge 2010-05-24 17:45:59 +03:00
Doug Turner
8f97a20153 Merge with m-c. no hand edits 2010-04-29 21:04:50 -07:00
Ehsan Akhgari
a87b134220 Bug 560647 - add startup timeline instrumentation; r=vlad 2010-05-19 19:22:19 -04:00
Mitchell Field
7763512029 Bug 542222 - Reduce recursion in netwerk makefiles.
--HG--
rename : netwerk/cache/src/nsCache.cpp => netwerk/cache/nsCache.cpp
rename : netwerk/cache/src/nsCache.h => netwerk/cache/nsCache.h
rename : netwerk/cache/src/nsCacheDevice.h => netwerk/cache/nsCacheDevice.h
rename : netwerk/cache/src/nsCacheEntry.cpp => netwerk/cache/nsCacheEntry.cpp
rename : netwerk/cache/src/nsCacheEntry.h => netwerk/cache/nsCacheEntry.h
rename : netwerk/cache/src/nsCacheEntryDescriptor.cpp => netwerk/cache/nsCacheEntryDescriptor.cpp
rename : netwerk/cache/src/nsCacheEntryDescriptor.h => netwerk/cache/nsCacheEntryDescriptor.h
rename : netwerk/cache/src/nsCacheMetaData.cpp => netwerk/cache/nsCacheMetaData.cpp
rename : netwerk/cache/src/nsCacheMetaData.h => netwerk/cache/nsCacheMetaData.h
rename : netwerk/cache/src/nsCacheRequest.h => netwerk/cache/nsCacheRequest.h
rename : netwerk/cache/src/nsCacheService.cpp => netwerk/cache/nsCacheService.cpp
rename : netwerk/cache/src/nsCacheService.h => netwerk/cache/nsCacheService.h
rename : netwerk/cache/src/nsCacheSession.cpp => netwerk/cache/nsCacheSession.cpp
rename : netwerk/cache/src/nsCacheSession.h => netwerk/cache/nsCacheSession.h
rename : netwerk/cache/src/nsDeleteDir.cpp => netwerk/cache/nsDeleteDir.cpp
rename : netwerk/cache/src/nsDeleteDir.h => netwerk/cache/nsDeleteDir.h
rename : netwerk/cache/src/nsDiskCache.h => netwerk/cache/nsDiskCache.h
rename : netwerk/cache/src/nsDiskCacheBinding.cpp => netwerk/cache/nsDiskCacheBinding.cpp
rename : netwerk/cache/src/nsDiskCacheBinding.h => netwerk/cache/nsDiskCacheBinding.h
rename : netwerk/cache/src/nsDiskCacheBlockFile.cpp => netwerk/cache/nsDiskCacheBlockFile.cpp
rename : netwerk/cache/src/nsDiskCacheBlockFile.h => netwerk/cache/nsDiskCacheBlockFile.h
rename : netwerk/cache/src/nsDiskCacheDevice.cpp => netwerk/cache/nsDiskCacheDevice.cpp
rename : netwerk/cache/src/nsDiskCacheDevice.h => netwerk/cache/nsDiskCacheDevice.h
rename : netwerk/cache/src/nsDiskCacheDeviceSQL.cpp => netwerk/cache/nsDiskCacheDeviceSQL.cpp
rename : netwerk/cache/src/nsDiskCacheDeviceSQL.h => netwerk/cache/nsDiskCacheDeviceSQL.h
rename : netwerk/cache/src/nsDiskCacheEntry.cpp => netwerk/cache/nsDiskCacheEntry.cpp
rename : netwerk/cache/src/nsDiskCacheEntry.h => netwerk/cache/nsDiskCacheEntry.h
rename : netwerk/cache/src/nsDiskCacheMap.cpp => netwerk/cache/nsDiskCacheMap.cpp
rename : netwerk/cache/src/nsDiskCacheMap.h => netwerk/cache/nsDiskCacheMap.h
rename : netwerk/cache/src/nsDiskCacheStreams.cpp => netwerk/cache/nsDiskCacheStreams.cpp
rename : netwerk/cache/src/nsDiskCacheStreams.h => netwerk/cache/nsDiskCacheStreams.h
rename : netwerk/cache/public/nsICache.idl => netwerk/cache/nsICache.idl
rename : netwerk/cache/public/nsICacheEntryDescriptor.idl => netwerk/cache/nsICacheEntryDescriptor.idl
rename : netwerk/cache/public/nsICacheListener.idl => netwerk/cache/nsICacheListener.idl
rename : netwerk/cache/public/nsICacheService.idl => netwerk/cache/nsICacheService.idl
rename : netwerk/cache/public/nsICacheSession.idl => netwerk/cache/nsICacheSession.idl
rename : netwerk/cache/public/nsICacheVisitor.idl => netwerk/cache/nsICacheVisitor.idl
rename : netwerk/cache/src/nsMemoryCacheDevice.cpp => netwerk/cache/nsMemoryCacheDevice.cpp
rename : netwerk/cache/src/nsMemoryCacheDevice.h => netwerk/cache/nsMemoryCacheDevice.h
rename : netwerk/cookie/src/nsCookie.cpp => netwerk/cookie/nsCookie.cpp
rename : netwerk/cookie/src/nsCookie.h => netwerk/cookie/nsCookie.h
rename : netwerk/cookie/src/nsCookieService.cpp => netwerk/cookie/nsCookieService.cpp
rename : netwerk/cookie/src/nsCookieService.h => netwerk/cookie/nsCookieService.h
rename : netwerk/cookie/public/nsICookie.idl => netwerk/cookie/nsICookie.idl
rename : netwerk/cookie/public/nsICookie2.idl => netwerk/cookie/nsICookie2.idl
rename : netwerk/cookie/public/nsICookieManager.idl => netwerk/cookie/nsICookieManager.idl
rename : netwerk/cookie/public/nsICookieManager2.idl => netwerk/cookie/nsICookieManager2.idl
rename : netwerk/cookie/public/nsICookiePermission.idl => netwerk/cookie/nsICookiePermission.idl
rename : netwerk/cookie/public/nsICookieService.idl => netwerk/cookie/nsICookieService.idl
rename : netwerk/dns/src/effective_tld_names.dat => netwerk/dns/effective_tld_names.dat
rename : netwerk/dns/src/nameprep.c => netwerk/dns/nameprep.c
rename : netwerk/dns/src/nameprep_template.c => netwerk/dns/nameprep_template.c
rename : netwerk/dns/src/nameprepdata.c => netwerk/dns/nameprepdata.c
rename : netwerk/dns/src/nsDNSService2.cpp => netwerk/dns/nsDNSService2.cpp
rename : netwerk/dns/src/nsDNSService2.h => netwerk/dns/nsDNSService2.h
rename : netwerk/dns/src/nsEffectiveTLDService.cpp => netwerk/dns/nsEffectiveTLDService.cpp
rename : netwerk/dns/src/nsEffectiveTLDService.h => netwerk/dns/nsEffectiveTLDService.h
rename : netwerk/dns/src/nsHostResolver.cpp => netwerk/dns/nsHostResolver.cpp
rename : netwerk/dns/src/nsHostResolver.h => netwerk/dns/nsHostResolver.h
rename : netwerk/dns/src/nsIDNKitInterface.h => netwerk/dns/nsIDNKitInterface.h
rename : netwerk/dns/public/nsIDNSListener.idl => netwerk/dns/nsIDNSListener.idl
rename : netwerk/dns/public/nsIDNSRecord.idl => netwerk/dns/nsIDNSRecord.idl
rename : netwerk/dns/public/nsIDNSRequest.idl => netwerk/dns/nsIDNSRequest.idl
rename : netwerk/dns/public/nsIDNSService.idl => netwerk/dns/nsIDNSService.idl
rename : netwerk/dns/src/nsIDNService.cpp => netwerk/dns/nsIDNService.cpp
rename : netwerk/dns/src/nsIDNService.h => netwerk/dns/nsIDNService.h
rename : netwerk/dns/public/nsIEffectiveTLDService.idl => netwerk/dns/nsIEffectiveTLDService.idl
rename : netwerk/dns/public/nsIIDNService.idl => netwerk/dns/nsIIDNService.idl
rename : netwerk/dns/public/nsPIDNSService.idl => netwerk/dns/nsPIDNSService.idl
rename : netwerk/dns/src/prepare_tlds.py => netwerk/dns/prepare_tlds.py
rename : netwerk/dns/src/punycode.c => netwerk/dns/punycode.c
rename : netwerk/dns/src/punycode.h => netwerk/dns/punycode.h
rename : netwerk/dns/src/race.c => netwerk/dns/race.c
rename : netwerk/mime/public/nsIMIMEHeaderParam.idl => netwerk/mime/nsIMIMEHeaderParam.idl
rename : netwerk/mime/public/nsIMIMEInfo.idl => netwerk/mime/nsIMIMEInfo.idl
rename : netwerk/mime/public/nsIMIMEService.idl => netwerk/mime/nsIMIMEService.idl
rename : netwerk/mime/src/nsMIMEHeaderParamImpl.cpp => netwerk/mime/nsMIMEHeaderParamImpl.cpp
rename : netwerk/mime/src/nsMIMEHeaderParamImpl.h => netwerk/mime/nsMIMEHeaderParamImpl.h
rename : netwerk/mime/public/nsMimeTypes.h => netwerk/mime/nsMimeTypes.h
rename : netwerk/protocol/about/src/nsAboutBlank.cpp => netwerk/protocol/about/nsAboutBlank.cpp
rename : netwerk/protocol/about/src/nsAboutBlank.h => netwerk/protocol/about/nsAboutBlank.h
rename : netwerk/protocol/about/src/nsAboutBloat.cpp => netwerk/protocol/about/nsAboutBloat.cpp
rename : netwerk/protocol/about/src/nsAboutBloat.h => netwerk/protocol/about/nsAboutBloat.h
rename : netwerk/protocol/about/src/nsAboutCache.cpp => netwerk/protocol/about/nsAboutCache.cpp
rename : netwerk/protocol/about/src/nsAboutCache.h => netwerk/protocol/about/nsAboutCache.h
rename : netwerk/protocol/about/src/nsAboutCacheEntry.cpp => netwerk/protocol/about/nsAboutCacheEntry.cpp
rename : netwerk/protocol/about/src/nsAboutCacheEntry.h => netwerk/protocol/about/nsAboutCacheEntry.h
rename : netwerk/protocol/about/src/nsAboutProtocolHandler.cpp => netwerk/protocol/about/nsAboutProtocolHandler.cpp
rename : netwerk/protocol/about/src/nsAboutProtocolHandler.h => netwerk/protocol/about/nsAboutProtocolHandler.h
rename : netwerk/protocol/about/public/nsAboutProtocolUtils.h => netwerk/protocol/about/nsAboutProtocolUtils.h
rename : netwerk/protocol/about/public/nsIAboutModule.idl => netwerk/protocol/about/nsIAboutModule.idl
rename : netwerk/protocol/data/src/nsDataChannel.cpp => netwerk/protocol/data/nsDataChannel.cpp
rename : netwerk/protocol/data/src/nsDataChannel.h => netwerk/protocol/data/nsDataChannel.h
rename : netwerk/protocol/data/src/nsDataHandler.cpp => netwerk/protocol/data/nsDataHandler.cpp
rename : netwerk/protocol/data/src/nsDataHandler.h => netwerk/protocol/data/nsDataHandler.h
rename : netwerk/protocol/data/src/nsDataModule.cpp => netwerk/protocol/data/nsDataModule.cpp
rename : netwerk/protocol/file/src/nsFileChannel.cpp => netwerk/protocol/file/nsFileChannel.cpp
rename : netwerk/protocol/file/src/nsFileChannel.h => netwerk/protocol/file/nsFileChannel.h
rename : netwerk/protocol/file/src/nsFileProtocolHandler.cpp => netwerk/protocol/file/nsFileProtocolHandler.cpp
rename : netwerk/protocol/file/src/nsFileProtocolHandler.h => netwerk/protocol/file/nsFileProtocolHandler.h
rename : netwerk/protocol/file/public/nsIFileChannel.idl => netwerk/protocol/file/nsIFileChannel.idl
rename : netwerk/protocol/file/public/nsIFileProtocolHandler.idl => netwerk/protocol/file/nsIFileProtocolHandler.idl
rename : netwerk/protocol/ftp/public/ftpCore.h => netwerk/protocol/ftp/ftpCore.h
rename : netwerk/protocol/ftp/src/nsFTPChannel.cpp => netwerk/protocol/ftp/nsFTPChannel.cpp
rename : netwerk/protocol/ftp/src/nsFTPChannel.h => netwerk/protocol/ftp/nsFTPChannel.h
rename : netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp => netwerk/protocol/ftp/nsFtpConnectionThread.cpp
rename : netwerk/protocol/ftp/src/nsFtpConnectionThread.h => netwerk/protocol/ftp/nsFtpConnectionThread.h
rename : netwerk/protocol/ftp/src/nsFtpControlConnection.cpp => netwerk/protocol/ftp/nsFtpControlConnection.cpp
rename : netwerk/protocol/ftp/src/nsFtpControlConnection.h => netwerk/protocol/ftp/nsFtpControlConnection.h
rename : netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp => netwerk/protocol/ftp/nsFtpProtocolHandler.cpp
rename : netwerk/protocol/ftp/src/nsFtpProtocolHandler.h => netwerk/protocol/ftp/nsFtpProtocolHandler.h
rename : netwerk/protocol/ftp/public/nsIFTPChannel.idl => netwerk/protocol/ftp/nsIFTPChannel.idl
rename : netwerk/protocol/gopher/src/nsGopherChannel.cpp => netwerk/protocol/gopher/nsGopherChannel.cpp
rename : netwerk/protocol/gopher/src/nsGopherChannel.h => netwerk/protocol/gopher/nsGopherChannel.h
rename : netwerk/protocol/gopher/src/nsGopherHandler.cpp => netwerk/protocol/gopher/nsGopherHandler.cpp
rename : netwerk/protocol/gopher/src/nsGopherHandler.h => netwerk/protocol/gopher/nsGopherHandler.h
rename : netwerk/protocol/http/src/README => netwerk/protocol/http/README
rename : netwerk/protocol/http/src/nsAHttpConnection.h => netwerk/protocol/http/nsAHttpConnection.h
rename : netwerk/protocol/http/src/nsAHttpTransaction.h => netwerk/protocol/http/nsAHttpTransaction.h
rename : netwerk/protocol/http/src/nsHttp.cpp => netwerk/protocol/http/nsHttp.cpp
rename : netwerk/protocol/http/src/nsHttp.h => netwerk/protocol/http/nsHttp.h
rename : netwerk/protocol/http/src/nsHttpActivityDistributor.cpp => netwerk/protocol/http/nsHttpActivityDistributor.cpp
rename : netwerk/protocol/http/src/nsHttpActivityDistributor.h => netwerk/protocol/http/nsHttpActivityDistributor.h
rename : netwerk/protocol/http/src/nsHttpAtomList.h => netwerk/protocol/http/nsHttpAtomList.h
rename : netwerk/protocol/http/src/nsHttpAuthCache.cpp => netwerk/protocol/http/nsHttpAuthCache.cpp
rename : netwerk/protocol/http/src/nsHttpAuthCache.h => netwerk/protocol/http/nsHttpAuthCache.h
rename : netwerk/protocol/http/src/nsHttpAuthManager.cpp => netwerk/protocol/http/nsHttpAuthManager.cpp
rename : netwerk/protocol/http/src/nsHttpAuthManager.h => netwerk/protocol/http/nsHttpAuthManager.h
rename : netwerk/protocol/http/src/nsHttpBasicAuth.cpp => netwerk/protocol/http/nsHttpBasicAuth.cpp
rename : netwerk/protocol/http/src/nsHttpBasicAuth.h => netwerk/protocol/http/nsHttpBasicAuth.h
rename : netwerk/protocol/http/src/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannel.cpp
rename : netwerk/protocol/http/src/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannel.h
rename : netwerk/protocol/http/src/nsHttpChunkedDecoder.cpp => netwerk/protocol/http/nsHttpChunkedDecoder.cpp
rename : netwerk/protocol/http/src/nsHttpChunkedDecoder.h => netwerk/protocol/http/nsHttpChunkedDecoder.h
rename : netwerk/protocol/http/src/nsHttpConnection.cpp => netwerk/protocol/http/nsHttpConnection.cpp
rename : netwerk/protocol/http/src/nsHttpConnection.h => netwerk/protocol/http/nsHttpConnection.h
rename : netwerk/protocol/http/src/nsHttpConnectionInfo.cpp => netwerk/protocol/http/nsHttpConnectionInfo.cpp
rename : netwerk/protocol/http/src/nsHttpConnectionInfo.h => netwerk/protocol/http/nsHttpConnectionInfo.h
rename : netwerk/protocol/http/src/nsHttpConnectionMgr.cpp => netwerk/protocol/http/nsHttpConnectionMgr.cpp
rename : netwerk/protocol/http/src/nsHttpConnectionMgr.h => netwerk/protocol/http/nsHttpConnectionMgr.h
rename : netwerk/protocol/http/src/nsHttpDigestAuth.cpp => netwerk/protocol/http/nsHttpDigestAuth.cpp
rename : netwerk/protocol/http/src/nsHttpDigestAuth.h => netwerk/protocol/http/nsHttpDigestAuth.h
rename : netwerk/protocol/http/src/nsHttpHandler.cpp => netwerk/protocol/http/nsHttpHandler.cpp
rename : netwerk/protocol/http/src/nsHttpHandler.h => netwerk/protocol/http/nsHttpHandler.h
rename : netwerk/protocol/http/src/nsHttpHeaderArray.cpp => netwerk/protocol/http/nsHttpHeaderArray.cpp
rename : netwerk/protocol/http/src/nsHttpHeaderArray.h => netwerk/protocol/http/nsHttpHeaderArray.h
rename : netwerk/protocol/http/src/nsHttpNTLMAuth.cpp => netwerk/protocol/http/nsHttpNTLMAuth.cpp
rename : netwerk/protocol/http/src/nsHttpNTLMAuth.h => netwerk/protocol/http/nsHttpNTLMAuth.h
rename : netwerk/protocol/http/src/nsHttpPipeline.cpp => netwerk/protocol/http/nsHttpPipeline.cpp
rename : netwerk/protocol/http/src/nsHttpPipeline.h => netwerk/protocol/http/nsHttpPipeline.h
rename : netwerk/protocol/http/src/nsHttpRequestHead.cpp => netwerk/protocol/http/nsHttpRequestHead.cpp
rename : netwerk/protocol/http/src/nsHttpRequestHead.h => netwerk/protocol/http/nsHttpRequestHead.h
rename : netwerk/protocol/http/src/nsHttpResponseHead.cpp => netwerk/protocol/http/nsHttpResponseHead.cpp
rename : netwerk/protocol/http/src/nsHttpResponseHead.h => netwerk/protocol/http/nsHttpResponseHead.h
rename : netwerk/protocol/http/src/nsHttpTransaction.cpp => netwerk/protocol/http/nsHttpTransaction.cpp
rename : netwerk/protocol/http/src/nsHttpTransaction.h => netwerk/protocol/http/nsHttpTransaction.h
rename : netwerk/protocol/http/public/nsIHttpActivityObserver.idl => netwerk/protocol/http/nsIHttpActivityObserver.idl
rename : netwerk/protocol/http/public/nsIHttpAuthManager.idl => netwerk/protocol/http/nsIHttpAuthManager.idl
rename : netwerk/protocol/http/public/nsIHttpAuthenticator.idl => netwerk/protocol/http/nsIHttpAuthenticator.idl
rename : netwerk/protocol/http/public/nsIHttpChannel.idl => netwerk/protocol/http/nsIHttpChannel.idl
rename : netwerk/protocol/http/public/nsIHttpChannelInternal.idl => netwerk/protocol/http/nsIHttpChannelInternal.idl
rename : netwerk/protocol/http/public/nsIHttpEventSink.idl => netwerk/protocol/http/nsIHttpEventSink.idl
rename : netwerk/protocol/http/public/nsIHttpHeaderVisitor.idl => netwerk/protocol/http/nsIHttpHeaderVisitor.idl
rename : netwerk/protocol/http/public/nsIHttpProtocolHandler.idl => netwerk/protocol/http/nsIHttpProtocolHandler.idl
rename : netwerk/protocol/res/public/nsIResProtocolHandler.idl => netwerk/protocol/res/nsIResProtocolHandler.idl
rename : netwerk/protocol/res/src/nsResProtocolHandler.cpp => netwerk/protocol/res/nsResProtocolHandler.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.h => netwerk/protocol/res/nsResProtocolHandler.h
rename : netwerk/protocol/viewsource/public/nsIViewSourceChannel.idl => netwerk/protocol/viewsource/nsIViewSourceChannel.idl
rename : netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp => netwerk/protocol/viewsource/nsViewSourceChannel.cpp
rename : netwerk/protocol/viewsource/src/nsViewSourceChannel.h => netwerk/protocol/viewsource/nsViewSourceChannel.h
rename : netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp => netwerk/protocol/viewsource/nsViewSourceHandler.cpp
rename : netwerk/protocol/viewsource/src/nsViewSourceHandler.h => netwerk/protocol/viewsource/nsViewSourceHandler.h
rename : netwerk/socket/base/nsISOCKSSocketInfo.idl => netwerk/socket/nsISOCKSSocketInfo.idl
rename : netwerk/socket/base/nsISSLSocketControl.idl => netwerk/socket/nsISSLSocketControl.idl
rename : netwerk/socket/base/nsISocketProvider.idl => netwerk/socket/nsISocketProvider.idl
rename : netwerk/socket/base/nsISocketProviderService.idl => netwerk/socket/nsISocketProviderService.idl
rename : netwerk/socket/base/nsITransportSecurityInfo.idl => netwerk/socket/nsITransportSecurityInfo.idl
rename : netwerk/socket/base/nsSOCKS4SocketProvider.h => netwerk/socket/nsSOCKS4SocketProvider.h
rename : netwerk/socket/base/nsSOCKSIOLayer.cpp => netwerk/socket/nsSOCKSIOLayer.cpp
rename : netwerk/socket/base/nsSOCKSIOLayer.h => netwerk/socket/nsSOCKSIOLayer.h
rename : netwerk/socket/base/nsSOCKSSocketProvider.cpp => netwerk/socket/nsSOCKSSocketProvider.cpp
rename : netwerk/socket/base/nsSOCKSSocketProvider.h => netwerk/socket/nsSOCKSSocketProvider.h
rename : netwerk/socket/base/nsSocketProviderService.cpp => netwerk/socket/nsSocketProviderService.cpp
rename : netwerk/socket/base/nsSocketProviderService.h => netwerk/socket/nsSocketProviderService.h
rename : netwerk/socket/base/nsUDPSocketProvider.cpp => netwerk/socket/nsUDPSocketProvider.cpp
rename : netwerk/socket/base/nsUDPSocketProvider.h => netwerk/socket/nsUDPSocketProvider.h
rename : netwerk/wifi/public/nsIWifiAccessPoint.idl => netwerk/wifi/nsIWifiAccessPoint.idl
rename : netwerk/wifi/public/nsIWifiListener.idl => netwerk/wifi/nsIWifiListener.idl
rename : netwerk/wifi/public/nsIWifiMonitor.idl => netwerk/wifi/nsIWifiMonitor.idl
rename : netwerk/wifi/src/nsWifiAccessPoint.cpp => netwerk/wifi/nsWifiAccessPoint.cpp
rename : netwerk/wifi/src/nsWifiAccessPoint.h => netwerk/wifi/nsWifiAccessPoint.h
rename : netwerk/wifi/src/nsWifiMonitor.cpp => netwerk/wifi/nsWifiMonitor.cpp
rename : netwerk/wifi/src/nsWifiMonitor.h => netwerk/wifi/nsWifiMonitor.h
rename : netwerk/wifi/src/nsWifiScannerMac.cpp => netwerk/wifi/nsWifiScannerMac.cpp
rename : netwerk/wifi/src/nsWifiScannerSolaris.cpp => netwerk/wifi/nsWifiScannerSolaris.cpp
rename : netwerk/wifi/src/nsWifiScannerUnix.cpp => netwerk/wifi/nsWifiScannerUnix.cpp
rename : netwerk/wifi/src/nsWifiScannerWin.cpp => netwerk/wifi/nsWifiScannerWin.cpp
rename : netwerk/wifi/src/osx_corewlan.mm => netwerk/wifi/osx_corewlan.mm
rename : netwerk/wifi/src/osx_wifi.h => netwerk/wifi/osx_wifi.h
rename : netwerk/wifi/src/wlanapi.h => netwerk/wifi/wlanapi.h
2010-06-05 21:18:12 -04:00
wfernandom2004@gmail.com
dfefa110ff Bug 472529, websockets (netwerk patch), r=smaug+biesi
--HG--
rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h
extra : rebase_source : 4f75d33eb4fc7cdaa1f011f176ef4434bbfe2c25
2010-06-17 21:33:42 +03:00
Doug Turner
6c196f14e2 Automerge with mc. no manual changes 2010-04-21 03:31:13 -07:00
Pam Greene
a2396d18b9 Bug 557604 - add IDN <iran>.ir in two forms to PSL. r=gerv. 2010-04-19 15:24:59 +01:00
Doug Turner
d08632917d Merge with mc 2010-03-08 10:09:55 -08:00
Gervase Markham
04bf91afb3 Bug 547985 - Comment out nsw.gov.au in PSL. r=pkasting. 2010-03-08 16:28:57 +00:00
Doug Turner
5daaf36bf1 Merge 2010-03-01 15:36:51 -08:00
Chris Jones
bc05dd163b Merge from mozilla-central 2010-02-22 21:31:18 -06:00
Paul O’Shannessy
6af0de413b Reduce extraneous console output from DNS Service when offline [r=dwitte] 2010-02-24 11:59:26 -08:00
Gervase Markham
0a8ae91a90 Bug 550970 - add gov.nc.tr to PSL. r=pkasting.
--HG--
extra : rebase_source : 917d5082964d6a5f6b11996b0d31f9983dabf023
2010-04-28 10:43:52 +01:00
Gervase Markham
6c08c1bbc2 Bug 560885 - add Australian CGDNs to PSL. r=pkasting.
--HG--
extra : rebase_source : 4bf89ea646eac64c418f31ab807e1ecf634a345c
2010-04-28 10:42:44 +01:00
Gervase Markham
561bafe28c Bug 560884 - update entry for .tv in PSL. r=pkasting.
--HG--
extra : rebase_source : 655b070deca7c63d5e972a1d0ab9b7508e119992
2010-04-28 10:41:57 +01:00
Benjamin Smedberg
89fff872c6 Merge mozilla-central into electrolysis 2010-01-13 10:51:41 -05:00
Dan Witte
64bc002cbf Bug 536650 - Cookie values not saved for pages loaded from file://, part 1: tighten up the etld service.
r=sdwilsh, sr=bz
2010-01-12 10:29:20 -08:00
Benjamin Smedberg
570f731f49 Merge mozilla-central to electrolysis. 2010-01-07 22:11:14 -05:00
Benjamin Smedberg
422b4b28d2 Merge mozilla-central into electrolysis. One code change was required: in nsDocShell::CreateStaticClone I replaced EnsureDocShell with MaybeCreateDocShell. 2009-12-12 13:38:25 -05:00
Gervase Markham
721744cb98 Bug 526756 - add .mv entries to PSL. r=pkasting. 2009-12-11 17:51:37 -08:00
Gervase Markham
aafd18238a Bug 531252 - add operaunite.com to PSL. r=pkasting. 2009-12-11 17:49:28 -08:00
Gervase Markham
1340237ef2 Bug 526739 - add iki.fi to public suffix list. 2009-12-11 16:58:35 -08:00
Chris Jones
e5481210f2 Merge mozilla-central to pick up unit test fixes 2009-10-22 20:33:36 -05:00
Peter Kasting
b0c13c868d Bug 520056 - Update Effective TLD list for .za.net and .za.org
r=gerv
2009-10-21 00:18:24 +02:00
Ben Turner
62534891fc Merge mozilla-central 2009-10-05 16:08:52 -07:00
Peter Kasting
4227e189e9 Bug 520010 - update Public Suffix list for .ua.
--HG--
extra : rebase_source : c4682082cafa136927fc7ac02664946a36dbd207
2009-10-03 11:25:05 +02:00
Ben Turner
29c6cc37ec Merge mozilla-central 2009-09-23 13:14:34 -07:00
Gervase Markham
141db18455 Bug 513834 - add "local" to Public Suffix List. Patch by Adam Langley, agl@chromium.org; r=gerv. 2009-09-22 11:37:24 +01:00
Gervase Markham
4526152711 Bug 469866 - update Public Suffix list with latest changes. Patch by pkasting; r=gerv. 2009-09-22 11:35:33 +01:00
Benjamin Smedberg
d44f878b56 Merge mozilla-central into Electrolysis. 2009-09-18 16:47:18 -04:00
Peter Kasting
19dc51f350 Bug 528470. Update Public Suffix List. r=gerv 2010-01-07 13:55:10 +13:00
Pam Greene
412d6ac0ad Bug 544319 - fix up PSL for .ml (Mali) TLD. r=gerv. 2010-02-11 13:39:12 +00:00
Jason Duell
7b9643e8c3 Necko init patch, with modeline fixes 2009-08-18 12:05:15 -07:00
Benjamin Smedberg
2e9438fd2f Followup to bug 398573 - remove REQUIRES from the tree since it is no longer used... automatically generated patch, rs=ted 2009-08-25 08:59:31 -07:00
Peter Kasting
5622adcffa Bug 512774 - Update eTLD ruls for .cr. r=gerv 2009-08-27 12:10:37 -07:00
Benjamin Smedberg
ce3386b2d4 Electrolysis-plugin-only bookkeeping commit. 2009-12-15 20:33:05 -05:00
Daniel Jeter II
8f9209bc4f Bug 503186 - DeprecationWarning using Python 2.6, r=bsmedberg 2009-07-17 10:20:11 -04:00
Adam Langley
7ff9827f0c Bug 492583 Change of registry-controlled-domain status for .pw
r=gerv
2009-05-15 20:56:11 +02:00
Peter Kasting
7730118f2f Bug 564583 - Add IDN TLDs for UAE, Saudi Arabia, Russia and Egypt to PSL. r=gerv. 2010-05-27 10:05:58 +01:00
Gervase Markham
95eb25d876 Bug 565044 - update .bh entry in the PSL. r=pkasting. 2010-05-26 14:38:56 +01:00
Patrick McManus
47f5a5ed6b Fixing bug 488162. Disable prefetches on proxy config and pref, r+sr=bzbarsky@mit.edu 2009-05-06 14:26:33 -07:00
Simon Montagu
6d6b3471c2 Display URLs containing unassigned Unicode code points in punycode. Bug 479413, r=jduell, sr=jst 2009-03-29 00:49:31 -07:00
Patrick McManus
47618549c5 Bug 467562. Fix race between the timeout on our DNS thread waits and signals to those threads that could cause DNS requests to go AWOL every so often. r+sr=bzbarsky 2009-01-14 12:18:27 -05:00
David Triendl
80d990d03e Bug 460776. Add 'nhs.uk' as an exception to the effective TLD list. r=gerv, a=beltzner 2008-11-11 22:38:49 -05:00
Patrick McManus
92f594cb63 Bug 453403. Add DNS prefetching, similar to what Google chrome does. r+sr=bzbarsky, a=beltzner 2008-11-07 18:00:26 -05:00
Justin Dolske
4c397f756a Backed out changeset e8fd3f4c52b6 2008-11-05 12:54:51 -08:00
Patrick McManus
346822dba8 Bug 453403. Add DNS prefetching, similar to what Google chrome does. r+sr=bzbarsky 2008-11-04 11:14:29 -05:00