cfc0c2d1bf
bug 577635 - android_stub.h broken for android platform version 8, pass ANDROID_VERSION to nss r=khuey
2010-07-19 14:05:29 -04:00
e84ef8ecfd
Bug 575620, remove obsolete patchfile from security/patches, no longer necessary with NSS 3.12.7
...
Not part of the build
2010-07-19 08:14:19 +02:00
c0e4a2661d
Bug 575620
...
makefile patch v2 for building NSS 3.12.7
r=wtc, r=kaie
2010-07-13 20:52:12 +02:00
51a435185d
Bug 575620, landing NSS 3.12.7 beta 2
...
r=wtc
2010-07-19 07:45:52 +02:00
63423c7d31
Bug 511320 - When FIPS mode change fails, inform the user. r=kaie
2010-07-18 22:27:23 +02:00
20ea55a2ce
Bug 527713 - Use nsIPromptService's alert instead of window.alert. r=kaie
2010-07-18 16:41:54 +02:00
f238aeef81
Bug 538531 - valgrind: UMR in sec_asn1e_write_contents() because PSM passes uninitialized SECItem to NSS r=sayrer,honzab.moz
...
--HG--
extra : rebase_source : 5adcbbde9728161c83ab3967e059ec8c50495edc
2010-07-18 11:25:16 +02:00
4306febc34
bug 577635 typo fix
2010-07-16 16:11:31 -04:00
39a7d1025e
bug 577635 - android_stub.h broken for android platform version 8 r=khuey
2010-07-16 12:11:09 -04:00
efe11750be
Bug 560256 - Ignore document.write() from external scripts when there is no proper insertion point. r=jonas.
2010-06-19 09:38:41 +03:00
1330106653
bug 539174 - Page Info > General lists AES-256 ciper as AES-256 256. r=db48x
2010-07-14 16:59:43 -05:00
08955d8bcc
Merge mozilla-central to tracemonkey.
2010-07-06 11:05:39 -07:00
dca1fdaf5b
Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedberg
2010-07-05 11:42:18 +02:00
ee99d76feb
Merge fix for bug 575208.
2010-07-03 08:10:46 -05:00
0fb4de7a31
Merge mozilla-central to tracemonkey.
2010-07-02 17:25:52 -07:00
dae810b5e1
Remove @status FROZEN and @status UNDER_REVIEW. r=bsmedberg
...
--HG--
extra : rebase_source : 7fab31a6b7898e05ff828482390846cc9ce2854d
2010-07-02 10:27:06 -04:00
af6bdfaeea
Backed out changeset 59ace8d80ce8
2010-07-04 22:01:13 +02:00
b11412ff34
Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedberg
2010-07-04 21:39:17 +02:00
dfed11844b
Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691.
2010-07-01 11:55:57 -04:00
b54a384bb8
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
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
69eb87bdc9
Backed out 9cfe0ace0e95 (SecurityInfo). Segfaulting.
2010-06-30 17:42:30 -07:00
099c13dad3
e10s HTTPS: securityInfo. sr=biesi.
2010-06-30 09:17:51 -07:00
c7c3407599
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
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
c2dc9a473f
Merge mozilla-central to tracemonkey.
2010-06-05 19:13:45 -04:00
251c051e26
Merge with mc
2010-05-25 13:48:25 -07:00
3fed591ba3
m-c to e10 merge
2010-05-24 17:45:59 +03:00
5d6ba66093
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
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
d34a8f6578
bug 559263 - implement jemalloc for android r=vlad
2010-05-25 11:28:14 -04:00
fe425e7ea6
Bug 556443 - Add support for building NSS on Android, r=ted
2010-05-19 13:13:25 -07:00
602522921b
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
736c6f6527
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
4fbbf74aa2
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
bd67d3621f
backout changeset 9a0a17e18b72 - wrong commit info
2010-06-17 21:57:13 +02:00
e3b5aa239b
Bug 559332 don't build mOnStateLocationChangeReentranceDetection / nsAutoAtomic ifndef DEBUG
...
r=kaie
2010-06-17 21:46:33 +02:00
a63ed7098e
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
2b08c58279
Bug 559333 useless signed check of PRUint32 index in nsCertTree::DeleteEntryObject
...
r=kaie
2010-06-16 18:54:22 +02:00
5350023988
Automerge with mc. no manual changes
2010-04-21 03:31:13 -07:00
e5ee949725
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
3ee064bc81
Bug 354273 S/MIME signed emails include duplicate cert in chain. r=nelson
2010-06-15 14:23:05 +01:00
86ea5f72e4
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
3487aea406
Bug 542460 - Remove executable permission on source files [r=ted.mielczarek]
2010-05-06 09:32:50 +02:00
1fabb10c87
Bug 562310 Part 6: Convert C-string version (nsCCommaSeparatedTokenizer) into generic nsCCharSeparatedTokenizer class, too. r=roc
2010-05-04 07:43:48 -07:00
008a7becb5
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
3bd37f1d67
Bug 555860, Enable Certplus Class 2 Primary CA for EV in PSM
...
r=rrelyea, r=honzab
2010-05-03 13:34:56 +02:00
122bfad67f
Bug 173729, Deleting a builtin cert should behave better
...
Improve wording to reduce confusion
r=rrelyea
2010-05-03 13:34:41 +02:00
Brad Lassey
Kai Engert
glen beasley
Marek Stępień
Julian Seward
Henri Sivonen
Tanner M. Young
Robert Sayre
Saint Wesonga
Jason Orendorff
Mitchell Field
Dão Gottwald
Benjamin Smedberg
Jason Duell
Honza Bambas
Doug Turner
Olli Pettay
Michael Wu
Ehsan Akhgari
Jesse Ruderman
Jae-Seong Lee-Russo
Marco Bonardo
timeless@mozdev.org
Mike Hommey
Daniel Holbert