Commit Graph

958 Commits

Author SHA1 Message Date
Rail Aliiev
364e83c545 Bug 616542 - Shorten file path length of mochitest; r=ted 2011-11-04 21:13:42 +00:00
Marco Bonardo
c48ef6e9ea Merge mozilla-central to mozilla-inbound 2011-11-04 21:56:10 +01:00
Olli Pettay
e36091a737 Bug 698929 - Implement event.stopImmediatePropagation, r=jst
--HG--
extra : rebase_source : 76d19175a58a4ac8113b144a19f9d7679ad54dd0
2011-11-04 19:17:19 +02:00
Brian Smith
1c4e1ba16c Bug 675221: Remove XPCOM proxy header #includes from PSM, r=kaie 2011-11-02 21:17:54 -07:00
Brian Smith
31a61d3dbc Bug 675221: Notify observers of PSM's background threads on the main thread, r=kaie 2011-11-02 21:14:33 -07:00
Benjamin Smedberg
a56d8001e1 Bug 675702: Call nsICertVerificationListener on the main thread, rev. 1, r=bsmith, r=mayhemer 2011-11-02 21:06:51 -07:00
Brian Smith
2b427075da Bug 675221: Remove XPCOM Proxies from PSM UI prompts, r=kaie 2011-11-02 21:02:48 -07:00
Brian Smith
1b9d8e8f68 Bug 675221: Remove XPCOM Proxies from nsNSSSocketInfo::GetPreviousCert, r=mayhemer 2011-11-02 21:01:47 -07:00
Brian Smith
7dc0898df0 Bug 698983: Fix extended validation indicator, r=mayhemer 2011-11-02 20:59:56 -07:00
Brian Smith
8d03da7492 Bug 669061: Upgrade Mozilla to NSS 3.13.1, r=wtc
--HG--
extra : rebase_source : d43ffd0eae375aae83017b855859ef2bc78d30d6
2011-11-02 20:54:18 -07:00
Brian Smith
0a9bf5fc31 Bug 675702 - Remove XPCOM Proxies: Do PSM client certificate processing on the main thread, r=kaie
--HG--
extra : rebase_source : 810f54d98fdad7e70ed2d8db8b13292d1d1bfa61
2011-10-30 17:35:14 -07:00
Brian Smith
a43aa7b046 Bug 686248: Add isExtendedValidation to nsISSLStatus so it can be used by mobile, r=meyhemer
--HG--
extra : rebase_source : 6d21f2fdc3cb587874662cc23f84503e63b95ed1
2011-10-30 11:43:06 -07:00
Kai Engert
dabffacd7f Bug 698753, Distrust two Malaysian Sub-CAs. r=rrelyea 2011-11-04 20:01:14 +01:00
Wan-Teh Chang
ab03d01ce0 Bug 695833: Update NSS to NSS_3_13_1_BETA2. Includes fixes for
bug 647706 and bug 691997.  See individual bugs for code reviews.
2011-10-22 17:46:33 -07:00
Wan-Teh Chang
5376f19d06 Bug 695833: Update NSS to NSS_3_13_1_BETA1, which includes fixes for
bug 693228 and bug 694148.  See individual bugs for code reviews.
2011-10-19 14:31:23 -07:00
Brian Smith
03cac665c5 Bug 686150: Do not verify client certificates when they are being used for SSL client auth, r=honzab.moz 2011-10-17 17:04:09 -07:00
Ehsan Akhgari
2a602a5685 Bug 690892 - Replace PR_TRUE/PR_FALSE with true/false on mozilla-central; rs=dbaron
Landing on a CLOSED TREE
2011-10-17 10:59:28 -04:00
Jeff Walden
b7753477cf Bug 693469 - Implement mozilla::ArrayLength and mozilla::ArrayEnd, and replace uses of NS_ARRAY_LENGTH whenever possible. (Exceptions: assigning to static initializers, use in static assertions, as template parameters, etc. These will go away when the relevant compilers have C++11 constexpr support.) r=cjones
--HG--
extra : rebase_source : b4bae9a0f85abf2feb828609b50e756916b99a6f
2011-10-10 22:50:08 -07:00
Ms2ger
cd715d9c9b Bug 540433 - Remove nsIDocumentViewer; r=smaug 2011-10-15 09:33:26 +02:00
Matheus Kerschbaum
b520783790 Bug 477358 - Kill NS_USE_NATIVE r=khuey 2011-10-12 20:32:07 +02:00
Jeff Walden
eb2cb918a4 Back out everything since 5435ee09cf7b. Tinderbox compilers hate me. r=epic-fail 2011-10-12 12:21:53 -07:00
Matheus Kerschbaum
8368560bae Bug 477358 - Kill NS_USE_NATIVE r=khuey 2011-10-12 20:32:07 +02:00
Jeff Walden
77ebbde4ab Bug 639469 - Implement mozilla::ArrayLength and mozilla::ArrayEnd, and replace uses of NS_ARRAY_LENGTH whenever possible. r=cjones
--HG--
extra : rebase_source : 860a8271bf7e51cde358f2a4185c410de1fc2960
2011-10-10 22:50:08 -07:00
Brian Smith
fcfb799dc8 Bug 669061: Upgrade to NSS 3.13 RC0, r=wtc 2011-10-07 13:37:26 -07:00
Brian Smith
7930221088 Bug 679140: Do all SSL error processing on the main thread, r=honzab.moz 2011-10-06 17:46:52 -07:00
Brian Smith
f05237fd5f Bug 675221: Remove XPCOM Proxies: Implement Runnable that can be waited on synchronously, r=bsmedberg 2011-10-06 17:46:41 -07:00
Brian Smith
664a01032c Bug 682329: Remove default SSL error UI, r=honzab.moz 2011-10-06 17:41:43 -07:00
Matt Brubeck
4a976aab61 Back out 2780356be1a1 (bug 675574) and 9928fb9a32b1 (bug 690220) on suspicion of causing browser-chrome shutdown hangs 2011-09-29 14:44:36 -07:00
Michael Wu
d8e503c38b Bug 675553 - Switch from PRBool to bool on a CLOSED TREE , r=bsmedberg,khuey,bz,cjones
--HG--
rename : tools/trace-malloc/bloatblame.c => tools/trace-malloc/bloatblame.cpp
2011-09-28 23:19:26 -07:00
Mounir Lamouri
6c638adde5 Bug 675574 - Do not allow more than one call to window.open() when we allow popups. r=jst 2011-09-28 23:23:36 +02:00
Kyle Huey
75aa6eed7a Merge m-c to b-s. 2011-09-15 16:44:46 -07:00
Margaret Leibovic
5b575af948 Bug 685302 - Use "website" instead of "web site" consistently across all strings in the UI. r=dao 2011-09-13 16:42:37 -07:00
Kyle Huey
614dad33a3 Merge m-c to b-s. 2011-09-07 10:47:50 -04:00
Mike Hommey
f45f435485 Bug 683441 - Always sign NSS libraries from packager.mk. r=ted 2011-09-06 08:19:37 +02:00
Kai Engert
7080218c34 Additional patch for bug 683261 - Better coverage for DigiNotarGate in NSS 2011-09-02 15:00:59 -04:00
Ehsan Akhgari
cc308df2be Bug 683449 - Really remove the exemptions; r=kaie over irc 2011-09-02 14:58:49 -04:00
Kai Engert
c4a5781db2 Bug 683261 - Better coverage for DigiNotarGate in NSS; r=rrelyea 2011-09-02 14:03:05 -04:00
Kai Engert
472f2f1189 Bug 683883 - Improve DigitNotarGate handling in PSM; r=rrelyea 2011-09-02 13:58:32 -04:00
Ehsan Akhgari
71d64d5d55 Bug 683449 - Remove the exemptions for the Staat der Nederlanden root; rs=LegNeato 2011-09-02 13:53:47 -04:00
Ms2ger
0038e2e573 Bug 684807 - Annotate crashtest assertions on Android; r=philor 2011-09-06 18:35:43 +02:00
Kyle Huey
4f13543825 Merge b-s to m-c. 2011-08-31 10:59:12 -04:00
Ehsan Akhgari
87c3b9b14a Bug 683449 - DigiNotar patch erroneously blocks one of the two Staat der Nederlanden roots; r=kaie 2011-08-31 10:11:17 -04:00
Kyle Huey
7b7b45a351 Merge m-c to b-s. 2011-08-31 07:52:43 -04:00
Marco Bonardo
6cda1d359c Merge mozilla-central and mozilla-inbound 2011-08-31 10:43:43 +02:00
Jim Chen
62c2a86756 Bug 674806 - e. Override ARCHFLAG instead of DSO_CFLAGS to retain -fPIC on Android; r= 2011-08-30 17:11:37 -07:00
Brian Smith
66e90b7db9 Bug 682927 - Dis-trust DigiNotar root certificate, part 3; r=kaie,dveditz 2011-08-30 10:33:04 -04:00
Kai Engert
a00df4bb79 Bug 682927 - Dis-trust DigiNotar root certificate, part 2; r=bsmith 2011-08-30 10:32:25 -04:00
Kai Engert
bcffebdb77 Bug 682927 - Dis-trust DigiNotar root certificate, part 1; r=bsmith 2011-08-30 10:31:46 -04:00
Kyle Huey
0e655f0dc8 Merge m-c to b-s. 2011-08-24 08:34:27 -04:00
Mike Hommey
b8480139d5 Bug 678214 - Properly link NSS with new style jemalloc. r=khuey 2011-08-23 15:30:44 +02:00
Boris Zbarsky
c98f58f505 Bug 666516. Stop casting things gotten by contract to concrete classes. r=kaie 2011-08-23 17:03:02 -04:00
Geoff Brown
1264a5446f Bug 668349 - Changes to xpcshell.ini; r=jmaher 2011-08-22 09:00:50 +01:00
Kai Engert
a37ca8f2ef Bug 669061, Upgrade to NSS 3.13, starting with NSS_3_13_BETA1, r=wtc
--HG--
rename : security/nss/cmd/lib/SSLerrs.h => security/nss/lib/ssl/SSLerrs.h
rename : security/nss/cmd/lib/SECerrs.h => security/nss/lib/util/SECerrs.h
2011-08-19 17:27:10 +02:00
flod
e0c7b967b8 Bug 649266 - Certificate window is broken with long text labels. r=kaie 2011-08-18 11:56:34 +02:00
Brian Smith
789b754b7a Bug 677418: Remove unused nsNSSComponent::GetNSSCipherIDFromPrefString, r=kaie 2011-08-17 20:21:06 -07:00
Brian Smith
1071ff0be7 Bug 677409: Remove unused nsICipherInfo API, r=kaie 2011-08-17 20:20:50 -07:00
Luke Wagner
87add7e577 Backed out changeset 0cf822d12c64 (and dependent be91fb29d950 and 53dd7a930bae) due to intermittent crashes
--HG--
extra : rebase_source : 9c96a4ac164ef8929591ef3d83ad6c974642557a
2011-08-15 17:21:23 -07:00
Brian Smith
60e886946e Bug 593077: Remove SSL 2.0 Support and Fortezza Cipher Suites, r=kaie 2011-08-15 22:38:56 -07:00
Malini Das
a0832b693a Bug 367393 - Add a packed MochiKit that contains only SimpleTest dependencies- plain tests 2/2. r=jmaher, a=test-only 2011-08-12 12:21:44 -04:00
Malini Das
da32b5cbd3 Bug 367393 - Add a packed MochiKit that contains only SimpleTest dependencies- update tests. r=jmaher, a=test-only 2011-08-12 12:21:37 -04:00
Malini Das
e306b1b5aa Bug 367393 - Add a packed MochiKit that contains only SimpleTest dependencies- chrome. r=jmaher, a=test-only 2011-08-12 12:21:36 -04:00
Brad Lassey
146bdc79f5 backing out changesets 1baddb020156, d9456378c12d, 187ac0d7b154, 40e392d958e0 and f2e8ee893fe4 2011-08-10 18:18:09 -04:00
Geoff Brown
cf4a559f2b Bug 668349 - changes to xpcshell.ini; r=jmaher 2011-08-10 16:56:49 -04:00
Luke Wagner
aba0d809cb Bug 674571 - Remove xpcom/proxy use in security/manager/ssl (since this can lead to off-thread scripted QI) (r=kaie) 2011-07-01 17:33:52 -07:00
Kai Engert
0419dd4465 Bug 673382, Upgrade Mozilla to NSS 3.12.11 and NSPR 4.8.9, final releases. Only version number changes, no code changes. r=wtc 2011-08-10 14:09:17 +02:00
Mike Hommey
26b79d5dba Bug 676455 - Don't fail to build NSS's modutil on Android. r=ted 2011-08-09 09:05:23 +02:00
Michael Wu
ccaba60ed1 Bug 676465 - Replace PRBool with boolean in IDL files, r=bsmedberg 2011-08-06 22:03:32 -07:00
Kai Engert
03e2453b23 Bug 673382, Upgrade to NSS 3.12.11, landing beta 3, r=wtc 2011-08-05 17:50:59 +02:00
Kai Engert
bb86424e1b Bug 673382, upgrading to NSS 3.12.11 beta 2, r=wtc 2011-08-05 02:13:14 +02:00
Ehsan Akhgari
b9380105e9 Merge the last green changeset on mozilla-inbound to mozilla-central 2011-07-28 10:37:23 -04:00
Kai Engert
9546b651f7 Bug 662557, OCSP validation errors are wrongly reported as SEC_ERROR_NO_MEMORY errors from CERT_PKIXVerifyCert, backout debug patch, r=bsmith 2011-07-27 20:49:33 +02:00
Wan-Teh Chang
c69ac544dc Bug 673382: Update NSS to NSS_3_12_11_BETA1, which includes the fixes for
Bug 661609, Bug 650276 (code not used by Mozilla), Bug 602509, Bug 655411,
Bug 655850, Bug 671711, Bug 617565, Bug 668001, Bug 346583, Bug 661061.
2011-07-27 09:07:32 -07:00
Ginn Chen
15a0ca47cc Bug 665509 - Firefox in dist/bin failed to load any webpage on Solaris after Bug 552864. r=mh+mozilla 2011-07-28 11:39:13 +08:00
Kai Engert
b64760c337 Bug 670454 - Certificates usage in Certificate Viewer is always shown as "could not verify this certificate for unknown reasons", r=bsmith 2011-07-20 18:21:53 +02:00
Kai Engert
f87d598688 Bug 442150 - "Backup all" button not enabled after cert import, r=johnath/gavin 2011-07-20 17:04:49 +02:00
Yu-Hsun Lin
b3ee61fe21 Bug 486081. Remove nsTime. r=roc
Use TimeStamp/TimeDuration instead.
2011-07-19 11:20:50 -04:00
Ms2ger
36c532ffa2 Bug 670235 - Remove nsIDOMWindowInternal; r=sicking 2011-07-15 12:31:34 +02:00
Gavin Sharp
773016aa6f Bug 662996. Don't send cookies with OCSP requests. r=bsmith, sr=kaie 2011-07-12 12:06:34 -04:00
Mike Hommey
910fe37b7c Bug 681588 - Cleanup wrap malloc and its use on Android. r=ted 2011-08-29 19:21:22 +02:00
Neil Rashbrook
dbca050d72 Bug 660529 Remove useless use of PromiseFlatString r=kaie 2011-07-04 22:06:24 +01:00
Kai Engert
b1fa71ea0a Bug 596221, PSM should use new function to find encryption certificates of email recipients -- Original patch contributed by Juergen Brauckmann, enhanced by me -- r=rrelyea -- Should fix bug 558337 and bug 337430, too. 2011-06-28 14:26:41 +02:00
Brian Smith
43c6eb0428 Bug 662557 - assert on out-of-memory errors in NSS even in release builds, r=kaie 2011-06-24 15:23:10 -07:00
timeless@mozdev.org
38d14ca69f Bug 468736 - PSM nsPSMBackgroundThread::requestExit is racy and not threadsafe, r=mayhemer 2009-04-07 04:51:32 +03:00
Mounir Lamouri
d0fc863efa Bug 658037 (1/2) - r=bz 2011-06-21 18:52:22 +02:00
Dão Gottwald
9875ff106c Backed out changeset dc3780dd8a43 (bug 311007). Going to change onLocationChange instead of adding onLocationChange2. 2011-06-14 00:02:28 +02:00
Ed Morley
223c46b36b Bug 659621 - Remove EXTRA_DSO_LIBS, EXTRA_DSO_LDOPTS, OS_LIBS from makefiles containing LIBXUL_LIBRARY = 1, now that libxul is always built; r=ted 2011-06-12 03:49:00 -04:00
Ian Neal
b92d8587a1 Bug 260364 - Fixup radiogroups to use new .value functionality of radio.xml pki patch r=kaie 2011-06-10 16:56:17 +01:00
Kyle Huey
d2da8f5e6c Merge m-c to cedar since I already pushed it in, and push what I actually wanted to push 2011-06-07 13:23:03 -07:00
Jonathan Protzenko
1b9ca7ae96 Bug 662126 - Audit ConfirmEx callers to ensure that aCheckState is not an uninitialized PRBool r=bz 2011-06-07 20:06:12 +02:00
Oonishi Atsushi
a32cac7d4c Bug 311007 - Add onLocationChange2 which distinguishes between same-document and different-document location changes to web progress listeners. r=smaug, sr=bzbarsky 2011-06-04 05:31:07 +09:00
Jonathan Protzenko
f8876b89e0 Bug 659666 - PSM passes uninitialized value for inout checkValue argument of promptPassword r=jdm 2011-05-31 20:17:57 +02:00
Rafael Ávila de Espíndola
5e9b072a1f b=659748 r=kaie Avoid jumping over variable definition. 2011-05-28 14:32:38 +02:00
Ms2ger
fb6f5dd0ca Bug 655517 - Remove nsIDOMDocumentEvent; f=ehsan r=smaug 2011-05-23 18:46:36 +02:00
Kai Engert
7a0da177a4 Bug 642148, finalize upgrade to NSS 3.12.10, missing piece is version numbers, no code changes, rs=me, DONTBUILD 2011-05-23 15:24:24 +02:00
Joel Maher
6993636556 Bug 616999. Xpcshell manifest support; manifest files. r=ted, a=test-only 2011-05-20 11:54:01 -04:00
Ed Morley
d260544670 Bug 316661 - Part A - Remove null-checks before delete. r=bsmedberg 2011-05-17 16:01:36 +02:00
Olli Pettay
a5e935bc3c Bug 656954 - Add defaultPrevented to nsIDOMEvent, r=sicking
--HG--
extra : rebase_source : f491aa3d1b40980ca0f6b8cc38a5e9e60d80b9e7
2011-05-13 23:44:35 +03:00
Ed Morley
79a58fe521 Bug 654600 - Remove WinCE code from security/manager/Makefile.in; r=kaie 2011-05-05 09:40:21 -07:00
Matt Brubeck
cbcfb337a2 Back out changeset 1defe29fdf3c, ffe31dc2d27f, 54bacc404a6f, 16772cb4a781, c169c3b8dfb2, 94f06945b818, 6a2724d755f3 for test failure. 2011-05-05 14:21:38 -07:00
Kai Engert
edd4ab84f1 Bug 479393, incremental patch to fix if condition, r=bsmith 2011-05-05 22:41:40 +02:00
Kai Engert
06e078c830 Bug 479393, fix whitespace, no code changes, rs=me 2011-05-05 22:41:40 +02:00
Kai Engert
01bf2a121b Bug 479393, move two functions within the file, no code change, rs=me 2011-05-05 22:41:40 +02:00
Kai Engert
ea424a3b60 Bug 479393, Add libpkix-based certificate validation to PSM (off by default), r=rrelyea, r=bsmith 2011-05-05 22:41:40 +02:00
Ed Morley
cefd9c561f Bug 654600 - Remove WinCE code from security/manager/Makefile.in; r=kaie 2011-05-05 09:40:21 -07:00
Kai Engert
cf1e6c4c33 Bug 646460, Don't allow to override after treating certificates as revoked, r=bsmith 2011-05-05 16:38:45 +02:00
Kai Engert
b5b651566c Bug 642144, Enable multiple roots for EV. (March 2011 batch, depends on NSS 3.12.10), r=rrelyea, r=honzab 2011-05-05 16:38:11 +02:00
Kai Engert
0f38bcec70 Bug 642148 - Upgrade Mozilla to NSPR 4.8.8 beta 3 and NSS 3.12.10 beta 1, r=wtc, r=kaie 2011-05-05 16:35:11 +02:00
Kai Engert
6582692dfc Backout bug 345094, revision 77ce8faa1906, r=bsmith 2011-05-05 16:33:36 +02:00
Chris Jones
ed22df8f64 Bug 556214, parts 1 and 1.1: Rename Monitor to ReentrantMonitor and fix existing Monitor users. r=roc
--HG--
rename : xpcom/glue/Monitor.h => xpcom/glue/ReentrantMonitor.h
2011-04-29 14:21:57 -05:00
Ed Morley
9095039f6a Bug 648545 - Remove outdated instances of META_COMPONENT from mozilla-central; r=kaie 2011-04-29 12:36:17 +02:00
Ehsan Akhgari
e62cc2c992 Backout changeset 05fe748d2031 (bug 468736) on the suspicion of 400% Tshutdown regression, landed on a CLOSED TREE 2011-04-27 12:56:56 -04:00
timeless@mozdev.org, Ehsan Akhgari
d4eb8b2079 Bug 468736 - PSM nsPSMBackgroundThread::requestExit is racy and not threadsafe; r=honzab 2009-04-07 04:51:32 +03:00
Ehsan Akhgari
20183f6cc2 Bug 517579 - TEST-UNEXPECTED-FAIL | test_bug413909.html | Secure page did not load, adding exception failed?; r=ted 2011-04-25 15:02:54 -04:00
Ehsan Akhgari
f5f4c79d42 Bug 650410 - Test for bug 383369 uses a timeout because it doesn't know how to use the download manager API!; r=sdwilsh
--HG--
extra : rebase_source : 36445f348b0909f9c9cecdc3a12f3a8ef187f6b7
2011-04-18 18:49:12 -04:00
Ehsan Akhgari
c5b0c5daca Bug 649012 - Fix some flaky mochitests which rely on non-zero timeout values; rs=ted 2011-04-15 18:26:50 -04:00
Ehsan Akhgari
96d750195b Merge cedar into mozilla-central 2011-04-08 02:27:03 -07:00
timeless@mozdev.org
525da7fe91 Bug 646534 cleanup: use return instead of goto
r=kaie
2011-03-31 13:50:47 +03:00
timeless@mozdev.org
ed01b48e63 Bug 646534 use doxygen style comment blocks
r=kaie
2011-03-31 13:50:47 +03:00
timeless@mozdev.org
544b803694 Bug 577266 Part 3: Correct misspellings in source code
r=kaie
2011-03-31 13:50:46 +03:00
Tyler Colgan
6c223fbdc3 Bug 507387 - Update license blocks to use "Mozilla Foundation" instead of "Mozilla Corporation"; r=gerv f=sgautherie.bz
DONTBUILD
2011-03-10 21:17:00 -08:00
Matheus Kerschbaum
93480c6366 Bug 639754 - Remove MOZ_IPC checks since IPC is always built now; r=bsmedberg 2011-04-02 19:14:00 -07:00
Kai Engert
5f65e5273a Bug 644012, crash with an empty issuer name in SSL certificate, +leak fix ... r=bsmith, a=dveditz
--HG--
extra : transplant_source : %FE4F%25%DE%E8%A7%A8%D6%90f%AD%1E%03%F5%FCM%85%AB%00
2011-03-23 20:35:00 +01:00
Mats Palmgren
637a5d4275 Bug 345094 - Make PL_Base64DecodeBuffer deal with an empty source buffer. r=honzab 2011-04-06 13:32:31 +02:00
Ehsan Akhgari
73dd5db57d Bug 646071 - Part 3: Remove nsInt64.h, and convert all uses of nsInt64 and nsUint64 in the tree to PRInt64 and PRUint64, respectively; r=bsmedberg 2011-03-31 20:15:27 -04:00
Ehsan Akhgari
49fceed112 Backout the latest cedar merge wholesale until I test the correctness of the merge locally. This commit takes the tree state back to changeset 8d3f6093c425 (the last known good changeset before the merge) 2011-04-01 12:23:48 -04:00
Ehsan Akhgari
f2b4323534 Merge cedar into mozilla-central 2011-04-01 11:37:50 -04:00
Chris Jones ext:(%20and%20Kyle%20Huey%20%3Ckhuey%40kylehuey.com%3E)
0bb511a3d7 Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-03-31 23:29:02 -05:00
Chris Jones
a75fb12531 Backed out changeset 4beec31b9ea9 for increasing frequency of intermittent orange bug 618052 2011-03-31 18:57:38 -05:00
Chris Jones ext:(%20and%20Kyle%20Huey%20%3Ckhuey%40kylehuey.com%3E)
cc8b4c9c6c Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-03-31 14:51:19 -05:00
Ehsan Akhgari
f4575bfe5e Bug 646071 - Part 3: Remove nsInt64.h, and convert all uses of nsInt64 and nsUint64 in the tree to PRInt64 and PRUint64, respectively; r=bsmedberg 2011-03-31 20:15:27 -04:00
L. David Baron
b2e59587e8 Use nsAutoLock::NewLock, nsAutoLock::DestroyLock, nsAutoMonitor::NewMonitor, and nsAutoMonitor::DestroyMonitor as required by the API. (Bug 594666) r=cjones 2011-03-29 08:43:26 -07:00
Ehsan Akhgari
ca0a27ab24 Merge cedar into mozilla-central 2011-03-29 10:39:07 -04:00
Michael Wu
f4745d0eb6 Bug 635087 - nsCryptoRunnable::Run leaks JSPrincipals, r=jst 2011-03-28 16:24:38 -07:00
Ehsan Akhgari
db0e06d061 Merge cedar into mozilla-central 2011-03-28 13:28:13 -04:00
Kai engert
79bd89f7ec Bug 552951 followup - Avoid the use of goto; r=mayhemer 2011-03-28 00:05:04 -04:00
timeless@mozdev.org
7a344a9ce9 Bug 552951 nsKeygenFormProcessor::GetPublicKey doesn't use pqgParams/arena created by decode_pqg_params
r=kaie
2011-03-28 00:03:11 -04:00
Zack Weinberg
d13c7d6fc7 Bug 644006: Don't crash on zero-length input to nsNSSCertificateDB::ConstructX509FromBase64. r=honzab 2011-03-27 11:21:08 -07:00
Wan-Teh Chang
94e37bf6e1 Bug 584562: Add algorithm string for RSA-PSS signatures.
The patch is contributed by Hanno Boeck <hanno@hboeck.de>.
r=wtc.
2011-03-27 10:49:36 -07:00
Matheus Kerschbaum
355ae99518 Bug 640838: Remove OpenVMS support. r=khuey 2011-03-26 11:51:35 -04:00
timeless@mozdev.org
b7809f4562 Bug 619201 nsCertOverrideService needs to initialize on the main thread to use the directory service
r=kaie
2011-03-28 16:55:29 -04:00
Justin Lebar
7e2c5ae50d Bug 592557 - Eliminate uses of PR_Atomic{Increment,Decrement} functions in favor of PR_ATOMIC_{INCREMENT,DECREMENT} macros. r=bsmedberg,gal
--HG--
extra : rebase_source : 71069eb9c9d61131adee49279e136c8574dabc62
2011-03-28 15:58:49 -04:00
David Bienvenu
16aabffcae Bug 379661 - ###!!! ASSERTION: PipUIContext not thread-safe: '_mOwningThread.GetThread() == PR_GetCurrentThread() - Mark PipUIContext as threadsafe as it doesn't contain member variables; r=kaie 2011-03-25 12:50:58 +02:00
Ehsan Akhgari
0a8d0256da Backout changeset de9265797f0a (bug 644070) because of test failures on Mac 2011-03-23 20:47:08 -04:00
Ehsan Akhgari
aa3e0ea5de Bug 644070 - nsNSSCertificate::defaultServerNickname leaks in case of server name conflict; r=mayhemer 2011-03-23 15:06:27 -04:00
Gervase Markham
81bc81e4cf Bug 642395 - further change to handling of bad certificates. r=kaie, a=beltzner. 2011-03-18 11:43:21 +00:00
Kaie Engert
00b6f71a17 Bug 642395 - change to handling of bad certificates. r=rrelyea, bsmith. a=sayrer 2011-03-17 14:40:13 -07:00
Gavin Sharp
5246cadda7 Back out 25027d672f50 (bug 636818) because it caused bustage (accidental file removal), a=#developers 2011-03-02 13:57:46 -08:00
Jason Orendorff
c5c4eeabcf Bug 636818 - Crash [@ js::CallJSPropertyOpSetter] or [@ js_SetProperty]. r=gal, a=dmandelin.
--HG--
extra : rebase_source : ffda69df6aa059fac4e742c905573809695c7765
2011-03-02 14:15:57 -06:00
Brian Smith
99229eb36d Bug 637361: Backout bug 573043, a=blocker 2011-03-01 19:16:22 -08:00
Brian Smith
6e3249a44c Bug 637361: Backout bug 573043 2011-03-01 19:11:22 -08:00
Honza Bambas
4b801dad80 Fix bug 573043. r=jmathies@mozilla.com, a=blocker.
--HG--
rename : security/manager/ssl/public/nsISSLStatus.idl => netwerk/base/public/nsISSLStatus.idl
rename : security/manager/boot/public/nsISSLStatusProvider.idl => netwerk/base/public/nsISSLStatusProvider.idl
rename : security/manager/ssl/public/nsIX509Cert.idl => netwerk/base/public/nsIX509Cert.idl
2011-02-08 16:12:29 -08:00
mattm@chromium.org
115d6d47df Bug 584922, leak of unicodePw SECITEM in nsPKCS12Blob::ExportToFile and nsPKCS12Blob::ImportFromFileHelper, r=kaie, a=beltzner 2011-02-17 14:53:44 +01:00
Kai Engert
9de12182dd Bug 614852, Enable multiple roots from NSS 3.12.9 for EV. (Nov/Dec 2010 batch), r=honzab.moz, a=johnath 2011-02-17 14:52:25 +01:00
Neil Rashbrook
5568229ea7 Bug 616813 Remove extraneous CRs r=kaie a=beltzner 2011-02-16 21:37:53 +00:00
Chris Jones
8991442744 Rollup of bug 615386, parts 1-6. Teach the reftest harness about <browser remote>. r=dbaron,roc,ted a=a
--HG--
rename : layout/tools/reftest/reftest.js => layout/tools/reftest/reftest-content.js
2011-02-03 13:54:10 -06:00
Sid Stamm
c9a91d7bb6 bug 557598 - Support strict-transport-security (STS) in private browsing mode; r=ehsan,dveditz a=blocking-betaN+ 2010-10-06 10:07:39 -07:00
Boying Lu
cfbf9938c5 Bug 621848 - memory leak in nsNSSComponent::IdentityInfoInit; r=mayhemer a=johnath 2011-01-17 12:26:53 -05:00
Kai Engert
cf5cea380b Bug 529485, PSM crashes [@ ProcessAuthKeyId ] when CERT_DecodeAuthKeyID(arena, extData) fails. Fix suggested by timeless, minimal patch by me. r=kaie/bsmith. a2.0=dolske 2011-01-13 23:33:37 +01:00
Kai Engert
228134d642 Bug 618368, Mozilla upgrade to NSS 3.12.9 final (includes NSPR 4.8.7 final). a=blocking-fennec-2.0+=doug.turner 2011-01-13 14:22:51 +01:00
Shawn Wilsher
ade39d2c6a Merge mozilla-central to Places. 2010-12-13 15:08:04 -08:00
Shawn Wilsher
2ed7d826a8 Merge mozilla-central into Places 2010-12-06 09:48:54 -08:00
Shawn Wilsher
9cdab945a8 Merge mozilla-central into Places. 2010-11-29 08:43:57 -08:00
Kai Engert
87284b33c4 Bug 612613, Comments only: Clarify intention of nsIX509CertDB::findEmail[Encryption|Signing]Cert
r=honzab, a=comment-only
DONTBUILD
2010-11-27 17:40:07 +01:00
Shawn Wilsher
915515d7fa Bug 607115 - use a much smaller guid format than we currently use for bookmarks
Part 1 - Mark and make nsIRandomGenerator threadsafe.
r=kaie
2010-11-23 16:04:28 -08:00
Kai Engert
a6c7eae2cd Bug 521849, SSL broken, may crash when FIPS softtoken checksum verification fails
r=honzab.moz, a=blocking2.0-final+=bsmedberg
2010-11-09 17:10:40 +01:00
Kyle Huey
16cf0c5018 Back out cl-as-a-native-command to fix Bug 615571. r=me a=NPOTB 2010-12-04 23:07:10 -05:00
Kyle Huey
db0879856c Backed out changeset 0e9ba7c029e3 2010-12-04 23:05:58 -05:00
Kyle Huey
e0760603a1 Bug 585011 - Invoke cl.py as a pymake native command. r=Callek, a=bsmedberg 2010-08-08 23:12:54 -07:00
timeless@mozdev.org
63ed124751 Bug 577919 mark DEBUG only variables as ifdef DEBUG in security
r=kaie
2010-07-11 15:57:22 +03:00
Ehsan Akhgari
ab717a320a Bug 644070 - nsNSSCertificate::defaultServerNickname leaks in case of server name conflict; r=mayhemer 2011-03-27 15:09:32 -04:00
timeless@mozdev.org
6203cd27c9 Bug 564584 @mozilla.org/security/certoverride;1 overrides crashes the application [@ nsNSSComponent::LogoutAuthenticatedPK11]; r=kaie a=bsmedberg 2010-05-25 17:34:13 +03:00
Kai Engert
ef7c26de60 Bug 482939 - Additional patch; r=roc a=bsmedberg 2010-11-26 12:20:30 -05:00
Robert O'Callahan
cb8fee773e Bug 482939 - Need to use nsAutoMonitor::New/DestroyMonitor when using nsAutoMonitor to grab monitors; r=kaie a=bsmedberg 2010-11-26 12:19:32 -05:00
Edmund Wong
3aad557531 Bug 423401 - Removed usage of nsDependentCString() r=kaie, r=honzab.moz a=bsmedberg 2010-11-26 12:15:16 -05:00
Kai Engert
8ce90f1ec7 bug 582759, Enable multiple new roots from NSS 3.12.8 for EV
r=rrelyea, a=johnath
2010-11-25 20:53:32 +01:00
Guillermo López
f9c8022af6 Bug 488037: certManager entities should use the .label/.accesskey convention, r=johnath, a=bsmedberg
--HG--
extra : rebase_source : d817fe39ff9df258fa6824b0fdbee0e10947983c
2010-10-29 16:54:01 -04:00
Kai Engert
d15be2e952 Bug 566478 - Invalid SSL cert error is not mobile-friendly [r=mayhemer a=blocking-fennecb2] 2010-10-28 11:46:00 -04:00
Mark Finkle
e0a3cc5dd7 Backout bug 566478 due to test orange a=orangehurts 2010-10-28 12:17:01 -04:00
Honza Bambas
1d9f2bbd55 Bug 566478 - Invalid SSL cert error is not mobile-friendly [r=kaie a=blocking-fennecb2] 2010-10-27 14:35:00 -04:00
Honza Bambas
49ee8413c5 Bustage on gcc fix for changeset 45376975eca8, a=bustage-fix 2010-10-26 14:17:26 +02:00
Honza Bambas
ab839fe1db Bug 575950 - (Fennec) SSL certificate is not confirmed for secure webpages, r=kaie+bz, a=blocking-fennec:2.0.b2+ 2010-10-26 13:57:18 +02:00
timeless@mozdev.org
0732590f3c Bug 489961 - enable modutil to verify chk files for freebl3.dll, softokn3.dll, and nssdmb3.dll, r=ted, a=bsmedberg 2010-03-05 04:37:00 -08:00
Kai Engert
2b9d46accd Bug 599324, land NSPR_4_8_7_BETA1 and NSS_3_12_9_BETA2, a=blocking-2.0-beta8+ 2010-12-09 12:04:11 +01:00
Kyle Huey
edc0b4c657 Bug 600433: Build shlibsign for i386 in a Mac UB. r=ted a=b 2010-11-21 13:45:21 -05:00
Kai Engert
00161b854e Bug 104103 - [r=rrelyea a=dolske] 2010-11-19 01:22:40 -08:00
Igor Bukanov
52ea348c4c bug 610198 - Replacing JS_GetStringBytes usage with JS_EncodeString. r=gal 2010-11-11 21:40:29 +01:00
David Anderson
7487c14d37 Backed out changeset 8e119f847f97 (build busted) 2010-11-11 11:19:42 -08:00
Igor Bukanov
e32ba97023 bug 610198 - Replacing JS_GetStringBytes usage with JS_EncodeString. r=gal 2010-11-02 15:36:25 +01:00
Robert Sayre
78fcef6d2d Merge mozilla-central to tracemonkey. 2010-11-09 15:29:44 -05:00
Igor Bukanov
92b67c9caf bug 607695 - Avoid unnecessary JS_GetStringBytes. r=gal 2010-10-28 17:15:53 +02:00
Alon Zakai
d83eb5d7d0 Bug 517584 - Fix orange in test for bug 480619. r=dwitte a=blocking-fennec 2010-10-14 17:28:45 -07:00
Blake Kaplan
dab96e4a0d bug 580128 - Fix code that expects XPConnect to hand outer windows to C++ from JS. r=peterv 2010-09-17 14:54:40 -07:00
Wan-Teh Chang
07bab27f71 Bug 587407: Add error message for error code
SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY.  r=wtc a=blocking2.0:betaN
2010-09-18 11:42:40 -07:00
Wan-Teh Chang
b7df763aad Bug 595300: Update NSS to NSS_3_12_8_RC0. r=alexei.volkov (see bug 595264)
a=blocking2.0:betaN
2010-09-18 09:28:21 -07:00
Wan-Teh Chang
a48af775d3 Bug 595300: Update NSS to NSS_3_12_8_BETA3. r=various a=blocking2.0:betaN 2010-09-18 06:34:25 -07:00
Geoff Lankow
9a80cfe5ec Bug 588511 - Alert displayed after compatibility wizard 'The operation could not be completed because of an internal failure. A secure network communication has not been cleaned up correctly. r=dtownsend, a=blocking2.0-beta6 2010-09-13 23:52:52 -07:00
Mounir Lamouri
0273bb3daa Bug 561636 (2/4) - Create new invalid form submission event and block invalid form submissions when there is an observer. r=smaug a2.0=blocking 2010-09-11 06:07:41 +02:00
Wan-Teh Chang
10e2a2f4b6 Bug 580679: remove preference security.ssl.enable_compression because
the change to build NSS with NSS_ENABLE_ZLIB=1 was reverted.  Will try
again after mozilla 2.0.  review+ and approval2.0+ by bsmedberg.
2010-09-02 13:40:19 -07:00
Dan Witte
c4091d7694 Back out Bug 536324 part 3. 2010-08-30 13:20:39 -07:00
Joel Maher
b61eda4b1d Bug 586754 Xpcshell tests should use relativesrcdir instead of $MODULE (android prepartion) r=mitchell.field a=NPOTB 2010-08-26 14:47:28 -07:00
Honza Bambas
825e460698 Bug 588298 - During mochitest-5 SSL mixedcontent tests, we spam tons of ###!!! ASSERTION: QueryInterface needed, fixed QI, r=kaie, a=blocking-final 2010-08-26 13:11:24 +02:00
Clint Talbert
1afdc1b8df Backed out changeset 49beef9387a0 due to Xpcshell orange a=backout
--HG--
extra : rebase_source : 01307f705ab07b7784401d69a53921b200544978
2010-08-25 14:03:44 -07:00
Joel Maher
51fff79f07 Bug 586754 Change xpcshell to use $relativesrcdir instead of $module for android support a=NPOTB r=mitchell.field 2010-08-25 11:47:39 -07:00
Joel Maher
ce269022ab Bug 574189 - Fix chrome tests to work from an extension for android and e10s support a=NPOTB r=ctalbert 2010-08-24 10:29:34 -07:00
Sid Stamm
c82bc1947a Bug 495115 - Implement Strict-Transport-Security to allow sites to specify HTTPS-only connections, r=kaie+honzab+bjarne, a=betaN+ 2010-06-03 14:03:17 -07:00
Dan Witte
5f4dbe5953 Bug 536324 - e10s HTTP: refactor nsHashPropertyBag. Part 3: contentLength consumers. r=jduell, a=beta5+ 2010-08-21 00:31:35 -07:00
Brad Lassey
e7118754f6 bug 587695 - relative path to android_stub.h is wrong r=mitch a=NPOTB 2010-08-16 12:44:20 -04:00
Honza Bambas
c480f0546d Bug 487402 - test_dynUnsecureRedirect.html intermittently fails, change timeouts to callbacks where possible, r=kaie, a=test only change/orange fix 2010-08-18 19:22:48 +02:00
Saint Wesonga
534e51e2f8 Bug 413363 - Dialog for importing your certificates in Certificate Manager has wrong title. r=kaie 2010-08-18 09:00:05 +02:00
Dan Witte
53a5ef6fe9 Merge mozilla-central -> e10s. 2010-08-13 21:24:11 -07:00
Honza Bambas
5c36b4edf3 Bug 536301 - e10s HTTPS: securityInfo. r=jduell, sr=kaie 2010-08-13 01:06:40 -07:00
Honza Bambas
315aedbbf7 Bug 570616 - nsNSSSocketInfo cannot deserialize when mCert was null. r=bz 2010-08-13 00:57:28 -07:00
Michael Brubeck
bb0cb6829c partial backout of bug 580679 - Build NSS with the TLS zlib compression code a=bsmedberg 2010-08-13 15:49:56 -03:00
Wan-Teh Chang
589c5b93a7 Bug 567134: Update msvc-aslr.patch for NSS (already applied).
Update NSS to NSS_3_12_8_BETA2 officially.  blocking2.0+
2010-08-12 14:13:12 -07:00
Wan-Teh Chang
17b96c0c9b Bug 580679: Build NSS with the TLS zlib compression code.
Add the security.ssl.enable_compression preference to
enable TLS compression, disabled by default.
r=khuey,kaie,sayrer,ted.  approval2.0+ by bsmedberg.
2010-08-12 14:12:05 -07:00
Justin Wood
459f532e55 Don't bother checking if NSS is in a child process unless MOZ_IPC is defined. r+a+=bz
Followup to Bug 559711. e10s HTTP: turn off NSS in child process(es)
2010-08-09 18:46:20 -04:00
Benjamin Smedberg
04d9914b13 Bug 559711 - Disable NSS in the content process, r=honzab 2010-08-09 14:38:44 -04:00
Wan-Teh Chang
cb9b691bb6 Bug 583908: Test the SSL_ENABLE_FALSE_START macro to allow building
with NSS 3.12.7 or older.  r=kaie.  approval2.0+ by sayrer.
2010-08-06 18:01:21 -07:00
Kyle Huey
c5fc54ad89 Bug 518136: Use -showIncludes to generate dependencies for MSVC for a substantial build performance win. r=ted 2010-08-04 16:59:23 -07:00
Wan-Teh Chang
3888ee5a98 Bug 583908 - Enable TLS false start in Mozilla. r/a=sayrer. (CLOSED TREE) 2010-08-03 23:36:53 -07:00
Wan-Teh Chang
fb34c59071 Bug 583908: Enable TLS false start by default. Add the preference
security.ssl.enable_false_start to disable it.  r=sayrer.
approval2.0+ by sayrer.
2010-08-02 22:10:52 -07:00
Wan-Teh Chang
e472041d5e Update NSS to NSS_3_12_8_BETA1. approval2.0+ by dtownsend in
bug 437904 and by sayrer in bug 525092.  Also includes fixes
for bug 526231, bug 575174, and bug 580679.

