Commit Graph

4788 Commits

Author SHA1 Message Date
Ryan VanderMeulen
84bb6ce5ad Backed out 6 changesets (bug 939318) for Windows xpcshell failures on a CLOSED TREE.
Backed out changeset faece15110ef (bug 939318)
Backed out changeset ecc0368d9283 (bug 939318)
Backed out changeset 4dcb889cf913 (bug 939318)
Backed out changeset 2fe8c65c26c2 (bug 939318)
Backed out changeset 0b9c1bbc7826 (bug 939318)
Backed out changeset fc191ae0a0e8 (bug 939318)
2014-08-29 14:22:47 -04:00
Daniel Stenberg
07e8c4d9a7 Bug 939318 - Introduce the "network.notify.changed" prefs. r=mcmanus
Makes it possible to disable 'changed' events.

Disable the events in test_ping_aboutnetworking.js and in
test_proxy-failover_passing.js
2014-08-29 01:11:00 -04:00
Daniel Stenberg
a67387629d Bug 939318 - Find and close HTTP connections without traffic after network change. r=mcmanus
SPDY/http2 connections get a ping and be allowed N seconds to respond.

Active HTTP connections will be allowed N seconds to get traffic, if they
don't afer N seconds they get closed to avoid risking stalled transfers.

N is 5 by default: pref is "network.http.network-changed.timeout"
2014-08-24 23:20:00 -04:00
Shashank Sabniveesu
14d47901ab Bug 1021142 - 'fclose()' at 2 places to avoid leaks on failure. r=bbondy 2014-08-28 11:35:50 -07:00
Chris Pearce
35125dcceb Bug 861090 - Create media.play-stand-alone pref to prevent loading videos as video documents. r=kinetik 2014-08-28 15:33:14 +12:00
Jeff Gilbert
1909c23f43 Bug 996266 - Fall back from failed WebGL context creation attribs. - r=kamidphish,bjacob 2014-08-27 16:16:22 -07:00
Carsten "Tomcat" Book
4c3afc78a3 Backed out changeset 6bcda9f223b3 (bug 996266) for bustage on a CLOSED TREE 2014-08-27 11:15:40 +02:00
Jeff Gilbert
51bd4b867c Bug 996266 - Fall back from failed WebGL context creation attribs. - r=kamidphish,bjacob 2014-08-27 01:31:14 -07:00
Jeff Gilbert
4cc106d5cf Bug 996266 - Kill WS. - r=kamidphish 2014-08-27 01:31:13 -07:00
Randell Jesup
7825fcc830 Bug 1058829: enable users to enable window/screensharing on WinXP and 10.6 via pref r=jib 2014-08-27 01:09:38 -04:00
Ralph Giles
ecfb261d77 Bug 1043696 - Enable fragmented mp4 on osx for HTML video. r=cpearce 2014-08-26 13:58:00 -07:00
Nicholas Nethercote
8b3951c20f Bug 1057912 - Privatize most of PLDHashTable's fields. r=roc.
--HG--
extra : rebase_source : 0f55e70b63d9c191fbd9418cb1177ff534deeed9
2014-08-25 16:56:33 -07:00
Ryan VanderMeulen
8017b23648 Backed out 7 changesets (bug 939318) for frequent Win7/Win8 xpcshell failures. a=backout
Backed out changeset 21dcd9e1b607 (bug 939318)
Backed out changeset cc131cf9ef81 (bug 939318)
Backed out changeset 02925699b9bb (bug 939318)
Backed out changeset a2d39ac660a6 (bug 939318)
Backed out changeset eeb8897aaa59 (bug 939318)
Backed out changeset d1e1ca369322 (bug 939318)
Backed out changeset 37bee525b188 (bug 939318)
2014-08-26 15:56:51 -04:00
Daniel Stenberg
9be938c1c2 Bug 939318 - Introduce the "network.notify.changed" prefs. r=mcmanus
Makes it possible to disable 'changed' events.

Disable the events in test_ping_aboutnetworking.js and in
test_proxy-failover_passing.js
2014-08-24 23:22:00 -04:00
Daniel Stenberg
dedeaf267e Bug 939318 - Find and close HTTP connections without traffic after network change. r=mcmanus
SPDY/http2 connections get a ping and be allowed N seconds to respond.

