dfed11844b
Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691.
2010-07-01 11:55:57 -04:00
00788a09ce
Fix incorrect quoting introduced in revision 90afd1e80d77 for bug 568691.
2010-06-22 17:08:24 -04:00
54fa052991
Bug 568691 - Add CID data back to classinfo because it's required for fastload to work correctly.
2010-06-22 12:59:57 -04:00
549d6ed5fd
Bug 568691 - Convert existing JS components to use NSGetFactory and add manifest files for them. In a followup we will link the .manifest files together at packaging time. This patch was developed on Linux: Windows and Mac may require additional changes.
...
--HG--
rename : toolkit/components/filepicker/src/nsFilePicker.js.in => toolkit/components/filepicker/src/nsFilePicker.js
2010-06-22 12:59:15 -04:00
cae1800556
Merge mozilla-central into the "branch" for but 568691. The omnijar XPT/component/chrome registration was removed during this merge, and will be re-added to the component manager shortly.
...
--HG--
rename : content/base/public/nsIChromeRegistry.idl => chrome/public/nsIChromeRegistry.idl
2010-06-21 11:41:42 -04:00
5b338a8304
Bug 568691 part B - mechanical changes to in-tree binary modules needed to get them building and registering correctly. After this patch, xpcshell appears to work.
2010-06-10 14:11:40 -04:00
08c7957dd0
# User Michal Novotny <michal.novotny@gmail.com>
...
# Date 1277056918 -7200
Bug 537164 - e10s HTTP: caching. r=jduell, sr=biesi
2010-06-23 23:55:19 -07:00
549ae22a9e
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
6e5944e4fe
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
873abc9611
Bug 536273 - e10s HTTP: get POSTs working. r=jduell
2010-05-30 15:30:28 -07:00
3fed591ba3
m-c to e10 merge
2010-05-24 17:45:59 +03:00
fea6936df1
Merged m-c
2010-05-13 18:04:53 -05:00
7492065872
merge with m-c. resolved conflicts in:
...
U chrome/src/nsChromeRegistry.cpp
U content/base/src/Makefile.in
U dom/base/nsDOMClassInfo.cpp
U toolkit/toolkit-tiers.mk
--HG--
rename : toolkit/mozapps/extensions/test/unit/test_bug541420.js => toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js
2010-05-11 11:09:54 -07:00
147aa768bb
Bug 552829 - e10s - Online and offline events. Quick define fix.
2010-05-11 13:22:34 -04:00
3ad2b78e45
Bug 552829 - e10s - Online and offline events. r=dougt
2010-05-11 08:44:12 -04:00
a19ace439e
b=559492 only dump leaked URLs on successful shutdown r=dbaron
2010-05-13 14:34:38 +12:00
86c0119176
# User Michal Novotny <michal.novotny@gmail.com>
...
# Date 1272456176 -7200
Bug 549241 - Channel classifier should run in chrome process. r=biesi, sr=jst
2010-05-21 14:03:02 -07:00
cb3b3e8e7b
Bug 560647 - add startup timeline instrumentation; r=vlad
2010-05-19 19:22:19 -04:00
41aab21115
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
19c4ba4f84
Bug 563274 - Overhaul nsIPrompt-related prompting code. r=gavin, sr=bs
...
--HG--
rename : toolkit/content/commonDialog.css => toolkit/components/prompts/content/commonDialog.css
rename : toolkit/content/commonDialog.js => toolkit/components/prompts/content/commonDialog.js
rename : toolkit/content/commonDialog.xul => toolkit/components/prompts/content/commonDialog.xul
rename : toolkit/content/selectDialog.js => toolkit/components/prompts/content/selectDialog.js
rename : toolkit/content/selectDialog.xul => toolkit/components/prompts/content/selectDialog.xul
2010-06-16 17:06:17 -07:00
63ca8b65c6
Merged m-c
2010-04-27 01:53:06 -05:00
a2d75cb968
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
df0f5a1cd0
Bug 541174 - e10s HTTP: Improve how URIs are serialized (part1). r=dwitte
2010-04-09 18:26:36 +12:00
5350023988
Automerge with mc. no manual changes
2010-04-21 03:31:13 -07:00
21d8a5efa0
Bug 545869 - Remove small buffer #defines and use preferences. r=honza
2010-04-20 09:32:28 -07:00
2918f2e692
Merge mozilla-central
2010-04-16 01:34:35 -05:00
55aabe42b5
merge from m-c. manually merging modules/plugin/test/testplugin/nptest.cpp dom/plugins/PluginModuleChild.cpp.
2010-03-26 14:22:48 -07:00
119d09e697
Bug 516085 - replace the most frequent IOService getter with an efficient one r=biesi
2010-04-12 08:44:28 -07:00
518a3564df
Bug 388195 - Remove gopher support. r=jduell,gavin sr=bz
2010-04-16 17:05:47 -04:00
9667302f77
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
c00ff9684a
Bug 506041 Part 2: Correct misspellings in source code
...
r=timeless
2010-05-13 14:19:50 +02:00
9bfb3bbd8c
Bug 553970 - Fix nsIURL::GetRelativeSpec documentation. r=biesi
...
--HG--
extra : rebase_source : 874de0e571120e2b9034d924b4e4f33f808bc0f0
2010-03-22 13:29:51 -07:00
2aa0bf2426
Bug 549641, Firefox raises alarm (in error console) about SSL servers being vulnerable to CVE-2009-3555
...
r=rrelyea, r=honzab
2010-05-03 13:34:16 +02:00
c815227af6
Bug 554120: Fix out-of-bounds read in nsStandardURL.cpp. r=biesi
2010-03-22 00:36:38 -07:00
fc77b978d9
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
b66334e394
Bug 386635 - Automatically wrap sandboxes in security wrappers to make them easier to use safely. r=jst
...
--HG--
extra : rebase_source : c21431a5de17359b622c71061802b9f1713fcc8f
2010-02-11 17:04:41 -08:00
6ffab16dcf
Bug 536279 (send request headers to chrome channel) and bug 536283 (send full nsHttpResponseHead in OnStartRequest) a=jae-seong r=dwitte,jduell
2010-03-23 08:14:36 -07:00
9828919387
Bug 543870: Implement File.url. r=bz sr=jst
2010-03-02 23:51:09 -08:00
6703f4b962
Make the nsIChannel comments clearer in terms of threading behavior. r=biesi
2010-03-01 12:47:31 -05:00
7c3fe71542
Bug 513074 - remove sync writes from current cache, r=biesi,michal.novotny sr=bzbarsky
2010-02-23 10:13:18 -08:00
a6a643cec1
nsIAuthPrompt2: add PREVIOUS_FAILED, bug 521467, r=biesi, sr=bz
...
Add flag nsIAuthInformation.PREVIOUS_FAILED to notify the
login manager that the previous login attempt failed.
That allows it to show a prompt instead of using the
stored values (silently).
--HG--
extra : rebase_source : 5a725bba1ae34d030fd60ecd5d67c74317de5d4f
2010-02-12 17:55:11 +01:00
115f4aa77c
Bug 535649 - Implement UI around CVE-2009-3555 and draft-rescorla-tls-renegotiation, r=rrelyea
...
== NSS 3.12.6 will block some renegotiation attempts on SSL sockets by default
== This patch does not yet implement new UI by default, but adds 4 new prefs to get fine grained control (blocking/allowing, displaying broken state)
== One of the prefs is a temporary pref that is supposed to go away at some point in the future
2010-02-07 13:09:51 +01:00
4ab62a6c6d
Bug 542962 - Remove some zero byte files, r=dbaron
2009-12-18 21:26:13 -08:00
0d62ff6e47
Bug 532147 - NetUtil.asyncFetch should take an nsIURI, string, nsIFile, or nsIChannel
...
This lets consumers pass a string for a uri, an nsIURI, an nsIFile, or an
nsIChannel to NetUtil.asyncFetch. It's now less code to get file contents
asynchronously that to do so synchronously in JavaScript.
r=bz
sr=vlad
2009-12-15 23:33:08 -08:00
6f5817dc82
Bug 532146 - NetUtil.jsm needs a helper for creating new channels
...
Adds a new method for creating an nsIChannel from a string spec, an nsIURI, or
an nsIFile.
r=bz
sr=vlad
2009-12-15 23:33:06 -08:00
8e001bc890
Backout of bug 532147 and bug 532146 due to test failure.
2009-12-16 11:02:10 -08:00
0217f0d6af
Bug 532147 - NetUtil.asyncFetch should take an nsIURI, string, nsIFile, or nsIChannel
...
This lets consumers pass a string for a uri, an nsIURI, an nsIFile, or an
nsIChannel to NetUtil.asyncFetch. It's now less code to get file contents
asynchronously that to do so synchronously in JavaScript.
r=bz
sr=vlad
2009-12-15 23:33:08 -08:00
4ee1ceeebc
Bug 532146 - NetUtil.jsm needs a helper for creating new channels
...
Adds a new method for creating an nsIChannel from a string spec, an nsIURI, or
an nsIFile.
r=bz
sr=vlad
2009-12-15 23:33:06 -08:00
c1f9653a4e
Bug 532143 - NetUtil.newURI should take a string or nsIFile
...
You can now automagically get an nsIURI providing a string or an nsIFile.
r=bz
sr=vlad
2009-12-15 23:33:03 -08:00
d3a31f03ed
Bug 533079 Actually land patch addressing review comments from bug 507970 a=shaver r=biesi
2009-12-07 10:49:46 +00:00
Benjamin Smedberg
Jason Duell
Doug Turner
Frederic Plourde
Olli Pettay
Chris Jones
Frederic Plourde
Karl Tomlinson
Ehsan Akhgari
wfernandom2004@gmail.com
Justin Dolske
Ben Newman
Josh Matthews
Taras Glek
Joe Drew
Neil Rashbrook
Michael Kohler
Justin Lebar
Kai Engert
Brandon Sterne
Blake Kaplan
Jonas Sicking
Boris Zbarsky
bjarne@runitsoft.com
Ben Bucksch
Phil Ringnalda
Shawn Wilsher
Dietrich Ayala
Jonathan Kew