Commit Graph

523 Commits

Author SHA1 Message Date
Robert Sayre
1ae649adc3 Merge mozilla-central to tracemonkey. 2010-07-06 11:05:39 -07:00
Saint Wesonga
e7a357dcaf Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedberg 2010-07-05 11:42:18 +02:00
Jason Orendorff
c46ef62c01 Merge fix for bug 575208. 2010-07-03 08:10:46 -05:00
Robert Sayre
70fc03b113 Merge mozilla-central to tracemonkey. 2010-07-02 17:25:52 -07:00
Mitchell Field
eb1e793da7 Remove @status FROZEN and @status UNDER_REVIEW. r=bsmedberg
--HG--
extra : rebase_source : 7fab31a6b7898e05ff828482390846cc9ce2854d
2010-07-02 10:27:06 -04:00
Dão Gottwald
9b15b69a1b Backed out changeset 59ace8d80ce8 2010-07-04 22:01:13 +02:00
Saint Wesonga
8dd5da1024 Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedberg 2010-07-04 21:39:17 +02:00
Benjamin Smedberg
4d172dd53d Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691. 2010-07-01 11:55:57 -04:00
Benjamin Smedberg
63c0077443 Merge mozilla-central into the branch for bug 568691, including fixup of the new jetpack binary module. 2010-06-25 19:41:09 -04:00
Benjamin Smedberg
45af085fff 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
Benjamin Smedberg
f13550a209 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
Jason Duell
edb3ec29fa Backed out 9cfe0ace0e95 (SecurityInfo). Segfaulting. 2010-06-30 17:42:30 -07:00
Honza Bambas
0fe23621ee e10s HTTPS: securityInfo. sr=biesi. 2010-06-30 09:17:51 -07:00
Doug Turner
901e02b2de Merging with mozilla-central. Manually merged: content/canvas/src/nsCanvasRenderingContext2D.cpp ipc/ipdl/Makefile.in toolkit/toolkit-tiers.mk toolkit/xre/nsEmbedFunctions.cpp
--HG--
rename : gfx/thebes/src/gfxSharedImageSurface.cpp => gfx/thebes/gfxSharedImageSurface.cpp
rename : gfx/thebes/public/gfxSharedImageSurface.h => gfx/thebes/gfxSharedImageSurface.h
2010-06-28 16:33:19 -07: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
Robert Sayre
d9e86770e3 Merge mozilla-central to tracemonkey. 2010-06-05 19:13:45 -04:00
Doug Turner
003acc6d48 Merge with mc 2010-05-25 13:48:25 -07:00
Olli Pettay
58b4f71840 m-c to e10 merge 2010-05-24 17:45:59 +03:00
Jason Orendorff
d7cbea1f4d Bug 533592, part 1 - Remove uses of and support for xpcnativewrappers=no/yes in manifests. (The default has been yes for some time and we will now only have that behavior.) r=mrbkap.
--HG--
extra : rebase_source : 996d2abecb15f44293abd470a28a3fe2706e130e
2010-05-27 12:33:54 -07:00
Doug Turner
fe405e740c 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
Brad Lassey
a15e734cc6 bug 559263 - implement jemalloc for android r=vlad 2010-05-25 11:28:14 -04:00
Michael Wu
09a0bf74f3 Bug 556443 - Add support for building NSS on Android, r=ted 2010-05-19 13:13:25 -07:00
Ehsan Akhgari
1f0e2cec91 Bug 523742 - Disable the Get Certificate button on the cert exception dialog when the cert is being retrieved in the background; r=johnath 2010-06-03 21:31:08 -04:00
Jesse Ruderman
f04ef428cb Remove stray line breaks from NS_ERROR messages, since they interfere with log processing. rs=jst
--HG--
extra : rebase_source : 87421691da969e0ebe5fbfbc44cd8f18617d1351
2010-06-17 13:28:38 -07:00
Jae-Seong Lee-Russo
5ae821c0ce Bug 530384 - Replace PR_MIN/PR_MAX with NS_MIN/NS_MAX in security/manager. r=kaie 2010-06-17 21:46:24 +02:00
Marco Bonardo
d0e5fc0583 backout changeset 9a0a17e18b72 - wrong commit info 2010-06-17 21:57:13 +02:00
timeless@mozdev.org
c799212a6e Bug 559332 don't build mOnStateLocationChangeReentranceDetection / nsAutoAtomic ifndef DEBUG
r=kaie
2010-06-17 21:46:33 +02:00
Marco Bonardo
5d6cf6042f Bug 530384 - Replace PR_MIN/PR_MAX with NS_MIN/NS_MAX in security/manager. r=kaie 2010-06-17 21:46:24 +02:00
timeless@mozdev.org
798e2282d4 Bug 559333 useless signed check of PRUint32 index in nsCertTree::DeleteEntryObject
r=kaie
2010-06-16 18:54:22 +02:00
Doug Turner
6c196f14e2 Automerge with mc. no manual changes 2010-04-21 03:31:13 -07:00
Kai Engert
05555f6df4 Bug 558140, Upgrade Mozilla to pick up new roots (NSS 3.12.6 + NSSCKBI_1_79_RTM)
r=wtc
2010-04-19 14:30:04 +02:00
Kai Engert
8d49c22dc4 Bug 354273 S/MIME signed emails include duplicate cert in chain. r=nelson 2010-06-15 14:23:05 +01:00
Honza Bambas
89b026a94e Bug 498311, HTTPS site is marked TLS intolerant and SSLv2 handshake is used when the stop loading button is clicked, r=kaie 2010-06-12 13:30:26 +02:00
Mike Hommey
ce41784187 Bug 542460 - Remove executable permission on source files [r=ted.mielczarek] 2010-05-06 09:32:50 +02:00
Daniel Holbert
4d7b4ac88a Bug 562310 Part 6: Convert C-string version (nsCCommaSeparatedTokenizer) into generic nsCCharSeparatedTokenizer class, too. r=roc 2010-05-04 07:43:48 -07:00
Daniel Holbert
20950733f1 Bug 562310 Part 1: Rename file nsCommaSeparatedTokenizer.h to nsCharSeparatedTokenizer.h (and update #includes). r=roc
--HG--
rename : xpcom/ds/nsCommaSeparatedTokenizer.h => xpcom/ds/nsCharSeparatedTokenizer.h
2010-05-04 07:43:48 -07:00
Kai Engert
789d452402 Bug 555860, Enable Certplus Class 2 Primary CA for EV in PSM
r=rrelyea, r=honzab
2010-05-03 13:34:56 +02:00
Kai Engert
90b7b3baa3 Bug 173729, Deleting a builtin cert should behave better
Improve wording to reduce confusion
r=rrelyea
2010-05-03 13:34:41 +02:00
Kai Engert
3171f40058 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
Kai Engert
0e72f129f4 Bug 469555, revert revision 7a3f4933c44f, because of regression bugs 554009 and 559677
r=honzab (in bug 559677)
2010-05-03 13:33:49 +02:00
timeless@mozdev.org
5273a85a73 Bug 557888 - nsCertAlreadyExists always leaks unused arena, r=kaie
--HG--
extra : rebase_source : 33db7306106d05a695da3928648f4540fb673eb0
2010-04-07 13:24:00 -07:00
timeless@mozdev.org
b92bf2348e Bug 557893 - ProcessRDN leaks decodeItem on failure, r=kaie
--HG--
extra : rebase_source : 4cdfdf205b6de7a810a4bf86cacd5c3e1635aa8d
2010-04-07 13:46:00 -07:00
Doug Turner
f295d7422b Merge 2010-03-12 15:20:36 -08:00
Joel Maher
d050afae06 Bug 544097 Chaning mochitests to run against mochi.test instead of localhost r=ted, waldo, dwitte p=jmaher. Landed on CLOSED TREE 2010-03-12 13:53:36 -08:00
timeless@mozdev.org
8751d837e5 Bug 456409 GetSlotWithMechanism leaks slot list element in several path
Handle OOM relating to PK11_GetFirstSafe/PK11_FreeSlotListElement
r=kaie

--HG--
extra : rebase_source : 738e54658fbf7b4d27cb307454a2a9904d07a138
2010-03-12 07:50:11 +01:00
timeless@mozdev.org
76ac517cef Bug 101378 Make psm dialogs non modal
r=kaie

--HG--
extra : rebase_source : 356662cc5a67c6296569312405df0476ca10fa5e
2010-03-12 07:50:10 +01:00
timeless@mozdev.org
7958d48767 Bug 469555 Support searching for certificates
r=kaie

--HG--
extra : rebase_source : 262d11f8512bf8f61e4b084b079f33a36407a65e
2010-03-12 07:50:09 +01:00
Doug Turner
d08632917d Merge with mc 2010-03-08 10:09:55 -08:00
Clint Talbert
7ffd9496bc Backed out changeset b4372055f473 -- due to unexplained orange on OS X Leak test (Bd) box 2010-03-07 17:34:23 -08:00