Active HTTP connections will be allowed N seconds to get traffic, if they
don't afer N seconds they get closed to avoid risking stalled transfers.

N is 5 by default: pref is "network.http.network-changed.timeout"
2014-08-24 23:20:00 -04:00
Shih-Chiang Chien
62c57a8d94 Bug 745283 - Part 4: WebIDL binding for UDPSocket API. r+sr=smaug, r=khuey, r=baku 2014-04-14 09:21:26 +08:00
Chris Pearce
8fc4eeca39 Bug 1057879 - Enable MP4Reader on Windows. r=kentuckyfriedtakahe 2014-08-26 14:34:54 +12:00
Ryan VanderMeulen
daedf86689 Bug 1048579 - Update the nsIChannel UUID. rs=Ms2ger
--HG--
extra : rebase_source : c4032b92e3ced113610ec9c365a5dadea2f57947
2014-08-25 09:55:57 -04:00
Shian-Yow Wu
c62134df9b Bug 1048615 - Fix crash when simultaneously opening remote JAR file with mEnsureChildFd enabled. r=jduell 2014-08-21 19:09:35 +08:00
Shian-Yow Wu
aac52d1de3 Bug 1055966 - Specify limitation of RemoteOpenFileChild::OpenNSPRFileDesc(). r=jduell 2014-08-21 10:13:43 +08:00
Shian-Yow Wu
ec63b63dfb Backed out changeset 69471d6c631a for missing reviewer name in the commit message. 2014-08-21 09:45:40 +08:00
Shian-Yow Wu
5cf293d903 Bug 1055966 - Specify limitation of RemoteOpenFileChild::OpenNSPRFileDesc(). 2014-08-21 09:40:19 +08:00
Mason Chang
9f8cadde05 Bug 1056190 - Delete Scrollgraph. r=benwa 2014-08-20 17:42:03 -07:00
John Daggett
80c7dbced9 Bug 975744 - remove font features pref and enable features by default. r=dbaron 2014-08-20 16:54:35 +09:00
Aaron Klotz
114fa16473 Bug 1054813: Add some missing MutexAutoLocks in nsZipReaderCache; r=mwu
--HG--
extra : rebase_source : 4f9caa7bd4ef1955c204e82bc33835a01d9f1e85
2014-08-19 12:11:03 -06:00
Masayuki Nakano
cc2693e6fa Bug 1054108 nsTextStore::GetTextExt() should return the position of composition start if the layout hasn't been computed yet and when Free ChangJie or Easy Changjei is active TIP r=emk 2014-08-15 23:52:46 +09:00
Kartikaya Gupta
6c0584ac01 Follow-up for bug 944938 to fix typo. r=me and DONTBUILD 2014-08-14 17:46:47 -04:00
Alexander Seleznev
7c18aef885 Bug 803633 - Add basic support for new scrollbar behavior in GTK+ [Part 1]. r=mstange, r=karlt 2014-08-10 16:05:51 +07:00
Valentin Gosu
6568fdac17 Bug 1045886 - Remove Cache directory from Android profiles r=michal 2014-08-13 16:43:45 +03:00
Harshit Harchani
8ab53106b7 Bug 927946 - Add all APZC preferences to all.js. r=botond
--HG--
extra : rebase_source : d96f4aea65b40490d4cc7f8ec8704a2a2f7ef4b8
2014-08-13 01:35:22 +05:30
Michael Wu
58f9bd9241 Bug 1036394 - Add support for getting the zip entry from the jar channel, r=jduell 2014-08-04 11:54:28 -04:00
Nicholas Nethercote
8c60d14a1a Bug 1050009 - Initialize pldhash tables with a length, not a capacity. r=roc.
* * *
imported patch rm-dummy-params

