Eric Rahm
c7c7afa9ce
Bug 1177541 - Remove warning if file is not found during deferred open. r=mcmanus
...
When doing a deferred open we should not emit a warning if the file is not
found. The proper return code is still returned.
2015-06-30 09:33:37 -07:00
Nicholas Nethercote
2599e0384d
Bug 1175771 (part 3) - Replace nsCacheEntryHashable::VisitEntries() with iterators. r=michal.
...
Note that FreeCacheEntries was unused, and so could be removed as well.
--HG--
extra : rebase_source : 9b34399dc79479b47935b89c21c0525d010127c1
2015-06-17 22:31:08 -07:00
Nicholas Nethercote
4ce0a4d3ed
Bug 1175771 (part 2) - Remove PL_DHashTableEnumerate() use from nsHostResolver. r=michal.
...
--HG--
extra : rebase_source : 28d252c83005b74c7106412a114fe7443f244ea4
2015-06-10 18:28:03 -07:00
Nicholas Nethercote
601e5edf97
Bug 1175771 (part 1) - Fix indentation in nsHostResolver::FlushCache(). r=michal.
...
--HG--
extra : rebase_source : e158de557cdf93c132627268c8dd2342d4c3de5f
2015-06-10 17:09:32 -07:00
Patrick McManus
57aa78c815
bug 1174152 - update test to be nsIObserver based r=hurley
2015-06-24 13:50:37 -04:00
Patrick McManus
cc04db5e46
bug 1174152 - crossorigin attribute for link rel=preconnect r=hsivonen
2015-06-19 17:11:42 -04:00
Ryan VanderMeulen
5f5c327690
Backed out changeset 8b4e4083639e (bug 1171931) for B2G debug emulator bustage.
2015-06-25 19:48:42 -04:00
Juan Gomez
702a59d135
Bug 1171931 - Refactor duplicated code using XRE_IsParent/ContentProcess. r=froydnj
...
--HG--
extra : rebase_source : 2ecbe6c1dd8a7ad8dc529b53349ad431cf1116c9
2015-06-24 14:11:00 -04:00
Ehsan Akhgari
60626aff92
Bug 1175480 - Expose the external content policy type from the load info objects; r=smaug
...
Consumers of this type need to deal with the external content policy
types. One example is HttpObserverManager.runChannelListener in
WebRequest.jsm.
2015-06-24 08:52:45 -07:00
Michal Novotny
3ce10dc57a
Bug 1171724 - Large OOMs in CacheFileMetadata, r=honzab
2015-06-24 06:33:37 +02:00
Valentin Gosu
d5df90e127
Bug 1142083 - Add test for IDN Unicode domain redirect. r=mcmanus
2015-06-20 00:03:57 +03:00
Michal Novotny
c6803255b7
Bug 1170645 - Intermittent crash in mozilla::net::nsWSAdmissionManager::RemoveFromQueue(mozilla::net::WebSocketChannel*), r=mcmanus
2015-06-21 14:37:36 +02:00
Ryan VanderMeulen
bbdd38fdde
Merge inbound to m-c. a=merge
...
CLOSED TREE
2015-06-19 16:33:59 -04:00
Patrick McManus
8cfe4dc411
Bug 1175545 - Dont process alt-svc on 421 r=hurley
2015-06-19 08:32:05 -04:00
Mike Taylor
d22a598539
Bug 1169772 - Add Android version to platform identifier of Fennec's UA string. r=mfinkle, r=gerv
2015-06-11 09:38:00 -04:00
Valentin Gosu
76297166d8
Bug 1172697 - URLs containing !// in the query or hash should not be handled as packaged app resources r=mcmanus
2015-06-09 02:20:02 +03:00
Valentin Gosu
2288418a7a
Bug 1142083 - IDN Unicode domain redirect is broken r=mcmanus
2015-06-18 16:05:21 +03:00
Carsten "Tomcat" Book
dc3312548b
Backed out changeset b2c472fe14ca (bug 1175480) for crashes in serviceworkers/test_request_context.htm
2015-06-18 09:54:44 +02:00
Boris Zbarsky
53a0fc0478
Bug 1175600 followup. Add getRelativePath to ye othere nsIFile implementatione so as to de-bust ye olde CLOSED TREE
2015-06-17 16:46:19 -04:00
Ehsan Akhgari
cee6f01c68
Bug 1175480 - Expose the external content policy type from the load info objects; r=smaug
...
Consumers of this type need to deal with the external content policy
types. One example is HttpObserverManager.runChannelListener in
WebRequest.jsm.
2015-06-17 15:09:06 -04:00
David Major
40bbd6a80c
Bug 1173860: Null check on sGlobalEntryTables. r=mcmanus
2015-06-17 11:23:43 -04:00
Carsten "Tomcat" Book
325cd7219a
Backed out changeset feb7cd25aafb (bug 1174152) for mulet timeout in test_rel_preconnect.html
...
--HG--
extra : rebase_source : aabdc3669df5b252c4373b9fb6049565e6560a0c
2015-06-17 16:58:57 +02:00
Patrick McManus
78c4fb4975
bug 1174152 link rel=preconnect crossorigin=anonymous r=hsivonen
2015-05-06 10:09:27 -04:00
Andrea Marchesini
45578e03fa
Bug 1170794 - Improve the length check of the input in nsUnicode*::GetMaxLength, r=dveditz
2015-06-17 12:21:39 +01:00
Michal Novotny
671167c884
Bug 1173378 - crash in mozilla::net::HttpBaseChannel::OverrideSecurityInfo(nsISupports*), r=ehsan
2015-06-17 13:16:33 +02:00
Fernando Jimenez
9d27d75942
Bug 1174078 - Calling "fetch" inside Service Worker's "onfetch" handler in b2g causes "onfetch" again that leads to an infinite loop. r=nsm
2015-06-17 11:50:07 +02:00
Nicholas Nethercote
a1b715b5df
Bug 1174625 - Overhaul PLDHashTable's iterator. r=froydnj.
...
This change splits PLDHashTable::Iterator::NextEntry() into two separate
functions, which allow you to get the current element and advance the iterator
separately, which means you can use a for-loop to iterate instead of a
while-loop.
As part of this change, the internals of PLDHashTable::Iterator were
significantly changed and simplified (and modelled after js::HashTable's
equivalent code). It's no longer duplicating code from PL_DHashTableEnumerator.
The chaos mode code was a casualty of this, but given how unreliable that code
has proven to be (see bug 1173212, bug 1174046) this is for the best. (We can
reimplement chaos mode once PLDHashTable::Iterator is back on more solid
footing again, if we think it's important.)
All these changes will make it much easier to add an alternative Iterator that
removes elements, which was turning out to be difficult with the prior code.
In order to make the for-loop header usually fit on a single line, I
deliberately renamed a bunch of things to have shorter names.
In summary, you used to write this:
PLDHashTable::Iterator iter(&table);
while (iter.HasMoreEntries()) {
auto entry = static_cast<FooEntry*>(iter.NextEntry());
// ... do stuff with |entry| ...
}
// iter's scope extends beyond here
and now you write this:
for (auto iter = table.Iter(); !iter.Done(); iter.Next()) {
auto entry = static_cast<FooEntry*>(iter.Get());
// ... do stuff with |entry| ...
}
// iter's scope doesn't reach here
--HG--
extra : rebase_source : fa5cac2fc50b1ab7624030bced4763131280f4d8
2015-06-11 21:19:53 -07:00
Valentin Gosu
d8933c48f3
Bug 1171127 - Listeners are not released in OnStopRequest in e10s mode. r=jduell
2015-06-15 02:39:29 +03:00
Ryan VanderMeulen
350215c93f
Backed out changeset 068df0223a6c (bug 1125961) for e10s crashes.
...
CLOSED TREE
2015-06-15 15:27:53 -04:00
Josh Matthews
e3e3f30ca2
Bug 1125961 - Allow sending null PBrowser actors when there's a triggering principal which can be used for security checks; r=dragana
2015-06-15 14:35:06 -04:00
Birunthan Mohanathas
0544e6bf2c
Bug 1164714 - Move netwerk/test/TestSTSParser.cpp into security/manager/ssl/tests/. r=keeler
...
--HG--
rename : netwerk/test/TestSTSParser.cpp => security/manager/ssl/tests/compiled/TestSTSParser.cpp
2015-06-14 21:37:12 -07:00
Michal Novotny
075c39f3b9
Bug 1151812 - Add telemetry to find optimal cache entry hash size, r=honzab
2015-06-14 14:13:18 +02:00
Nicholas Hurley
ff91c700ee
Bug 959752 - Make the network predictor work under e10s. r=mcmanus
2015-06-18 11:23:00 +02:00
Christoph Kerschbaumer
4e803ed392
Bug 1175352 - Refactor LoadInfo arguments to be more self contained (r=bent)
2015-06-18 15:37:20 -07:00
Ted Mielczarek
67dc1eedaa
bug 1170582 - Fix nsSocketTransport on iOS. r=mayhemer
...
--HG--
extra : commitid : 2DvDwkwMsaH
extra : rebase_source : c59dfe432e01e9dbedbeda8d5ea847311df19d26
2015-05-06 07:51:51 -04:00
Ben Kelly
c88bedc28b
Bug 1172884 P1 Properly decode body when intercepted response redirects. r=jduell
2015-06-12 07:20:21 -07:00
Sanchit Kumar
8411afb4ae
Bug 1171016 - Initialize the linelen variable at its declaration in ParseFTPList.cpp. r=mcmanus
2015-06-11 11:47:00 -04:00
Nicholas Nethercote
00d9c7daa3
Bug 1173247 (part 2) - Remove PL_DHashTableEnumerate() uses from nsDiskCacheBindery. r=michal.
2015-06-10 13:07:41 -07:00
Nicholas Nethercote
fc71ecdf27
Bug 1173247 (part 1) - Remove PL_DHashTableEnumerate() uses from nsDiskCacheBindery. r=michal.
2015-06-10 13:07:41 -07:00
Phil Ringnalda
26d25ec201
Backed out 3 changesets (bug 1172884, bug 1169819) for OS X timeouts in browser_force_refresh.js in bc3
...
CLOSED TREE
Backed out changeset 7b23ff6ac3a2 (bug 1169819)
Backed out changeset 1434730c0e19 (bug 1172884)
Backed out changeset 17d6ecf1b4ec (bug 1172884)
2015-06-11 20:57:24 -07:00
Eric Rahm
10246c32dc
Bug 1171583 - Remove mutable warning from |nsSimpleURI::SetUserPass|. r=bz
2015-06-11 18:32:03 -07:00
Ben Kelly
9e311feb1c
Bug 1172884 P1 Properly decode body when intercepted response redirects. r=jduell
2015-06-11 18:29:28 -07:00
Wes Kocher
6783fcf01d
Backed out changeset 6231a72d0557 (bug 1172884) for being the wrong patches landed a=backout
...
--HG--
extra : amend_source : 0c9d908d7b413bcf054c85aa5db901651cdc06a3
2015-06-11 17:57:51 -07:00
Ben Kelly
2ce68bcbc9
Bug 1172884 P1 Properly decode body when intercepted response redirects. r=mayhemer a=kwierso
2015-06-11 17:52:01 -07:00
Nicholas Nethercote
b73bd8538c
Bug 1172789 (part 3) - Remove PL_DHashTableEnumerate() uses from nsLoadGroup. r=michal.
...
This change also factors out some duplicated code.
2015-06-10 13:07:40 -07:00
Nicholas Nethercote
8fb3be0911
Bug 1172789 (part 2) - Remove PL_DHashTableEnumerate() uses from nsLoadGroup. r=michal.
2015-06-10 13:07:40 -07:00
Nicholas Nethercote
9569f3b922
Bug 1172789 (part 1) - Remove PL_DHashTableEnumerate() uses from nsLoadGroup. r=michal.
2015-06-10 13:07:40 -07:00
Wes Kocher
cf559bd6b2
Merge m-c to inbound, a=merge CLOSED TREE
2015-06-10 18:38:28 -07:00
Wes Kocher
4eedce1509
Merge inbound to central, a=merge
2015-06-10 18:29:39 -07:00
Eric Rahm
0edf5974e9
Bug 1171716 - Part 5: Use NS_ReleaseOnMainThread in HttpBaseChannel dtor. r=froydnj
2015-06-10 08:33:32 -07:00
Eric Rahm
7cb6d37333
Bug 1171716 - Part 3: Use NS_ReleaseOnMainThread in WebSocketChannel dtor. r=froydnj
2015-06-10 08:33:30 -07:00
Eric Rahm
49cd162711
Bug 1171716 - Part 2: Use NS_ReleaseOnMainThread in nsBaseChannel. r=froydnj
2015-06-10 08:33:28 -07:00
Birunthan Mohanathas
68936083a8
Bug 1172584 - Avoid coping FallibleTArray in SendRequestRunnable constructor. r=dragana
2015-06-08 10:52:14 -07:00
Bill McCloskey
3d39da47b9
Bug 1163861 - Pass window IDs in nsILoadInfo (r=ckerschb)
2015-06-09 21:04:50 -07:00
Wes Kocher
54bccdc15f
Backed out 5 changesets (bug 1171716) for android bustage
...
Backed out changeset 4986f8464f9c (bug 1171716)
Backed out changeset bc8405b07d10 (bug 1171716)
Backed out changeset 10e18e494630 (bug 1171716)
Backed out changeset be499a3cae5d (bug 1171716)
Backed out changeset f75717d3eba0 (bug 1171716)
2015-06-09 18:48:37 -07:00
Eric Rahm
3d28a45468
Bug 1171716 - Part 5: Use NS_ReleaseOnMainThread in HttpBaseChannel dtor. r=froydnj
2015-06-09 18:25:48 -07:00
Eric Rahm
42e8d5e05f
Bug 1171716 - Part 3: Use NS_ReleaseOnMainThread in WebSocketChannel dtor. r=froydnj
2015-06-09 18:25:46 -07:00
Eric Rahm
1f36355681
Bug 1171716 - Part 2: Use NS_ReleaseOnMainThread in nsBaseChannel. r=froydnj
2015-06-09 18:25:44 -07:00
Birunthan Mohanathas
eb5db88588
Bug 968520 - Add mozilla::fallible to more FallibleTArray::InsertElementsAt calls. r=froydnj
2015-06-09 17:27:35 -07:00
Carsten "Tomcat" Book
989624d484
Merge mozilla-central to fx-team
2015-06-10 15:25:21 +02:00
Florian Quèze
e09d0ceffd
Bug 1164159 - Stop using a wrappedJSObject hack to access nsIBrowserSearchService.getDefaultEngineInfo, r=markh.
2015-06-10 11:18:08 +02:00
Wes Kocher
41e334cea0
Merge m-c to fx-team, a=merge
2015-06-09 19:30:16 -07:00
Tim Taubert
545e7a83fb
Bug 1167508 - Fix tests that expect a sync remoteness change after calling .loadURI() r=billm
2015-06-09 22:11:58 +02:00
Ehsan Akhgari
ab951e3376
Bug 1172139 - Convert nsIHttpChannel to builtinclass; r=mcmanus
2015-06-08 11:27:35 -04:00
Dragana Damjanovic
afb6eb0a46
Bug 1172885 - nsHttpChannel::BeginConnect must call AsyncAbort in the case of an error. r=valentin
2015-06-09 04:07:00 -04:00
Ryan VanderMeulen
9ad81c2b58
Backed out changeset e1a0969cbc53 (bug 1171020) for bustage.
...
CLOSED TREE
2015-06-09 12:05:36 -04:00
Sanchit Kumar
e5edaa4303
Bug 1171020 - Value stored to aLen is never read fixes in nsMultiMixedConv.cpp. r=mcmanus
...
CLOSED TREE
2015-06-08 20:44:00 -04:00
Ehsan Akhgari
4472ebdffd
Bug 1164397 - Part 2: Add an API for overriding the original URI on HttpChannelBase; r=mcmanus
2015-06-05 15:57:37 -04:00
Ehsan Akhgari
8b5efc1636
Bug 1164397 - Part 1: Use the original channel URI for constructing the cache entry key when we're dealing with an intercepted channel; r=mcmanus
2015-06-05 15:57:35 -04:00
Geoff Brown
1040d6c4f5
Bug 995686 - Request longer timeout for test_backgroundfilesaver.js; r=paolo
2015-06-04 10:51:14 -06:00
Ryan VanderMeulen
c2e15cd8c8
Backed out changeset e95a9e8e7650 (bug 1170795
) for e10s test_fetch_event.html faliures.
2015-06-04 11:09:07 -04:00
Josh Matthews
3bd0da1770
Bug 1170795
- Ignore redirect errors for synthesized cache entries. r=mayhemer
2015-06-04 10:06:33 -04:00
Eric Rahm
518166f0c8
Bug 1165515 - Part 14: Undef PR_LOG macros when using mozilla/Logging.h. r=froydnj
...
Make it harder for users to accidentally reintroduce usage of the PR_LOG macros
when using 'mozilla/Logging.h'. This can still be worked around by directly
including 'prlog.h' (and not 'mozilla/Logging.h') if absolutely necessary.
2015-06-03 15:26:07 -07:00
Eric Rahm
75c4bebb79
Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
...
This is straightforward mapping of PR_LOG levels to their LogLevel
counterparts:
PR_LOG_ERROR -> LogLevel::Error
PR_LOG_WARNING -> LogLevel::Warning
PR_LOG_WARN -> LogLevel::Warning
PR_LOG_INFO -> LogLevel::Info
PR_LOG_DEBUG -> LogLevel::Debug
PR_LOG_NOTICE -> LogLevel::Debug
PR_LOG_VERBOSE -> LogLevel::Verbose
Instances of PRLogModuleLevel were mapped to a fully qualified
mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a
fully qualified mozilla::LogLevel::* level, and all other instances were
mapped to us a shorter format of LogLevel::*.
Bustage for usage of the non-fully qualified LogLevel were fixed by adding
|using mozilla::LogLevel;| where appropriate.
2015-06-03 15:25:57 -07:00
Eric Rahm
67f6de2a30
Bug 1165515 - Part 9: Remove instances of using numeric log levels 1-5. rs=froydnj
2015-06-03 15:22:35 -07:00
Eric Rahm
cc58068318
Bug 1165515 - Part 5: Convert instances of PR_LOG_ALWAYS. r=froydnj
...
Most instances were converted to PR_LOG_INFO, some to PR_LOG_DEBUG, and some
to PR_LOG_ERROR.
2015-06-03 15:22:30 -07:00
Eric Rahm
f50b813989
Bug 1165515 - Part 3: Convert PR_LOG_TEST to MOZ_LOG_TEST. r=froydnj
2015-06-03 15:22:28 -07:00
Ryan VanderMeulen
2b848889f8
Merge inbound to m-c. a=merge
2015-06-03 15:55:09 -04:00
Liang-Heng Chen
7397b7309f
Bug 1115480 - Part 1: Implement XPCOM module for mDNSProvider. r=mcmanus
2015-05-20 23:06:00 -04:00
Dragana Damjanovic
09c2350905
Bug 1169554 - Do not reconnect on shutdown. r=mayhemer
2015-05-29 02:06:00 -04:00
Honza Bambas
326b2476af
Bug 1170534 - Remove Visual Event Tracer. r=dougt
2015-06-02 11:44:00 -04:00
Garvan Keeley
9fc741d36b
Bug 1157400
- Part1: port chromium XP wifi scanning code. r=mcmanus
2015-06-03 08:26:47 -04:00
Garvan Keeley
c09b2a165d
Bug 1157400
- Port Chromium WinXP wifi scanner to gecko. r=mcmanus
2015-06-03 08:26:47 -04:00
Nicholas Nethercote
e849e6588b
Bug 1170416 (part 3) - Remove the PLDHashTable2 typedef. r=froydnj.
...
--HG--
extra : rebase_source : 9510ea47204fffa163cac43aeaaac6ae1ad80419
2015-05-19 16:46:17 -07:00
Wes Kocher
bcd821592f
Merge m-c to inbound, a=merge
2015-06-02 18:43:25 -07:00
Wes Kocher
d80ffbf1c9
Merge inbound to central, a=merge
2015-06-02 18:20:12 -07:00
Carsten "Tomcat" Book
541d80f6d9
Merge mozilla-central to fx-team
2015-06-02 13:17:21 +02:00
Wes Kocher
4e9f80ed2e
Backed out 14 changesets (bug 1165515) for b2g mochitest-6 permafail CLOSED TREE
...
Backed out changeset 9b97e2aa2ed9 (bug 1165515)
Backed out changeset 150606c022a2 (bug 1165515)
Backed out changeset 4e875a488349 (bug 1165515)
Backed out changeset 467e7feeb546 (bug 1165515)
Backed out changeset d6b6cc373197 (bug 1165515)
Backed out changeset 0615265b593c (bug 1165515)
Backed out changeset fafd1dce9f08 (bug 1165515)
Backed out changeset d1df869245f9 (bug 1165515)
Backed out changeset 6876a7c63611 (bug 1165515)
Backed out changeset b7841c94a9a3 (bug 1165515)
Backed out changeset e5e3617f7c73 (bug 1165515)
Backed out changeset 39be3db95978 (bug 1165515)
Backed out changeset 0ec74176f8de (bug 1165515)
Backed out changeset 5b928dd10d71 (bug 1165515)
2015-06-01 17:57:58 -07:00
Tim Taubert
2cb9c616e2
Bug 1156065 - Send cloneable messages from SiteSpecificUserAgent.js to fix UA overrides r=billm
2015-05-30 09:07:59 +02:00
Valentin Gosu
b2e6518351
Bug 1036275
- Add Packaged App Service r=honzab
2015-06-03 01:46:15 +03:00
Valentin Gosu
332b9471a3
Bug 1036275
- Change nsHttpChannel to call into PackagedAppService for urls containing !// r=honzab
2015-06-03 01:46:02 +03:00
Eric Rahm
e8a5eb8d6e
Bug 1165515 - Part 14: Undef PR_LOG macros when using mozilla/Logging.h. r=froydnj
...
Make it harder for users to accidentally reintroduce usage of the PR_LOG macros
when using 'mozilla/Logging.h'. This can still be worked around by directly
including 'prlog.h' (and not 'mozilla/Logging.h') if absolutely necessary.
2015-06-01 14:31:01 -07:00
Eric Rahm
f82c0e7caf
Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
...
This is straightforward mapping of PR_LOG levels to their LogLevel
counterparts:
PR_LOG_ERROR -> LogLevel::Error
PR_LOG_WARNING -> LogLevel::Warning
PR_LOG_WARN -> LogLevel::Warning
PR_LOG_INFO -> LogLevel::Info
PR_LOG_DEBUG -> LogLevel::Debug
PR_LOG_NOTICE -> LogLevel::Debug
PR_LOG_VERBOSE -> LogLevel::Verbose
Instances of PRLogModuleLevel were mapped to a fully qualified
mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a
fully qualified mozilla::LogLevel::* level, and all other instances were
mapped to us a shorter format of LogLevel::*.
Bustage for usage of the non-fully qualified LogLevel were fixed by adding
|using mozilla::LogLevel;| where appropriate.
2015-06-01 14:31:01 -07:00
Eric Rahm
4095cdb19f
Bug 1165515 - Part 9: Remove instances of using numeric log levels 1-5. rs=froydnj
2015-06-01 14:31:00 -07:00
Eric Rahm
0a502beb23
Bug 1165515 - Part 5: Convert instances of PR_LOG_ALWAYS. r=froydnj
...
Most instances were converted to PR_LOG_INFO, some to PR_LOG_DEBUG, and some
to PR_LOG_ERROR.
2015-06-01 14:31:00 -07:00
Eric Rahm
dc090e3fe5
Bug 1165515 - Part 3: Convert PR_LOG_TEST to MOZ_LOG_TEST. r=froydnj
2015-06-01 14:31:00 -07:00
Michal Novotny
594c5d9881
Bug 1157322 - TSan: data race netwerk/cache2/CacheIOThread.cpp:315 OnDispatchedEvent, r=honzab
2015-06-01 15:59:17 +02:00
Michal Novotny
30fb016392
Bug 1122070 - TSan: data race netwerk/cache2/CacheIOThread.cpp:97 DispatchInternal, r=honzab
2015-06-01 15:36:44 +02:00
Michal Novotny
911576aab6
Bug 1168221 - Assertion failure: !mDataStarted, r=hurley
2015-05-29 23:28:54 +02:00
Christoph Kerschbaumer
2f7f6f2cce
Bug 1120487 - Implement shim before moving security checks into AsyncOpen, ioservice changes (r=sicking,sworkman)
2015-05-29 10:41:41 -07:00