roytam1/mozilla45esr
1
0
Fork 0
mirror of https://github.com/roytam1/mozilla45esr.git synced 2026-05-26 15:39:48 +00:00
Code Issues Projects Releases Wiki Activity
276 Commits 3 Branches 1 Tag
master
Commit Graph

31 Commits

Author SHA1 Message Date
roytam1 50d2e2b43c import changes from tenfourfox: 
- #651: M1779993 + backbugs (9197c1505)
- #651: M1786188 M1791029 (28b4c0882)
- #651: M1761233 M1687303 M1633019 M1797336 M1799748 M1801102 (fb91afbb4)
- add MDN script to problematic scripts due to screen blanking after load (2488fabc4)
- #659: initial support for per-host CSS grid whitelist (c889bc5ce)
- #659 sidecar: better blocking means for developer.mozilla.org (c51a503ed)
- #659: tuneups and edgecases (17b23692f)
 2023-04-21 10:33:34 +08:00
roytam1 c28b308ecb partly import changes from tenfourfox: 
- #651: M1767365+backbugs M1757604 M1497246 M1771774 M1776658 M1761981 M1773717 (bc6daa0ae)
 2022-09-19 14:59:37 +08:00
roytam1 f433ba88d6 partly import changes from tenfourfox: 
- first rolling release: update to 91ESR EV and roots, HSTS, TZs, TLDs (d7c93b6cf)
- security: M1730935, M1735152, M1730048 (1603b00d0)
 2021-11-01 09:15:14 +08:00
roytam1 786ae0146a import change from tenfourfox: 
- closes #647: M1724107 M1721107+backbugs M1716622 +TLDs HSTS (a3a4a114b)
 2021-09-07 10:04:41 +08:00
roytam1 a317c00b04 import changes from tenfourfox: 
- #636: basic Auto Reader View (83a100c42)
- moar adblock hosts (7b403249b)
- #636: fix double redirects with fragments (3e8ae43a5)
- OlgaTPark/tenfourfox#14 — M1520960 M1660998 - Allow saving passwords in private windows with a dismissed-by-default doorhanger and fix preferences accordingly (#637) (fcfba098e)
 2021-03-17 09:31:34 +08:00
roytam1 89383021d9 import changes from tenfourfox: 
- #633: M1683627 M786797 and disable CSP reporting due to M1542194 and others (0897c8df9)
- #633: update tzdata, HSTS, pins, TLDs (b7ad30596)
- #621: better wallpaper for communities.apple.com (7b55a0cc4)
 2021-02-20 22:25:33 +08:00
roytam1 d97646cc37 import changes from tenfourfox: 
- #632: M1424915 M1354233 M1324114 M1343008 M1236277(just backbugs) M1328955 (d87db7e16)
- #632: M1362498 M1397686 M136178 M1320252 M1355875 (82cb3b59e)
- #632: M241788 M1271955 M1249352(p1) + additional local optimizations (438bdb726)
- #632: M1249352 part 2 (2c61821e4)
- more hosts for adblock (c1a28532c)
- #632: M1249352(remaining) M1358297(backbugs) M1369317(pp1,3,4) M1426996 (1eab6170b)
- even more host (just one) for adblock (011118c38)
 2020-11-27 09:40:25 +08:00
roytam1 9310bd65f6 import changes from tenfourfox: 
- #612 (from OlgaTPark/14) M1250987 M1309358 M1394399 (06bbc2e34)
- #612 (from OlgaTPark/14) additional fixes (53381bf93)
- minor fix for menu icon scaling (thanks @OlgaTPark again) (1d72924e6)
- disable tile pings to Mozilla, since we don't use them anyway (f8a8156e8)
- OlgaTPark's 1.25x change and PDF.js fonts tweak (7a010018d)
- fix glitch with reader mode menu on inappropriate start page (bc7189521)
- #631: M1607762 M1654620 (7a7bba46e)
- #631: update TLDs, HSTS (ececaa972)
 2020-11-16 22:08:38 +08:00
roytam1 82a4aaf95f import changes from tenfourfox: 
- #619: M1258041 M1285428 M1274685 (thanks @OlgaTPark) (c2d494215)
- #621: wallpaper and speculative fix (didn't work, but good to have) (cbcbd24be)
- #622: M1660537 M1641487(modified) M1645492 (291688840)
 2020-09-18 22:30:14 +08:00
