Commit Graph

1053 Commits

Author SHA1 Message Date
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
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
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
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
Doug Turner
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
Jesse Ruderman
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
Jae-Seong Lee-Russo
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
Marco Bonardo
5ebad349f1 backout changeset 9a0a17e18b72 - wrong commit info 2010-06-17 21:57:13 +02:00
Marco Bonardo
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
timeless@mozdev.org
87fe91746b Bug 559333 useless signed check of PRUint32 index in nsCertTree::DeleteEntryObject
r=kaie
2010-06-16 18:54:22 +02:00
Kai Engert
0403e4139f Bug 354273 S/MIME signed emails include duplicate cert in chain. r=nelson 2010-06-15 14:23:05 +01:00
Honza Bambas
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
Mike Hommey
4129f47992 Bug 542460 - Remove executable permission on source files [r=ted.mielczarek] 2010-05-06 09:32:50 +02:00
Daniel Holbert
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
Daniel Holbert
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
Kai Engert
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
Kai Engert
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
timeless@mozdev.org
41337c956c Bug 557888 - nsCertAlreadyExists always leaks unused arena, r=kaie
--HG--
extra : rebase_source : 33db7306106d05a695da3928648f4540fb673eb0
2010-04-07 13:24:00 -07:00
timeless@mozdev.org
447ebae44b Bug 557893 - ProcessRDN leaks decodeItem on failure, r=kaie
--HG--
extra : rebase_source : 4cdfdf205b6de7a810a4bf86cacd5c3e1635aa8d
2010-04-07 13:46:00 -07:00
Doug Turner
453380b2a7 Merge 2010-03-12 15:20:36 -08:00
Joel Maher
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
timeless@mozdev.org
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
Doug Turner
c741a38e65 Merge 2010-03-01 15:36:51 -08:00
Chris Jones
66e2a2f448 Merge from mozilla-central 2010-02-22 21:31:18 -06:00
Kai Engert
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
Kai Engert
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
Henri Sivonen
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
Henri Sivonen
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
Jonas Sicking
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
Brad Lassey
96319c4535 backing out changesets e939397fc6a5, 88529662c474 and 3d7c54b194bb due to random hangs in pgo tests 2010-03-09 22:33:11 -05:00
Joel Maher
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
Kyle Huey
a7c3948d0a Backed out changeset 8ce70abd7777 2010-03-09 01:14:21 -05:00
Joel Maher
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
Clint Talbert
5b4513c7e9 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
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
Robert Sayre
103fa1295e Merge mozilla-central to tracemonkey. 2010-06-21 18:01:14 -07:00
Luke Wagner
41b9495dcf Bug 565157 - typed JS_AddRoot (r=igor) 2010-06-07 17:05:02 -07:00
Benjamin Smedberg
a3abf70391 Merge mozilla-central into electrolysis 2010-02-09 11:39:28 -05:00
Benjamin Smedberg
efa70ad28e Merge mozilla-central into electrolysis. 2010-02-03 13:28:22 -05:00
Daniel Holbert
868688bc4b Bug 456099 followup: Remove unneeded & unused variables introduced by earlier outparam-deletion patch. r=smaug 2010-02-02 12:05:22 -08:00
Kai Engert
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
Kai Engert
2bfab230a2 Bug 540332, Update PSM to include the latest NSS error codes, r=rrelyea 2010-02-07 13:06:53 +01:00
Benjamin Smedberg
5ce04ab127 Merge mozilla-central to electrolysis. 2010-01-06 11:27:39 -05:00
timeless@mozdev.org
ce04e613ae merging 2010-01-05 23:50:02 +01:00
timeless@mozdev.org
2ca671cc18 Bug 327181 - actually deleting nsIBadCertListener.idl r/sr=biesi 2010-01-05 23:42:34 +01:00