Commit Graph

239 Commits

Author SHA1 Message Date
Brian O'Keefe
11bcc1cd9e Bug 875934 - Move LIBRARY_NAME to moz.build (batch #1); r=mshal
--HG--
extra : rebase_source : 385d3fd65475ffc18ee44ae088753649470e214b
2013-06-17 15:21:01 -04:00
Mike Shal
7fd6f5b4f1 Bug 882738 - Remove SRCS_IN_OBJDIR from Makefile.in; r=joey
From a071ba8cffdd4584b3cd31eae207e5b76b9e9c95 Mon Sep 17 00:00:00 2001
2013-06-13 13:49:01 -04:00
Vladimir Vukicevic
f4af325139 b=882906; remove EXTRA_DSO_LIBS; r=ted 2013-06-13 22:58:22 -04:00
Kyle Machulis
99cba1b16b Bug 880486 - ns_stun_get_attrs doubly defined on B2G Desktop with MOZ_B2G_RIL [r=pwang] 2013-06-06 18:10:00 -07:00
Jan-Ivar Bruaroey
d63b10b121 Bug 860397: turn_unittest checks that TURN_SERVER_ADDRESS is IP#s not FQDN r=rjesup 2013-06-05 18:01:07 -04:00
Patrick Wang
c4af980de5 Bug 867933 - Part 2 - provide gonk-specific addrs.c to enable nICEr to enumerate network interfaces in gonk. r=ekr 2013-05-08 13:48:25 +08:00
Mike Shal
5169c0a913 Bug 864774 - Part 2: Move CPPSRCS to moz.build as CPP_SOURCES; r=joey CLOSED TREE
From 9e0ba7f425143f545eb6c4b26a9a96b5ade4d8e9 Mon Sep 17 00:00:00 2001
2013-04-23 17:54:15 -04:00
Suhas Nandakumar
3621f5d9d0 Bug 867273 - Force PR_LOG in production builds. r=ekr 2013-05-20 19:11:01 -07:00
Adam Roach [:abr]
a3bdf8a972 Bug 874008: Fix bustage r=ekr 2013-05-21 09:25:10 +08:00
Adam Roach [:abr]
1eac5a0bee Bug 874008 - Check format strings for r_log r=ekr 2013-05-21 09:16:07 +08:00
EKR
df473e9155 Bug 856433 - Allow cancellation of nonexistent nrappkit timers off the STS thread. r=abr 2013-04-16 19:29:23 -07:00
EKR
67c54cf1da Bug 854085. Make thread asserts conditional on DEBUG not MOZ_DEBUG. r=jesup 2013-04-16 13:13:09 -07:00
Mike Shal
df7deac25b Bug 846634 - Part 2: Move EXPORTS to moz.build; r=joey 2013-04-16 15:24:43 -04:00
EKR
266f6535f8 Bug 856848 - Fix thread crash r=ehugg
Bug 856848 - Fix thread crash r=ehugg,ekr
2013-04-01 12:34:36 -07:00
Randell Jesup
8ba741b379 Bug 860222: use our own isascii() for sanitizing TURN passwords r=glandium 2013-04-11 22:46:23 -04:00
Ryan VanderMeulen
59c03675bb Backed out changeset f556245d6da1 (bug 856848) for build bustage on a CLOSED TREE. 2013-04-11 15:42:37 -04:00
EKR
046c5d0db8 Bug 856848 - Fix thread crash r=ehugg,ekr 2013-04-01 12:34:36 -07:00
Randell Jesup
2fd2630889 Bug 830100: Avoid deadlocks by sending packets asynchronously r=ekr 2013-04-11 03:16:03 -04:00
EKR
f5a15d044b Bug 830100: Refactor transport flow to allow destruction on any thread r=derf 2013-02-19 03:43:34 -08:00
Adam Roach [:abr]
766388dc2b Bug 860143: Check correct variable when setting host r=ekr 2013-04-10 13:37:50 -05:00
Randell Jesup
da1e2526eb Backout changeset 5abbf6fd5466 (Bug 830100) for sctp_unittest failure ON A CLOSED TREE r=ryanvm 2013-04-09 17:35:20 -04:00
EKR
f7d3f3002b Bug 830100: Refactor transport flow to allow destruction on any thread r=derf 2013-02-19 03:43:34 -08:00
EKR
9b7964fb15 Bug 786235 - Rewrite TURN stack to match RFC 5766. r=abr 2013-04-06 17:58:58 -07:00
Randell Jesup
de29cf69bc Bug 838380: don't crash browser on server 500 error r=abr 2013-04-08 17:11:31 -04:00
Randell Jesup
0712bf1b4a Bug 838319: don't assert() on bad STUN input credentials; accept utf8 for UTF-8 r=dmose 2013-04-06 03:29:58 -04:00
Kyle Machulis
72a717a860 Bug 855465 - Add emacs python mode comments to moz.build files; r=gps 2013-04-01 11:36:59 -07:00
Randell Jesup
82ad486abe Bug 841126: Update DataChannels to use new stack option to ignore port numbers over DTLS links r=jesup 2013-03-31 21:09:24 -04:00
Kyle Machulis
43628a7867 Backout for changeset 03452b187c14 (Bug 855465) due to bustage on a CLOSED TREE; r=qdot 2013-03-29 15:12:58 -07:00
Kyle Machulis
334c0800cf Bug 855465 - Add emacs python mode comments to moz.build files; r=gps
--HG--
extra : rebase_source : 004a756492323e1a049586e85b3be5037159df20
2013-03-29 13:56:18 -07:00
Randell Jesup
2eb06ed39b Bug 853998: bustage fix for the SyncRunnable test (warning fix) r=abr on a CLOSED TREE 2013-03-27 23:32:00 -04:00
EKR
e15f167300 Bug 853998 test (WIP)
Bug 853998 - Test for SyncRunnable r=jesup
2013-03-26 23:50:51 -07:00
Jan-Ivar Bruaroey
f66551b7df Bug 840962 - Don't fail ICE on VPN adapters which store friendly names differently. r=ekr 2013-03-26 17:25:07 -04:00
EKR
4648337f9e Assert on WrapRunnableRet with NS_DISPATCH_NORMAL
Bug 847439. Assert on WrapRunnableRet with NS_DISPATCH_NORMAL. r=derf,jesup
2013-03-04 08:51:48 -08:00
Mike Hommey
74f28e30ee Bug 854085 - Fix unused-but-set-variable from ASSERT_ON_THREAD macro in media/mtransport/runnable_utils.h. r=jesup 2013-03-26 11:07:02 +01:00
Mike Hommey
ea912ef189 Backout changeset 1c7bf97d3b6f (bug 854085) for bustage 2013-03-26 09:12:36 +01:00
Mike Hommey
8e53e396ae Bug 854085 - Fix unused-but-set-variable from ASSERT_ON_THREAD macro in media/mtransport/runnable_utils.h. r=jesup 2013-03-26 08:47:49 +01:00
EKR
71019da9d6 Bug 844493. Remove NS_DISPATCH_SYNC from main thread. r=derf,abr 2013-03-03 23:10:30 -08:00
Mike Shal
7ecea60097 Bug 844654 - Part 2: Move MODULE to moz.build; rs=gps 2013-03-19 11:47:00 -07:00
Steven Lee
2750d15203 Bug 818843 - Part 3: Do not build test cases. r=ted 2013-03-19 16:02:44 -04:00
Steven Lee
5a1d8c2297 Bug 818843 - Part 2: gyp modifications and add some system call wrappers for B2G. r=ted, r=ethanhugg, r=jesup 2013-03-19 16:02:44 -04:00
Jan-Ivar Bruaroey
bcec5e774e Bug 837919 - RTCPeerConnection constructor supports FQDN STUN servers. r=ekr 2013-03-08 15:11:17 -05:00
Ryan VanderMeulen
172229c2bb Backed out changeset 893cf3614356 (bug 837919) for crashtest & mochitest orange. 2013-03-08 11:41:27 -05:00
Jan-Ivar Bruaroey
8a1cecde61 Bug 837919 - RTCPeerConnection constructor supports FQDN STUN servers. r=ekr 2013-03-07 16:14:01 -05:00
EKR
631c78c2a2 Bug 843644 - DNS resolution for STUN servers. r=abr 2013-02-21 08:52:30 -08:00
Adam Roach [:abr]
f677436eec Bug 845283 - Move formatting buffer onto the stack 2013-03-01 17:21:39 -06:00
Gregory Szorc
45faa95b04 Merge mozilla-central into build-system
Only conflict was configure.in amd was due to context, not
changed lines themselves.
2013-02-25 22:09:18 -08:00
Gregory Szorc
2fa6d9d925 Bug 784841 - Part 18u: Convert /media; r=glandium 2013-02-25 12:47:22 -08:00
Adam Roach [:abr]
a1bece2060 Bug 841566 - Turn on testserver logging for WebRTC-related systems r=jesup,ted.mielczarek 2013-02-22 14:53:56 -06:00
Adam Roach [:abr]
45e065993f Bug 843595 - Null checks on pair dtor r=ekr 2013-02-25 11:12:33 -06:00
EKR
f60aee836a Bug 840508 - assert that nr_timer is called in the STS thread. r=abr 2013-02-19 09:01:12 -08:00
EKR
979c8149dc Bug 835283: Thread asserts for nr_socket_prsock r=jesup 2013-02-15 18:33:31 -08:00
EKR
11e237674a Bug 838169. Fix NrIceCtx cleanup. r=abr 2013-02-10 21:18:24 -08:00
EKR
a4f7e1e3fc Bug 839963 - Add instrumentation to nr_timer. r=abr 2013-02-10 23:23:02 -08:00
Daniel Holbert
87cf0d7808 Bug 836570: Mark media/mtransport/build as FAIL_ON_WARNINGS on non-MSVC compilers. r=jesup 2013-02-11 17:52:55 -08:00
Nicholas Nethercote
420347d889 Bug 825105 - Fix two clang warnings in media/mtransport/. r=ekr.
--HG--
extra : rebase_source : 5a1aa4960f364f50f12c1cee1f0838202be6191d
2013-02-10 18:01:07 -08:00
EKR
04125e83f2 Bug 831290 - Avoid double done_cb firing in nICEr r=abr 2013-02-03 12:05:12 -08:00
Bill Gianopoulos
b9690d3a18 Bug 837395: define EAFNOSUPPORT for VC9 r=rjesup 2013-02-02 12:28:35 -05:00
Daniel Holbert
89b1916236 Bug 836355: Mark media/mtransport/test/ as FAIL_ON_WARNINGS. r=jesup 2013-02-01 08:02:03 -08:00
Adam Roach [:abr]
3c250daa80 Bug 825927 Patch 2: Lengths, leaks, and contracts. r=ekr
Contains ISC-licensed code sourced from:
http://ftp.netbsd.org/pub/NetBSD/NetBSD-release-6/src/lib/libc/inet/inet_ntop.c
2013-01-31 14:16:13 -06:00
Daniel Holbert
a2b7c5d7b6 Bug 836303: Remove unused fields from TransportTestPeer class, in sctp_unittest.cpp. r=ekr 2013-01-31 09:13:31 -08:00
Daniel Holbert
0b130466ed Bug 836126: Use size_t instead of int for loop variable, in loop running from 0 to sizeof(something). r=ekr 2013-01-31 09:13:29 -08:00
Randell Jesup
83c2fd91ec Bug 818670: Enable AEC in PeerConnection, AGC/NoiseSuppression in gUM (w/bustage fix) r=derf 2013-01-29 11:55:09 -05:00
Daniel Holbert
fb6f354b51 Bug 836418: Disable the macros MOZ_MTLOG_MODULE() & MOZ_MTLOG() if PR_LOGGING is off. r=jesup 2013-01-30 13:13:38 -08:00
Daniel Holbert
5fdf43bd79 Bug 836182: Make mtransport's gtest invocations be consistent about signedness of arguments. r=jesup 2013-01-30 07:31:55 -08:00
Adam Roach [:abr]
81b2a8baa1 Bug 825927 Patch 1: Fix log message formats r=ekr 2013-01-23 16:33:20 -06:00
Adam Roach [:abr]
1a573d6999 Bug 825927 Patch 0: Clean up whitespace r=ekr 2013-01-25 14:07:28 -06:00
Ed Morley
58ea6b383c Backout 40f09f7bc670 & fc262e3c635f (bug 818670) for frequent fedora64 mochitest-3 leaks on a CLOSED TREE 2013-01-30 10:32:11 +00:00
Randell Jesup
5bfe28ca5c Bug 818670: Enable AEC in PeerConnection, AGC/NoiseSuppression in gUM (w/bustage fix) r=derf 2013-01-29 11:55:09 -05:00
Ed Morley
367cd59d9d Backout df75a87cce60 & 19e164f7d88d (bug 818670) for build bustage on a CLOSED TREE 2013-01-29 17:28:30 +00:00
Daniel Holbert
f89310d796 Bug 835686: Mark debug-only variable as DebugOnly in transportlayer.h. r=ekr 2013-01-29 09:01:11 -08:00
Daniel Holbert
e5dec73856 Bug 835692: Convert TransportLayerDtls::kMaxDigestLength to be a size_t, since that's how it's used & what it's compared to. r=ekr 2013-01-29 09:01:10 -08:00
Randell Jesup
abaf7857dc Bug 818670: Enable AEC in PeerConnection, AGC/NoiseSuppression in gUM r=derf 2013-01-29 11:55:09 -05:00
Randell Jesup
ee0aa6fbdb Bug 830146: Add packet logging for DataChannels, and log SCTP debugs through NSPR r=jesup,mcmanus 2013-01-29 02:46:26 -05:00
Justin Lebar
00a0bba88a Backed out changeset 9b803c2821b9 (bug 818843) due to B2G device build breakage on Mac. rs=jesup
--HG--
extra : rebase_source : 981d5e9504c69eb76112fca35fd0a36110593659
2013-01-25 17:14:05 -05:00
EKR
a9a1f3a5ed Bug 786236: Per-context configurable STUN servers. r=abr 2013-01-05 11:40:34 -08:00
Randell Jesup
9bcd9ec6c3 Bug 834062: Disable INET6 for sctp unittests on Android to match the tested code r=ekr 2013-01-23 19:31:37 -05:00
Steven Lee
28db8f365c Bug 818843 - Media changes. r=rjesup 2013-01-23 18:08:16 -05:00
EKR
9bf70cc915 Bug 829757 - Clean up a=candidate stripping. r=abr 2013-01-19 15:18:28 -08:00
EKR
ccd851b350 Strip a= from trickle ICE candidates
Bug 829757 - Accept a=candidate ICE candidates (for now). r=ehugg
2013-01-17 09:18:06 -08:00
Daniel Holbert
ca8d20175e Followup to Bug 821292: Remove unneeded semicolon after NS_INLINE_DECL_THREADSAFE_REFCOUNTING(), to fix build warning. 2013-01-16 16:54:15 -08:00
Ethan Hugg
fb6486eed4 Bug 830451 Treat PEER_REFLEXIVE like SERVER_REFLEXIVE r=adam 2013-01-14 12:07:28 -08:00
Adam Roach [:abr]
b0029bacd5 Bug 807494: Fix stun address to point to Mozilla-operated server. r=ekr 2013-01-14 20:38:15 -05:00
Doug Turner
a9eb151cf8 Backout c9831bed6bb7 - Bug 818843 - This change broke building B2G on the mac. r=me
--HG--
extra : rebase_source : 7bef8dc1c394d45302f17379ab2cbd90ecda6975
2013-01-07 08:48:24 -08:00
Jan-Ivar Bruaroey
e9179b9022 Bug 824955: Ice-candidate username/pwd nullchecks r=jesup 2013-01-04 11:45:22 -05:00
Steven Lee
fb7916fef7 Bug 818843 - Media changes. r=rjesup 2013-01-06 22:24:14 -05:00
EKR
ea0b0c79d4 Bug 827029 - Clean up license boilerplate in mtransport. r=jesup 2013-01-05 14:58:59 -08:00
EKR
138736f24c Bug 822159 - Fix trickle ICE to start checking when new candidates come in. r=abr 2012-12-20 08:12:45 -08:00
EKR
4ae5e15efb Bug 825651: Cancel asynchronous callbacks for nICEr upon destruction r=abr 2013-01-01 15:14:28 -08:00
Jan-Ivar Bruaroey
5ce93456e9 Bug 824851: Fixed RUN_ON_THREAD to not dispatch on own thread. r=ekr 2012-12-28 15:42:53 -05:00
Jan-Ivar Bruaroey
30b1a7cbaf Bug 824263 - Shutdown: PeerConnectionMedia disconnect_all() + peer_ctx cleanup. r=jesup,ekr 2012-12-27 17:38:45 -05:00
EKR
e85f37d43c Bug 824097 - Fix uninitialized memory read in nr_stun_server_ctx. r=jesup 2012-12-21 15:14:06 -08:00
EKR
693c7463fa Bug 821292 - Clean up runnables when RUN_ON_THREAD runs on the same thread. r=jesup 2012-12-21 07:11:02 -08:00
EKR
4ccc635ab9 Bug 820102 - Clean up MediaPipeline threading (re-land after fix). r=derf,jesup 2012-12-21 06:03:22 -08:00
Ed Morley
020839f9bb Backout 21409a401d75 (bug 821292),9587e39f9a50 (bug 820102) for conflicts and assertions respectively, on a CLOSED TREE 2012-12-21 16:15:01 +00:00
EKR
e6f9ea6e63 Bug 821292 - Clean up runnables when RUN_ON_THREAD runs on the same thread. r=jesup 2012-12-21 07:11:02 -08:00
EKR
470d172869 Bug 820102 - Clean up MediaPipeline threading. r=derf,jesup 2012-12-21 06:03:22 -08:00
EKR
0a06495cf6 Bug 817430: Set initial controlled/controlling values, based on inbound T/F. r=jesup 2012-12-02 13:49:56 -08:00
EKR
b2552acbba Bug 819096: Fix for =/== confusion in trickle ICE r=abr 2012-12-06 15:39:56 -08:00
Adam Roach [:abr]
a8ee93abb1 Bug 820410/bug 818293/bug 817432/bug 817341: Update to imported ICE library r=jesup 2012-12-13 14:01:13 -06:00
Randell Jesup
ff2218cb04 Bug 816640: nrappkit timers need to be threadsafe r=ekr 2012-12-14 18:16:29 -05:00
Dan Mosedale
48a25bac31 Bug 819825, fix ICE/STUN crash on Android by null-checking setlocale(), r=abr 2012-12-13 16:52:52 -08:00
Dan Mosedale
536c723258 Bug 819821, adds more logging for STUN, r=jesup 2012-12-13 07:14:21 -08:00
Gian-Carlo Pascutto
6b755ededd Bug 816822 - Fix build files, unit tests, and clone some linux headers to make WebRTC unit tests build on Android, r=dmose,ted 2012-12-12 12:05:57 -08:00
Gian-Carlo Pascutto
d00c43b665 Bug 813911 - Fix nrappkit on Android in gyp build file. r=dmose, ted 2012-12-12 12:05:50 -08:00
EKR
fd7090483a Bug 792175 - Move PeerConnection operations onto main thread. r=jesup,derf,ehugg 2012-09-26 10:14:23 -07:00
Gian-Carlo Pascutto
a3be1db368 Bug 813918 - Fix nICEr build for Android. r=dmose 2012-12-11 20:11:15 +01:00
Randell Jesup
f86cd2d8b1 Bug 752657: backout sigslot multithreaded due to deadlocks rs=jesup 2012-12-11 12:54:24 -05:00
Randell Jesup
9ae439bc32 Bug 752657: switch all uses of sigslot to default to multithreaded (win32 already defaults that way) r=ekr 2012-12-11 07:59:57 -05:00
Valentin Gosu
d9fc31cfe1 Bug 783205 - Networking Dashboard. r=mcmanus, r=jorendorff, sr=biesi 2012-12-10 09:13:55 -05:00
Saurabh Anand
6de7befa37 Bug 818817 - Fix some compiler warnings, r=Ms2ger 2012-12-09 22:53:19 +05:30
EKR
dfc4104a87 Bug 817451, Correctly set mRole in PC unit tests. r=ehugg 2012-12-02 18:06:21 -08:00
EKR
3b298160b5 Bug 815039, Add template to bind non-member function calls into runnables. r=jesup 2012-12-02 16:53:47 -08:00
EKR
e6a12d7f74 Bug 812785: ICE issues r=jesup 2012-11-20 06:12:52 -08:00
Daniel Holbert
321d58af6d Bug 815367: Fix warnings for extra semicolons in media/mtransport/test/. r=jesup 2012-11-26 20:34:19 -08:00
Ethan Hugg
f62573e4e6 Bug 814164 - Disable builder run of ice_unittest r=jesup 2012-11-26 09:47:18 -08:00
Ethan Hugg
0aff34f3d3 Bug 811118 build webrtc unittests by default but run only some r=jesup 2012-11-12 15:34:05 -08:00
Ryan VanderMeulen
f9cd0623b0 Backed out changeset b527670b6728 (bug 811118) for orange. 2012-11-16 21:24:14 -05:00
Ethan Hugg
ae04e69977 Bug 811118 build webrtc unittests by default r=jesup 2012-11-12 15:34:05 -08:00
Daniel Holbert
8538e22f8d Bug 812278: Remove no-longer-necessary semicolons after MOZ_MTLOG_MODULE macro invocations, to fix GCC pedantic build warnings. r=jesup 2012-11-15 17:50:26 -08:00
Ted Mielczarek
1285e0d26b bug 809693 - fix minidump location for WebRTC C++ unit tests. r=ekr 2012-11-14 10:52:55 -05:00
EKR
4588905837 Bug 803885 - Set SCTP NO_LINGER in unit tests; r=jesup 2012-11-14 06:22:55 -08:00
Nathan Froyd
99ad4d5219 Bug 809950 - fix mtransport logging macros to not introduce static initializers; r=jesup 2012-11-08 13:44:41 -05:00
EKR
988e5fc796 Bug 807259: Fix shutdown for WebRTC standalone unit tests. r=anant 2012-10-31 16:31:47 +01:00
EKR
6ee946c418 Bug 801221: Move mtransport operations onto STS thread; r=jesup 2012-10-18 13:01:52 -07:00
Daniel Holbert
dcaf1ab623 Bug 805470: Remove trailing semicolons to fix build warnings in /media/mtransport. r=jesup 2012-10-26 10:49:57 -07:00
Ehsan Akhgari
8e702f60c5 Backed out 2 changesets (bug 579517)
Backed out changeset 5298adc70963
Backed out changeset 86ccf7c918ce (bug 579517)
2012-10-25 12:32:24 -04:00
Ehsan Akhgari
f3c0ac7a23 Code hygiene: don't use PR_TRUE and PR_FALSE, and use stdint types instead of PRInt types (no bug really, but you could say bug 579517) 2012-10-25 11:48:19 -04:00
Isaac Aggrey
a86815785b Bug 794510: Part 5 - use plarena.h type definitions; r=ehsan 2012-10-11 01:39:28 -05:00
Daniel Holbert
df7f3e3936 Bug 801210: Remove unnecessary semicolon after NS_INLINE_DECL_THREADSAFE_REFCOUNTING in media/mtransport headers. r=jesup 2012-10-13 10:15:15 -07:00
Ehsan Akhgari
c2c0b53beb Bug 800401 - Make sure that the WebRTC build system does not impose the -Werror flag on all Linux/Mac builds; r=jesup
In the future, we need to hook these up to the FAIL_ON_WARNINGS machinery.
2012-10-11 13:42:12 -04:00
Ehsan Akhgari
7a6d31cb1c Remove some unused variables, no bug 2012-10-11 09:19:35 -04:00
EKR
01ae33d80f Bug 798997, Add libjingle license to gtest_utils.h, r=derf DONTBUILD (NPOTB) 2012-10-07 20:29:09 -07:00
EKR
a2d1de5b67 Bug 782408: Update nrappkit to use stddint types r=jesup 2012-10-07 10:16:35 -07:00
EKR
c521582f07 Bug 798860: Generate 1024-bit RSA keys for dtls mtransport streams r=bsmith 2012-10-06 23:55:23 -07:00
EKR
7e1291fe34 Bug 790517: mtransport - Generic media transport subsystem for ICE and DTLS r=jesup,bsmith,mcmanus 2012-10-02 13:04:58 -07:00
EKR
d1600ddf16 Bug 790517: mtransport import/build for nrappkit/nICEr r=ted 2012-10-02 10:12:50 -07:00
Randell Jesup
95b1ed5bf3 Bug 766758: License for nICEr (media/mtransport/third_party/nICEr) r=gerv 2012-10-07 01:34:30 -04:00
EKR
36512bf067 Bug 790517: Import nICEr library for mtransport rs=biesi,jesup r=gerv 2012-09-21 07:11:13 -07:00
EKR
c4de0ea3c3 Bug 790517: Import nrappkit library for mtransport rs=roc,jesup r=gerv 2012-10-04 11:16:21 -07:00