Commit Graph

464 Commits

Author SHA1 Message Date
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
Joel Maher
ef6c5fda3d 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
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
Kai Engert
75fcbb529e 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
Kai Engert
b8b6c1c39e 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
Kai Engert
5cdb1c39f0 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
Henri Sivonen
edb78a70da 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
Henri Sivonen
5637e5e28c 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
Jonas Sicking
aecb30c8cf 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
Benjamin Smedberg
33745658c4 Merge mozilla-central into electrolysis 2010-02-09 11:39:28 -05:00
Benjamin Smedberg
f64a66954c Merge mozilla-central into electrolysis. 2010-02-03 13:28:22 -05:00
Daniel Holbert
f2535af536 Bug 456099 followup: Remove unneeded & unused variables introduced by earlier outparam-deletion patch. r=smaug 2010-02-02 12:05:22 -08:00
Benjamin Smedberg
0ba2d6e348 Merge mozilla-central with electrolysis. 2010-01-25 11:57:19 -05:00
Benjamin Smedberg
70c85cd51a Merge mozilla-central into electrolysis 2010-01-19 16:42:37 -05:00
Michael Wu
30340e81bf Bug 536453 - Don't build NSS's nsinstall, r=ted
--HG--
extra : rebase_source : 19c03fcdb4d4498171c572d87f7611a8fb878f12
2010-01-19 13:26:31 -08:00
Kai Engert
5e46a26c8d 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
Kai Engert
02c519331a Bug 540332, Update PSM to include the latest NSS error codes, r=rrelyea 2010-02-07 13:06:53 +01:00
Kai Engert
0ccf958b45 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
Wan-Teh Chang
4c7c95666b 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
Palo Misik
cbe20e57ef Bug 530505: Rev IID on various interfaces for Gecko 1.9.3 r=bsmedberg 2010-01-23 11:34:08 -05:00
Benjamin Smedberg
869fa2a2d8 Merge mozilla-central to electrolysis. 2010-01-06 11:27:39 -05:00
timeless@mozdev.org
0e4581c3c4 merging 2010-01-05 23:50:02 +01:00
timeless@mozdev.org
73c09f5089 Bug 327181 - actually deleting nsIBadCertListener.idl r/sr=biesi 2010-01-05 23:42:34 +01:00
Benjamin Smedberg
daab3b8125 Merge mozilla-central into electrolysis. 2009-12-15 20:31:04 -05:00
Benjamin Smedberg
767eb11cb4 Merge mozilla-central into electrolysis 2009-12-04 11:28:50 -05:00
Kai Engert
697c86dc09 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
Kai Engert
f87e116006 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
Ted Mielczarek
522f48e9f7 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
Ted Mielczarek
f261e84eaa NSS: Allow the specification of an alternate library for SQLite. b=519550 r=rrelyea 2009-12-15 01:52:21 -05:00
Benjamin Smedberg
b55b15dccf 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
Benjamin Smedberg
300d0dafa7 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
Benjamin Smedberg
7a581148bc Merge mozilla-central into Electrolysis. 2009-11-24 10:06:03 -05:00
Benjamin Smedberg
737515b2c8 Merge mozilla-central into electrolysis. 2009-11-19 12:41:46 -05:00
Jim Mathies
1e83668bfe 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
Olli Pettay
cab5358845 Bug 523356 - Remote event listeners for Electrolysis, r=bsmedberg 2009-11-17 16:22:23 +02:00
Olli Pettay
d0250ab7c3 Backout Bug 523356 2009-11-17 13:56:49 +02:00
Olli Pettay
cc2bb5ab11 Bug 523356 - Remote event listeners for Electrolysis, r=bsmedberg 2009-11-17 10:43:39 +02:00
Kai Engert
505942bdf8 Bug 472014 - the smartcardmonitoringthread code uses the wrong allocator and isn't careful about buffer sizes, r=rrelyea 2009-11-14 20:54:46 -08:00
Oleg Romashin
a8536c0a5c Bug 528184 - Invalid read, missing null check in nsNSSIOLayer.cpp. r=kaie 2009-11-12 19:45:37 +02:00
Dão Gottwald
1b21023c95 Bug 527347 - nsIScriptableUnicodeConverter::convertToByteArray aLen out param should be optional. r=smontagu 2009-11-12 11:07:00 +01:00
Gijs Kruitbosch
41ba1acfa5 Back out bug 487059, fix tests and EM to cope, r=gavin,beltzner, bug 524995
--HG--
extra : rebase_source : d8414b8de165cf2fa534719c36416d82d21872c6
2009-10-29 14:44:10 +01:00
L. David Baron
f4d96977fc Fix spelling of 'multiple' to cause another round of builds and talos runs. 2010-02-17 11:29:15 -05:00
L. David Baron
903892cbf2 Fix spelling of 'browser' to cause another round of builds and talos runs. 2010-02-17 11:04:10 -05:00
Kai Engert
5635ca4b0e Bug 546389, nsssysinit binary built inside source tree, not objdir, a=bsmedberg to land fix into CLOSED TREE
=== Removing binary output file security/nss/lib/sysinit/nsssysinit from tree, it was not intended to be added
=== Prevent file from being built, in order to prevent people to add it back accidentally when using hg addremove
=== I classify this as checkin as fixing tinderbox bustage, because developers experience problems when working with patch queues, as explained in bug 546389
2010-02-16 15:43:56 +01:00
Kai Engert
ce2e533bb3 Bug 527659, Update Mozilla-central to NSS 3.12.6
=== r=rrelyea for upgrading to release candidate 1
=== reapplying bug 519550 on top
=== includes PSM makefile tweak to keep TLS disabled (variables changed in the updated NSS snapshot)
=== change configure.in to require the newer system NSS, r=wtc
2010-02-12 09:47:51 +01:00
Phil Ringnalda
1515ba9ac8 Bug 523070 - Remove useless commented out certdbkeycol tree columns, r=kaie 2009-10-26 18:39:23 -07:00
Phil Ringnalda
3d24554a52 Bug 523287 - Remove commented out cert tree columns and their unusable strings, r=kaie 2009-10-26 18:39:23 -07:00
timeless@mozdev.org
8060a2db9d Bug 427716 - don't get modules before locks, r=kaie 2009-10-25 10:03:13 -07:00