e9367578b98ab35181533c0762e710b7f5607165: Bug 569044 - "e10s HTTP: handle requests with no responseHead" [r=jduell]
Honza Bambas <honzab.moz> - Fri, 18 Jun 2010 03:32:00 -0700 - rev 46911
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Bug 569044 - "e10s HTTP: handle requests with no responseHead" [r=jduell]
7050d2595c2da5d660ec1e0c62af72dbe0cc4943: Merged again from m-c to get latest bits and avoid deleted branch issue.
Jason Duell <jduell.mcbugs@gmail.com> - Tue, 22 Jun 2010 17:57:09 -0700 - rev 46910
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Merged again from m-c to get latest bits and avoid deleted branch issue.
155d97b3f8c9f6e74239e9cca56db40e53610dc1: Merge from m-c.
Jason Duell <jduell.mcbugs@gmail.com> - Tue, 22 Jun 2010 17:33:57 -0700 - rev 46909
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Merge from m-c. Fair amount of merge conflicts. Biggest item was changes to nsHttpChannel from web sockets changes. Other likely suspects if things are borken: nsFrameLoader.cpp: - nsFrameLoader::EnsureMessageManager: pass "this" (orig e10s code) or nsnull (m-c) to local process call to new nsFrameMessageManager(), callback arg? Smaug said null. - only calling SetCallBackData for local case. also +r smaug. nsPrefBranch.cpp had fairly extensive merge conflicts. nsChromeRegistry had lots of changes. Dougt did most of the non-necko changes (thanks).
f80302dc4c6cdc3ec12ca024388f3bc3a70f62cf: Bug 569227 - Join HttpChannelChild with its TabChild, r=smaug
Honza Bambas <honzab.moz@firemni.cz> - Fri, 18 Jun 2010 12:49:28 +0200 - rev 46908
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Bug 569227 - Join HttpChannelChild with its TabChild, r=smaug
f5adde791b93168cceb4ee3f6cc3969510fd8b17: Bug 564382 - Remove CPOWs from PContentProcess tree. r=olli
Josh Matthews <josh@joshmatthews.net> - Thu, 17 Jun 2010 14:10:14 -0700 - rev 46907
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Bug 564382 - Remove CPOWs from PContentProcess tree. r=olli
b480c5f26a702b7745bcee1dd1358c70a5b138e2: Bug 570867 - e10s http: add cookies to request in child, not parent [r=dwitte]
Benjamin Stover <bstover@mozilla.com> - Tue, 15 Jun 2010 16:07:10 -0700 - rev 46906
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Bug 570867 - e10s http: add cookies to request in child, not parent [r=dwitte]
f2ef80cc432f203ed7b0cf6f71c68bafeea70acf: Bug 571380, e10s: build problem in content/canvas/src/nsCanvasRenderingContext2D.cpp(2653), r=roc
Honza Bambas <honzab.moz@firemni.cz> - Sat, 12 Jun 2010 13:37:59 +0200 - rev 46905
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Bug 571380, e10s: build problem in content/canvas/src/nsCanvasRenderingContext2D.cpp(2653), r=roc
780d60ef1a75c525a5a19e93caf9d7271576e53a: Add bug numbers for all TODO items that lack them in necko e10s code. r=cjones
Jason Duell <jduell.mcbugs@gmail.com> - Wed, 09 Jun 2010 20:19:28 -0700 - rev 46904
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Add bug numbers for all TODO items that lack them in necko e10s code. r=cjones
712c3d00ba300098e475e1356f8b5cf74a518eb0: Bug 570945 - Qt is not compiling. r=me. Slightly modifed based on chris.jones comments
Doug Turner <dougt@dougt.org> - Wed, 09 Jun 2010 16:02:38 -0700 - rev 46903
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Bug 570945 - Qt is not compiling. r=me. Slightly modifed based on chris.jones comments
e3bf810e91596f4b678df580a24aca9c3e53635a: Bug 568632 - rename MozGetShmemContent to MozGetAsyncContext. r=joe
Oleg Romashin <romaxa@gmail.com> - Tue, 08 Jun 2010 13:27:24 -0400 - rev 46902
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Bug 568632 - rename MozGetShmemContent to MozGetAsyncContext. r=joe
c11f32e403db04365475b6b46e141aed8f3744b6: Bug 569270 - Assertion on child process shutdown in xpcshell. r=dwitte
Frederic Plourde<frederic.plourde@polymtl.ca> - Tue, 08 Jun 2010 07:57:47 -0400 - rev 46901
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Bug 569270 - Assertion on child process shutdown in xpcshell. r=dwitte
250fd088e49dfc213c189d95bbd4a72b9229d6da: HttpBaseChannel.cpp was missing from the http fixup in rev 03c8158afebe
Doug Turner <dougt@dougt.org> - Mon, 07 Jun 2010 15:54:54 -0700 - rev 46900
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
HttpBaseChannel.cpp was missing from the http fixup in rev 03c8158afebe
3825724e7f06ea46360ae092b59dbbf4a3a68c56: Fix up the chrome registry. I think the mc->e10s merge was bad
Doug Turner <dougt@dougt.org> - Mon, 07 Jun 2010 15:49:12 -0700 - rev 46899
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Fix up the chrome registry. I think the mc->e10s merge was bad
ebeb7279db4a3f02e651f83c59c003a4c76134d3: Adjust the netwerk/ipc makefile so that it can find http sources
Doug Turner <dougt@dougt.org> - Mon, 07 Jun 2010 15:02:45 -0700 - rev 46898
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Adjust the netwerk/ipc makefile so that it can find http sources
2dff2dec513f87e1f8b03973c80f29aa1d00910a: Fixing up the res makefile
Doug Turner <dougt@dougt.org> - Mon, 07 Jun 2010 14:53:35 -0700 - rev 46897
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Fixing up the res makefile
2f5993d0b7e817e59649f6daf84f70ad4384fe46: Add cookie tests to xpcshell tests.
Dan Witte <dwitte@mozilla.com> - Mon, 07 Jun 2010 15:13:03 -0700 - rev 46896
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Add cookie tests to xpcshell tests.
03c8158afebe4bc410deef00a17d7f29ca94b808: Fixup to http after the necko-file-move
Doug Turner <dougt@dougt.org> - Mon, 07 Jun 2010 14:40:08 -0700 - rev 46895
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Fixup to http after the necko-file-move
55fae139a210f8be3f3fcab9df71a7bab5ec2113: Moving cookie ipc source to the right place.
Doug Turner <dougt@dougt.org> - Mon, 07 Jun 2010 14:19:20 -0700 - rev 46894
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Moving cookie ipc source to the right place.
a9d29c4a712b2ec4827f77b3e6a8867cf6b97db6: Merging with M-C.
Doug Turner <dougt@dougt.org> - Mon, 07 Jun 2010 13:38:02 -0700 - rev 46893
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Merging with M-C. Hand merged the following files: U chrome/src/nsChromeRegistry.cpp U chrome/src/nsChromeRegistry.h U content/base/src/nsFrameLoader.cpp U content/base/src/nsFrameLoader.h U dom/src/geolocation/nsGeolocation.cpp U dom/src/geolocation/nsGeolocation.h U netwerk/build/Makefile.in U netwerk/cookie/nsCookieService.cpp U netwerk/cookie/nsCookieService.h
9528774c42de180a006ca3a6175a73c2bb7fead7: Bug 565475 - Allow 3rd party cookies for session only. r=sdwilsh
Dan Witte <dwitte@mozilla.com> - Mon, 07 Jun 2010 12:32:12 -0700 - rev 46892
Push 14210 by dougt@mozilla.com at Thu, 01 Jul 2010 06:28:42 +0000
Bug 565475 - Allow 3rd party cookies for session only. r=sdwilsh
(0) -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 +300000 tip