Commit Graph

13156 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
8b6316ec5f Merge mozilla-central to mozilla-inbound 2016-07-22 11:59:06 +02:00
Carsten "Tomcat" Book
336105a0de merge mozilla-inbound to mozilla-central a=merge 2016-07-22 11:58:02 +02:00
Carsten "Tomcat" Book
c7846e126c Backed out changeset 16aa7041c009 (bug 1287107) for causing xpcshell and mac tests 2016-07-22 11:30:23 +02:00
Jim Chen
ce45a595ab Bug 1287946 - Update existing code to use mozilla::java; r=me 2016-07-21 13:49:04 -04:00
Fabrice Desré
f5b619fb28 Bug 1287107 - Making transition alive with gaia as chrome:// r=bholley,fabrice
MozReview-Commit-ID: 9uVUrmuVFXQ

--HG--
extra : rebase_source : d0c19fcda5c72ecdce3b0d0bbbafa5a7954d7a4c
2016-03-03 09:58:47 -08:00
Tom Tromey
5538d692d3 Bug 1286877 - do not set c-basic-offset for python-mode; r=gps
This removes the unnecessary setting of c-basic-offset from all
python-mode files.

This was automatically generated using

    perl -pi -e 's/; *c-basic-offset: *[0-9]+//'

... on the affected files.

The bulk of these files are moz.build files but there a few others as
well.

MozReview-Commit-ID: 2pPf3DEiZqx

--HG--
extra : rebase_source : 0a7dcac80b924174a2c429b093791148ea6ac204
2016-07-14 10:16:42 -06:00
Carsten "Tomcat" Book
4a64baa9d4 merge mozilla-inbound to mozilla-central a=merge 2016-07-21 16:24:36 +02:00
Rob Wu
f8554fe4b9 Bug 1234677 - Introduce _generated_background_page.html r=billm
- Fixes bugzil.la/1234677
- Fixes bugzil.la/1286057
- Fixes bug: the URL failed to load if a query string or reference
  fragment was present.

MozReview-Commit-ID: 4oMwI3IS7OX

--HG--
extra : rebase_source : 621878e4f62febdc34899192e254f8ec315b789e
2016-07-12 13:55:14 -07:00
Franziskus Kiefer
dd5231632f Bug 1263793 - Using content signature verifier for verifying remote newtab, r=keeler,mayhemer
MozReview-Commit-ID: ABXYYseKImq

--HG--
extra : rebase_source : 79614e5215e738dff9683ad447245bd830c887bf
2016-05-19 10:59:48 +02:00
Chris Peterson
d634a99cad Bug 1277106 - Part 4: Remove MOZ_UTF16() macro. r=Waldo 2016-07-19 21:07:53 -07:00
Chris Peterson
b175c9fdd5 Bug 1277106 - Part 2: Expand MOZ_UTF16() strings to u"" string literals. r=Waldo 2016-07-20 22:03:25 -07:00
Carsten "Tomcat" Book
e8bc59a87a Backed out changeset 684888aeee81 (bug 1287946) 2016-07-21 08:07:12 +02:00
Jim Chen
78f67d1f6f Bug 1287946 - Update existing code to use mozilla::java; r=me 2016-07-21 00:42:26 -04:00
Christoph Kerschbaumer
9ec95d3d9d Bug 471020 - Implement X-Content-Type-Options: nosniff. r=dveditz,bz,mcmanus 2016-07-20 12:22:27 +02:00
Mike Hommey
d5a26f74b7 Bug 1280578 - Free pAdapterAddrs with GlobalFree in sctp_init_ifns_for_vrf(). r=jesup
Until da6f8ba in upstream git repository, sctp_init_ifns_for_vrf() was
using the MALLOC and FREE macros, using respectively HeapAlloc and
HeapFree. da6f8ba changed the allocations to use GlobalAlloc, but didn't
change the deallocations to use the symmetric GlobalFree.

This doesn't seem to cause direct problems, but when wrapping one family
of allocation functions, the dissymmetry causes allocator mismatch
problems.

Moreover, the MALLOC macro being unused, it might as well be removed,
along the FREE macro, so that both allocations and deallocations use one
API explicitly.

See https://github.com/sctplab/usrsctp/pull/92
2016-07-20 14:04:40 +09:00
Xidorn Quan
76db18facb Bug 1284406 part 3 - Export ICU headers in include/unicode. r=glandium
MozReview-Commit-ID: FuwAgEGjhxm

