Ryan VanderMeulen
9e342ce37a
Revert to revision 63dfac3c9c87 due to mass bustage pile-ups that landed after it on a CLOSED TREE.
2014-05-16 12:29:37 -04:00
Honza Bambas
e8ceeb1152
Bug 998608 - Intermittent netwerk/test/unit/test_range_requests.js | request reports itself as not pending from onDataAvailable!, r=michal
2014-05-16 17:13:04 +02:00
Shian-Yow Wu
29e21bb5f7
Bug 945152 - Part 3-1: New libjar APIs. r=aklotz
2014-05-16 13:34:43 +08:00
Nicholas Hurley
4f66bb13b6
Bug 1006804 - Enforce TLS key type and size restrictions in HTTP/2. r=mcmanus.
2014-05-14 10:37:05 -07:00
Sylvestre Ledru
2c31abd95e
Bug 1003929: Remove some useless declarations in netwerk/protocol/ found by scan-build, the LLVM/Clang static analyzer. r=mcmanus
2014-05-13 17:18:20 +02:00
Ethan Tseng
9c5f6c7691
Bug 1007577 - [RTSP] Remove nsIInterfaceRequestor from RtspControllerParent. r=sworkman
2014-05-09 15:08:09 +08:00
Ethan Tseng
4b189402f3
Bug 1006530
- Closing a audio RTSP streaming via tab page causes system crash. r=sworkman
2014-05-08 16:16:11 +08:00
Carsten "Tomcat" Book
a3c8c6b85e
Merge mozilla-central to b2g-i
2014-05-09 14:20:02 +02:00
John Shih
09d8a647d2
Bug 996535 - Convert linux socket to NSPR/PRFileDesc. r=sworkman
2014-04-15 14:39:57 +08:00
Neil Rashbrook
5b1f7b4a77
Bug 514280 Only use nsCOMPtr for interfaces r=bsmedberg
2014-05-08 20:08:38 +01:00
Daniel Stenberg
9b3002ffb1
Bug 1007029 - GenerateGoAway: Remove pointless memset(). r=mcmanus
2014-05-08 09:27:00 -04:00
Robert O'Callahan
7043c985ba
Bug 1006248. Part 1: Add MOZ_EXPORT in various places. r=glandium
...
--HG--
extra : rebase_source : cfe209a412cae28d405eae413415cebb6959072a
2014-05-06 17:26:46 +12:00
Daniel Stenberg
620f55a660
Bug 1005821 - http2: store streamID on correct index within frame. r=hurley
...
Http2Session::GenerateGoAway() inserts the 'mOutgoingGoAwayID' at index
7 while the comment (and the current http2 spec draft-12) says it should
be at index 8.
2014-05-05 10:58:00 +02:00
Ed Morley
b107d7de01
Merge mozilla-central and inbound
2014-05-01 16:23:05 +01:00
Ed Morley
8cd8e828e7
Merge latest green inbound changeset and mozilla-central; r=khuey to work around bug 1002652 comment 13
2014-05-01 15:49:37 +01:00
Honza Bambas
ec884e84a0
Bug 916052 - Adapt about:cache to the HTTP cache v2 API, r=michal+MattN
2014-05-01 13:28:12 +02:00
Patrick McManus
1366b6fd61
bug 1003935 - call dontreuse() on reclaimed conns with transaction refs r=sworkman
2014-04-30 13:15:46 -04:00
Nicholas Hurley
dad13d622c
Bug 1003320 - Send HPACK buffer size updates when receiving SETTINGS_HEADER_TABLE_SIZE. r=mcmanus
2014-04-29 18:46:07 -07:00
Nicholas Hurley
f0e5a8c1c1
Bug 1001022 part 1 - http/2 draft 12 client implementation. r=mcmanus
2014-04-29 18:46:03 -07:00
Nicholas Hurley
b75cd1cf68
Bug 993037 (part 1) - http/2 draft 11 client implementation. r=mcmanus
2014-04-29 18:45:59 -07:00
Nathan Froyd
84041459a1
Bug 1003306 - part 2 - use services::GetPermissionManager everywhere that's appropriate; r=ehsan
2014-04-29 13:27:26 -04:00
Honza Bambas
fcfec4dbfa
Backing out bug 916052 (2557b51a47a0) for build bustage on linux/osx, r=bustage on CLOSED TREE
2014-04-30 13:05:43 +02:00
Honza Bambas
bbabececf4
Bug 916052 - Adapt about:cache to the HTTP cache v2 API, r=michal+MattN
2014-04-30 12:39:18 +02:00
Birunthan Mohanathas
5f1fde8824
Bug 900908 - Part 3: Change uses of numbered macros in nsIClassInfoImpl.h/nsISupportsImpl.h to the variadic variants. r=froydnj
2014-04-27 03:06:00 -04:00
R Kent James
9d2752314f
Bug 698730 - Add username to connection cache hash so NTLM gets correct connection, r=mcmanus
2014-04-26 12:01:39 -07:00
Honza Bambas
ffa0366ff3
Bug 913810 - make nsHttpChannel properly react to FILE_NOT_FOUND from the cache, r=michal
2014-04-26 18:42:07 +02:00
Wes Kocher
7e12aa6d98
Merge inbound to m-c
2014-04-22 17:54:44 -07:00
Ethan Tseng
f2d1f8c08a
Bug 992568 - Part 2: Refactor RtspChannel to support redirection. r=sworkman
2014-04-03 19:08:34 +08:00
Makoto Kato
d20c2455e3
Bug 26767 - FTP client detects UTF-8 if server returns UTF8 on FEAT. r=michal.novotny
2014-04-23 01:12:58 +09:00
Valentin Gosu
bd28245b1f
Bug 822480 - Fix e10s bits of Resource Timing implementation. r=bz, r=honzab
...
* Move nsITimedChannel to HttpBaseChannel which is inherited by HttpChannelChild
* Return mZeroTime instead of 0 in nsPerformanceTiming
* Pass redirect count from parent to child channel
2014-04-21 09:34:33 -04:00
Adrian Lungu
864ffca9e7
Bug 822480 - Add in the Resource Timing API. r=honzab, r=jst
2013-10-15 18:35:44 -07:00
Patrick McManus
759b8bc24f
Bug 997690 - nsHttpConnection::IdleTimeout default can be set internally r=hurley
2014-04-16 12:34:56 -04:00
Ethan Tseng
1531ef0eaf
Bug 996688 - Prevent potential crash in RtspConnectionHandler::parsePlayResponse. r=sworkman
2014-04-16 00:59:30 +08:00
Doug Turner
8fa43a4630
Bug 995070 - Add preference to send 'Prefer: Safe' header as defined by draft-nottingham-safe-hint-01. r=mcmanus
2014-04-13 21:39:13 -07:00
John Shih
4059919385
Bug 949956 - Move duplicated code to NetStatistics.h. r=mcmanus
2014-01-14 17:55:29 +08:00
Steve Workman
852d079189
Bug 990268 - Send FTPChannelParent::mStatus in IPDL messages to FTPChannelChild r=mayhemer
2014-04-07 11:26:22 -07:00
Ryan VanderMeulen
ec69e2de4b
Merge inbound to m-c.
2014-04-04 14:51:38 -04:00
Benjamin Smedberg
efdee4270b
Bug 986582 - Get rid of the toolkit.telemetry.enabledPreRelease pref and make the toolkit.telemetry.enabled pref do the right thing for beta users who are testing a final release build, r=rnewman
...
--HG--
extra : rebase_source : 43f70e2c1c3207f37ba0789245958cb0c34187f6
2014-04-03 14:55:42 -04:00
Honza Bambas
f943deb115
Bug 984994 - Reintroduce 'network.http.use-cache' pref, r=jduell
2014-04-04 14:42:06 +02:00
Ryan VanderMeulen
7649261537
Merge inbound to m-c.
2014-04-03 15:24:54 -04:00
Ethan Tseng
3b4037bfdc
Bug 990862 - [RTSP] Rename RtspChannel to RtspChannelChild. r=sworkman
...
--HG--
rename : netwerk/protocol/rtsp/RtspChannel.cpp => netwerk/protocol/rtsp/RtspChannelChild.cpp
rename : netwerk/protocol/rtsp/RtspChannel.h => netwerk/protocol/rtsp/RtspChannelChild.h
2014-04-02 16:32:26 +08:00
Masayuki Nakano
d42c98a423
Bug 990855 part.2 Remove dom/events from local includes of moz.build files r=smaug
2014-04-03 13:18:38 +09:00
Patrick McManus
40006e722c
bug 968417 - revalidating images needs loadgroup parent for spdy push r=seth
2014-01-29 22:35:40 -05:00
snigdha
9cc482da68
Bug 798033 - Headers should generally not do "using namespace" at file scope. r=jib, r=jmathies, r=rjesup, r=ekr, r=ncameron, r=blassey
2014-04-01 08:29:25 -04:00
Jason Duell
b7e2679c07
Bug 985230 - mStatus is not correct in HttpChannelChild::OnStartRequest r=sworkman
2014-03-31 14:43:04 -07:00
Steve Workman
2a59ad54ea
Bug 925623 - Support delivery of WebSocket events off-main-thread in WebSocketChannel r=jduell
2014-03-27 13:58:19 -07:00
Ehsan Akhgari
186680d83a
Bug 798158 - Part 1: Use a pointer-sized type to store refcounts internally; r=bsmedberg
2014-03-27 16:38:33 -04:00
Steve Workman
f158767b3e
Bug 983910 - Set mParentListener for HttpChannelParent objects created after HTTP redirects
2014-03-27 13:11:50 -07:00
Ms2ger
4eb83267c9
Bug 984006 - Remove xpcom/ds from local includes; r=ehsan
2014-03-27 21:05:14 +01:00
Ethan Tseng
e1ff533891
Bug 977518 - [RTSP] Resource leak from RtspMediaResource, RtspController and RTSPSource. r=sworkman
2014-02-27 15:28:18 +08:00
Patrick McManus
9998726e8b
bug 988421 - spdy push concurrency mismatch r=hurley
2014-03-26 12:48:23 -04:00
John Shih
697caff053
Bug 960426 - Part 2: Modifications for IDL change. r=blassey
2014-03-05 11:54:55 +08:00
Ryan VanderMeulen
336a053131
Backed out changeset 636fa3174368 (bug 983910) for xpcshell failures.
...
CLOSED TREE
2014-03-26 15:47:54 -04:00
Nathan Froyd
719e6a25de
Bug 986082 - add memory reporters for SPDY zlib buffers; r=hurley,njn
2014-03-20 14:22:17 -04:00
Nicholas Hurley
33cbd38dd5
Bug 965869 (part 1) - HTTP/2 draft10 client implementation. r=mcmanus
2014-03-26 10:58:09 -07:00
Steve Workman
6145b26592
Bug 983910 - Set mParentListener for HttpChannelParent objects created after HTTP redirects r=jduell
2014-03-26 10:30:58 -07:00
Andrea Marchesini
ebeddf1969
Bug 910010 - Implementation of PFileDescriptorSet - part 2, r=bent
2014-03-25 18:37:28 +00:00
Andrea Marchesini
fdcbca4082
Bug 910010 - Implementation of PFileDescriptorSet - part 1, r=khuey
2014-03-25 18:37:13 +00:00
Sid Stamm
197817a1d7
Bug 835357 - fix telemetry probes for DNT so they accumulate before the pings are sent. r=mcmanus
2014-03-20 16:37:47 -07:00
Patrick McManus
ae599f9845
bug 477578 - http methods should be case sensitive r=hurley
2014-03-18 12:36:18 -04:00
Honza Bambas
cf96244f17
Bug 975787 - With cache disabled, assertion fails in nsWyciwygChannel::WriteToCacheEntry, r=michal
2014-03-17 18:21:37 +01:00
Kyle Huey
d7764d686d
Bug 981150: Use nsTArrayForwardDeclare.h more. r=ehsan
2014-03-15 12:00:17 -07:00
Kyle Huey
b564544cf7
Bug 967364: Pass already_AddRefed by reference instead of by value. r=bsmedberg
2014-03-15 12:00:17 -07:00
Kyle Huey
1f3d658bb3
Bug 967364: Use every already_AddRefed. r=bsmedberg
2014-03-15 12:00:16 -07:00
Kyle Huey
fe6c4e28d6
Bug 967364: Rename already_AddRefed::get to take. r=bsmedberg
2014-03-15 12:00:15 -07:00
Steve Workman
c0d484b966
Bug 975338 - Enable diverting of HTTP and FTP channels back to parent process from child r=jduell
2014-03-10 23:04:28 +01:00
Ed Morley
e914d19aae
Backed out changeset 97858e5c1f13 (bug 975338)
2014-03-10 17:57:53 +00:00
Ed Morley
d40a564ed3
Backed out changeset 1b4b0a309453 (bug 975338)
2014-03-10 17:57:49 +00:00
Ed Morley
4cf7c6989a
Backed out changeset 7a78f199e1cd (bug 975338)
2014-03-10 17:57:46 +00:00
Steve Workman
b040432bc0
Bug 975338 - Implement nsI|ADivertableChannel in FTPChannelChild|Parent r=jduell
2014-03-10 18:31:57 +01:00
Steve Workman
54ba73d1af
Bug 975338 - Implement nsI|ADivertableChannel in HttpChannelChild|Parent r=jduell
2014-03-10 18:31:21 +01:00
Steve Workman
65a4092dcf
Bug 975338 - Add PChannelDiverter and new messages to PHttpChannel r=jduell
2014-03-10 18:31:05 +01:00
Robert O'Callahan
d2c4de68fa
Bug 955888. Part 6: In chaos mode, when reading from an HTTP connection, sometimes read less than the full amount of available data. r=jduell
...
--HG--
extra : rebase_source : aab04fbb2a52c7b89dda30410b77bb323fd80de6
2014-03-03 18:12:42 +13:00
Robert O'Callahan
a8f286460f
Bug 955888. Part 5: In chaos mode, insert an HTTP transaction into the pending queue at a random position among transactions with the same priority. r=jduell
...
This effectively means HTTP transactions issue in a random order but priorities
are still respected.
--HG--
extra : rebase_source : 04e3888eee67ca2985d0307ac86c24cfa66de6a8
2014-03-03 18:12:38 +13:00
Ryan VanderMeulen
4b522d63ad
Merge m-c to inbound.
2014-03-06 13:56:13 -05:00
Ethan Tseng
b39081770b
Bug 979761 - [RTSP] Crash when playing RTSP streaming with MPEG AAC Audio codec (regression caused by bug 970271). r=vchang
2014-03-05 16:12:21 +08:00
Honza Bambas
f90a76df78
Bug 960902 - Disallow concurrent HTTP cache read read when validation is needed, r=michal
2014-03-06 14:36:20 +01:00
Ryan VanderMeulen
0d7b59001e
Backed out changeset 6f05267b4afc (bug 798033) for Android bustage.
2014-03-05 09:55:52 -05:00
Honza Bambas
746849fb45
Bug 904571 - crash in mozilla::net::HttpChannelParentListener::OnRedirectResult, r=jduell
2014-03-05 15:01:54 +01:00
snigdha
a441998156
Bug 798033 - Headers should generally not do "using namespace" at file scope. r=jib, r=jmathies, r=rjesup, r=ekr, r=ncameron, r=blassey
2014-03-05 08:47:45 -05:00
Kent James
4f649f049d
Bug 977736 - Rewind stream early in DoAuthRetry. r=honzab
2014-03-04 13:51:37 -05:00
Ehsan Akhgari
eecde05734
Bug 977964 - Move some flags to moz.build; r=glandium
2014-03-03 21:58:37 -05:00
Benjamin Smedberg
94943cb1d8
Bug 881413 - Avoid a race condition in HTTP shutdown by explicitly cancelling nsHttpConnectionMgr::mTimer when we shut down the socket thread, r=mcmanus
2014-02-28 16:40:38 -08:00
Ryan VanderMeulen
5fcc92f054
Merge m-c to inbound.
2014-02-27 17:33:47 -05:00
Carsten "Tomcat" Book
01f93d64ea
Merge mozilla-central to b2g-inbound
2014-02-27 15:59:39 +01:00
Thomas Zimmermann
0d41c050a4
Bug 970271: Fix inaccessible base class nsIStreamListener, r=jduell.mcbugs
...
GCC warns about an inaccessible base class nsIStreamListener in
class RtspChannel. Using protected inheritance in nsBaseChannel
fixes this.
2014-02-27 10:18:34 +01:00
Thomas Zimmermann
48fe549a4e
Bug 970271: Fix GCC warnings about unused variables, r=vchang
2014-02-27 10:18:26 +01:00
Thomas Zimmermann
8b0df2e5f9
Bug 970271: Fix GCC warnings about ignored return value, r=jduell.mcbugs
2014-02-27 10:18:17 +01:00
Thomas Zimmermann
8d60b47c77
Bug 970271: Fix GCC warnings about comparison of signed and unsigned values, r=rjesup
2014-02-27 10:18:10 +01:00
Thomas Zimmermann
2650d61350
Bug 970271: Fix GCC warnings about uninitialized variables, r=jduell.mcbugs
2014-02-27 10:18:00 +01:00
Scott West
195da932bf
Bug 401564 - Test and fix for redirection losing Accept header. r=mcmanus
...
The test has a redirect where the initial GET request had Accept:
application/json, and ensures that this is also the type of the
redirected request.
The fix is done in the setup of the replicated HttpBaseChannel, where
the previous channel's Accept header is copied to the new one, if it
exists.
2014-02-26 09:03:14 -05:00
Andrew McCreight
0353960345
Bug 962608 - Make PL_DHashTableInit infallible by default. r=briansmith,bsmedberg,ehsan,froydnj,jduell,jfkthame,roc,smaug
2014-02-27 10:04:09 -08:00
Patrick McManus
8ba14148f4
bug 975750 - remove httpdatausage r=jduell
2014-02-25 20:39:08 -05:00
Cameron McCormack
250a5a0129
Bug 976912 - Move Telemetry.h include from nsHttpChannel.h to nsHttpChannel.cpp. rs=mcmanus
2014-02-27 10:29:19 +11:00
Girish Sharma
1511ede395
Bug 970246 - Create an http-on-response-set-cookie notification to tell when cookies are created via SET-COOKIE response header. r=honzab
2014-02-27 00:14:42 +05:30
L. David Baron
c91b8791d1
Bug 976350 patch 2: Rename nsTraceRefcntImpl to nsTraceRefcnt. r=bsmedberg
...
Now that bug 975295 removed the obsolete wrapper class, we can rename
nsTraceRefcntImpl back to its correct pre-XPCOM-glue name,
nsTraceRefcnt.
The best part is that the one place where indentation should have needed
fixing, nsTraceRefcnt::DemangleSymbol, never had its indentation fixed
for the previous renaming.
--HG--
rename : xpcom/base/nsTraceRefcntImpl.cpp => xpcom/base/nsTraceRefcnt.cpp
rename : xpcom/base/nsTraceRefcntImpl.h => xpcom/base/nsTraceRefcnt.h
2014-02-26 13:36:36 -08:00
Patrick McManus
748d773593
bug 974932 - spdy large upload chunk sizes, and fewer TLS application data records r=hurley
2014-02-24 16:27:27 -05:00
Chris Peterson
8e5e2743ce
Bug 974785 - Fix -Wsometimes-uninitialized warning in nsHttpConnection.cpp. r=sworkman
2014-02-19 21:54:14 -08:00
James Kitchener
f62a2dcc1e
Bug 464222 - Add a baseURI attribute to nsIViewSourceChannel. r=bz
2014-02-20 08:43:53 -05:00
Patrick McManus
730fb7cb62
bug 973207 - revert 905460 for nightly crashes r=backout
2014-02-17 13:53:25 -05:00
Jeff Muizelaar
a1db66be04
Bug 973256. Don't double printf. r=jdm
...
I suspect this was accidental.
--HG--
extra : rebase_source : 002fd9d384bc8d7b961b58df0c870057fb3e0a18
2014-02-15 23:45:15 -05:00
Steve Workman
45a7b1e326
Bug 970939 - Remove unwanted non-SPDY assertion from nsHttpConnection::StartShortLivedTCPKeepalives() r=mcmanus
2014-02-14 10:49:05 -08:00
Patrick McManus
9f8d9a772d
bug 905460 - necko cleanups: manual ref counts, 32 bit formatters, whitespace r=sworkman
...
--HG--
extra : rebase_source : 2bfdaf1fc84d86ff07ed7fcad14447f591672beb
2014-01-17 17:06:25 -05:00
Patrick McManus
c7d1d27380
bug 971893 crash in onMsgCancelTransaction r=hurley
...
--HG--
extra : rebase_source : 3577ce28650db79883b3c39331d2e44413a2b96a
2014-02-13 10:52:57 -05:00
Patrick McManus
adf9ed6f0c
bug 971001 - backout 625383 for failing awsy r=backout
2014-02-11 16:18:17 -05:00
Ehsan Akhgari
d91d200572
Bug 969757 - Remove the dead code in our tree which pretends to support OS/2; r=roc,mcmanus,gps,jorendorf,bsmedberg sr=bsmedberg
2014-02-10 17:57:01 -05:00
Patrick McManus
c3a11f47df
bug 970279 - tie null transactions to cancel and timeout events r=hurley
2014-02-07 17:30:36 -05:00
Honza Bambas
efab360be6
Bug 969365 - Do ShouldCheckAppCache with AppID and InBrowser in HttpChannelParent, r=jduell
2014-02-07 22:15:25 +01:00
Honza Bambas
76d4ebed1e
Bug 965031 - Improve usage of levels of nsHttp log module, r=mcmanus
2014-02-07 22:15:24 +01:00
Steve Workman
121f9e83ae
Bug 444328 - Enable TCP Keepalive for short and long-lived HTTP Connections (exc. SPDY, WebSockets) r=mcmanus
2014-02-06 11:51:38 -08:00
James Kitchener
3e8a969a0d
Bug 964239 - Give selected channels awareness of srcdoc base URI. r=bz
2014-02-06 09:46:29 -05:00
Ethan Tseng
524ca36ead
Bug 966627 - Fix typos in ARTSPConnection::receiveRTSPReponse/postReceiveReponseEvent. r=sworkman
2014-02-01 20:47:53 +08:00
Patrick McManus
b6275dd517
bug 625383 - optimize http chunked decoder memmoves r=hurley
2014-01-31 22:00:20 -05:00
Honza Bambas
723ab5aff0
Bug 913820 - Base for size limit preferences in HTTP cache v2, r=michal
2014-02-04 01:53:00 +01:00
Honza Bambas
eb9c03b9e5
Bug 949175 - Remove possibility to un-persist a cache entry after it has been opened, r=michal
2014-02-04 01:52:59 +01:00
Patrick McManus
f0d11b753b
bug 965348 - control SocketTransportService::Poll tick during spdy idle r=hurley
2014-01-30 02:29:20 -05:00
Ethan Tseng
c1082ab70e
Bug 951188 - [RTSP][V1.3] No error notification when the RTSP link fails to load. r=sworkman
2014-01-30 10:00:53 +08:00
Nicholas Hurley
15ca033083
Bug 959333 - HTTP/2 should say so in the status line. r=mcmanus
2014-01-29 13:42:19 -08:00
Nicholas Hurley
cec4290744
Bug 951293 - Fix speculative connection limiting. r=mcmanus
2014-01-29 13:39:30 -08:00
Ryan VanderMeulen
3cd00d5594
Merge b2g-inbound to m-c.
2014-01-28 16:12:29 -05:00
Honza Bambas
7cdb98db06
Bug 963703 - Don't use LoadUnblocked flag as cache priority load indication, r=michal
2014-01-28 17:21:21 +01:00
Jim Chen
12ab2e2ac9
Bug 963592 - Perform replacements for updated UA overrides. r=fabrice
2014-01-28 09:04:39 -05:00
Daniel Stenberg
dfa257a455
Bug 676358 - HTTP auth realm parameter parsed as quoted-string doesn't get unescaped r=jduell
2014-01-24 15:07:37 -08:00
Sid Stamm
44162c7454
Bug 861117 - report errors when URIs passed into nsISiteSecurityService::IsSecureURI are malformed. r=briansmith,keeler
2014-01-24 14:37:51 -08:00
Daniel Stenberg
736938c11c
Bug 959100 - Make ParseChunkRemaining detect chunk size overflow. r=jduell
2014-01-17 17:07:29 +01:00
Daniel Stenberg
5b606b8254
Bug 926042 - Convert path length to unsigned ints to avoid overflowing and crashing. r=jduell
2014-01-23 09:38:29 -05:00
Jason Duell
736b2d8de1
Bug 936979: websocket will never connected after a lot of failure r=mcmanus
2014-01-22 19:04:18 -08:00
Honza Bambas
296342b9d9
Bug 958311 - Fix partial content condition in nsHttpChannel, prevent any reuse of doomed files in cache v2, r=michal
2014-01-22 18:54:51 +01:00
Ryan VanderMeulen
32e08fe628
Merge m-c to inbound.
2014-01-17 15:17:49 -05:00
Josh Aas
eca8766d4d
Remove dead code, stuff that used to override IPDL methods that don't exist any more. No bug. r=jduell,eitan
2014-01-17 13:58:05 -06:00
Josh Aas
31f560c053
Bug 960648: Consistently mark IPDL methods as MOZ_OVERRIDE. Part 2. r=bent
2014-01-17 13:49:39 -06:00
Honza Bambas
c0dd1c1e3f
Bug 939567 - HTTP cache v2: nsWyciwygChannel must open cache entry on a single thread, r=michal
2014-01-17 14:32:01 +01:00
Honza Bambas
1a0be10718
Bug 924116 - HTTP cache v2: persists frecency and experiment with half-life, r=michal
2014-01-09 00:27:33 +01:00
Andrea Marchesini
dd1ce74810
Bug 952084 - Porting nsIDOMMozConnection to WebIDL, r=ehsan, r=bz
2014-01-16 11:53:48 +01:00
Ryan VanderMeulen
aa43f6624d
Backed out changeset 8a5f36d486b4 (bug 959100) for bustage.
...
CLOSED TREE
2014-01-17 10:19:31 -05:00
Daniel Stenberg
2cdb53e517
Bug 959100 - Detect chunk size overflow in ParseChunkRemaining. r=jduell
2014-01-17 10:03:44 -05:00
Tom Schuster
f39e81815a
Bug 939294 - Change xpidl jsval to handles. r=gabor,bz,khuey,bsmedberg,terrence
2014-01-09 18:39:36 +01:00
Nicholas Hurley
e53d17dc30
Bug 959799 - Fix autogen include guard error. r=mcmanus
2014-01-15 08:22:30 -05:00
Robert O'Callahan
1dca717865
Bug 946065. Part 5: Move content/events to dom/ and flatten away 'src' directory. r=Ms2ger
...
--HG--
rename : content/events/src/DOMWheelEvent.cpp => dom/events/DOMWheelEvent.cpp
rename : content/events/src/DOMWheelEvent.h => dom/events/DOMWheelEvent.h
rename : content/events/src/EventTarget.cpp => dom/events/EventTarget.cpp
rename : content/events/public/EventTarget.h => dom/events/EventTarget.h
rename : content/events/public/MutationEvent.h => dom/events/MutationEvent.h
rename : content/events/src/PointerEvent.cpp => dom/events/PointerEvent.cpp
rename : content/events/src/PointerEvent.h => dom/events/PointerEvent.h
rename : content/events/src/SpeechRecognitionError.cpp => dom/events/SpeechRecognitionError.cpp
rename : content/events/src/SpeechRecognitionError.h => dom/events/SpeechRecognitionError.h
rename : content/events/src/TextComposition.cpp => dom/events/TextComposition.cpp
rename : content/events/src/TextComposition.h => dom/events/TextComposition.h
rename : content/events/src/Touch.cpp => dom/events/Touch.cpp
rename : content/events/src/Touch.h => dom/events/Touch.h
rename : content/events/crashtests/104310-1.html => dom/events/crashtests/104310-1.html
rename : content/events/crashtests/116206-1.html => dom/events/crashtests/116206-1.html
rename : content/events/crashtests/135345-1.html => dom/events/crashtests/135345-1.html
rename : content/events/crashtests/422009-1.xhtml => dom/events/crashtests/422009-1.xhtml
rename : content/events/crashtests/457776-1.html => dom/events/crashtests/457776-1.html
rename : content/events/crashtests/496308-1.html => dom/events/crashtests/496308-1.html
rename : content/events/crashtests/682637-1.html => dom/events/crashtests/682637-1.html
rename : content/events/crashtests/crashtests.list => dom/events/crashtests/crashtests.list
rename : content/events/crashtests/eventctor-nulldictionary.html => dom/events/crashtests/eventctor-nulldictionary.html
rename : content/events/crashtests/eventctor-nullstorage.html => dom/events/crashtests/eventctor-nullstorage.html
rename : content/events/crashtests/recursive-DOMNodeInserted.html => dom/events/crashtests/recursive-DOMNodeInserted.html
rename : content/events/crashtests/recursive-onload.html => dom/events/crashtests/recursive-onload.html
rename : content/events/src/moz.build => dom/events/moz.build
rename : content/events/src/nsAsyncDOMEvent.cpp => dom/events/nsAsyncDOMEvent.cpp
rename : content/events/public/nsAsyncDOMEvent.h => dom/events/nsAsyncDOMEvent.h
rename : content/events/src/nsContentEventHandler.cpp => dom/events/nsContentEventHandler.cpp
rename : content/events/src/nsContentEventHandler.h => dom/events/nsContentEventHandler.h
rename : content/events/src/nsDOMAnimationEvent.cpp => dom/events/nsDOMAnimationEvent.cpp
rename : content/events/src/nsDOMAnimationEvent.h => dom/events/nsDOMAnimationEvent.h
rename : content/events/src/nsDOMBeforeUnloadEvent.cpp => dom/events/nsDOMBeforeUnloadEvent.cpp
rename : content/events/src/nsDOMBeforeUnloadEvent.h => dom/events/nsDOMBeforeUnloadEvent.h
rename : content/events/src/nsDOMClipboardEvent.cpp => dom/events/nsDOMClipboardEvent.cpp
rename : content/events/src/nsDOMClipboardEvent.h => dom/events/nsDOMClipboardEvent.h
rename : content/events/src/nsDOMCommandEvent.cpp => dom/events/nsDOMCommandEvent.cpp
rename : content/events/src/nsDOMCommandEvent.h => dom/events/nsDOMCommandEvent.h
rename : content/events/src/nsDOMCompositionEvent.cpp => dom/events/nsDOMCompositionEvent.cpp
rename : content/events/src/nsDOMCompositionEvent.h => dom/events/nsDOMCompositionEvent.h
rename : content/events/src/nsDOMDataContainerEvent.cpp => dom/events/nsDOMDataContainerEvent.cpp
rename : content/events/src/nsDOMDataContainerEvent.h => dom/events/nsDOMDataContainerEvent.h
rename : content/events/src/nsDOMDataTransfer.cpp => dom/events/nsDOMDataTransfer.cpp
rename : content/events/src/nsDOMDataTransfer.h => dom/events/nsDOMDataTransfer.h
rename : content/events/src/nsDOMDeviceMotionEvent.cpp => dom/events/nsDOMDeviceMotionEvent.cpp
rename : content/events/src/nsDOMDeviceMotionEvent.h => dom/events/nsDOMDeviceMotionEvent.h
rename : content/events/src/nsDOMDragEvent.cpp => dom/events/nsDOMDragEvent.cpp
rename : content/events/src/nsDOMDragEvent.h => dom/events/nsDOMDragEvent.h
rename : content/events/src/nsDOMEvent.cpp => dom/events/nsDOMEvent.cpp
rename : content/events/src/nsDOMEvent.h => dom/events/nsDOMEvent.h
rename : content/events/src/nsDOMEventTargetHelper.cpp => dom/events/nsDOMEventTargetHelper.cpp
rename : content/events/src/nsDOMEventTargetHelper.h => dom/events/nsDOMEventTargetHelper.h
rename : content/events/src/nsDOMFocusEvent.cpp => dom/events/nsDOMFocusEvent.cpp
rename : content/events/src/nsDOMFocusEvent.h => dom/events/nsDOMFocusEvent.h
rename : content/events/public/nsDOMKeyNameList.h => dom/events/nsDOMKeyNameList.h
rename : content/events/src/nsDOMKeyboardEvent.cpp => dom/events/nsDOMKeyboardEvent.cpp
rename : content/events/src/nsDOMKeyboardEvent.h => dom/events/nsDOMKeyboardEvent.h
rename : content/events/src/nsDOMMessageEvent.cpp => dom/events/nsDOMMessageEvent.cpp
rename : content/events/src/nsDOMMessageEvent.h => dom/events/nsDOMMessageEvent.h
rename : content/events/src/nsDOMMouseEvent.cpp => dom/events/nsDOMMouseEvent.cpp
rename : content/events/src/nsDOMMouseEvent.h => dom/events/nsDOMMouseEvent.h
rename : content/events/src/nsDOMMouseScrollEvent.cpp => dom/events/nsDOMMouseScrollEvent.cpp
rename : content/events/src/nsDOMMouseScrollEvent.h => dom/events/nsDOMMouseScrollEvent.h
rename : content/events/src/nsDOMMutationEvent.cpp => dom/events/nsDOMMutationEvent.cpp
rename : content/events/src/nsDOMMutationEvent.h => dom/events/nsDOMMutationEvent.h
rename : content/events/src/nsDOMNotifyAudioAvailableEvent.cpp => dom/events/nsDOMNotifyAudioAvailableEvent.cpp
rename : content/events/src/nsDOMNotifyAudioAvailableEvent.h => dom/events/nsDOMNotifyAudioAvailableEvent.h
rename : content/events/src/nsDOMNotifyPaintEvent.cpp => dom/events/nsDOMNotifyPaintEvent.cpp
rename : content/events/src/nsDOMNotifyPaintEvent.h => dom/events/nsDOMNotifyPaintEvent.h
rename : content/events/src/nsDOMScrollAreaEvent.cpp => dom/events/nsDOMScrollAreaEvent.cpp
rename : content/events/src/nsDOMScrollAreaEvent.h => dom/events/nsDOMScrollAreaEvent.h
rename : content/events/src/nsDOMSimpleGestureEvent.cpp => dom/events/nsDOMSimpleGestureEvent.cpp
rename : content/events/src/nsDOMSimpleGestureEvent.h => dom/events/nsDOMSimpleGestureEvent.h
rename : content/events/src/nsDOMTextEvent.cpp => dom/events/nsDOMTextEvent.cpp
rename : content/events/src/nsDOMTextEvent.h => dom/events/nsDOMTextEvent.h
rename : content/events/src/nsDOMTouchEvent.cpp => dom/events/nsDOMTouchEvent.cpp
rename : content/events/src/nsDOMTouchEvent.h => dom/events/nsDOMTouchEvent.h
rename : content/events/src/nsDOMTransitionEvent.cpp => dom/events/nsDOMTransitionEvent.cpp
rename : content/events/src/nsDOMTransitionEvent.h => dom/events/nsDOMTransitionEvent.h
rename : content/events/src/nsDOMUIEvent.cpp => dom/events/nsDOMUIEvent.cpp
rename : content/events/src/nsDOMUIEvent.h => dom/events/nsDOMUIEvent.h
rename : content/events/src/nsDOMXULCommandEvent.cpp => dom/events/nsDOMXULCommandEvent.cpp
rename : content/events/src/nsDOMXULCommandEvent.h => dom/events/nsDOMXULCommandEvent.h
rename : content/events/src/nsEventDispatcher.cpp => dom/events/nsEventDispatcher.cpp
rename : content/events/public/nsEventDispatcher.h => dom/events/nsEventDispatcher.h
rename : content/events/src/nsEventListenerManager.cpp => dom/events/nsEventListenerManager.cpp
rename : content/events/src/nsEventListenerManager.h => dom/events/nsEventListenerManager.h
rename : content/events/src/nsEventListenerService.cpp => dom/events/nsEventListenerService.cpp
rename : content/events/src/nsEventListenerService.h => dom/events/nsEventListenerService.h
rename : content/events/public/nsEventNameList.h => dom/events/nsEventNameList.h
rename : content/events/src/nsEventStateManager.cpp => dom/events/nsEventStateManager.cpp
rename : content/events/src/nsEventStateManager.h => dom/events/nsEventStateManager.h
rename : content/events/public/nsEventStates.h => dom/events/nsEventStates.h
rename : content/events/public/nsIEventListenerService.idl => dom/events/nsIEventListenerService.idl
rename : dom/base/nsIJSEventListener.h => dom/events/nsIJSEventListener.h
rename : content/events/src/nsIMEStateManager.cpp => dom/events/nsIMEStateManager.cpp
rename : content/events/src/nsIMEStateManager.h => dom/events/nsIMEStateManager.h
rename : content/events/public/nsIPrivateTextEvent.h => dom/events/nsIPrivateTextEvent.h
rename : content/events/public/nsIPrivateTextRange.h => dom/events/nsIPrivateTextRange.h
rename : dom/src/events/nsJSEventListener.cpp => dom/events/nsJSEventListener.cpp
rename : dom/src/events/nsJSEventListener.h => dom/events/nsJSEventListener.h
rename : content/events/src/nsPaintRequest.cpp => dom/events/nsPaintRequest.cpp
rename : content/events/src/nsPaintRequest.h => dom/events/nsPaintRequest.h
rename : content/events/src/nsPrivateTextRange.cpp => dom/events/nsPrivateTextRange.cpp
rename : content/events/src/nsPrivateTextRange.h => dom/events/nsPrivateTextRange.h
rename : content/events/public/nsVKList.h => dom/events/nsVKList.h
rename : content/events/test/bug226361_iframe.xhtml => dom/events/test/bug226361_iframe.xhtml
rename : content/events/test/bug299673.js => dom/events/test/bug299673.js
rename : content/events/test/bug322588-popup.html => dom/events/test/bug322588-popup.html
rename : content/events/test/bug415498-doc1.html => dom/events/test/bug415498-doc1.html
rename : content/events/test/bug415498-doc2.html => dom/events/test/bug415498-doc2.html
rename : content/events/test/bug426082.html => dom/events/test/bug426082.html
rename : content/events/test/bug457672.html => dom/events/test/bug457672.html
rename : content/events/test/bug591249_iframe.xul => dom/events/test/bug591249_iframe.xul
rename : content/events/test/bug602962.xul => dom/events/test/bug602962.xul
rename : content/events/test/bug656379-1.html => dom/events/test/bug656379-1.html
rename : content/events/test/chrome.ini => dom/events/test/chrome.ini
rename : content/events/test/empty.js => dom/events/test/empty.js
rename : content/events/test/file_bug679494.html => dom/events/test/file_bug679494.html
rename : content/events/test/mochitest.ini => dom/events/test/mochitest.ini
rename : content/events/test/test_addEventListenerExtraArg.html => dom/events/test/test_addEventListenerExtraArg.html
rename : content/events/test/test_all_synthetic_events.html => dom/events/test/test_all_synthetic_events.html
rename : content/events/test/test_bug226361.xhtml => dom/events/test/test_bug226361.xhtml
rename : content/events/test/test_bug238987.html => dom/events/test/test_bug238987.html
rename : content/events/test/test_bug288392.html => dom/events/test/test_bug288392.html
rename : content/events/test/test_bug299673-1.html => dom/events/test/test_bug299673-1.html
rename : content/events/test/test_bug299673-2.html => dom/events/test/test_bug299673-2.html
rename : content/events/test/test_bug322588.html => dom/events/test/test_bug322588.html
rename : content/events/test/test_bug328885.html => dom/events/test/test_bug328885.html
rename : content/events/test/test_bug336682.js => dom/events/test/test_bug336682.js
rename : content/events/test/test_bug336682_1.html => dom/events/test/test_bug336682_1.html
rename : content/events/test/test_bug336682_2.xul => dom/events/test/test_bug336682_2.xul
rename : content/events/test/test_bug367781.html => dom/events/test/test_bug367781.html
rename : content/events/test/test_bug368835.html => dom/events/test/test_bug368835.html
rename : content/events/test/test_bug379120.html => dom/events/test/test_bug379120.html
rename : content/events/test/test_bug391568.xhtml => dom/events/test/test_bug391568.xhtml
rename : content/events/test/test_bug402089.html => dom/events/test/test_bug402089.html
rename : content/events/test/test_bug405632.html => dom/events/test/test_bug405632.html
rename : content/events/test/test_bug409604.html => dom/events/test/test_bug409604.html
rename : content/events/test/test_bug412567.html => dom/events/test/test_bug412567.html
rename : content/events/test/test_bug415498.xul => dom/events/test/test_bug415498.xul
rename : content/events/test/test_bug422132.html => dom/events/test/test_bug422132.html
rename : content/events/test/test_bug426082.html => dom/events/test/test_bug426082.html
rename : content/events/test/test_bug427537.html => dom/events/test/test_bug427537.html
rename : content/events/test/test_bug428988.html => dom/events/test/test_bug428988.html
rename : content/events/test/test_bug432698.html => dom/events/test/test_bug432698.html
rename : content/events/test/test_bug443985.html => dom/events/test/test_bug443985.html
rename : content/events/test/test_bug447736.html => dom/events/test/test_bug447736.html
rename : content/events/test/test_bug448602.html => dom/events/test/test_bug448602.html
rename : content/events/test/test_bug450876.html => dom/events/test/test_bug450876.html
rename : content/events/test/test_bug456273.html => dom/events/test/test_bug456273.html
rename : content/events/test/test_bug457672.html => dom/events/test/test_bug457672.html
rename : content/events/test/test_bug489671.html => dom/events/test/test_bug489671.html
rename : content/events/test/test_bug493251.html => dom/events/test/test_bug493251.html
rename : content/events/test/test_bug502818.html => dom/events/test/test_bug502818.html
rename : content/events/test/test_bug508479.html => dom/events/test/test_bug508479.html
rename : content/events/test/test_bug517851.html => dom/events/test/test_bug517851.html
rename : content/events/test/test_bug534833.html => dom/events/test/test_bug534833.html
rename : content/events/test/test_bug545268.html => dom/events/test/test_bug545268.html
rename : content/events/test/test_bug547996-1.html => dom/events/test/test_bug547996-1.html
rename : content/events/test/test_bug547996-2.xhtml => dom/events/test/test_bug547996-2.xhtml
rename : content/events/test/test_bug556493.html => dom/events/test/test_bug556493.html
rename : content/events/test/test_bug563329.html => dom/events/test/test_bug563329.html
rename : content/events/test/test_bug574663.html => dom/events/test/test_bug574663.html
rename : content/events/test/test_bug586961.xul => dom/events/test/test_bug586961.xul
rename : content/events/test/test_bug591249.xul => dom/events/test/test_bug591249.xul
rename : content/events/test/test_bug591815.html => dom/events/test/test_bug591815.html
rename : content/events/test/test_bug593959.html => dom/events/test/test_bug593959.html
rename : content/events/test/test_bug602962.xul => dom/events/test/test_bug602962.xul
rename : content/events/test/test_bug603008.html => dom/events/test/test_bug603008.html
rename : content/events/test/test_bug605242.html => dom/events/test/test_bug605242.html
rename : content/events/test/test_bug607464.html => dom/events/test/test_bug607464.html
rename : content/events/test/test_bug613634.html => dom/events/test/test_bug613634.html
rename : content/events/test/test_bug615597.html => dom/events/test/test_bug615597.html
rename : content/events/test/test_bug617528.xul => dom/events/test/test_bug617528.xul
rename : content/events/test/test_bug624127.html => dom/events/test/test_bug624127.html
rename : content/events/test/test_bug635465.html => dom/events/test/test_bug635465.html
rename : content/events/test/test_bug641477.html => dom/events/test/test_bug641477.html
rename : content/events/test/test_bug648573.html => dom/events/test/test_bug648573.html
rename : content/events/test/test_bug650493.html => dom/events/test/test_bug650493.html
rename : content/events/test/test_bug656379-1.html => dom/events/test/test_bug656379-1.html
rename : content/events/test/test_bug656379-2.html => dom/events/test/test_bug656379-2.html
rename : content/events/test/test_bug656954.html => dom/events/test/test_bug656954.html
rename : content/events/test/test_bug659071.html => dom/events/test/test_bug659071.html
rename : content/events/test/test_bug659350.html => dom/events/test/test_bug659350.html
rename : content/events/test/test_bug662678.html => dom/events/test/test_bug662678.html
rename : content/events/test/test_bug667612.html => dom/events/test/test_bug667612.html
rename : content/events/test/test_bug667919-1.html => dom/events/test/test_bug667919-1.html
rename : content/events/test/test_bug679494.xul => dom/events/test/test_bug679494.xul
rename : content/events/test/test_bug689564.html => dom/events/test/test_bug689564.html
rename : content/events/test/test_bug698929.html => dom/events/test/test_bug698929.html
rename : content/events/test/test_bug741666.html => dom/events/test/test_bug741666.html
rename : content/events/test/test_bug742376.html => dom/events/test/test_bug742376.html
rename : content/events/test/test_bug812744.html => dom/events/test/test_bug812744.html
rename : content/events/test/test_bug822898.html => dom/events/test/test_bug822898.html
rename : content/events/test/test_bug847597.html => dom/events/test/test_bug847597.html
rename : content/events/test/test_bug855741.html => dom/events/test/test_bug855741.html
rename : content/events/test/test_bug864040.html => dom/events/test/test_bug864040.html
rename : content/events/test/test_bug930374-chrome.html => dom/events/test/test_bug930374-chrome.html
rename : content/events/test/test_bug930374-content.html => dom/events/test/test_bug930374-content.html
rename : content/events/test/test_bug944011.html => dom/events/test/test_bug944011.html
rename : content/events/test/test_bug944847.html => dom/events/test/test_bug944847.html
rename : content/events/test/test_bug946632.html => dom/events/test/test_bug946632.html
rename : content/events/test/test_clickevent_on_input.html => dom/events/test/test_clickevent_on_input.html
rename : content/events/test/test_continuous_wheel_events.html => dom/events/test/test_continuous_wheel_events.html
rename : content/events/test/test_dblclick_explicit_original_target.html => dom/events/test/test_dblclick_explicit_original_target.html
rename : content/events/test/test_dom_keyboard_event.html => dom/events/test/test_dom_keyboard_event.html
rename : content/events/test/test_dom_mouse_event.html => dom/events/test/test_dom_mouse_event.html
rename : content/events/test/test_dom_wheel_event.html => dom/events/test/test_dom_wheel_event.html
rename : content/events/test/test_draggableprop.html => dom/events/test/test_draggableprop.html
rename : content/events/test/test_dragstart.html => dom/events/test/test_dragstart.html
rename : content/events/test/test_eventctors.html => dom/events/test/test_eventctors.html
rename : content/events/test/test_eventctors.xul => dom/events/test/test_eventctors.xul
rename : content/events/test/test_focus_disabled.html => dom/events/test/test_focus_disabled.html
rename : content/events/test/test_messageEvent.html => dom/events/test/test_messageEvent.html
rename : content/events/test/test_moz_mouse_pixel_scroll_event.html => dom/events/test/test_moz_mouse_pixel_scroll_event.html
rename : content/events/test/test_wheel_default_action.html => dom/events/test/test_wheel_default_action.html
rename : content/events/test/window_bug493251.html => dom/events/test/window_bug493251.html
rename : content/events/test/window_bug617528.xul => dom/events/test/window_bug617528.xul
rename : content/events/test/window_bug659071.html => dom/events/test/window_bug659071.html
rename : content/events/test/window_wheel_default_action.html => dom/events/test/window_wheel_default_action.html
extra : rebase_source : 5eb1db8f1791b8842ddc683e3c0ea13e4e3a933b
2014-01-10 16:03:25 +13:00
Honza Bambas
8ee832cff4
Bug 949667 - crash in mozilla::net::HttpChannelParent::OnStartRequest, fail redirect to unsupported protocol on child process, r=jduell
2014-01-14 15:59:00 +01:00
Nicholas Hurley
4655a48e04
Bug 958992 - http/2 draft09 support. r=mcmanus
2014-01-13 17:16:26 -08:00
Ryan VanderMeulen
b998c68cd4
Merge m-c to inbound.
2014-01-13 17:52:40 -05:00
Carsten "Tomcat" Book
8a0fd8f669
Merge mozilla-central to b2g-inbound
2014-01-13 14:44:08 +01:00
Ethan Tseng
252250bbff
Bug 951175 - [RTSP] Disabling the hotspot will cause a system crash while playing RTSP streaming. r=sworkman
2014-01-09 16:18:31 +08:00
Steve Workman
07cc7876a3
Bug 947391 - Cancel HTTP response timeout in OnSocketReadable r=mcmanus
2014-01-08 14:12:33 -08:00
Patrick McManus
e5378a19be
bug 266532 - addons with broken OnDataAvailable contract break http channel progress offsets (reland) r=jduell
2013-12-05 11:25:43 -05:00
Patrick McManus
2311cd485e
bug 959172 - double SpdySession::CleanupStream r=hurley
2014-01-13 10:10:10 -05:00
Ryan VanderMeulen
794c7b3270
Backed out changeset 0d7d5af0b1b1 (bug 266532) for Windows bustage.
...
CLOSED TREE
2014-01-13 13:05:38 -05:00
Patrick McManus
389b753812
bug 266532 - addons with broken OnDataAvailable contract break http channel progress offsets r=jduell
...
--HG--
extra : rebase_source : d9beeef85aa5179f9d2513b56eb37c1dbfdd7a07
2013-12-05 11:25:43 -05:00
Patrick McManus
cb8d9416e8
bug 957093 - namespace consistency for netwerk/protocol/http r=sworkman
...
--HG--
extra : rebase_source : f5b1a5e92239003020e75019efbe78a636150b34
2014-01-07 17:05:56 -05:00