Jan Beich
c7cd60add5
Bug 778078 - Disable GLib slice allocator on systems with jemalloc in libc. r=glandium
2012-10-17 16:36:43 +02:00
Wes Johnston
e7f221b4b9
Bug 795406 - Set up profile unlocker. r=bsmedberg
2012-10-05 17:58:29 -07:00
Wes Johnston
2275b3a49c
Bug 795053 - Unlock locked profiles on Android. r=blassey
2012-10-05 12:35:26 -07:00
Wes Johnston
e6a74c214f
backout c1b386c21158
2012-10-02 11:48:31 -07:00
Wes Johnston
c37af0ec32
Bug 795053 - Add ability to unlock a profile from Java. r=blassey
2012-10-02 11:00:13 -07:00
Phil Ringnalda
a805f63272
Back out 63105f3adf34 (bug 721843) for xpcshell timeouts
2012-10-01 20:43:27 -07:00
Benoit Girard
bd92e12bd2
Bug 721843 - Add just-in-time debugging by using CRAWL_STACK_ON_SIGSEGV on non official builds for mac/linux. r=ted
2012-10-01 22:09:20 -04:00
Marshall Culpepper
e5a8a843cd
Bug 778349: Initial support for OS ("FOTA") updates in Gonk. r=rstrong r=bbondy r=fabrice
2012-09-30 21:55:51 -05:00
Kyle Huey
6dc54b8e20
Bug 792625: Fix xpcshell to accept non-ASCII command line arguments on Windows. r=bsmedberg
2012-09-30 09:45:05 -07:00
Ryan VanderMeulen
3f97e4a635
Bug 787313 - Add back code that was erroneously reverted. r=ochameau
2012-09-26 18:56:49 -04:00
Mounir Lamouri
dcf0c40223
Merge mozilla-inbound in mozilla-central.
2012-09-26 11:57:25 +01:00
Benjamin Smedberg
6cf3e61f1e
Bug 792541 - Block sprotector.dll on Windows 8 and up. Add support in the windows blocklist for flags and add a flag for "win8 and up only", r=ehsan
...
--HG--
rename : build/valgrind/cross-architecture.sup => build/valgrind/x86_64-redhat-linux-gnu.sup
extra : rebase_source : e7f5420fd981d467f109e2dc9a7408f32cc18394
2012-09-25 22:25:51 -07:00
Alexandre Poirot
cc7725aed0
Bug 787313 - Add /attach-console
argument on Windows in order to attach Firefox std IO to parent console. r=ted
2012-09-25 12:58:08 -04:00
Benoit Jacob
1908a951bc
Bug 786383 - add MOZ_AVOID_OPENGL_ALTOGETHER option - r=karlt
2012-09-21 13:44:35 -04:00
Ms2ger
1e7015f897
Merge PGO-green changeset from m-i to m-c.
2012-09-20 11:51:47 +02:00
Ms2ger
14bb88f62a
Bug 581198 - Remove xpcom/io from LOCAL_INCLUDES; r=ted
2012-09-20 09:55:36 +02:00
Jan Beich
f301b4373a
Bug 789436 - Remove one more SIGFPE workaround for FreeBSD. r=sicking
2012-09-18 21:35:04 -04:00
Koosha Khajeh Moogahi
8d39310f18
Bug 788242: Implement and make use of void versions of NS_ENSURE_* macros; r=ehsan,bsmedberg
2012-09-14 14:30:31 +04:30
Matt Brubeck
69a7e88f2d
Bug 789346 - Remove obsolete comment about .purgecaches and debug builds [r=taras]
2012-09-10 18:53:23 -07:00
Ehsan Akhgari
b5c39afb4e
Bug 792502 - Kill the FunctionTimer code; r=vlad
2012-09-19 16:59:38 -04:00
Aryeh Gregor
5a68b81a9b
Bug 783523 - Fix platform-specific nsresult misuse; r=ehsan,tbsaunde,smaug
2012-08-16 14:58:11 +03:00
Randell Jesup
eedf93a21d
Bug 773151: Convert nsCAutoString->nsAutoCString CLOSED TREE r=bsmedberg
2012-09-01 22:35:17 -04:00
Landry Breuil
038741989a
Bug 785738 Part 3: use PRTime instead of int64_t where appropriate; r=ehsan
2012-08-30 09:10:35 +02:00
Benoit Jacob
9948f9058a
Bug 680644 - Simplify glxtest and make it similar to glxinfo to avoid X server crashes - r=karlt
...
We were getting orange B's due to X server crashes on builders.
2012-08-28 15:38:08 -04:00
Martin Vogt
12e20f88a4
Bug 680644 - Let glxtest use a XWindow instead of a GLXPixmap - r=bjacob
...
This simplifies code and avoids a X server crash with certain FGLRX setups.
2012-08-22 23:16:30 -04:00
Bob Clary
3e8d092c95
Bug 587982 - Log MS CRT Warnings and Abort on MS CRT Errors and Assertions, r=ted.mielczarek.
2012-08-27 12:12:32 -07:00
Marshall Culpepper
51818865da
Bug 764683: Manage /system mount permissions when applying Gecko updates in B2G, and download them to /data/local. r=rstrong r=bbondy r=cjones
2012-08-27 12:27:14 -03:00
Justin Lebar
fa99876b6c
Bug 721264 - Followup: Add bug number to comment. DONTBUILD
...
--HG--
extra : rebase_source : f64958f476febe85bbac1b1ba40f3707ed3132af
2012-08-22 13:37:22 -07:00
Johnathan Nightingale
8af0ddb479
Bug 721264 - Blocklist babyfox.dll for instability. r=bsmedberg a=lsblakk
...
--HG--
extra : rebase_source : 2baba41b8a8d5546a67d9e366a23e27841cdffb2
2012-08-21 17:29:51 -04:00
Ehsan Akhgari
0fd9123eac
Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg
...
This patch was generated by a script. Here's the source of the script for
future reference:
function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
! -wholename "*security/nss*" \
! -wholename "*/.hg*" \
! -wholename "obj-ff-dbg*" \
! -name nsXPCOMCID.h \
! -name prtypes.h \
-type f \
\( -iname "*.cpp" \
-o -iname "*.h" \
-o -iname "*.c" \
-o -iname "*.cc" \
-o -iname "*.idl" \
-o -iname "*.ipdl" \
-o -iname "*.ipdlh" \
-o -iname "*.mm" \) | \
xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}
convert PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t
convert PRIntn int
convert PRUintn unsigned
convert PRSize size_t
convert PROffset32 int32_t
convert PROffset64 int64_t
convert PRPtrdiff ptrdiff_t
convert PRFloat64 double
2012-08-22 11:56:38 -04:00
Aryeh Gregor
dbff4eaa1c
Bug 782252 - Convert declared types to nsresult; r=ehsan
2012-08-06 15:02:31 +03:00
Aryeh Gregor
0923bf00ef
Bug 780618 - Move all error codes to nsError.h; r=ehsan
2012-07-27 17:03:27 +03:00
Mike Hommey
ed3290c432
Bug 776325 - Set gtk program name to the one defined in application.ini. r=karlt
2012-08-09 16:34:26 +02:00
Aryeh Gregor
98c0410ea1
Bug 777292 - modules/libpref/, toolkit/: Fix incorrect conversions to nsresult; r=bsmedberg
2012-07-30 12:24:36 +03:00
Aryeh Gregor
6e5854f625
Bug 777292 - modules/libpref/, toolkit/: Remove conversions to nsresult that will always result in NS_SUCCEEDED; r=bsmedberg
2012-07-27 16:54:09 +03:00
Mike Hommey
6173fa297f
Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted
2012-08-04 20:26:44 +02:00
Ehsan Akhgari
b40b21d633
Merge the nullptr conversion from mozilla-central into mozilla-inbound
2012-07-30 10:28:15 -04:00
Aryeh Gregor
e806eeab4f
Bug 777292 part 2 - Change all nsnull to nullptr
2012-07-30 17:20:58 +03:00
Aryeh Gregor
bcce1c96d2
Bug 777292 - Don't use |= on nsresult; r=ehsan
2012-07-27 17:03:08 +03:00
Jeff Muizelaar
7b59b859b6
Bug 777879. Add SAMPLE_INIT() to XRE_InitChildProcess. r=ehsan
...
We need this for profiling child processes.
--HG--
extra : rebase_source : 3ea50c12da824daa0fe35b52e58f58f29b5de986
2012-07-27 14:57:48 -04:00
Brian R. Bondy
b2ba1e0a50
Bug 774140 - Remove code duplication for IsVistaOrLater. r=bsmedberg
2012-07-25 10:23:26 -04:00
Ted Mielczarek
287174e5d2
bug 761909 - crash reporter plumbing for gonk. r=bsmedberg
2012-07-16 19:50:52 -04:00
Benjamin Smedberg
d19c5bb416
Bug 771251 - OOP crash reporting accesses the directory service off the main thread. In addition, the first design of the crash injector callback meant that we're dropping some set of Flash crashes which happen during an RPC call. r=ted
...
* Fix the directory service usage by saving the pending directory path from OOPInit.
* Force clients to call OOPInit on the main thread.
* Make injected crashes available via TakeMinidumpForChild and give each crash a sequence number so that we can pick the earliest crash from the three possibilities; delete the other two to avoid polluting about:crashes
2012-07-10 22:20:05 -04:00
Neil Rashbrook
fe9b695c26
Bug 766494 Followup to bug 278860 to check for the actual missing profile folder r=bsmedberg
2012-07-10 19:53:19 +01:00
Benoit Girard
7aa6b28d00
Bug 766579 - Part 1: Add SP param to NS_StackWalk. r=dbaron
...
--HG--
extra : rebase_source : dd4905ffadf5fe9327449fffdfbc665b05d74a6a
2012-06-27 16:08:21 -04:00
Nathan Froyd
a7eb97f896
Bug 370750 - consolidate mochitest files installation; r=glandium
...
With assistance on the patch from Ms2ger, Waldo, and Mossop.
2012-07-03 16:49:02 -04:00
Rafael Ávila de Espíndola
cec3998a41
Bug 763361 - shutdown. sigsegv during freelibrary.
...
Call RecordShutdownEndTimeStamp from XRE_main. r=benjamin.
2012-07-06 18:29:53 -04:00
Ehsan Akhgari
9a6c20bd77
Bug 758992 - Make the classes which use the XPCOM nsISupports implementation macros final, to avoid the warning about deleting using a pointer to a base class with virtual functions and no virtual dtor (xre parts); r=jrmuizel
2012-06-19 23:49:05 -04:00
Benjamin Smedberg
cc2ebeab8a
Bug 769048 part C - Build an injector DLL which can watch for crashes in Flash player processes. This involves building two copies of breakpad: one to live inside of libxul which uses mozalloc and the dynamic CRT, another to link into the injector which links the CRT statically and doesn't use mozalloc. Introduce a new define/makefile variable MOZ_CRASHREPORTER_INJECTOR rather than repeating "#if defined(XP_WIN) && !defined(HAVE_64BIT_OS) in many places. r=ehsan/khuey
...
--HG--
extra : rebase_source : 33bd0a74ce70a564963a6ca125e01048577fb554
2012-07-02 14:55:12 -04:00
Phil Ringnalda
8933eff28c
Back out 6a386d638a1a (bug 746277) for packaged build bustage
2012-06-27 08:31:38 -07:00
Joey Armstrong
4d213decb0
bug 746277: replace hg shell pipelines with make logic
2012-05-16 15:09:00 -04:00
Benjamin Smedberg
ea4315c1ff
Bug 755724 Part C - Move ScopedAppData into the XPCOM glue, r=glandium
...
--HG--
rename : toolkit/xre/nsAppData.cpp => toolkit/xre/CreateAppData.cpp
rename : toolkit/xre/nsAppData.cpp => xpcom/glue/AppData.cpp
extra : rebase_source : 6223397345e77b00f14d93a1f188c042fc5f89ea
2012-06-08 08:41:30 -04:00
Martin Stransky
00527285da
Bug 627699 - Port GTK2 to GTK3, toolkit part, r=karlt
2012-06-16 18:06:10 +12:00
Honza Bambas
41779e1714
Bug 720778 - Important threads should have a name for better debugability, r=bsmith, sr=bsmedberg+glandium
2012-06-12 19:06:20 +02:00
Geoff Lankow
00f3a215c9
Bug 749930 - Replace uses of nsILocalFile with nsIFile (compiled code only); r=bsmedberg
2012-06-06 14:08:30 +12:00
Jacek Caban
8874d43980
Bug 759063 - toolkit/xre Windows tests link to unneeded updatecommon lib; r=ehsan
2012-05-29 18:01:31 -04:00
Matthew Noorenberghe
5840f74316
Bug 731047 - Clean up old profile after Firefox profile reset. r=bsmedberg, ui-r=limi
...
--HG--
extra : rebase_source : 28d16189069f2a05cbe5e16d271561ab53aa9b1e
2012-03-19 17:01:49 -07:00
Ehsan Akhgari
b944b89870
Bug 758742 - Fix up the string manipulation in nsUpdateProcessor::ProcessUpdate; r=Neil
2012-05-25 15:52:54 -04:00
Joey Armstrong
3ae5ce5e31
bug 758748: change SOURCE_REPO var check from error to warn.
2012-05-25 18:52:52 -04:00
Ed Morley
18aedf9b51
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-05-25 14:25:53 +01:00
Jim Mathies
bd3f82ea02
Bug 750911 - Add a third 'flags' parameter to XRE_main and add support for WindowsEnvironmentType. r=bsmedberg
2012-05-25 05:01:29 -05:00
Ed Morley
b3716758ef
Merge last PGO-green changeset of mozilla-inbound to mozilla-central
2012-05-24 15:48:20 +01:00
Olli Pettay
4aae264f39
Bug 756131 - API for creating default profiles for webapps, r=benjamin
2012-05-24 17:29:52 +03:00
Nicolas Silva
2337ceaadf
Bug 722012 - Added a call to XInitThreads before the first call to XOpenDisplay to fix OMTC crashes. r=karlt
...
--HG--
rename : toolkit/mozapps/update/test/chrome/test_0093_stagedBackground.xul => toolkit/mozapps/update/test/chrome/test_0092_finishedBackground.xul
rename : toolkit/mozapps/update/test/unit/test_0113_general.js => toolkit/mozapps/update/test/unit/test_0110_general.js
rename : toolkit/mozapps/update/test/unit/test_0114_general.js => toolkit/mozapps/update/test/unit/test_0111_general.js
rename : toolkit/mozapps/update/test/unit/test_0115_general.js => toolkit/mozapps/update/test/unit/test_0112_general.js
rename : toolkit/mozapps/update/test/unit/test_0172_fileLocked_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete.js
rename : toolkit/mozapps/update/test_svc/unit/test_0173_fileLocked_xp_win_partial_svc.js => toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial.js
extra : rebase_source : f527614c4a5f0b8979bd8bc39dcd3ca739ba9e08
2012-05-22 11:34:34 -04:00
Ehsan Akhgari
c3c06d86cd
Merge from mozilla-central
2012-05-22 10:51:49 -04:00
Ehsan Akhgari
ab9253304f
Bug 307181 - Stage Firefox updates in the background after they're downloaded, and replace the application directory on restart; r=rstrong,bbondy
...
When Firefox downloads an update, it previously kept the update around to apply
it on the next restart. This patch changes this so that the updater program
is launched in the background as soon as the update has finished downloading
in order to stage the updated version of the application by copying the
existing installation directory to a temporary location and applying the update
on top of it, and replace the existing installation directory with the staged
directory on the next restart.
Because the replacing step is typically very fast, this patch eliminates the
wait for the update to be applied on restart, making it unnecessary to show a
progress dialog when restarting.
--HG--
rename : toolkit/mozapps/update/test/chrome/test_0092_finishedBackground.xul => toolkit/mozapps/update/test/chrome/test_0093_stagedBackground.xul
rename : toolkit/mozapps/update/test/unit/test_0110_general.js => toolkit/mozapps/update/test/unit/test_0113_general.js
rename : toolkit/mozapps/update/test/unit/test_0111_general.js => toolkit/mozapps/update/test/unit/test_0114_general.js
rename : toolkit/mozapps/update/test/unit/test_0112_general.js => toolkit/mozapps/update/test/unit/test_0115_general.js
rename : toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0172_fileLocked_xp_win_complete.js
rename : toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial.js => toolkit/mozapps/update/test/unit/test_0173_fileLocked_xp_win_partial.js
rename : toolkit/mozapps/update/test/unit/test_0110_general.js => toolkit/mozapps/update/test_svc/unit/test_0113_general_svc.js
rename : toolkit/mozapps/update/test/unit/test_0111_general.js => toolkit/mozapps/update/test_svc/unit/test_0114_general_svc.js
rename : toolkit/mozapps/update/test/unit/test_0112_general.js => toolkit/mozapps/update/test_svc/unit/test_0115_general_svc.js
rename : toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete.js => toolkit/mozapps/update/test_svc/unit/test_0172_fileLocked_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial.js => toolkit/mozapps/update/test_svc/unit/test_0173_fileLocked_xp_win_partial_svc.js
2012-05-22 10:50:04 -04:00
Mike Hommey
55512a4c8a
Bug 658848 - Clean up XRE_WANT_DLL_BLOCKLIST. r=bsmedberg
2012-05-22 08:46:17 +02:00
Gervase Markham
ca171eec44
Bug 716478 - update licence to MPL 2.
2012-05-21 12:12:37 +01:00
Ehsan Akhgari
8737791b22
Bug 757437 - Remove the rest of the support code for xpcshell-specific Mac bundle hacks from bug 307181; r=rstrong
2012-05-22 11:32:01 -04:00
Ehsan Akhgari
a3acad4ec8
Merge mozilla-central into mozilla-inbound
2012-05-24 14:52:27 -04:00
Alexandre Poirot
95752b9fb6
Bug 753856 - Use CONOUT$ for stderr on Windows. r=ted
2012-05-24 16:11:34 +02:00
Gavin Sharp
22e5cffb69
Bug 747990: Add ability to specify the "application name" used in the user agent in application.ini, r=bsmedberg
...
--HG--
extra : rebase_source : fbaaa2e94c2bbaf74e001147ec014b1ffdf3502f
2012-04-23 16:09:23 -04:00
Matt Brubeck
58eb5eeac0
Back out c209fea124e1 (bug 754198) because of Win64 build failure
2012-05-11 13:23:49 -07:00
Fabrice Desré
8c0c24a4a2
Bug 754198 - Warning treated as error in jemalloc.c. Build busted. [r=jlebar,bsmedberg]
2012-05-11 12:34:24 -07:00
Kyle Huey
1d46f06fd5
Bug 751585: Don't enforce ASLR for binary components on XP, because system DLLs don't have ASLR and trigger false positives. r=bsmedberg,ehsan
2012-05-07 13:02:57 -07:00
Ms2ger
3b04c7d79e
Bug 741245 - Remove nsresult return value from nsXPConnect::GetSafeJSContext(); r=bholley
2012-05-05 11:00:05 +02:00
Kyle Huey
1bb79c852a
Bug 749648 - Null-check the return value of MapViewOfFile properly in CheckASLR; r=ehsan
2012-04-28 17:11:40 -04:00
Jared Wein
2a4a40439b
Bug 515785 - Use new icons for each task in Win7 Jump list tasks. r=bbondy
2012-04-28 11:22:06 -04:00
Alexandre Poirot
d15656d096
Bug 673383 - Output stdout in regular command line on Windows. r=ted
2012-04-28 11:04:36 -04:00
Ehsan Akhgari
3f561f1dad
Merge mozilla-central into birch
2012-04-20 13:50:08 -04:00
Ehsan Akhgari
b0555ad014
Merge mozilla-central into birch
2012-04-19 10:03:36 -04:00
Myk Melez
fd7a6dd8f7
bug 746156 - isolate webapp runtime files into subdirectory of Firefox package; r=bsmedberg, a=akeybl
2012-04-19 00:39:52 -07:00
Peng Kang
98d1b53def
Bug 737056 - Replace NS_CompareVersions more intuitive C++ API called mozilla::Version. r=bsmedberg
2012-04-18 23:22:29 -04:00
Ehsan Akhgari
816e9ddd2e
Backout changeset c3d4c0bdd4bf (bug 737056) for build bustage
2012-04-18 17:05:06 -04:00
Peng Kang
ebc77567f8
Bug 737056 - Replace NS_CompareVersions more intuitive C++ API called mozilla::Version. r=bsmedberg
2012-04-18 16:31:59 -04:00
Myk Melez
2dc4aaa8f0
bug 746457 - fix bustage in reading extension default prefs (not covered by tests) from changeset ef55c163a23a (bug 725408); followup patch that completely reverts change to the previous behavior; r,a=bustage
2012-04-18 01:03:42 -07:00
Myk Melez
a06b256405
bug 746457 - fix bustage in reading extension default prefs (not covered by tests) from changeset ef55c163a23a (bug 725408); r,a=bustage
2012-04-17 23:58:12 -07:00
Myk Melez
0e8cb8852d
bug 725408 - implement WebappRT launcher/shell; r=bsmedberg
2012-04-17 07:11:53 -07:00
Ms2ger
8299fe6b09
Backing out bf0a78471e5e:dc7022e2d807 for inexplicable windows crashes.
2012-04-14 17:52:34 +02:00
Ms2ger
f88fab52fb
Bug 741245 - Remove nsresult return value from nsXPConnect::GetSafeJSContext(); r=bholley
2012-04-14 15:05:01 +02:00
Michael Kaply
89becf8299
Bug 278860 - Show the right error message when the profile is missing; r=bsmedberg a=mfinkle
2012-04-19 15:40:49 -04:00
Oleg Romashin
ea99848944
Bug 740244 - Do not compile glx test when EGL provider enabled. r=bjacob
2012-04-11 17:55:22 -04:00
Justin Lebar
4cbb9aa916
Bug 742491 - Use a thread-safe DLL patcher on Windows, when possible. r=glandium
2012-04-10 15:52:56 -04:00
Justin Lebar
c5edb21551
Bug 742833 - In WindowsDllInterceptor, assign to the out-param as soon as the trampoline is set up, to avoid a race condition. r=glandium
...
--HG--
extra : rebase_source : 22108070e44a33e8df5105fd896a7f28571fe32c
2012-04-10 15:43:04 -04:00
Igor Bukanov
5220367ed1
Bug 737364 - part 2 - replace JSContext with JSRuntime in the GC-related API
...
This part replaces the JSContext *cx argument in most GC-related API
with JSRuntime *rt. When possible, the patch removes the code to obtain
a temporary cx just to run the GC.
The patch also removes JS_DestroyContextMaybeGC. That function is not
used in FF code base and its implementation is broken. It requires that
the context has an entered compartment when it is destroyed, which in
turns implies a missing leave compartment call.
2012-03-28 12:13:30 +02:00
Ehsan Akhgari
e130fd8945
Merge the last green PGO changeset from mozilla-inbound to mozilla-central
2012-04-05 13:40:53 -04:00
Joey Armstrong
a49a00567b
Bug 688061 - reduce shell command use - r=khuey
2012-04-03 15:53:07 -04:00
Mark Capella
38934b4912
Bug 712936 - Convert users of PR_STATIC_ASSERT to MOZ_STATIC_ASSERT. r=jwalden
2012-04-02 17:21:24 -07:00
Veeraya Pupatwibul
1bdf9d9923
Bug 741333 - Remove PRBool/PR_TRUE/PR_FALSE that crept in r=Ms2ger
2012-04-04 11:15:10 +02:00
Jim Mathies
366dee9682
Bug 736953 - Break XRE_main up into parts that can be called individually, r=dtownsend
2012-03-27 08:37:35 -05:00