wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
44,494 Commits 1 Branch 166 Tags 1.2 GiB
d194b9d486
Commit Graph

503 Commits

Author SHA1 Message Date
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
Doug Turner
ded51c1c5f 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
d9e86770e3 Merge mozilla-central to tracemonkey. 2010-06-05 19:13:45 -04:00
Doug Turner
003acc6d48 Merge with mc 2010-05-25 13:48:25 -07:00
Olli Pettay
58b4f71840 m-c to e10 merge 2010-05-24 17:45:59 +03:00
Jason Orendorff
d7cbea1f4d 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
Doug Turner
fe405e740c 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
Brad Lassey
a15e734cc6 bug 559263 - implement jemalloc for android r=vlad 2010-05-25 11:28:14 -04:00
Michael Wu
09a0bf74f3 Bug 556443 - Add support for building NSS on Android, r=ted 2010-05-19 13:13:25 -07:00
Ehsan Akhgari
1f0e2cec91 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
Jesse Ruderman
f04ef428cb 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
5ae821c0ce 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
d0e5fc0583 backout changeset 9a0a17e18b72 - wrong commit info 2010-06-17 21:57:13 +02:00
timeless@mozdev.org
c799212a6e Bug 559332 don't build mOnStateLocationChangeReentranceDetection / nsAutoAtomic ifndef DEBUG 
r=kaie
 2010-06-17 21:46:33 +02:00
Marco Bonardo
5d6cf6042f 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
798e2282d4 Bug 559333 useless signed check of PRUint32 index in nsCertTree::DeleteEntryObject 
r=kaie
 2010-06-16 18:54:22 +02:00
Doug Turner
6c196f14e2 Automerge with mc. no manual changes 2010-04-21 03:31:13 -07:00
Kai Engert
05555f6df4 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
Kai Engert
8d49c22dc4 Bug 354273 S/MIME signed emails include duplicate cert in chain. r=nelson 2010-06-15 14:23:05 +01:00
Honza Bambas
89b026a94e 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
ce41784187 Bug 542460 - Remove executable permission on source files [r=ted.mielczarek] 2010-05-06 09:32:50 +02:00
Daniel Holbert
4d7b4ac88a 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
20950733f1 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
789d452402 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
90b7b3baa3 Bug 173729, Deleting a builtin cert should behave better 
Improve wording to reduce confusion
r=rrelyea
 2010-05-03 13:34:41 +02:00
Kai Engert
3171f40058 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
Kai Engert
0e72f129f4 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
timeless@mozdev.org
5273a85a73 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
b92bf2348e Bug 557893 - ProcessRDN leaks decodeItem on failure, r=kaie 
--HG--
extra : rebase_source : 4cdfdf205b6de7a810a4bf86cacd5c3e1635aa8d
 2010-04-07 13:46:00 -07:00
Doug Turner
f295d7422b Merge 2010-03-12 15:20:36 -08:00
Joel Maher
d050afae06 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
8751d837e5 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
timeless@mozdev.org
76ac517cef Bug 101378 Make psm dialogs non modal 
r=kaie

--HG--
extra : rebase_source : 356662cc5a67c6296569312405df0476ca10fa5e
 2010-03-12 07:50:10 +01:00
timeless@mozdev.org
7958d48767 Bug 469555 Support searching for certificates 
r=kaie

--HG--
extra : rebase_source : 262d11f8512bf8f61e4b084b079f33a36407a65e
 2010-03-12 07:50:09 +01:00
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
Brad Lassey
bb55fe310f backing out changesets e939397fc6a5, 88529662c474 and 3d7c54b194bb due to random hangs in pgo tests 2010-03-09 22:33:11 -05:00
Joel Maher
aef3dc32c3 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
1d0289c601 Backed out changeset 8ce70abd7777 2010-03-09 01:14:21 -05:00
Joel Maher
cee9b522a0 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
Benjamin Smedberg
33745658c4 Merge mozilla-central into electrolysis 2010-02-09 11:39:28 -05:00