roytam1 4855b847df import changes from tenfourfox: 
- #620: initial support for sticky reader (bf39401a5)
- #620: add reader mode to context menu (cceb528dd)
 2020-09-18 22:24:33 +08:00
roytam1 b0419c145e import changes from tenfourfox: 
- #587: M1598543 M1607902 disable remote jars (cfb4b1e08)
- closes #588: make urlbar a bit more responsive (2b0ed5adb)
- #587: update TLDs (c15b86c49)
 2020-02-15 09:43:03 +08:00
roytam1 9b34b27e21 import changes from tenfourfox: 
- remove Get More Tools, since it doesn't work (638361bd8)
- #583: always-on (mostly) reader mode (cb5d8f86a)
- #583: update Readability to latest tip; update glue to new API (8bd4c09a7)
- #581: M1047098 M1355576 (ec8e68102)
- closes #582: M1358018 modified for 45ESR (74fd7b6d0)
- a better idea for #583 (f0a4e7686)
- #584: M1507180 M1598605 (7b58ac561)
- #584: update certs, pins, TLDs (f9572b6f0)
- #334: remove moar tele (0761d9501)
 2019-12-24 15:08:05 +08:00
roytam1 a1b817dabc import changes from tenfourfox: 
- instrument script loads for debugging (f71ffd52a)
- #541: temporary workaround for infinite errors on github (8c40900ac)
- #431: M1385165 (5b2393042)
- #575: high-level disable only (b321cdff4)
- additional hosts for adblock (a891fb6c0)
- #370: M976073 minus tele with backbugs (20c8bb414)
- mark JS sites needing flips for confidence testing; #375 (M1275282) (2eda8a4d4)
- [partly imported] closes #577: add back general.useragent.override.* (a8f4daa76)
- remove google safebrowsing URLs since they are dead (d89529ac0)
- #579: M1218456 +backbugs -nsILinkHandler removal, with changes for 45 (5e0cd430c)
- #375: M1352323 M1038099 (eb6f62648)
- #375: M1334642 +efficiency patch (1d2b06b10)
- [with additions] closes #375: M1353187 (partial) (45c95c3da)
- [with modification] #578: M1580320 M1584170 (216c8ff73)
- #578: update pins, preload, TLDs (46acdd518)
 2019-11-22 16:18:20 +08:00
roytam1 6d2d37b9f8 import change from tenfourfox: 
- make tele really impossible (78ce567c4)
- #568: update certs, pins, TLDs, miners (fe73f72f7)
 2019-09-04 22:52:49 +08:00
roytam1 706b4d3150 import changes from tenfourfox: 
- #565: M1367219 (6f63dc2cc)
- more adblock hosts (8cf4190e2)
- #565: implement nsASCIIMask from M1358297 (41b1fc937) (with vc2013 fix by replacing constexpr to MOZ_CONSTEXPR and MOZ_CONSTEXPR_VAR)
- #565: M1358225 with fix for M1548306 applied (8eed11298) (with vc2013 fix by replacing constexpr to MOZ_CONSTEXPR and MOZ_CONSTEXPR_VAR)
- even more adblock hosts (5d005926f)
- #565: M1347737 (9ab5bb0ed)
- #565: M1358297 parts 3 and 4 (3fd15a87a)
- #521: baseline parser support for async/await, with toggle, without bytecode (passes tests) (0e5746aaf)
- #521: fix yield handling (includes M1305566 pts 4-7) (2d25f717b)
- #521: make async functions throw for compatibility when enabled (46b01b5d4)
- #569: M1204714 (c45b2e8b5)
- #568: M1560495 (adapted for 45) M1562033+M1466449 M1559715 M1564449 M1573160 (d019bd3dc)
- #568: update certs, pins, TLDs, miners (ed3129eeb)
- #570: oops (dd79a9f75)
and added -bigobj compile switch to ssl/moz.build.
 2019-08-27 00:22:58 +08:00
roytam1 37e4036856 import changes from tenfourfox: 
- #551: M1538402 M1516325 M1544670 (a5f18b580) (without nspr changes)
- #551: M1538619 M1538736 M1542829 M1543617 M1531346 M1540166 (54aa2d7cc)
- #446: fine, eat your placebo and enjoy it (f6dd8303f)
 2019-05-07 22:24:00 +08:00