--HG--
extra : rebase_source : c25987eb11bae197218d5fc53b77def19afa36ac
2014-08-06 06:31:21 -07:00
Birunthan Mohanathas
f80c18a8b9 Bug 1047877 - Flatten modules/libpref/{public,src}/ directories. r=bsmedberg
--HG--
rename : modules/libpref/src/Makefile.in => modules/libpref/Makefile.in
rename : modules/libpref/src/Preferences.cpp => modules/libpref/Preferences.cpp
rename : modules/libpref/public/Preferences.h => modules/libpref/Preferences.h
rename : modules/libpref/src/init/all.js => modules/libpref/init/all.js
rename : modules/libpref/public/nsIPrefBranch.idl => modules/libpref/nsIPrefBranch.idl
rename : modules/libpref/public/nsIPrefBranch2.idl => modules/libpref/nsIPrefBranch2.idl
rename : modules/libpref/public/nsIPrefBranchInternal.idl => modules/libpref/nsIPrefBranchInternal.idl
rename : modules/libpref/public/nsIPrefLocalizedString.idl => modules/libpref/nsIPrefLocalizedString.idl
rename : modules/libpref/public/nsIPrefService.idl => modules/libpref/nsIPrefService.idl
rename : modules/libpref/public/nsIRelativeFilePref.idl => modules/libpref/nsIRelativeFilePref.idl
rename : modules/libpref/src/nsPrefBranch.cpp => modules/libpref/nsPrefBranch.cpp
rename : modules/libpref/src/nsPrefBranch.h => modules/libpref/nsPrefBranch.h
rename : modules/libpref/src/nsPrefsFactory.cpp => modules/libpref/nsPrefsFactory.cpp
rename : modules/libpref/src/prefapi.cpp => modules/libpref/prefapi.cpp
rename : modules/libpref/src/prefapi.h => modules/libpref/prefapi.h
rename : modules/libpref/src/prefapi_private_data.h => modules/libpref/prefapi_private_data.h
rename : modules/libpref/src/prefread.cpp => modules/libpref/prefread.cpp
rename : modules/libpref/src/prefread.h => modules/libpref/prefread.h
2014-08-07 21:52:04 -07:00
Nicholas Hurley
b4b1cf6efb Bug 1047594 - Enable http2 and alpn by default r=mcmanus r=dkeeler a=kwierso 2014-08-07 15:53:09 -07:00
Ed Morley
3f022990e9 Backed out changeset 72f85a52a2ca (bug 1047594) for causing bug 1050063 2014-08-07 16:41:42 +01:00
Mike Hommey
0f4c5d9244 Bug 1047267 - Move remaining OS_LIBS and EXTRA_LIBS to moz.build. r=gps
* * *
Bug 1047267 - To fold with "Move remaining OS_LIBS and EXTRA_LIBS to moz.build"
2014-08-07 14:21:03 +09:00
Nicolas Silva
d6dd3d64a1 Bug 1025138 - Integrate DrawTargetTiled preffed off. r=mattwoodrow 2014-08-06 14:40:03 +02:00
Mike Hommey
c9d509aafc Bug 1045783 - Move HOST_EXTRA_LIBS to moz.build as HOST_OS_LIBS. r=mshal 2014-08-06 07:26:05 +09:00
Mike Hommey
ec54bf6c1f Bug 1045783 - Move most OS_LIBS to moz.build and do some related cleanup. r=mshal 2014-08-06 07:25:33 +09:00
Nicholas Hurley
706f6d2c0f Bug 1047594 - Enable http2 and alpn by default r=mcmanus r=dkeeler 2014-08-05 08:41:14 -07:00
Birunthan Mohanathas
cdcd0b26ea Bug 1047876 - Flatten modules/libjar/zipwriter/{public,src}/ directories. r=glandium
--HG--
rename : modules/libjar/zipwriter/src/StreamFunctions.cpp => modules/libjar/zipwriter/StreamFunctions.cpp
rename : modules/libjar/zipwriter/src/StreamFunctions.h => modules/libjar/zipwriter/StreamFunctions.h
rename : modules/libjar/zipwriter/src/ZipWriterModule.cpp => modules/libjar/zipwriter/ZipWriterModule.cpp
rename : modules/libjar/zipwriter/src/nsDeflateConverter.cpp => modules/libjar/zipwriter/nsDeflateConverter.cpp
rename : modules/libjar/zipwriter/src/nsDeflateConverter.h => modules/libjar/zipwriter/nsDeflateConverter.h
rename : modules/libjar/zipwriter/public/nsIZipWriter.idl => modules/libjar/zipwriter/nsIZipWriter.idl
rename : modules/libjar/zipwriter/src/nsZipDataStream.cpp => modules/libjar/zipwriter/nsZipDataStream.cpp
rename : modules/libjar/zipwriter/src/nsZipDataStream.h => modules/libjar/zipwriter/nsZipDataStream.h
rename : modules/libjar/zipwriter/src/nsZipHeader.cpp => modules/libjar/zipwriter/nsZipHeader.cpp
rename : modules/libjar/zipwriter/src/nsZipHeader.h => modules/libjar/zipwriter/nsZipHeader.h
rename : modules/libjar/zipwriter/src/nsZipWriter.cpp => modules/libjar/zipwriter/nsZipWriter.cpp
rename : modules/libjar/zipwriter/src/nsZipWriter.h => modules/libjar/zipwriter/nsZipWriter.h
2014-08-04 06:55:01 -07:00
Simon Montagu
bb379e11f7 Bug 756022 patch 3: merge tr with x-western, r=jfkthame 2014-08-05 10:49:16 +03:00
Simon Montagu
dc330880c3 Bug 750622 patch 2: merge x-central-euro with x-western, r=jfkthame 2014-08-05 10:49:16 +03:00
Simon Montagu
19df2710fa Bug 750622 patch 1: merge x-baltic with x-western, r=jfkthame 2014-08-05 10:49:16 +03:00
Dragana Damjanovic
6a9806b987 Bug 1007020 - Also send progress information when connection is LOAD_BACKGROUND. r=bz 2014-08-01 02:10:00 -04:00
Ed Morley
070f2d591a Merge mozilla-central and inbound 2014-08-04 12:23:28 +01:00
Brad Lassey
95a48c38b7 bug 1037424 - follow up to allow browser from privileged content r=jesup 2014-08-02 13:42:08 -04:00
Masayuki Nakano
f8ee0998c0 Bug 1037328 Enable TSF mode in default settings of Nightly builds r=jimm+emk+m_kato 2014-08-04 10:31:25 +09:00
Randell Jesup
2b9f18550e Bug 1048017: pref on WebRTC screensharing - whitelist blocks access by default rs=jesup 2014-08-03 11:30:06 -04:00
Paul Kerr [:pkerr]
d6ff48efe7 Bug 1037424 - Part 1: Implement prefs-based screenshare domain whitelist in MediaManager. r=mt 2014-07-30 17:03:20 -04:00
Sid Stamm
edab85ef33 Bug 994782 - Remove the old Content Security Policy parser, CSPUtils.jsm and tie-in logic. (r=ckerschb,jst) 2014-07-30 14:37:22 -07:00
Ralph Giles
a998be842d Bug 941296 - h.264 platform decoder for OS X. r=cpearce
Implement an h.264 decoder using Apple's VideoToolbox framework.
Based on gstreamer's vtdec because there's very little documentation
for this API beyond the framework's header file.

