9d932051e4
Bug 511320 - When FIPS mode change fails, inform the user. r=kaie
2010-07-18 22:27:23 +02:00
7c24f6e03d
Bug 527713 - Use nsIPromptService's alert instead of window.alert. r=kaie
2010-07-18 16:41:54 +02:00
4fc12f82be
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
f835b80164
bug 577635 typo fix
2010-07-16 16:11:31 -04:00
cc496a7c34
bug 577635 - android_stub.h broken for android platform version 8 r=khuey
2010-07-16 12:11:09 -04:00
6061afc7d9
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
77a270fb0e
bug 539174 - Page Info > General lists AES-256 ciper as AES-256 256. r=db48x
2010-07-14 16:59:43 -05:00
f94d6c3608
Merge mozilla-central to tracemonkey.
2010-07-06 11:05:39 -07:00
4bd9280674
Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedberg
2010-07-05 11:42:18 +02:00
61bc026152
Merge fix for bug 575208.
2010-07-03 08:10:46 -05:00
2fd899ed0f
Merge mozilla-central to tracemonkey.
2010-07-02 17:25:52 -07:00
d0f35f6883
Remove @status FROZEN and @status UNDER_REVIEW. r=bsmedberg
...
--HG--
extra : rebase_source : 7fab31a6b7898e05ff828482390846cc9ce2854d
2010-07-02 10:27:06 -04:00
b2124655df
Backed out changeset 59ace8d80ce8
2010-07-04 22:01:13 +02:00
8952503f91
Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedberg
2010-07-04 21:39:17 +02:00
a677e5bf91
Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691.
2010-07-01 11:55:57 -04:00
29e089defb
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
0df0345c66
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
a7e67d32ad
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
386cfabff6
Backed out 9cfe0ace0e95 (SecurityInfo). Segfaulting.
2010-06-30 17:42:30 -07:00
8faab2606c
e10s HTTPS: securityInfo. sr=biesi.
2010-06-30 09:17:51 -07:00
e5c86fcd42
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
386a098a89
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
b2c88178e3
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
5a3f306961
Merge mozilla-central to tracemonkey.
2010-06-05 19:13:45 -04:00
3b935d5b7c
Merge with mc
2010-05-25 13:48:25 -07:00
93984b6736
m-c to e10 merge
2010-05-24 17:45:59 +03:00
578fc3cdd3
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
0dc0f3273e
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
74db90d53e
bug 559263 - implement jemalloc for android r=vlad
2010-05-25 11:28:14 -04:00
46ef482d76
Bug 556443 - Add support for building NSS on Android, r=ted
2010-05-19 13:13:25 -07:00
b2361e058e
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
9478c01a40
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
3875488c7e
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
5ebad349f1
backout changeset 9a0a17e18b72 - wrong commit info
2010-06-17 21:57:13 +02:00
ebde40e905
Bug 559332 don't build mOnStateLocationChangeReentranceDetection / nsAutoAtomic ifndef DEBUG
...
r=kaie
2010-06-17 21:46:33 +02:00
64d6e856c2
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
87fe91746b
Bug 559333 useless signed check of PRUint32 index in nsCertTree::DeleteEntryObject
...
r=kaie
2010-06-16 18:54:22 +02:00
9a784d5dfd
Automerge with mc. no manual changes
2010-04-21 03:31:13 -07:00
30fb04f127
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
0403e4139f
Bug 354273 S/MIME signed emails include duplicate cert in chain. r=nelson
2010-06-15 14:23:05 +01:00
a835a85bb1
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
4129f47992
Bug 542460 - Remove executable permission on source files [r=ted.mielczarek]
2010-05-06 09:32:50 +02:00
8c1dcec454
Bug 562310 Part 6: Convert C-string version (nsCCommaSeparatedTokenizer) into generic nsCCharSeparatedTokenizer class, too. r=roc
2010-05-04 07:43:48 -07:00
76eb0b7a70
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
eb2ff88741
Bug 555860, Enable Certplus Class 2 Primary CA for EV in PSM
...
r=rrelyea, r=honzab
2010-05-03 13:34:56 +02:00
8944ab6865
Bug 173729, Deleting a builtin cert should behave better
...
Improve wording to reduce confusion
r=rrelyea
2010-05-03 13:34:41 +02:00
2eae427786
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
5fd09f7dab
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
41337c956c
Bug 557888 - nsCertAlreadyExists always leaks unused arena, r=kaie
...
--HG--
extra : rebase_source : 33db7306106d05a695da3928648f4540fb673eb0
2010-04-07 13:24:00 -07:00
447ebae44b
Bug 557893 - ProcessRDN leaks decodeItem on failure, r=kaie
...
--HG--
extra : rebase_source : 4cdfdf205b6de7a810a4bf86cacd5c3e1635aa8d
2010-04-07 13:46:00 -07:00
453380b2a7
Merge
2010-03-12 15:20:36 -08:00
6b6e9978a3
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
f7e0599a99
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
5f92125469
Bug 101378 Make psm dialogs non modal
...
r=kaie
--HG--
extra : rebase_source : 356662cc5a67c6296569312405df0476ca10fa5e
2010-03-12 07:50:10 +01:00
9c5655d775
Bug 469555 Support searching for certificates
...
r=kaie
--HG--
extra : rebase_source : 262d11f8512bf8f61e4b084b079f33a36407a65e
2010-03-12 07:50:09 +01:00
6b387f5757
Merge with mc
2010-03-08 10:09:55 -08:00
5b4513c7e9
Backed out changeset b4372055f473 -- due to unexplained orange on OS X Leak test (Bd) box
2010-03-07 17:34:23 -08:00
3cd691129e
Bug 544097 - Change mochitests to use mochi.test instead of localhost for mobile test refactoring p=jmaher, r=sayrer,dwitte
2010-03-07 16:08:05 -08:00
c741a38e65
Merge
2010-03-01 15:36:51 -08:00
66e2a2f448
Merge from mozilla-central
2010-02-22 21:31:18 -06:00
1282088a1f
Bug 527659, Update Mozilla-central to NSS 3.12.6 RTM (RC2)
...
=== pushing final release, r=wtc
=== adding a directory with on-top-patches, r=wtc
=== also, update to NSPR 4.8.4 final, r=wtc
2010-03-05 14:44:10 +01:00
e2d74b698a
Bug 462919, ability to override NSS database path for xulrunner applications
...
merged and adjusted whitespace. r=rrelyea
2010-02-18 13:24:05 +01:00
440e6facc8
Bug 540332, Update PSM to include the latest NSS error codes
...
Patch v3, yet another string, r=wtc
2010-02-18 13:21:44 +01:00
bef52a9b34
Bug 546644 - Remove trailing white space from test_bug521461.html. r=honzab.moz.
...
--HG--
extra : rebase_source : 0c601a1c1365c47c23deedae5e850028ae7024f1
2010-02-22 14:17:35 +02:00
26010bfe9d
Bug 546644 - Remove trailing white space from test_innerHtml[Delayed]UnsecurePicture.html. r=honzab.moz.
...
--HG--
extra : rebase_source : c8cbc1e282a189a88bd5dc84d75bf2cb8f6c13b9
2010-02-22 14:17:35 +02:00
12091aa8ea
Bug 544698 part 1: Move value processing from submission code to elements. Decomtaminate. Kill a few dead functions. r=jst
2010-02-24 21:58:16 -08:00
96319c4535
backing out changesets e939397fc6a5, 88529662c474 and 3d7c54b194bb due to random hangs in pgo tests
2010-03-09 22:33:11 -05:00
1c8d232df2
Bug 544097 changing mochitests to use mochi.test instead of localhost for windows mobile refactoring p=jmaher, r=ted,dwitte, sayrer, waldo, ctalbert
2010-03-09 08:55:39 -08:00
a7c3948d0a
Backed out changeset 8ce70abd7777
2010-03-09 01:14:21 -05:00
694ec71da0
Bug 544097 Change mochitests to use mochi.test instead of localhost for mobile refactoring p=jmaher r=ted,dwitte,sayrer
2010-03-08 19:21:33 -08:00
9b4b59c837
Merge mozilla-central to tracemonkey.
...
--HG--
rename : dom/indexedDB/IDBCursorRequest.cpp => dom/indexedDB/IDBCursor.cpp
rename : dom/indexedDB/IDBCursorRequest.h => dom/indexedDB/IDBCursor.h
2010-06-30 11:54:20 -07:00
103fa1295e
Merge mozilla-central to tracemonkey.
2010-06-21 18:01:14 -07:00
0978149cf3
Backed out changeset db6f8068e9a5
2010-06-29 17:49:21 +02:00
c81affe35c
Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedgerg
2010-06-29 17:14:36 +02:00
41b9495dcf
Bug 565157 - typed JS_AddRoot (r=igor)
2010-06-07 17:05:02 -07:00
a3abf70391
Merge mozilla-central into electrolysis
2010-02-09 11:39:28 -05:00
efa70ad28e
Merge mozilla-central into electrolysis.
2010-02-03 13:28:22 -05:00
868688bc4b
Bug 456099 followup: Remove unneeded & unused variables introduced by earlier outparam-deletion patch. r=smaug
2010-02-02 12:05:22 -08:00
c161f955a7
Merge mozilla-central with electrolysis.
2010-01-25 11:57:19 -05:00
ba2072a2b8
Merge mozilla-central into electrolysis
2010-01-19 16:42:37 -05:00
0feabb27b6
Bug 536453 - Don't build NSS's nsinstall, r=ted
...
--HG--
extra : rebase_source : 19c03fcdb4d4498171c572d87f7611a8fb878f12
2010-01-19 13:26:31 -08:00
62caa75f94
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
2bfab230a2
Bug 540332, Update PSM to include the latest NSS error codes, r=rrelyea
2010-02-07 13:06:53 +01:00
d6c30005d8
Bug 527659, Update mozilla-central to NSS 3.12.6 (beta)
...
== NSS portion
== r=rrelyea/wtc for upgrading mozilla-central to cvs tag NSS_3_12_6_BETA1
== This includes reapplying the (merged) patch from bug 519550 on top of NSS.
== PSM portion
== Includes the patch to disable TLS compression, r=kaie
== Include the patch to disable zlib test programs, which don't work on maemo, r=kaie
2010-02-07 12:54:28 +01:00
4c4c88d8f2
Bug 529319: Use LIB_SUFFIX instead of IMPORT_LIB_SUFFIX for NSS import
...
libraries because NSS uses a different import library suffix (.a) for
MinGW (Mozilla uses dll.a), but NSS's import library suffix is the same
as Mozilla's LIB_SUFFIX on all platforms. The patch is contributed by
Jacek Caban <jacek@codeweavers.com>. r=wtc.
2010-02-05 18:27:00 -08:00
d4c2344fc8
Bug 530505: Rev IID on various interfaces for Gecko 1.9.3 r=bsmedberg
2010-01-23 11:34:08 -05:00
5ce04ab127
Merge mozilla-central to electrolysis.
2010-01-06 11:27:39 -05:00
ce04e613ae
merging
2010-01-05 23:50:02 +01:00
2ca671cc18
Bug 327181 - actually deleting nsIBadCertListener.idl r/sr=biesi
2010-01-05 23:42:34 +01:00
83b97480d2
Merge mozilla-central into electrolysis.
2009-12-15 20:31:04 -05:00
4e352d7aeb
Merge mozilla-central into electrolysis
2009-12-04 11:28:50 -05:00
7146022112
Bug 499716, Enable Buypass Class 3 CA 1 for EV in PSM
...
r=rrelyea, approval-1.9.2=johnath
2009-12-04 07:10:35 +01:00
272a11b589
Bug 528277, Release NSS 3.12.4 + new roots to Mozilla
...
approval-1.9.2=johnath (comment 3)
2009-12-04 07:04:06 +01:00
92a98a2e95
Rename sqlite3 library to mozsqlite3, fixes compile problems and crashes on Mac OS X. b=513747 r=sdwilsh
2009-12-15 01:52:57 -05:00
c0c711dcde
NSS: Allow the specification of an alternate library for SQLite. b=519550 r=rrelyea
2009-12-15 01:52:21 -05:00
a17ea948ee
Merge additional changes from electrolysis and mozilla-central into the electrolysis-plugins-only tracking branch.
...
--HG--
branch : electrolysis-plugins-only
2009-12-04 11:42:28 -05:00
c23e173ce0
Straight revert of content/* dom/interfaces/canvas/* dom/ipc/* toolkit/content/tests/fennec-tile-testapp/* netwerk/* security/manager/ssl* to their mozilla-central state. This named branch will be used as a temporary area to merge just the plugin portion of electrolysis into mozilla-central.
...
--HG--
branch : electrolysis-plugins-only
2009-11-30 13:31:41 -05:00
e53a7195d5
Merge mozilla-central into Electrolysis.
2009-11-24 10:06:03 -05:00
d74c6776f3
Merge mozilla-central into electrolysis.
2009-11-19 12:41:46 -05:00
aa6998dee6
Bug 520607 - Remove use of "ntlm" auth module and replace with use of "sys-ntlm". r=wtc, cbiesinger. sr=bz.
2009-11-19 16:12:43 -06:00
glen beasley
Marek Stępień
Julian Seward
Brad Lassey
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
Kai Engert
Mike Hommey
Daniel Holbert
Joel Maher
Clint Talbert
Joel Maher
Chris Jones
Jonas Sicking
Kyle Huey
Luke Wagner
Wan-Teh Chang
Palo Misik
Ted Mielczarek
Jim Mathies