Commit Graph

6934 Commits

Author SHA1 Message Date
Jonas Sicking
32a03526e0 Backout bugs 586754, 574189, 584611 due to orange. a=backout 2010-08-20 11:08:43 -07:00
Joel Maher
a6d440687b Bug 586754 xpcshell tests should use relativesrcdir instead of $MODULE r=:Mitch a=NPOTB 2010-08-20 09:32:58 -07:00
Joel Maher
e3359fd310 Bug 574189 - Fix chrome tests so they can run from a .jar bundle (e10s, android) r=ctalbert a=NPOTB 2010-08-20 09:28:13 -07:00
Brad Lassey
cc1043a003 bug 587695 - relative path to android_stub.h is wrong r=mitch a=NPOTB 2010-08-16 12:44:20 -04:00
Honza Bambas
8bb7670f7e 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
54ca873537 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
816de088d0 Merge mozilla-central -> e10s. 2010-08-13 21:24:11 -07:00
Honza Bambas
c32ff56c91 Bug 536301 - e10s HTTPS: securityInfo. r=jduell, sr=kaie 2010-08-13 01:06:40 -07:00
Honza Bambas
3b87f4167c Bug 570616 - nsNSSSocketInfo cannot deserialize when mCert was null. r=bz 2010-08-13 00:57:28 -07:00
Michael Brubeck
06e3d2ec5c 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
4e22b9325c 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
f561e6a88d 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
f3e725de22 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
d6046ea06d Bug 559711 - Disable NSS in the content process, r=honzab 2010-08-09 14:38:44 -04:00
Wan-Teh Chang
dc23c8f9f4 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
b33484f540 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
8da7b6bc29 Bug 583908 - Enable TLS false start in Mozilla. r/a=sayrer. (CLOSED TREE) 2010-08-03 23:36:53 -07:00
Wan-Teh Chang
137eb3f5f0 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
03a94729f0 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
8e8ab66a73 Bug 539174 - Add localization note and use positional arguments in l10n. r=db48x 2010-07-24 11:02:26 +02:00
Wan-Teh Chang
7c6e763b21 Bug 567134: turn on -dynamicbase for optimized Windows NSS builds. r=khuey. 2010-07-21 17:13:16 -07:00
Brad Lassey
cf31d613af 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
ecc96b655c 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
cc876aa6b9 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
cb1f2ad5ff Bug 575620, landing NSS 3.12.7 beta 2
r=wtc
2010-07-19 07:45:52 +02:00
glen beasley
9d932051e4 Bug 511320 - When FIPS mode change fails, inform the user. r=kaie 2010-07-18 22:27:23 +02:00
Marek Stępień
7c24f6e03d Bug 527713 - Use nsIPromptService's alert instead of window.alert. r=kaie 2010-07-18 16:41:54 +02:00
Julian Seward
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
Brad Lassey
f835b80164 bug 577635 typo fix 2010-07-16 16:11:31 -04:00
Brad Lassey
cc496a7c34 bug 577635 - android_stub.h broken for android platform version 8 r=khuey 2010-07-16 12:11:09 -04:00
Henri Sivonen
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
Tanner M. Young
77a270fb0e 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
f94d6c3608 Merge mozilla-central to tracemonkey. 2010-07-06 11:05:39 -07:00
Saint Wesonga
4bd9280674 Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedberg 2010-07-05 11:42:18 +02:00
Jason Orendorff
61bc026152 Merge fix for bug 575208. 2010-07-03 08:10:46 -05:00
Robert Sayre
2fd899ed0f Merge mozilla-central to tracemonkey. 2010-07-02 17:25:52 -07:00
Mitchell Field
d0f35f6883 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
b2124655df Backed out changeset 59ace8d80ce8 2010-07-04 22:01:13 +02:00
Saint Wesonga
8952503f91 Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedberg 2010-07-04 21:39:17 +02:00
Benjamin Smedberg
a677e5bf91 Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691. 2010-07-01 11:55:57 -04:00
Benjamin Smedberg
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
Benjamin Smedberg
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
Benjamin Smedberg
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
Jason Duell
386cfabff6 Backed out 9cfe0ace0e95 (SecurityInfo). Segfaulting. 2010-06-30 17:42:30 -07:00
Honza Bambas
8faab2606c e10s HTTPS: securityInfo. sr=biesi. 2010-06-30 09:17:51 -07:00
Doug Turner
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
Jason Duell
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
Doug Turner
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
Robert Sayre
5a3f306961 Merge mozilla-central to tracemonkey. 2010-06-05 19:13:45 -04:00
Doug Turner
3b935d5b7c Merge with mc 2010-05-25 13:48:25 -07:00