Reuse the MOZ_APPLEMEDIA define from the mp3 decoder.

AAC decoding is stubbed to use the BlankDecoderModule's 440A tone.

Provide a stub header for the VideoToolbox framework and load
it dynamically at run time so we can build and run on versions
prior to MacOS X 10.8 where it's not available.

Dynamically load the CoreMedia framework as well, but build
against its headers since it's available on MacOS X 10.7 or
later, which is our minimum build version.
2014-07-24 13:47:00 -07:00
Kearwood (Kip) Gilbert
b6271ffc9c Bug 1026023 - Part 1: Create Preferences. r=mwoodrow
- Added layout.css.scroll-behavior.enabled preference to enable and disable
  scroll behavior and related smooth scrolling.
- Added layout.css.scroll-behavior.spring-constant preference to enable tuning
  of the smooth scroll motion.  spring-constant controls the strength of the
  simulated MSD (Mass-Spring-Damper).
- Added layout.css.scroll-behavior.damping-ratio preference to enable tuning
  of the smooth scroll motion.  damping-ratio controls the under, over, or
  critically damped behavior of the simulated MSD.
2014-06-12 10:50:54 -07:00
Mike Hommey
1e79fe55c2 Bug 1043802 - Remove TOOLS_DIRS and TEST_TOOLS_DIRS. r=gps 2014-07-29 08:55:55 +09:00
Ben Kelly
adfd86b42b Bug 1029620 P5 Create dom.fetch.enabled pref, defaulted to false. r=ehsan 2014-07-28 15:28:20 -04:00
Randell Jesup
f8df63b25d Bug 1043515: Add max-br and max-mbps H.264 SDP fmtp parameters; update supported h264 level r=ehugg 2014-07-27 19:59:46 -04:00
Patrick McManus
8d789efedf Bug 354493 - revert Add nsINetworkZonePolicy to protect resources loaded from private IPs r=backout a=backout 2014-07-24 10:05:36 -04:00
Wes Kocher
c605bcd891 Merge m-c to inbound a=merge 2014-07-24 17:55:50 -07:00
Mike Hommey
dbad84b131 Bug 1043344 - Move libraries and programs build to the compile tier. r=gps 2014-07-25 07:14:40 +09:00
Mike Hommey
ec8f2172fe Bug 1043289 - Don't declare SOURCES and USE_LIBS when there is nothing to build. r=mshal 2014-07-25 07:10:15 +09:00
Reuben Morais
3cf7372708 Bug 1019159 - Remove unused category registration prefs. r=gwagner 2014-07-24 15:47:52 -03:00
Carsten "Tomcat" Book
f2360c7833 merge mozilla-inbound to mozilla-central a=merge 2014-07-23 15:50:58 +02:00
Susanna Bowen
4e66a798af Bug 1021952 - Add ruby display values and ruby frames. r=dholbert,bz 2014-07-22 19:08:01 -07:00
Mike Hommey
71623acdd6 Bug 1036894 part 9 - Replace all EXTRA_DSO_LDOPTS, SHARED_LIBRARY_LIBS and LIBS with EXTRA_LIBS, OS_LIBS or OS_LDFLAGS, appropriately. r=gps
OS_LIBS for libraries that are not part of the gecko tree, EXTRA_LIBS for
libraries, such as NSPR, that are in the tree, but are not handled by
moz.build just yet. Those EXTRA_LIBS may also come from a system library.
However, in cases where the expanded variables are always empty for the
in-tree case, OS_LIBS is used (as for, e.g. MOZ_ZLIB_LIBS). OS_LDFLAGS is
used exclusively for non-library linker flags.