--HG--
extra : source : c07ceab42b47b18a1e8d436e7c888bdd113575fa
2016-07-20 15:00:13 +10:00
Xidorn Quan
17ee95ed83 Bug 1284406 part 1 - Move warning suppression of C4577 to global level. r=glandium
MozReview-Commit-ID: 66TD5A3L73D

--HG--
extra : source : e35f507952ccb081e77d5ba78c1b0d2ed566ac73
2016-07-20 15:00:13 +10:00
Honza Bambas
908654ae93 Bug 1287487 - remove no longer relevant test_bug651100.js, r=jduell 2016-07-18 08:54:00 +02:00
Honza Bambas
9ce4e1672b Bug 913823 - enable some net xpcshell tests that have been disabled because of cache2, r=michal
--HG--
extra : rebase_source : fba8cea900333bee5ef026446fbf48ed56a518ae
2016-07-18 09:03:00 +02:00
Masatoshi Kimura
8f5ad0af70 Bug 1286694 - Part 1: Modify test_tls_server.js to test TLS 1.3. r=keeler
MozReview-Commit-ID: 5OhfwG1J1Hq

--HG--
extra : rebase_source : 7336296aa363f3eeedec64fb5ed5cfd79dbd99c0
extra : source : 7214c64cf4798f0622df13eebbfc3e4ddbe0c952
2016-07-20 04:59:28 +09:00
Wes Kocher
3bba9b339e Backed out 5 changesets (bug 1287623) for static build bustage CLOSED TREE
Backed out changeset a48daec87ec9 (bug 1287623)
Backed out changeset 248153344e15 (bug 1287623)
Backed out changeset 8aa409c9b1ce (bug 1287623)
Backed out changeset 602d4d88e806 (bug 1287623)
Backed out changeset 114da8bdc0b0 (bug 1287623)
2016-07-20 15:40:33 -07:00
Andrew McCreight
41cc2c03eb Bug 1287624, part 2 - Replace swap with forget in a few places. r=froydnj
The return argument was initialized to null in all of these, so it
should not change the behavior.
2016-07-20 15:19:00 -07:00
Andrew McCreight
f4b033d329 Bug 1287623, part 5 - Convert CacheFileIOManager::gInstance to StaticRefPtr. r=mayhemer 2016-07-20 15:19:00 -07:00
Andrew McCreight
54bdb774ad Bug 1287623, part 4 - Make CacheIndex::gInstance a StaticRefPtr. r=mayhemer 2016-07-20 15:19:00 -07:00
Andrew McCreight
afa9136306 Bug 1287602 - CacheFile::GetChunk() is unused. r=michal 2016-07-20 15:18:59 -07:00
Wes Kocher
e2d9911273 Backed out changeset 21d8bb5af7b4 (bug 1263793) for leaks in various jobs CLOSED TREE 2016-07-20 11:16:37 -07:00
Franziskus Kiefer
9b9c643025 Bug 1263793 - Using content signature verifier for verifying remote newtab, r=keeler,mayhemer
MozReview-Commit-ID: CHUPgBr8WaC