roytam1 067eb934c1 import changes from tenfourfox: 
- #446 + #334: trim refresh driver further; restore old Tele removal (4594eee51)
- #446: cap default frame rate to 30fps (based on M1503339) (9465ea36d)
- #547: block modal HTTP auth DOS M1312243 M377496 + glue code (d60d9721f)
- #550: pref on mediasource for mp4 (37789a58a)
- #399: null check in FindNearestCommonAncestorFrame from PM 978 (23f303460)
 2019-04-02 21:49:06 +08:00
roytam1 ba65ece578 import changes from tenfourfox: 
- #501: basic support (doesn't work yet, doesn't crash) from M1294490 (630d19190)
- #501: add toggle pref (ac0300a55)
- #501: functional decoder wrapper (339688135)
- #501: libwebp 1.0.1 with endian fix to highlevel decoder (c2ce1fbd0)
- #501: convert to Demux API; add colour profile support (ceed59655)
- #501: make animated WebP failures fatal for now (ed1453647)
- #516: try to be aggressive again with global window idle timeout (f281a6bf8)
 2019-02-20 15:00:50 +08:00
roytam1 88d6f807c3 import changes from tenfourfox: 
- #527: M1054906 M1278599 M1252228 (+ESR45 changes, see M1263778 for info) (09256df98)
- #517: more complete workaround for Rocket Loader (392618510)
- fix an assert M1416774 (c9ed275af)
- #529: jsop_in folding M1244098 M1041586 (partial) (a8fa64068)
- #530: Object.getOwnPropertyDescriptors M1245024 M1279303 (052586b55)
- #531: pref CSS error reporting to false except for DEBUG builds (f059d57c0)
- #525: workaround for old addons, uBlock origin (f898ad643)
- intel specific fixes + gstate cleanup (#532) (e4c087349)
- Merge branch 'master' of github.com:classilla/tenfourfox (9f9119069)
 2018-11-02 21:21:39 +08:00
roytam1 0f0a4f2f20 import changes from tenfourfox: 
- #525: pref off for FPR10 (6912ea34a)
- #526: update certs and pins (8a7210bac)
- #526: M1492823 M1483699 M1496340 M1492524 (f818695f0)
 2018-10-25 10:12:01 +08:00
roytam1 0b27a01673 import changes from tenfourfox: 
- #522: basic window.open=noopener, refactor popup blocker M1267338 M1267339 (46bf256a1)
- closes #522: rel=noopener M1222516 M1358469 M1419960 (6abcdc2cc)
- closes #524: enable MSE by default (3c3b61b6f)
- #399: M1342849 (47b8abd55)
- more hosts for adblock (8f342c327)
- #334: remove Telemetry from JS-DOM-XPConnect runtime (b95f6e968)
- #525: data URL opaque origins M1324406 M1381728 (3920907ee)
- #392: prerequisite SetCanonicalName M1235656 M1236638 (c1f84d628)
- #392: Symbol.toStringTag M1114580 (w/o ESClassValue change; w/45ESR boilerplate) (3cf6b4057)
- #525: fix assertion (until asyncOpen2 is implemented) (d9ffd4d15)
- another host for adblock (ff9433ee7)
- #526: M1493347 M1487098 M1423278 (4d34a54ce)
- #526: update certs and pins (bcc8aabb9)
 2018-10-10 21:23:35 +08:00
roytam1 1a7ee70948 import changes from tenfourfox: 
- #463: rework idle callbacks to use max timeout; try to fix stalls; pref off by default for FPR9 (12cdb0cd2)
- #516: idle time to 10s; add more adblock hosts (dc12741be)
 2018-07-28 08:31:40 +08:00
roytam1 b9c80fa570 import changes from tenfourfox: 
- closes #463: fix name of pref and pref on requestIdleCallback (a87d157ba)
- #504: hook up valueAsDate to correct pref (80c343933)
 2018-07-08 10:09:36 +08:00
roytam1 6eca2ddf0a import changes from tenfourfox-history: 
- #493: image max-width M823483 M1247929 (1e8048f6f)
- closes #493: fix height for flexbox case M1030952 M1180107 (3d108a56a) (with fix for msvc)
- closes #484: wallpaper unrenderable icons getting into Cocoa menus (35862d42c)
- revert UA fx60 change, add as new agent, add IE11 (3698c7959)
- #469: a few more hosts for adblock (a2c8faf0b)
- #491: M1443891 M1444231 M1443092 M1448774 M1452416 (9661a95c2)
- #491: update certs and pins (8aaf95173)
- #491: backout M1452416 for bustage, we'll think of another way to implement this (f6c7b6f4a)
- fix for x86 by Ken/MacPorts (cadf0e4e0)
- #497: improve DOM KeyboardEvent support (5eacbf2ea)
- #483: okay, let's try tuning Purple again now that 485 is fixed (aabc8bc25)
- #469: more adblock entries (29b022d4d)
- #399: tune up HTTP cache M1248003 M1248389 (f5d414283)
- #491: new fix for M1452416 (3f1408e19)
- #491: M1393367 M1452202 (c4a05454d)
- #491: update certs and pins (3642b952f)
- #491: M1452075 (cb09bc27d)
- #469: and a couple more (efceaf1c0)
- #491: M1449548 (adapted for 45) (05c79ddd2)
- #491: update certs and pins (again) (619952aa4)
- #499: same-site cookie support (64dc7e7f8)
 2018-05-31 21:31:50 +08:00
roytam1 1a65205c5b import changes from tenfourfox-history: 
- #469: expose adblock pref in UI (3c7ba565e) (partly)
- #483: speculative GC/CC retuning (851222ca4)
- enable intel atomic operations (8fba598e8)
- #482: better bidi M1358275 M1392181 M1428774 + backbugs (e88a717ab)
- #482: note to self (d70096a7c)
- #483: wrong way on purple buffer (otherwise OOMs result) (d1ee9ade1)
- #478 chemspill: M1446062 fixes M1446068 (d2a1328e6)
- #469: more hosts for adblock (d8ada86ef)
- M1252374 reduce mallocs in displayList generation (78a7470f6)
- #485: mostly working destructuring nested rest assignment (2edc0af3d)
- closes #486: amp up hashtables M1352889 M1352890 M1379282 (1a6015752)
- #469: more hosts and a miner for basic adblock (3b1a55df8)
- #405: fix idl (1dab98d2e)
- #469, #399: more adblock hosts, faster StringBegins/End, any-link, base/srcdoc M1247359 M843579 M1238804 (610226ea6)
- #334, closes #489: enable TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 for amtrak.com (595021326)
- #399: remove padding-box support M1166728 (845e1834f)
- #399: disable SPDY/3.1 M1287132 (540f47f9c)
- #488: basic support for DOM iterables, {NodeList,DOMTokenList}.forEach M1216751 M1290636 (8409d1511)
- closes #488: M1257849 M1244328 finish DOMTokenList transition, bustage fixes (6b1b6131e)
- #491: update certs and pins (d2003d9a6)
- closes #492: rc4 bad, increase throttle, update UAs, reduce font URL overhead, nerdwallet ATSUI font block (8f7a0cce0)
- #469: some more hosts for adblock (c1af11d1a)
 2018-05-31 20:53:21 +08:00
roytam1 933581b8d3 import changes from tenfourfox-history: 
- M1301093 part 1 for URL bar (see also M1283329) (34bd3e08f)
- #469: script blocking (plus blacklist a couple fonts on LATimes) (9b75c96b8)
- #469: clean up, add more hosts to scriptblock (80eb1366d)
- #463: initial plumbing for requestIdleCallback (334075d50)
- #471: speculative fix (1cd209093)
- update nytimes ATSUI font blacklist (25614a763)
- #469: more hosts for basic adblock (ec682d148)
 2018-05-31 17:11:25 +08:00
roytam1 235a5ea444 import changes from tenfourfox-history: 
- #444, #334: retune session store; remove telemetry (8482c1f9d)
- Revert "conditional check for PPC/x86" temporarily to make better pull request. (40c43f15b)
- look for log2() without std namespace (a61d449ef)
- rewrite access to control and FPU structures (2b58e23b7)
- #438: revert M1371908 for startup assertions and crashes (ad2a5336b)
- Wrong revert! Revert "Revert "conditional check for PPC/x86" temporarily to make better pull request." (9781a9144)
- Corretly revert to allow better pull. Revert "remove flags to remove altivec from here" (69a66da97)
- #399: ChildNode-ParentNode DOM4 M911477 M1301777 M1308922 M1104955 M1054759 M1258163 (bc5e0e5db)
- Revert "look for log2() without std namespace" - need to investigate more (16fa9b6b4)
- #399: M1249913 M1310403 M1260515 (fa3943ab2)
- #399: passive event listener support M1266066 (3b4f93bf6)
- #399: abspos edge case M1379306 (aaa273649)
- #455: remove unnecessary compiler options (36134ebb3)
- #457: update certs and pins (245059e2b)
- #446: refresh driver overhaul + M1367830 M1352205 (85934d6f5)
- add CONTRIBUTING (35e86c9ee)
- #446: reduce throttle interval (ce4255be2)
- #457, #459: M1413741 M1408990 M1418922 M1422389 M1415598 M1423159 M1399400 M1428589 M1427870 M1425780 (1b84841d6)
- #457: M1414425 M1418854 M1411708 M1395508 M1408017 M1425000 + assertion tweaks (f3d191862)
- #457: M1419363 + WeakPtr support from M1267918 (014868942)
- #457: M1414452 converted to nsAutoTArray from AutoTArray (ba925258b)
- #457: M1412145 (c8c5a6c2b)
 2018-05-31 15:31:40 +08:00
roytam1 89830cff26 disable log2 in jsmath, and import changes from tenfourfox: 
- #334: more tele from TabBrowser; also remove gMultiProcessBrowser since we don't support it (16f8592aa)
- #431: M1388354 M1388014 (da843afa1)
- #438: M1393098 (539efce0c)
- #388: M1354564 (d375d57d3)
- #429: Brotli 1.0.1 (c69914a5a) (with ppc-only defines removed)
- #429: install modules/woff2 (current to Fx57) (87b560912) (with ppc-only defines removed)
- #429: update OTS to 5.2.0 plus patches and M1396026 (1ce2a83ec) (with binary literals removed)
- #317: update graphite2 to 1.3.10 (f4bf5ad97)
- #429: update Harfbuzz to 1.5.1 (083639c71)
- #317: patch thebes for graphite2 alignment issues; enable graphite fonts (b7fead52b)
- #434: adjust video queue settings; Mach factor decode delay logic (default off) (9b5b09a6c)
- clean up a couple warnings (f37f7669d)
- #426: M1385395 (b8ebae839)
- #438: M1375599 (84bfb83b1)
- #442: M1381157 (ffbe7ea3a)
 2018-05-31 14:43:36 +08:00
roytam1 ac0651448a import changes from tenfourfox: https://github.com/classilla/tenfourfox/compare/966d8cab820858bcda2fa8e945ed14b66d9e83f9...e7767cdaa56ee060b14702ed64ae594958fcb1dd 
- issue #385: unconditionally disable JS source compression (6a91f9666)
- #359: security.pki.sha1_enforcement_level -> 1 (966d8cab8)
- for #375: M1349940 M1355595 M1334635 M1353708 M1354782 M1354781 M1349742 M1345315 M1356655 M1356663 M1357638 M1358809 M1307134 M1331342 M1220466 (964aa7e7c)
- #378: ensure remaining users of faulty LZ4 module never execute (922a32738)
- #387: pulled nsGenConList.* with relevant deps up to mozilla-central (b1831fc75)
- prerequisite for #375: M1347759 (8e58b5c8f)
- #375: M1348278 (8d665811d)
- #368: pref on Brotli (7da09aa4e)
- #375: M1330912 (sync patch only) (bea84e507)
- #375: M1342719 M1342720 (f4015e0c1)
- Bug 1071646 - Light refactoring of lexical binding helpers in Parser. (r=jorendorff) (167ad8564)
- Bug 1071646 - Make functions block-scoped in JS and implement Annex B semantics for compatibility. (r=jorendorff) (25844de1b)
- Bug 1071646 - Support labelled function declarations in sloppy mode per Annex B.3.2. (r=jorendorff) (37bf861a9)
- Bug 1071646 - Introduce JSOP_BINDVAR to support Annex B.3.3.3. (r=jorendorff) (884bd2ab5)
- Bug 1071646 - Cast ParseNode to Definition using as<T>. (r=jorendorff) (feba46e3f)
- Bug 1071646 - Support JSOP_BINDVAR in Baseline. (r=jandem) (92b6a3b48)
- #372: merge changeset 299512 (c28302281)
- Bug 1071646 - Support JSOP_BINDVAR in Ion. (r=jandem) (d05f77998)
- Bug 1231758 - Fix bogus assertion in BCE for Annex B function assignment. (r=jorendorff) (a11dcf0cc)
- Bug 1234717 - Fix upvar TDZ for block-scoped functions. (r=jorendorff) (2ec542b5a)
- Bug 1071646 - Forgot to commit tests on backout and relanding cycle. (r=me) (069a26bf9)
- #372: merge changeset 303861 (745f7e7a2)
- Bug 1235590 - Allow redeclaring block-scoped functions and warn about deprecation for now. (r=jorendorff) (8a51cc1f9)
- Bug 1243793 - Fix handling of labels when emitting hoisted function definitions. (r=jorendorff) (c0ffd70f9)
- Bug 1236875 - Fix BytecodeEmitter::atBodyLevel() for modules r=efaust (5b2c22f62)
- Bug 1304641 - TraceLogger: Also throw compartment mismatch error when running in the jits, r=bbouvier (717134569)
- Bug 1198833 - Variable redeclaration should be a syntax error r=shu (ac6710b0f)
- #393, Bug 1135377 - Part 1: Implement RegExp unicode flag. r=till, f=anba (d00063089)
- #393, Bug 1135377 - Part 2: Parse RegExp unicode character in non-CharacterClass. r=till, f=anba (c85a176bd)
- #393, Bug 1135377 - Part 3: Parse RegExp unicode character in CharacterClass. r=till, f=anba (68f44ec41)
- #393, Bug 1135377 - Part 4: Support everything Atom in RegExp with unicode flag. r=till, f=anba (4e924a688)
- #393, Bug 1135377 - Part 5: Support CharacterClassEscape in RegExp with unicode flag. r=till, f=anba (45a4712b0)
- #393, Bug 1135377 - Part 6: Support ignoreCase for BMP in RegExp with unicode flag. r=till, f=anba (cf744e9d3)
- #393, Bug 1135377 - Part 7: Support ignoreCase for non-BMP in RegExp with unicode flag. r=till, f=anba (f31a9f9e8)
- #393, Bug 1135377 - Part 8: Disallow extended pattern in RegExp with unicode flag. r=till, f=anba (c05db4075)
- #393, Bug 1135377 - Part 9: Use RegExp unicode flag in String.prototype.{match,replace,split}. r=till, f=anba (8636a96b7)
- #393, Bug 1135377 - Part 10: Decrement index when it points trail surrogate that has corresponding lead surrogate. r=till, f=anba (522d06ab3)
- #393, Bug 1135377 - Part 11: Support back reference with unicode flag. r=till, f=anba (122e41a28)
- #393, Bug 1279467 - Fix null handling in RegExp character class with unicode flag. r=till (741f170e6)
- #393: bustage fix (3e39760c8)
- #393, Bug 1281739 - Do not match K, S, k, s, KELVIN SIGN, LATIN SMALL LETTER LONG S with \W in unicode ignoreCase RegExp. r=till (3c5d4bab8)
- #375: M1233101 (a6a0b895f)
- #375, #391: branch hint malloc and recursion checks, clean up MAsm type barrier spooge (a008a1978)
- closes #380: fix toSource() tests (f9de6783b)
- #394: fix and enable ES7 exponentiation operator (6dc5f54dc)
- #396: M1342009, plus refactor to PLDHashTable a la M1352888 (06fcc091f)
- #375: M1347634 1352235 (aa6b13c59)
- #375: M1351303 (f7badd24e)
- #375: M1287277 M1259677; temporarily disable M1351303 due to crashes (75d95f15b)
- #375: M1363423 M1273828 M1364661 (e7767cdaa)
 2018-05-31 14:43:16 +08:00
roytam1 3d7d3ae7fe partly import changes from https://github.com/classilla/tenfourfox/commit/c9b2922b70d0052b78a1a9bc6069cefe5a119124 , with ppc-only changes excluded 2018-05-31 14:43:14 +08:00
roytam1 0904249120 initial import from mozilla-esr45 (hg rev dcc6d7a0dc00) 2018-05-28 07:32:58 +08:00