Always pass EXTRA_LIBS before OS_LIBS on linker command lines.

Forbid EXTRA_DSO_LDOPTS, SHARED_LIBRARY_LIBS and LIBS in Makefiles.
2014-07-23 13:31:02 +09:00
Mike Hommey
e5c43ef995 Bug 1036894 part 8 - Move most in-tree library linkage information to moz.build, as USE_LIBS. r=gps 2014-07-23 13:30:52 +09:00
Mike Hommey
90e434e1ca Bug 1036894 part 7 - Move HOST_LIBS to moz.build, as HOST_USE_LIBS. r=gps 2014-07-23 13:29:50 +09:00
Wes Kocher
3ffa891f7d Merge m-c to inbound 2014-07-22 18:39:17 -07:00
J. Ryan Stinnett
21d100bbbc Bug 1000428 - Part 1: Drive WiFi UI option visibility from pref. r=janx 2014-07-14 12:11:00 -04:00
Mike Hommey
b99bba5c3f Bug 1041864 - Remove LIBRARY_NAMEs that aren't used. r=mshal 2014-07-23 08:39:56 +09:00
Botond Ballo
252b31ed11 Bug 1032880 - Disable 'transparent content with displayports' warning in tests. r=tn
--HG--
extra : source : 15adf5eda9a8f4576202b62ad0268c73bcdc4977
2014-07-22 17:01:50 -04:00
Wes Kocher
ad451576bd Backed out changeset 6ab8ef0895ca (bug 1032880) for bustage 2014-07-23 16:55:00 -07:00
Botond Ballo
d655cb14e4 Bug 1032880 - Disable 'transparent content with displayports' warning in tests. r=tn
--HG--
extra : rebase_source : 21ea67d322cb4a780b67584be4047f6ca8ac6690
2014-07-22 17:01:50 -04:00
Wes Kocher
05218f8d51 Merge inbound to m-c a=merge 2014-07-18 17:51:39 -07:00
Ryan VanderMeulen
c300f93ef4 Merge fx-team to m-c. a=merge 2014-07-18 15:21:24 -04:00
Shane Caraveo
bf1b792930 Bug 1032432 remove builtin manifest support, r=felipe 2014-07-18 10:27:52 -07:00
Ryan VanderMeulen
77b1c14c1a Merge m-c to inbound. a=merge 2014-07-18 10:25:14 -04:00
Carsten "Tomcat" Book
2071b3e405 Backed out changeset 06a1ebb05c63 (bug 1000428) for causing regressions 2014-07-18 12:03:53 +02:00
J. Ryan Stinnett
09133b77c2 Bug 1038254 - Disable memory-mapped array buffers on Windows. r=fabrice 2014-07-16 19:02:00 -04:00
J. Ryan Stinnett
350b41d961 Bug 1000428 - Part 1: Drive WiFi UI option visibility from pref. r=janx 2014-07-14 12:11:00 +02:00
Matthew A. Miller
3e4a77c11c Bug 983504 - Modify constraints for screen sharing. r=bholley,jib 2014-07-08 00:01:27 -06:00
Jon Coppeard
0cd5bbd52c Bug 1017141 - Add prefs for setting min/max empty chunk counts r=bent 2014-07-16 10:01:20 +01:00
Wes Kocher
107ab3668c Merge m-c to inbound 2014-07-15 17:39:19 -07:00
Brad Lassey
4b63fe5886 bug 1037488 - MediaEngineTabVideoSource should set width, height and framerate based on constraints and prefs passed to Allocate() r=jesup 2014-07-11 11:55:23 -04:00
Steve Workman
793520eac4 Bug 354493 - Add nsINetworkZonePolicy to protect resources loaded from private IPs r=mcmanus 2014-07-17 11:08:20 -07:00
Shian-Yow Wu
a8c7f109a8 Bug 988816 - Allow to keep file descriptor in JAR cache. r=aklotz, jduell 2014-07-18 10:46:24 +08:00
Shian-Yow Wu
63d29bd74a Bug 988816 - Support multiple OpenNSPRFileOpen() on RemoteOpenFile. r=aklotz, jduell 2014-07-18 10:46:22 +08:00
Birunthan Mohanathas
a3b4387964 Bug 1038417 - Convert tabs to spaces in moz.build files. r=gps 2014-07-14 15:58:10 -07:00
Monica Chew
9d17090d7f Bug 1038370: Change updateURL to point to /downloads (r=gcp) 2014-07-14 13:31:32 -07:00
Andrew McCreight
77d782bb63 Bug 1038207 - Fix various classes that reimplement nsISupports. r=ehsan 2014-07-14 12:21:34 -07:00
Mike Habicher
cb56124dcb Bug 1036637 - disable HDR on low-memory devices, r=dhylands 2014-07-13 11:50:48 -04:00
Masayuki Nakano
449d1b4e2e Bug 1037330 Don't enable TSF mode on WinXP nor WinServer 2003 with "intl.tsf.enable" r=jimm 2014-07-12 02:09:59 +09:00
Kartikaya Gupta
408dc2b73d Bug 1037164 - Add an implementation for Preferences::SetFloat. r=bz 2014-07-11 08:25:12 -04:00
Michal Novotny
4ee73488db Bug 979900 - Avoid completely filling cache partition on Gonk, r=honzab 2014-07-11 08:25:55 +02:00
Boris Zbarsky
e8aa2f7514 Bug 965413 part 3. Add a .loadInfo property to channels. r=mcmanus 2014-07-10 02:56:36 -04:00
Michal Novotny
c3742f1212 Bug 1013395 - HTTP cache v2: have a limit for write backlog, r=honzab 2014-07-10 07:59:29 +02:00
Wes Kocher
4a69a1eeba Backed out changeset 7b5a6cc2a244 (bug 354493) for frequent intermittent xpcshell oranges 2014-07-09 18:20:54 -07:00
Steve Workman
f80ce043ba Bug 354493 - Add nsINetworkZonePolicy to restrict private resource loads from public networks r=mcmanus 2014-07-09 11:16:39 -07:00
Benoit Girard
60e200d97f Bug 864829 - Add graphics performance warning feature. r=bjacob
--HG--
extra : rebase_source : 11585fb913c4a10c9293787fa6e86f2f76bdcdb4
2014-05-07 18:09:41 -04:00
Mats Palmgren
3c044199e9 Bug 1006326 - Enable the 'box-decoration-break' CSS property by default. r=roc 2014-07-07 16:08:42 +00:00
Shelly Lin
70c847b390 Bug 744896 - Part 1: Implement AudioTrack, VideoTrack and other related interfaces. r=bz,roc 2014-04-16 11:06:45 +08:00