--HG--
extra : rebase_source : 969bd058a157c7307b7a4d3c2a4c5d62e82b7489
2016-05-19 10:59:48 +02:00
Thomas Zimmermann
4bee1b2945 Bug 1288077: Forward declare arrays by including 'nsTArrayForwardDeclare.h', r=froydnj
MozReview-Commit-ID: 4RBeHDyhQgr
2016-07-20 17:29:36 +02:00
Thomas Zimmermann
c9844397ea Bug 1288077: Whitespace fixes, r=froydnj
MozReview-Commit-ID: DpKAsid5O3k
2016-07-20 17:29:36 +02:00
Michal Novotny
d115f7f708 Bug 1287266 - Integer overflow check in WebSocketChannel::ProcessInput, r=mcmanus 2016-07-20 17:15:32 +02:00
Andrew McCreight
9653815dee Bug 1287623, part 5 - Convert CacheFileIOManager::gInstance to StaticRefPtr. r=mayhemer 2016-07-21 09:54:17 -07:00
Andrew McCreight
3059107942 Bug 1287623, part 4 - Make CacheIndex::gInstance a StaticRefPtr. r=mayhemer 2016-07-21 09:54:17 -07:00
Carsten "Tomcat" Book
b73990fc83 Merge mozilla-central to mozilla-inbound 2016-07-21 16:26:18 +02:00
Nathan Froyd
121f6f491f Bug 1282154 - add more override declarations for Android-specific code; r=snorp 2016-07-21 16:46:41 -04:00
Dragana Damjanovic
56aa665f1b Bug 1274818 - Early return from nsHttpChannel::CallOnStartRequest on its second call, r=dragana 2016-07-15 12:14:00 +02:00
Jonathan Hao
198b01a6aa Bug 1270681 - Add a test to ensure that the HTTP Cache is respecting usercontextId. r=mayhemer 2016-07-18 02:21:00 +02:00
Dragana Damjanovic dd.mozilla@gmail.com
35cecae1b6 Bug 1261585 - Make nsITraceableChannel listener work with content encoding.r=jduell
--HG--
extra : rebase_source : 98c549ada53f64f66eb716801f0140da6b7252ef
2016-07-19 05:05:00 +02:00
Honza Bambas
fb60c43315 Bug 1288327 - Disable some HTTP cache tests when the old backend is used, r=dragana
--HG--
rename : netwerk/test/unit/test_cache2-29e-non-206-response.js => netwerk/test/unit/test_cache2-29e-concurrent_read_half-non-206-response.js
2016-07-21 02:00:00 +08:00
Nicholas Nethercote
b844244609 Bug 1273043 - Add a missing null check to HttpChannelChild::DoOnStartRequest(). r=michal.
--HG--
extra : rebase_source : 9524ee9f1328505c8136a8da8bfea49fb279f33e
2016-07-12 10:33:07 +10:00
Wes Kocher
c9783f64cb Backed out 4 changesets (bug 471020) for frequent Windows w(2) failures CLOSED TREE a=merge
Backed out changeset d9675ab3d203 (bug 471020)
Backed out changeset 3ee328c56de0 (bug 471020)
Backed out changeset 000576e264bd (bug 471020)
Backed out changeset ffe60708c457 (bug 471020)
2016-07-18 16:07:28 -07:00
Kannan Vijayan
2c6b8dc9ef Bug 1286636 - Use dedicated custom-port query socket to do mDNS queries. Respond to queries using per-interface sockets. r=justindarc 2016-07-18 12:41:31 -04:00
Christoph Kerschbaumer
f897b7df7e Bug 471020 - Implement X-Content-Type-Options: nosniff. r=dveditz,bz,mcmanus 2016-07-18 14:47:48 +02:00
Andrea Marchesini
c2e7f126f5 Bug 1282407 - Implement nsIURIWithBlobImpl to support blobURL after revoking them, r=smaug 2016-07-17 16:32:02 +02:00
Carsten "Tomcat" Book
a0992595d6 merge mozilla-inbound to mozilla-central a=merge 2016-07-17 10:08:08 +02:00
Wes Kocher
ad9620b862 Merge m-c to autoland a=merge 2016-07-15 17:01:59 -07:00
Carsten "Tomcat" Book
0f6e33eb43 Merge mozilla-central to mozilla-inbound on a CLOSED TREE 2016-07-15 16:16:45 +02:00
Xidorn Quan
30788d7d8b Backed out 4 changeset (bug 1284406) for build bustage on CLOSED TREE
--HG--
extra : amend_source : 9ad3b754789e60fe021f5b1989d7063cea8ca457
extra : histedit_source : 66c8b4fc923335e88a4593fd900c6c2cf57f6123%2C0f634c3c453a5d922de0e4e66dac69deec9f729c
2016-07-16 12:27:45 +10:00
Xidorn Quan
7167e29a37 Bug 1284406 part 2 - Export ICU headers in include/unicode. r=glandium
MozReview-Commit-ID: FuwAgEGjhxm

--HG--
extra : source : a90c00e3fa63f1e9934fe5f515233dddb11970b6
2016-07-16 11:44:15 +10:00
Xidorn Quan
9b80ed9cd0 Bug 1284406 part 1 - Move warning suppression of C4577 to global level. r=glandium
MozReview-Commit-ID: 66TD5A3L73D

--HG--
extra : source : 61c129befe265ed4628995aaf71aa9ec6bfd9636
2016-07-16 11:44:15 +10:00
Jan Horak
f1cd3790fc Bug 890908 - Move Negotiate auth off main thread. r=mayhemer
--HG--
extra : rebase_source : ca85ad4bb099845b45a276823fe1abca68d384eb
2016-07-14 03:32:00 -04:00