--HG--
extra : rebase_source : 74988b3cb91db5dccc5f904c12cbee4acfa46162
2010-08-02 13:49:18 -07:00
Alexander L. Slovesnik
cd44d4ece9 Bug 539174 - Add localization note and use positional arguments in l10n. r=db48x 2010-07-24 11:02:26 +02:00
Wan-Teh Chang
47c7d8190a Bug 567134: turn on -dynamicbase for optimized Windows NSS builds. r=khuey. 2010-07-21 17:13:16 -07:00
Brad Lassey
d9940b5fd6 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
Kai Engert
d0e88fa154 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
Kai Engert
ecf2fc288a Bug 575620
makefile patch v2 for building NSS 3.12.7
r=wtc, r=kaie
2010-07-13 20:52:12 +02:00
Kai Engert
009fb15221 Bug 575620, landing NSS 3.12.7 beta 2
r=wtc
2010-07-19 07:45:52 +02:00
glen beasley
ad7bc8e67b Bug 511320 - When FIPS mode change fails, inform the user. r=kaie 2010-07-18 22:27:23 +02:00
Marek Stępień
93f45ff7cd Bug 527713 - Use nsIPromptService's alert instead of window.alert. r=kaie 2010-07-18 16:41:54 +02:00
Julian Seward
98f5697d12 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
Brad Lassey
0727ce280f bug 577635 typo fix 2010-07-16 16:11:31 -04:00
Brad Lassey
0591ba2021 bug 577635 - android_stub.h broken for android platform version 8 r=khuey 2010-07-16 12:11:09 -04:00
Henri Sivonen
e985ea0186 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
Tanner M. Young
caecba9aef bug 539174 - Page Info > General lists AES-256 ciper as AES-256 256. r=db48x 2010-07-14 16:59:43 -05:00
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