74929 2011-12-20 07:20:35 -0800 webkit-patch apply-attachment is very slow for big patches 2012-05-14 05:07:42 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60223 1 ossy ossy abarth blambov ddkilzer dpranke eric krit ojan ossy rwlbuis webkit.review.bot wsiegrist zarvai zimmermann oldest_to_newest 524602 0 ossy 2011-12-20 07:20:35 -0800 I ran into this problem, because Qt EWS was very very slow today. And the slowness was caused by big patches in https://bugs.webkit.org/show_bug.cgi?id=73643 I measured a little bit and found that apply-attachment is absolutely non effective now. apply-attachment: 640 sec ($ Tools/Scripts/webkit-patch apply-attachment 120013) - Fetching: https://bugs.webkit.org/attachment.cgi?id=120013&action=edit : 100 sec - Fetching: https://bugs.webkit.org/show_bug.cgi?id=73643&ctype=xml : 420 sec - Processing patch 120013 from bug 73643 : 120 sec my simple method: 85 sec ($ wget https://bugs.webkit.org/attachment.cgi?id=120013 $ Tools/Scripts/svn-apply attachment.cgi?id=120013) - wget: 60 sec - svn-apply: 25 sec It would be great if we can make webkit-patch apply-attachment faster for huge patches to make EWS bots faster. 524717 1 abarth 2011-12-20 11:41:11 -0800 Assigned for investigation. Feel free to steal. 524749 2 eric 2011-12-20 12:11:18 -0800 I suspect it's because we load the entire attachment into memory. Probably multiple times. see attachment.py: def contents(self): # FIXME: We shouldn't be grabbing at _bugzilla. return self._bug._bugzilla.fetch_attachment_contents(self.id()) Then we apply the contents via applypatch.py: self._tool.checkout().apply_patch(state["patch"], force=self._options.non_interactive or self._options.force_patch) which in turn pipes it through: self._executive.run_command(args, input=patch.contents()) I suspect that for starters, we should make sure contents() is never called more than once (And if so, cache the value). 594332 3 ossy 2012-04-03 03:07:03 -0700 I ran into this bug again with a huge sized bug: EWS did the following things: Fetching: https://bugs.webkit.org/attachment.cgi?id=135006&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=25206&ctype=xml Fetching: https://bugs.webkit.org/attachment.cgi?id=135006&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=25206&ctype=xml Fetching: https://bugs.webkit.org/show_bug.cgi?id=25206&ctype=xml Unfortunately https://bugs.webkit.org/show_bug.cgi?id=25206&ctype=xml is 104Mb sized and it takes ~9.5 minutes to fetch it. I'm going to pick up this bug. 594334 4 zimmermann 2012-04-03 03:12:42 -0700 (In reply to comment #3) > I ran into this bug again with a huge sized bug: > > EWS did the following things: > Fetching: https://bugs.webkit.org/attachment.cgi?id=135006&action=edit > Fetching: https://bugs.webkit.org/show_bug.cgi?id=25206&ctype=xml > Fetching: https://bugs.webkit.org/attachment.cgi?id=135006&action=edit > Fetching: https://bugs.webkit.org/show_bug.cgi?id=25206&ctype=xml > Fetching: https://bugs.webkit.org/show_bug.cgi?id=25206&ctype=xml > > Unfortunately https://bugs.webkit.org/show_bug.cgi?id=25206&ctype=xml > is 104Mb sized and it takes ~9.5 minutes to fetch it. > > I'm going to pick up this bug. Just a quick FYI: WildFox: Ossy: nope, I have no clue of webkitpy, I only know how to make it check the big file checkbox WildFox: Ossy: Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py WildFox: Ossy: in "def _fill_attachment_form", right after "self.browser['ispatch'] = ("1",)" inject: WildFox: Ossy: self.browser['bigfile'] = ("bigfile",) This makes us always check the big file check box.. What we really should do is figure out the size before, and eventually check it, if needed (I'd even ask the user, your patch is XXX MB, do you really want to upload it...) 594338 5 eric 2012-04-03 03:20:35 -0700 We keep the patch in memory. Maybe more than one copy. :) 594425 6 ossy 2012-04-03 06:13:21 -0700 https://bugs.webkit.org/show_bug.cgi?id=25206 This bug has many 7.5-10Mb sized attachments from Chromium EWS. It is overkiller for EWS bots fetch the whole bug 3 times. :( ( For Qt EWS it takes 30 minutes to process a patch from this bug. :( ) Can we make Chromium EWS not to upload huge diffs? URLs point to an external storage would be better. 594489 7 ossy 2012-04-03 08:10:53 -0700 The size of the bug is 105Mb. :(( Our EWS always dies with OOM during processing this huge XML. 594490 8 rwlbuis 2012-04-03 08:14:25 -0700 Hi Ossy, (In reply to comment #7) > The size of the bug is 105Mb. :(( > > Our EWS always dies with OOM during processing this huge XML. I was wondering, would obsoleting those archive attachments help? Cheers, Rob. 594500 9 ossy 2012-04-03 08:23:09 -0700 (In reply to comment #8) > Hi Ossy, > > (In reply to comment #7) > > The size of the bug is 105Mb. :(( > > > > Our EWS always dies with OOM during processing this huge XML. > > I was wondering, would obsoleting those archive attachments help? > Cheers, > > Rob. I hope, let's see. I'll remove the r? from the patch, and then put it back after EWSs dropped it from their queue. 594752 10 eric 2012-04-03 12:34:15 -0700 I see. This has little to do with the attachment fetch, and all do to with the fact that bugzilla at some point started including attachments in the ctype=xml response. I've seen this for a while, but don't know how to fix it. Presumably we'll have to move off of ctype=xml, onto some custom BeautifulSoup parsing of the normal page. :( Ah! I see. It's a template option: https://bugzilla.mozilla.org/show_bug.cgi?id=302669 We'll just have to fix our template. 594755 11 eric 2012-04-03 12:36:36 -0700 http://trac.webkit.org/browser/trunk/Websites/bugs.webkit.org/template/en/default/bug/show.xml.tmpl#L106 I'm not sure how we disable the "displayfields.attachmentdata" option, but I'm sure we can figure it out. :) We can also copy that template over to the custom section and modify it as we see fit. 601222 12 136911 zarvai 2012-04-12 07:45:06 -0700 Created attachment 136911 show.xml.tmpl add bugs.webkit.org/template/en/custom/bug/show.xml.tmpl : I replaced this section [% IF displayfields.attachmentdata %] <data encoding="base64">[% a.data FILTER base64 %]</data> with this content: [% IF displayfields.attachmentdata %] [%# Return URL of attachment instead of data #%] <url>[% urlbase FILTER uri FILTER html %]attachment.cgi?id=[% a.id %]</url> Is it a valid solution for this problem? Is any other modification necessary to apply the new template file? 601334 13 eric 2012-04-12 10:37:06 -0700 Looks fine to me, but ddkilzer or wms would be better reviewers. 601335 14 136911 eric 2012-04-12 10:37:50 -0700 Comment on attachment 136911 show.xml.tmpl I'm going to r+, but please give them 24 hours to comment before changing to cq+. We're in no rush here. 604722 15 137684 ddkilzer 2012-04-18 07:39:51 -0700 Created attachment 137684 Diff between default and custom show.xml.tmpl 604725 16 ddkilzer 2012-04-18 07:53:02 -0700 (In reply to comment #10) > I see. This has little to do with the attachment fetch, and all do to with the fact that bugzilla at some point started including attachments in the ctype=xml response. I've seen this for a while, but don't know how to fix it. Presumably we'll have to move off of ctype=xml, onto some custom BeautifulSoup parsing of the normal page. :( > > Ah! I see. It's a template option: > https://bugzilla.mozilla.org/show_bug.cgi?id=302669 > > We'll just have to fix our template. Looking at the patches on that b.m.o. bug, it seems like adding this query parameter to the URL fetching the data would do the same thing: excludefield=attachmentdata Did anyone try modifying webkit-patch to add that query parameter to "ctype=xml"? I only ask because modifying templates in Bugzilla means that the template modification has to be reapplied every time we update Bugzilla, which tends to be labor-intensive. If we can just exclude the attachment data (and aren't using the attachment URL for anything), that seems like a better approach. Yes, I really think we should add the "excludefield=attachmentdata" query parameter instead. 604726 17 136911 ddkilzer 2012-04-18 07:53:50 -0700 Comment on attachment 136911 show.xml.tmpl r- since we should just add "excludefield=attachmentdata" to the URL to exclude this field from the XML. Compare these two URLs: https://bugs.webkit.org/show_bug.cgi?id=25206&ctype=xml https://bugs.webkit.org/show_bug.cgi?id=25206&ctype=xml&excludefield=attachmentdata 604730 18 ossy 2012-04-18 07:56:54 -0700 (In reply to comment #17) > (From update of attachment 136911 [details]) > r- since we should just add "excludefield=attachmentdata" to the URL to exclude this field from the XML. Compare these two URLs: > > https://bugs.webkit.org/show_bug.cgi?id=25206&ctype=xml > https://bugs.webkit.org/show_bug.cgi?id=25206&ctype=xml&excludefield=attachmentdata Yayyy, it will be so simpler. Zoltán, could you prepare a patch to make webkit-patch add "&excludefield=attachmentdata" to the query? 604752 19 137695 ddkilzer 2012-04-18 08:19:37 -0700 Created attachment 137695 Untested fix to add "excludefield=attachmentdata" everywhere "ctype=xml" is used 604755 20 ddkilzer 2012-04-18 08:20:40 -0700 (In reply to comment #19) > Created an attachment (id=137695) [details] > Untested fix to add "excludefield=attachmentdata" everywhere "ctype=xml" is used I don't have time to test this, but this is basically the type of fix I'm suggesting. 604876 21 137695 eric 2012-04-18 10:39:55 -0700 Comment on attachment 137695 Untested fix to add "excludefield=attachmentdata" everywhere "ctype=xml" is used If this works, this sounds like the better fix, yes. I wonder what other options to show_bug.cgi I should know about. :) 606511 22 zarvai 2012-04-20 05:00:41 -0700 I ran some test with the patch, it seems ok. 618591 23 ossy 2012-05-08 10:07:57 -0700 Oh ... I thought it is fixed long time ago. :) If you guys don't want to submit the full patch, I'll do it tomorrow. 618592 24 ossy 2012-05-08 10:09:02 -0700 (In reply to comment #23) > Oh ... I thought it is fixed long time ago. :) If you guys don't want to submit the full patch, I'll do it tomorrow. We really need this patch, because Qt EWS bots are dying now, because they try to fetch https://bugs.webkit.org/show_bug.cgi?id=84614 618595 25 137695 abarth 2012-05-08 10:11:53 -0700 Comment on attachment 137695 Untested fix to add "excludefield=attachmentdata" everywhere "ctype=xml" is used Looks like this just needs a ChangeLog. 619250 26 140878 ossy 2012-05-09 00:59:40 -0700 Created attachment 140878 r+-ed patch with changelog 619252 27 140878 ossy 2012-05-09 01:00:53 -0700 Comment on attachment 140878 r+-ed patch with changelog David, is it OK for you? :) 622818 28 140878 ossy 2012-05-14 04:16:21 -0700 Comment on attachment 140878 r+-ed patch with changelog There wasn't any objection in the last 3 weeks, so we shouldn't wait more (and block fixing this annoying bug). 622852 29 140878 webkit.review.bot 2012-05-14 05:07:34 -0700 Comment on attachment 140878 r+-ed patch with changelog Clearing flags on attachment: 140878 Committed r116934: <http://trac.webkit.org/changeset/116934> 622853 30 webkit.review.bot 2012-05-14 05:07:42 -0700 All reviewed patches have been landed. Closing bug. 136911 2012-04-12 07:45:06 -0700 2012-04-18 08:19:37 -0700 show.xml.tmpl template.patch text/plain 6936 zarvai ZGlmZiAtLWdpdCBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFuZ2VMb2cgYi9XZWJzaXRl cy9idWdzLndlYmtpdC5vcmcvQ2hhbmdlTG9nCmluZGV4IGU5OTViODMuLjIzMzc4OTggMTAwNjQ0 Ci0tLSBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFuZ2VMb2cKKysrIGIvV2Vic2l0ZXMv YnVncy53ZWJraXQub3JnL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA0LTEyICBa b2x0YW4gQXJ2YWkgIDx6YXJ2YWlAaW5mLnUtc3plZ2VkLmh1PgorCisgICAgICAgIFJlcGxhY2lu ZyBhdHRhY2htZW50IGRhdGEgd2l0aCB0aGUgdXJsIG9mIHRoZSBhdHRhY2htZW50IGRhdGEgaW4g WE1MIG91dHB1dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzQ5MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBQYXJzaW5nIGJ1Z3Mgd2l0aCBodWdlIGF0dGFjaG1lbnRzIHNsb3dzIGRvd24gUXQgRVdTLiAK KworICAgICAgICAqIHRlbXBsYXRlL2VuL2N1c3RvbS9idWcvc2hvdy54bWwudG1wbDogQWRkZWQu CisKIDIwMTItMDQtMDEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAg ICBDb2RlIHJldmlldyB0b29sIG5vIGxvbmdlciBuZWVkcyB0byB3b3JrIGFyb3VuZCBwb3NpdGlv bjpmaXhlZCBoYW5kbGluZyBvbiBpUGFkCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9idWdzLndlYmtp dC5vcmcvdGVtcGxhdGUvZW4vY3VzdG9tL2J1Zy9zaG93LnhtbC50bXBsIGIvV2Vic2l0ZXMvYnVn cy53ZWJraXQub3JnL3RlbXBsYXRlL2VuL2N1c3RvbS9idWcvc2hvdy54bWwudG1wbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xOGZiZDIyCi0tLSAvZGV2L251bGwKKysrIGIv V2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL3RlbXBsYXRlL2VuL2N1c3RvbS9idWcvc2hvdy54bWwu dG1wbApAQCAtMCwwICsxLDE0OCBAQAorWyUjIFRoZSBjb250ZW50cyBvZiB0aGlzIGZpbGUgYXJl IHN1YmplY3QgdG8gdGhlIE1vemlsbGEgUHVibGljCisgICMgTGljZW5zZSBWZXJzaW9uIDEuMSAo dGhlICJMaWNlbnNlIik7IHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUKKyAgIyBleGNlcHQgaW4g Y29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLiBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YKKyAg IyB0aGUgTGljZW5zZSBhdCBodHRwOi8vd3d3Lm1vemlsbGEub3JnL01QTC8KKyAgIworICAjIFNv ZnR3YXJlIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFu ICJBUworICAjIElTIiBiYXNpcywgV0lUSE9VVCBXQVJSQU5UWSBPRiBBTlkgS0lORCwgZWl0aGVy IGV4cHJlc3Mgb3IKKyAgIyBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZp YyBsYW5ndWFnZSBnb3Zlcm5pbmcKKyAgIyByaWdodHMgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRo ZSBMaWNlbnNlLgorICAjCisgICMgVGhlIE9yaWdpbmFsIENvZGUgaXMgdGhlIEJ1Z3ppbGxhIEJ1 ZyBUcmFja2luZyBTeXN0ZW0uCisgICMKKyAgIyBUaGUgSW5pdGlhbCBEZXZlbG9wZXIgb2YgdGhl IE9yaWdpbmFsIENvZGUgaXMgTmV0c2NhcGUgQ29tbXVuaWNhdGlvbnMKKyAgIyBDb3Jwb3JhdGlv bi4gUG9ydGlvbnMgY3JlYXRlZCBieSBOZXRzY2FwZSBhcmUKKyAgIyBDb3B5cmlnaHQgKEMpIDE5 OTggTmV0c2NhcGUgQ29tbXVuaWNhdGlvbnMgQ29ycG9yYXRpb24uIEFsbAorICAjIFJpZ2h0cyBS ZXNlcnZlZC4KKyAgIworICAjIENvbnRyaWJ1dG9yKHMpOiBCcmFkbGV5IEJhZXR6IDxiYmFldHpA c3R1ZGVudC51c3lkLmVkdS5hdT4KKyAgIyAgICAgICAgICAgICAgICAgQ29saW4gT2dpbHZpZSA8 bW96aWxsYUBjb2xpbm9naWx2aWUuY28udWs+CisgICMKKyAgIyVdCitbJSBQUk9DRVNTIGJ1Zy90 aW1lLmh0bWwudG1wbCAlXQorPD94bWwgdmVyc2lvbj0iMS4wIiBbJSBJRiBQYXJhbSgndXRmOCcp ICVdZW5jb2Rpbmc9IlVURi04IiBbJSBFTkQgJV1zdGFuZGFsb25lPSJ5ZXMiID8+Cis8IURPQ1RZ UEUgYnVnemlsbGEgU1lTVEVNICJbJSB1cmxiYXNlIEZJTFRFUiBodG1sICVdYnVnemlsbGEuZHRk Ij4KKworPGJ1Z3ppbGxhIHZlcnNpb249IlslIGNvbnN0YW50cy5CVUdaSUxMQV9WRVJTSU9OICVd IgorICAgICAgICAgIHVybGJhc2U9IlslIHVybGJhc2UgRklMVEVSIHhtbCAlXSIKKyAgICAgICAg ICBtYWludGFpbmVyPSJbJSBQYXJhbSgnbWFpbnRhaW5lcicpIEZJTFRFUiB4bWwgJV0iCitbJSBJ RiB1c2VyLmlkICVdCisgICAgICAgICAgZXhwb3J0ZXI9IlslIHVzZXIuZW1haWwgRklMVEVSIHht bCAlXSIKK1slIEVORCAlXQorPgorCitbJSBGT1JFQUNIIGJ1ZyA9IGJ1Z3MgJV0KKyAgWyUgSUYg YnVnLmVycm9yICVdCisgICAgPGJ1ZyBlcnJvcj0iWyUgYnVnLmVycm9yIEZJTFRFUiB4bWwgJV0i PgorICAgICAgPGJ1Z19pZD5bJSBidWcuYnVnX2lkIEZJTFRFUiB4bWwgJV08L2J1Z19pZD4KKyAg ICA8L2J1Zz4KKyAgWyUgRUxTRSAlXQorICAgIDxidWc+CisgICAgICBbJSBGT1JFQUNIIGZpZWxk ID0gYnVnLmZpZWxkcyAlXQorICAgICAgICBbJSBJRiBkaXNwbGF5ZmllbGRzLiRmaWVsZCAlXQor ICAgICAgICAgIFslKyBQUk9DRVNTIGJ1Z19maWVsZCAlXQorICAgICAgICBbJSBFTkQgJV0KKyAg ICAgIFslIEVORCAlXQorCisgICAgICBbJSMgVGhpcyBpcyBoZXJlIHNvIGF1dG9tYXRlZCBjbGll bnRzIGNhbiBzdGlsbCB1c2UgcHJvY2Vzc19idWcuY2dpICVdCisgICAgICBbJSBJRiBkaXNwbGF5 ZmllbGRzLnRva2VuICYmIHVzZXIuaWQgJV0KKyAgICAgICAgICA8dG9rZW4+WyUgaXNzdWVfaGFz aF90b2tlbihbYnVnLmlkLCBidWcuZGVsdGFfdHNdKSBGSUxURVIgeG1sICVdPC90b2tlbj4KKyAg ICAgIFslIEVORCAlXQorCisgICAgICBbJSMgTm93IGhhbmRsZSAnc3BlY2lhbCcgZmllbGRzICMl XQorICAgICAgWyUgSUYgZGlzcGxheWZpZWxkcy5ncm91cCAlXQorICAgICAgICBbJSBGT1JFQUNI IGcgPSBidWcuZ3JvdXBzICVdCisgICAgICAgICAgWyUgTkVYVCBVTkxFU1MgZy5pc29uICVdCisg ICAgICAgICAgPGdyb3VwPlslIGcubmFtZSBGSUxURVIgeG1sICVdPC9ncm91cD4KKyAgICAgICAg WyUgRU5EICVdCisgICAgICBbJSBFTkQgJV0KKworICAgICAgWyUjIEJ1ZyBGbGFncyAlXQorICAg ICAgWyUgRk9SRUFDSCB0eXBlID0gYnVnLmZsYWdfdHlwZXMgJV0KKyAgICAgICAgWyUgRk9SRUFD SCBmbGFnID0gdHlwZS5mbGFncyAlXQorICAgICAgICAgIDxmbGFnIG5hbWU9IlslIHR5cGUubmFt ZSBGSUxURVIgeG1sICVdIgorICAgICAgICAgICAgICAgIGlkPSJbJSBmbGFnLmlkIEZJTFRFUiB4 bWwgJV0iCisgICAgICAgICAgICAgICAgc3RhdHVzPSJbJSBmbGFnLnN0YXR1cyBGSUxURVIgeG1s ICVdIgorICAgICAgICAgICAgICAgIHNldHRlcj0iWyUgZmxhZy5zZXR0ZXIubG9naW4gRklMVEVS IHhtbCAlXSIKKyAgICAgICAgICBbJSBJRiBmbGFnLnJlcXVlc3RlZSAlXQorICAgICAgICAgICAg ICByZXF1ZXN0ZWU9IlslIGZsYWcucmVxdWVzdGVlLmxvZ2luIEZJTFRFUiB4bWwgJV0iCisgICAg ICAgICAgWyUgRU5EICVdCisgICAgICAgICAgLz4KKyAgICAgICAgWyUgRU5EICVdCisgICAgICBb JSBFTkQgJV0KKyAgICAgIFslIElGIGRpc3BsYXlmaWVsZHMubG9uZ19kZXNjICVdCisgICAgICAg IFslIEZPUkVBQ0ggYyA9IGJ1Zy5sb25nZGVzY3MgJV0KKyAgICAgICAgICBbJSBORVhUIElGIGMu aXNwcml2YXRlICYmICF1c2VyLmluX2dyb3VwKFBhcmFtKCJpbnNpZGVyZ3JvdXAiKSkgJV0KKyAg ICAgICAgICA8bG9uZ19kZXNjIGlzcHJpdmF0ZT0iWyUgYy5pc3ByaXZhdGUgRklMVEVSIHhtbCAl XSI+CisgICAgICAgICAgICA8d2hvIG5hbWU9IlslIGMuYXV0aG9yLm5hbWUgRklMVEVSIHhtbCAl XSI+WyUgYy5hdXRob3IuZW1haWwgRklMVEVSIHhtbCAlXTwvd2hvPgorICAgICAgICAgICAgPGJ1 Z193aGVuPlslIGMudGltZSBGSUxURVIgdGltZSBGSUxURVIgeG1sICVdPC9idWdfd2hlbj4KKyAg ICAgICAgICAgIFslIElGIHVzZXIuaW5fZ3JvdXAoUGFyYW0oJ3RpbWV0cmFja2luZ2dyb3VwJykp ICYmIChjLndvcmtfdGltZSAtIDAgIT0gMCkgJV0KKyAgICAgICAgICAgICAgPHdvcmtfdGltZT5b JSBQUk9DRVNTIGZvcm1hdHRpbWV1bml0IHRpbWVfdW5pdCA9IGMud29ya190aW1lIEZJTFRFUiB4 bWwgJV08L3dvcmtfdGltZT4KKyAgICAgICAgICAgIFslIEVORCAlXQorICAgICAgICAgICAgPHRo ZXRleHQ+WyUgYy5ib2R5IEZJTFRFUiB4bWwgJV08L3RoZXRleHQ+CisgICAgICAgICAgPC9sb25n X2Rlc2M+CisgICAgICAgIFslIEVORCAlXQorICAgICAgWyUgRU5EICVdCisgICAgICAKKyAgICAg IFslIElGIGRpc3BsYXlmaWVsZHMuYXR0YWNobWVudCAlXQorICAgICAgICBbJSBGT1JFQUNIIGEg PSBidWcuYXR0YWNobWVudHMgJV0KKyAgICAgICAgICBbJSBORVhUIElGIGEuaXNwcml2YXRlICYm ICF1c2VyLmluX2dyb3VwKFBhcmFtKCJpbnNpZGVyZ3JvdXAiKSkgJV0KKyAgICAgICAgICA8YXR0 YWNobWVudAorICAgICAgICAgICAgICBpc29ic29sZXRlPSJbJSBhLmlzb2Jzb2xldGUgRklMVEVS IHhtbCAlXSIKKyAgICAgICAgICAgICAgaXNwYXRjaD0iWyUgYS5pc3BhdGNoIEZJTFRFUiB4bWwg JV0iCisgICAgICAgICAgICAgIGlzcHJpdmF0ZT0iWyUgYS5pc3ByaXZhdGUgRklMVEVSIHhtbCAl XSIKKyAgICAgICAgICA+CisgICAgICAgICAgICA8YXR0YWNoaWQ+WyUgYS5pZCAlXTwvYXR0YWNo aWQ+CisgICAgICAgICAgICA8ZGF0ZT5bJSBhLmF0dGFjaGVkIEZJTFRFUiB0aW1lIEZJTFRFUiB4 bWwgJV08L2RhdGU+CisgICAgICAgICAgICA8ZGVzYz5bJSBhLmRlc2NyaXB0aW9uIEZJTFRFUiB4 bWwgJV08L2Rlc2M+CisgICAgICAgICAgICA8ZmlsZW5hbWU+WyUgYS5maWxlbmFtZSBGSUxURVIg eG1sICVdPC9maWxlbmFtZT4KKyAgICAgICAgICAgIDx0eXBlPlslIGEuY29udGVudHR5cGUgRklM VEVSIHhtbCAlXTwvdHlwZT4KKyAgICAgICAgICAgIDxzaXplPlslIGEuZGF0YXNpemUgRklMVEVS IHhtbCAlXTwvc2l6ZT4KKyAgICAgICAgICAgIDxhdHRhY2hlcj5bJSBhLmF0dGFjaGVyLmVtYWls IEZJTFRFUiB4bWwgJV08L2F0dGFjaGVyPgorICAgICAgICAgICAgWyUjIFRoaXMgaXMgaGVyZSBz byBhdXRvbWF0ZWQgY2xpZW50cyBjYW4gc3RpbGwgdXNlIGF0dGFjaG1lbnQuY2dpICVdCisgICAg ICAgICAgICBbJSBJRiBkaXNwbGF5ZmllbGRzLnRva2VuICYmIHVzZXIuaWQgJV0KKyAgICAgICAg ICAgICAgPHRva2VuPlslIGlzc3VlX2hhc2hfdG9rZW4oW2EuaWQsIGEubW9kaWZpY2F0aW9uX3Rp bWVdKSBGSUxURVIgeG1sICVdPC90b2tlbj4KKyAgICAgICAgICAgIFslIEVORCAlXQorICAgICAg ICAgICAgWyUgSUYgZGlzcGxheWZpZWxkcy5hdHRhY2htZW50ZGF0YSAlXQorICAgICAgICAgICAg ICBbJSMgUmV0dXJuIFVSTCBvZiBhdHRhY2htZW50IGluc3RlYWQgb2YgZGF0YSAjJV0KKyAgICAg ICAgICAgICAgPHVybD5bJSB1cmxiYXNlIEZJTFRFUiB1cmkgRklMVEVSIGh0bWwgJV1hdHRhY2ht ZW50LmNnaT9pZD1bJSBhLmlkICVdPC91cmw+CisgICAgICAgICAgICBbJSBFTkQgJV0gICAgICAg IAorCisgICAgICAgICAgICBbJSBGT1JFQUNIIGZsYWcgPSBhLmZsYWdzICVdCisgICAgICAgICAg ICAgIDxmbGFnIG5hbWU9IlslIGZsYWcudHlwZS5uYW1lIEZJTFRFUiB4bWwgJV0iCisgICAgICAg ICAgICAgICAgICAgIGlkPSJbJSBmbGFnLmlkIEZJTFRFUiB4bWwgJV0iCisgICAgICAgICAgICAg ICAgICAgIHN0YXR1cz0iWyUgZmxhZy5zdGF0dXMgRklMVEVSIHhtbCAlXSIKKyAgICAgICAgICAg ICAgICAgICAgc2V0dGVyPSJbJSBmbGFnLnNldHRlci5lbWFpbCBGSUxURVIgeG1sICVdIgorICAg ICAgICAgICAgICAgICAgICBbJSBJRiBmbGFnLnN0YXR1cyA9PSAiPyIgJiYgZmxhZy5yZXF1ZXN0 ZWUgJV0KKyAgICAgICAgICAgICAgICAgICAgICByZXF1ZXN0ZWU9IlslIGZsYWcucmVxdWVzdGVl LmVtYWlsIEZJTFRFUiB4bWwgJV0iCisgICAgICAgICAgICAgICAgICAgIFslIEVORCAlXQorICAg ICAgICAgICAgICAgLz4KKyAgICAgICAgICAgIFslIEVORCAlXQorICAgICAgICAgIDwvYXR0YWNo bWVudD4KKyAgICAgICAgWyUgRU5EICVdCisgICAgICBbJSBFTkQgJV0KKyAgICAgIAorICAgICAg WyUgSG9vay5wcm9jZXNzKCJidWdfZW5kIikgJV0KKworICAgIDwvYnVnPgorICBbJSBFTkQgJV0K K1slIEVORCAlXQorCis8L2J1Z3ppbGxhPgorCitbJSBCTE9DSyBidWdfZmllbGQgJV0KKyAgWyUg Rk9SRUFDSCB2YWwgPSBidWcuJGZpZWxkICVdCisgICAgWyUjIFdlIG5lZWQgdG8gaGFuZGxlIHNv bWUgZmllbGRzIGRpZmZlcmVudGx5LiBUaGlzIHNob3VsZCBiZWNvbWUKKyAgICAgICMgbmljZXIg b25jZSB3ZSBoYXZlIGN1c3RmaWVsZHMsIGFuZCBhIHR5cGUgYXR0cmlidXRlIGZvciB0aGUgZmll bGRzCisgICAgICAjJV0KKyAgICBbJSBuYW1lID0gJycgJV0KKyAgICBbJSBJRiBmaWVsZCA9PSAn cmVwb3J0ZXInIE9SIGZpZWxkID09ICdhc3NpZ25lZF90bycgT1IKKyAgICAgICAgICBmaWVsZCA9 PSAncWFfY29udGFjdCcgJV0KKyAgICAgIFslIG5hbWUgPSB2YWwubmFtZSAlXQorICAgICAgWyUg dmFsID0gdmFsLmVtYWlsICVdCisgICAgWyUgRUxTSUYgZmllbGQgPT0gJ2NyZWF0aW9uX3RzJyBP UiBmaWVsZCA9PSAnZGVsdGFfdHMnICVdCisgICAgICBbJSB2YWwgPSB2YWwgRklMVEVSIHRpbWUg JV0KKyAgICBbJSBFTkQgJV0KKyAgICA8WyUgZmllbGQgJV1bJSBJRiBuYW1lICE9ICcnICVdIG5h bWU9IlslIG5hbWUgRklMVEVSIHhtbCAlXSJbJSBFTkQgLSVdPlslIHZhbCBGSUxURVIgeG1sICVd PC9bJSBmaWVsZCAlXT4KKyAgWyUgRU5EICVdCitbJSBFTkQgJV0K 137684 2012-04-18 07:39:51 -0700 2012-04-18 08:19:37 -0700 Diff between default and custom show.xml.tmpl bug-74929-default-to-custom.diff text/plain 695 ddkilzer LS0tIFdlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy90ZW1wbGF0ZS9lbi9kZWZhdWx0L2J1Zy9zaG93 LnhtbC50bXBsCTIwMTEtMDEtMjcgMTM6MTU6MDQuMDAwMDAwMDAwIC0wODAwCisrKyBXZWJzaXRl cy9idWdzLndlYmtpdC5vcmcvdGVtcGxhdGUvZW4vY3VzdG9tL2J1Zy9zaG93LnhtbC50bXBsCTIw MTItMDQtMTggMDc6Mzc6MjMuMDAwMDAwMDAwIC0wNzAwCkBAIC0xMDQsNyArMTA0LDggQEAKICAg ICAgICAgICAgICAgPHRva2VuPlslIGlzc3VlX2hhc2hfdG9rZW4oW2EuaWQsIGEubW9kaWZpY2F0 aW9uX3RpbWVdKSBGSUxURVIgeG1sICVdPC90b2tlbj4KICAgICAgICAgICAgIFslIEVORCAlXQog ICAgICAgICAgICAgWyUgSUYgZGlzcGxheWZpZWxkcy5hdHRhY2htZW50ZGF0YSAlXQotICAgICAg ICAgICAgICA8ZGF0YSBlbmNvZGluZz0iYmFzZTY0Ij5bJSBhLmRhdGEgRklMVEVSIGJhc2U2NCAl XTwvZGF0YT4KKyAgICAgICAgICAgICAgWyUjIFJldHVybiBVUkwgb2YgYXR0YWNobWVudCBpbnN0 ZWFkIG9mIGRhdGEgIyVdCisgICAgICAgICAgICAgIDx1cmw+WyUgdXJsYmFzZSBGSUxURVIgdXJp IEZJTFRFUiBodG1sICVdYXR0YWNobWVudC5jZ2k/aWQ9WyUgYS5pZCAlXTwvdXJsPgogICAgICAg ICAgICAgWyUgRU5EICVdICAgICAgICAKIAogICAgICAgICAgICAgWyUgRk9SRUFDSCBmbGFnID0g YS5mbGFncyAlXQo= 137695 2012-04-18 08:19:37 -0700 2012-05-09 00:59:30 -0700 Untested fix to add "excludefield=attachmentdata" everywhere "ctype=xml" is used bug-74929-untested-fix.diff text/plain 4102 ddkilzer ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cgYi9Ub29scy9TY3Jp cHRzL3ByZXBhcmUtQ2hhbmdlTG9nCmluZGV4IGExMGI5MmYuLmY3NjdiYjQgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKKysrIGIvVG9vbHMvU2NyaXB0cy9wcmVw YXJlLUNoYW5nZUxvZwpAQCAtMzQ1LDcgKzM0NSw3IEBAIHN1YiBmZXRjaEJ1Z0Rlc2NyaXB0aW9u RnJvbVVSTCgkJCkKIHsKICAgICBteSAoJGJ1Z1VSTCwgJGJ1Z051bWJlcikgPSBAXzsKIAotICAg IG15ICRidWdYTUxVUkwgPSAiJGJ1Z1VSTCZjdHlwZT14bWwiOworICAgIG15ICRidWdYTUxVUkwg PSAiJGJ1Z1VSTCZjdHlwZT14bWwmZXhjbHVkZWZpZWxkPWF0dGFjaG1lbnRkYXRhIjsKICAgICAj IFBlcmwgaGFzIG5vIGJ1aWx0IGluIFhNTCBwcm9jZXNzaW5nLCBzbyB3ZSdsbCBmZXRjaCBhbmQg cGFyc2Ugd2l0aCBjdXJsIGFuZCBncmVwCiAgICAgIyBQYXNzIC0taW5zZWN1cmUgYmVjYXVzZSBz b21lIGN5Z3dpbiBpbnN0YWxscyBoYXZlIG5vIGNlcnRzIHdlIGRvbid0CiAgICAgIyBjYXJlIGFi b3V0IHZhbGlkYXRpbmcgdGhhdCBidWdzLndlYmtpdC5vcmcgaXMgd2hvIGl0IHNheXMgaXQgaXMg aGVyZS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy91 cmxzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3VybHMucHkKaW5k ZXggYjU0NzA0NS4uZjJlNGE2OCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vY29uZmlnL3VybHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y29uZmlnL3VybHMucHkKQEAgLTQ3LDcgKzQ3LDcgQEAgYnVnX3NlcnZlcl9kb21haW4gPSAid2Vi a2l0Lm9yZyIKIGJ1Z19zZXJ2ZXJfaG9zdCA9ICJidWdzLiIgKyBidWdfc2VydmVyX2RvbWFpbgog X2J1Z19zZXJ2ZXJfcmVnZXggPSAiaHR0cHM/Oi8vJXMvIiAlIHJlLnN1YignXC4nLCAnXFwuJywg YnVnX3NlcnZlcl9ob3N0KQogYnVnX3NlcnZlcl91cmwgPSAiaHR0cHM6Ly8lcy8iICUgYnVnX3Nl cnZlcl9ob3N0Ci1idWdfdXJsX2xvbmcgPSBfYnVnX3NlcnZlcl9yZWdleCArIHIic2hvd19idWdc LmNnaVw/aWQ9KD9QPGJ1Z19pZD5cZCspKCZjdHlwZT14bWwpPyIKK2J1Z191cmxfbG9uZyA9IF9i dWdfc2VydmVyX3JlZ2V4ICsgciJzaG93X2J1Z1wuY2dpXD9pZD0oP1A8YnVnX2lkPlxkKykoJmN0 eXBlPXhtbHwmZXhjbHVkZWZpZWxkPWF0dGFjaG1lbnRkYXRhKSoiCiBidWdfdXJsX3Nob3J0ID0g ciJodHRwcz9cOi8vJXMvYi8oP1A8YnVnX2lkPlxkKykiICUgYnVnX3NlcnZlcl9kb21haW4KIAog YXR0YWNobWVudF91cmwgPSBfYnVnX3NlcnZlcl9yZWdleCArIHIiYXR0YWNobWVudFwuY2dpXD9p ZD0oP1A8YXR0YWNobWVudF9pZD5cZCspKCZhY3Rpb249KD9QPGFjdGlvbj5cdyspKT8iCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvdXJsc191bml0dGVz dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy91cmxzX3VuaXR0ZXN0 LnB5CmluZGV4IDc0YzIyNDAuLjJiOTRiODYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NvbmZpZy91cmxzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NvbmZpZy91cmxzX3VuaXR0ZXN0LnB5CkBAIC0zNywxMCArMzcsMTcg QEAgY2xhc3MgVVJMc1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFscygxMjM0NSwgcGFyc2VfYnVnX2lkKCJodHRwOi8vd2Via2l0Lm9yZy9iLzEyMzQ1Iikp CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKDEyMzQ1LCBwYXJzZV9idWdfaWQoImZvb1xuXG5o dHRwOi8vd2Via2l0Lm9yZy9iLzEyMzQ1XG5iYXJcblxuIikpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKDEyMzQ1LCBwYXJzZV9idWdfaWQoImh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEyMzQ1IikpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKDEyMzQ1LCBwYXJz ZV9idWdfaWQoImh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzQ1JmN0 eXBlPXhtbCIpKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscygxMjM0NSwgcGFyc2VfYnVnX2lk KCJodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM0NSZjdHlwZT14bWwm ZXhjbHVkZWZpZWxkPWF0dGFjaG1lbnRkYXRhIikpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KDEyMzQ1LCBwYXJzZV9idWdfaWQoImh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyMzQ1ZXhjbHVkZWZpZWxkPWF0dGFjaG1lbnRkYXRhJmN0eXBlPXhtbCIpKQogCiAgICAg ICAgICMgT3VyIHVybCBwYXJzZXIgaXMgc3VwZXItZnJhZ2lsZSwgYnV0IGF0IGxlYXN0IHdlJ3Jl IHRlc3RpbmcgaXQuCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKE5vbmUsIHBhcnNlX2J1Z19p ZCgiaHR0cDovL3d3dy53ZWJraXQub3JnL2IvMTIzNDUiKSkKICAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMoTm9uZSwgcGFyc2VfYnVnX2lkKCJodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9jdHlwZT14bWwmaWQ9MTIzNDUiKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoTm9u ZSwgcGFyc2VfYnVnX2lkKCJodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9jdHlw ZT14bWwmaWQ9MTIzNDUmZXhjbHVkZWZpZWxkPWF0dGFjaG1lbnRkYXRhIikpCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWxzKE5vbmUsIHBhcnNlX2J1Z19pZCgiaHR0cDovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/Y3R5cGU9eG1sJmV4Y2x1ZGVmaWVsZD1hdHRhY2htZW50ZGF0YSZpZD0x MjM0NSIpKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhOb25lLCBwYXJzZV9idWdfaWQoImh0 dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2V4Y2x1ZGVmaWVsZD1hdHRhY2htZW50 ZGF0YSZjdHlwZT14bWwmaWQ9MTIzNDUiKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoTm9u ZSwgcGFyc2VfYnVnX2lkKCJodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9leGNs dWRlZmllbGQ9YXR0YWNobWVudGRhdGEmaWQ9MTIzNDUmY3R5cGU9eG1sIikpCiAKICAgICBkZWYg dGVzdF9wYXJzZV9hdHRhY2htZW50X2lkKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFs cygxMjM0NSwgcGFyc2VfYXR0YWNobWVudF9pZCgiaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvYXR0 YWNobWVudC5jZ2k/aWQ9MTIzNDUmYWN0aW9uPXJldmlldyIpKQpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5CmluZGV4IDNk MmE5NjkuLjQ1YWM1OWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L25ldC9idWd6aWxsYS9idWd6aWxsYS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkKQEAgLTMwMyw3ICszMDMsNyBAQCBjbGFzcyBC dWd6aWxsYShvYmplY3QpOgogICAgIGRlZiBidWdfdXJsX2Zvcl9idWdfaWQoc2VsZiwgYnVnX2lk LCB4bWw9RmFsc2UpOgogICAgICAgICBpZiBub3QgYnVnX2lkOgogICAgICAgICAgICAgcmV0dXJu IE5vbmUKLSAgICAgICAgY29udGVudF90eXBlID0gIiZjdHlwZT14bWwiIGlmIHhtbCBlbHNlICIi CisgICAgICAgIGNvbnRlbnRfdHlwZSA9ICImY3R5cGU9eG1sJmV4Y2x1ZGVmaWVsZD1hdHRhY2ht ZW50ZGF0YSIgaWYgeG1sIGVsc2UgIiIKICAgICAgICAgcmV0dXJuICIlc3Nob3dfYnVnLmNnaT9p ZD0lcyVzIiAlIChjb25maWdfdXJscy5idWdfc2VydmVyX3VybCwgYnVnX2lkLCBjb250ZW50X3R5 cGUpCiAKICAgICBkZWYgc2hvcnRfYnVnX3VybF9mb3JfYnVnX2lkKHNlbGYsIGJ1Z19pZCk6Cg== 140878 2012-05-09 00:59:40 -0700 2012-05-14 05:07:33 -0700 r+-ed patch with changelog bug-74929-20120509095938.patch text/plain 5407 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2NTAyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjRhYWFmYzdiY2Y5NzhmZGYwYTM2MjUwMWE2NzA3NDBj MjkyMGU5Yi4uNDNjN2NjNmE4Mzg2OTQ4ZGQ2ZGU5Y2FhZjhiMzExMWU2MGJkZGNhNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEyLTA1LTA5ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgd2Via2l0LXBhdGNoIGFwcGx5LWF0dGFjaG1lbnQgaXMgdmVyeSBzbG93IGZvciBiaWcg cGF0Y2hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzQ5MjkKKworICAgICAgICBBZGQgImV4Y2x1ZGVmaWVsZD1hdHRhY2htZW50ZGF0YSIgdG8gdGhl IFVSTCBldmVyeXdoZXJlCisgICAgICAgICJjdHlwZT14bWwiIGlzIHVzZWQgdG8gZXhjbHVkZSB0 aGlzIGZpZWxkIGZyb20gdGhlIFhNTC4KKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRo LgorCisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZzoKKyAgICAgICAgKGZldGNo QnVnRGVzY3JpcHRpb25Gcm9tVVJMKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jb25maWcvdXJscy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25m aWcvdXJsc191bml0dGVzdC5weToKKyAgICAgICAgKFVSTHNUZXN0LnRlc3RfcGFyc2VfYnVnX2lk KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemls bGEucHk6CisgICAgICAgIChCdWd6aWxsYS5idWdfdXJsX2Zvcl9idWdfaWQpOgorCiAyMDEyLTA1 LTA5ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgTWFkZSBidWls ZC13ZWJraXQgY29weSBXZWJLaXRMaWJyYXJpZXMgdG8gdGhlIHJpZ2h0IGxvY2F0aW9uIGFnYWlu IGFmdGVyIHIxMTYyNTcKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VM b2cgYi9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCmluZGV4IDhhNDhlNTY3ZWM1OGMz YThjODU2OWUwMzRjM2E4YTA2M2M5YWJiN2UuLmRmNjg3ZGMyYzk5MjQxNmM1ZmU1YWU2MTc4Yjhh YmM4ODk4NTRhNDQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cK KysrIGIvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwpAQCAtMzQ1LDcgKzM0NSw3IEBA IHN1YiBmZXRjaEJ1Z0Rlc2NyaXB0aW9uRnJvbVVSTCgkJCkKIHsKICAgICBteSAoJGJ1Z1VSTCwg JGJ1Z051bWJlcikgPSBAXzsKIAotICAgIG15ICRidWdYTUxVUkwgPSAiJGJ1Z1VSTCZjdHlwZT14 bWwiOworICAgIG15ICRidWdYTUxVUkwgPSAiJGJ1Z1VSTCZjdHlwZT14bWwmZXhjbHVkZWZpZWxk PWF0dGFjaG1lbnRkYXRhIjsKICAgICAjIFBlcmwgaGFzIG5vIGJ1aWx0IGluIFhNTCBwcm9jZXNz aW5nLCBzbyB3ZSdsbCBmZXRjaCBhbmQgcGFyc2Ugd2l0aCBjdXJsIGFuZCBncmVwCiAgICAgIyBQ YXNzIC0taW5zZWN1cmUgYmVjYXVzZSBzb21lIGN5Z3dpbiBpbnN0YWxscyBoYXZlIG5vIGNlcnRz IHdlIGRvbid0CiAgICAgIyBjYXJlIGFib3V0IHZhbGlkYXRpbmcgdGhhdCBidWdzLndlYmtpdC5v cmcgaXMgd2hvIGl0IHNheXMgaXQgaXMgaGVyZS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NvbmZpZy91cmxzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vY29uZmlnL3VybHMucHkKaW5kZXggNDg4MzBjNTY0MzUzNDM1N2E2MTk5OWQzNDY0MWI4 MGU0OTg0N2U4Ny4uODhhZDM3M2ExNzA2MmE3Y2ZkZDY1ODkzOTc3MDBkYjllMWQyMzhhZiAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3VybHMucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3VybHMucHkKQEAgLTQ3LDcg KzQ3LDcgQEAgYnVnX3NlcnZlcl9kb21haW4gPSAid2Via2l0Lm9yZyIKIGJ1Z19zZXJ2ZXJfaG9z dCA9ICJidWdzLiIgKyBidWdfc2VydmVyX2RvbWFpbgogX2J1Z19zZXJ2ZXJfcmVnZXggPSAiaHR0 cHM/Oi8vJXMvIiAlIHJlLnN1YignXC4nLCAnXFwuJywgYnVnX3NlcnZlcl9ob3N0KQogYnVnX3Nl cnZlcl91cmwgPSAiaHR0cHM6Ly8lcy8iICUgYnVnX3NlcnZlcl9ob3N0Ci1idWdfdXJsX2xvbmcg PSBfYnVnX3NlcnZlcl9yZWdleCArIHIic2hvd19idWdcLmNnaVw/aWQ9KD9QPGJ1Z19pZD5cZCsp KCZjdHlwZT14bWwpPyIKK2J1Z191cmxfbG9uZyA9IF9idWdfc2VydmVyX3JlZ2V4ICsgciJzaG93 X2J1Z1wuY2dpXD9pZD0oP1A8YnVnX2lkPlxkKykoJmN0eXBlPXhtbHwmZXhjbHVkZWZpZWxkPWF0 dGFjaG1lbnRkYXRhKSoiCiBidWdfdXJsX3Nob3J0ID0gciJodHRwcz9cOi8vJXMvYi8oP1A8YnVn X2lkPlxkKykiICUgYnVnX3NlcnZlcl9kb21haW4KIAogYXR0YWNobWVudF91cmwgPSBfYnVnX3Nl cnZlcl9yZWdleCArIHIiYXR0YWNobWVudFwuY2dpXD9pZD0oP1A8YXR0YWNobWVudF9pZD5cZCsp KCZhY3Rpb249KD9QPGFjdGlvbj5cdyspKT8iCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jb25maWcvdXJsc191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NvbmZpZy91cmxzX3VuaXR0ZXN0LnB5CmluZGV4IDc0YzIyNDA5MDU3ODcw N2U4YmRlMGFmMDE1ZWZiNTg4NThjNWU3ZDAuLjJiOTRiODYwZTY5NGZlZDVkMGMwYjBiZTE2ZjJi Y2E2M2YzNjNiNWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2Nv bmZpZy91cmxzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NvbmZpZy91cmxzX3VuaXR0ZXN0LnB5CkBAIC0zNywxMCArMzcsMTcgQEAgY2xhc3MgVVJMc1Rl c3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFscygxMjM0NSwg cGFyc2VfYnVnX2lkKCJodHRwOi8vd2Via2l0Lm9yZy9iLzEyMzQ1IikpCiAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWxzKDEyMzQ1LCBwYXJzZV9idWdfaWQoImZvb1xuXG5odHRwOi8vd2Via2l0Lm9y Zy9iLzEyMzQ1XG5iYXJcblxuIikpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKDEyMzQ1LCBw YXJzZV9idWdfaWQoImh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzQ1 IikpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKDEyMzQ1LCBwYXJzZV9idWdfaWQoImh0dHA6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzQ1JmN0eXBlPXhtbCIpKQorICAg ICAgICBzZWxmLmFzc2VydEVxdWFscygxMjM0NSwgcGFyc2VfYnVnX2lkKCJodHRwOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM0NSZjdHlwZT14bWwmZXhjbHVkZWZpZWxkPWF0 dGFjaG1lbnRkYXRhIikpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKDEyMzQ1LCBwYXJzZV9i dWdfaWQoImh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzQ1ZXhjbHVk ZWZpZWxkPWF0dGFjaG1lbnRkYXRhJmN0eXBlPXhtbCIpKQogCiAgICAgICAgICMgT3VyIHVybCBw YXJzZXIgaXMgc3VwZXItZnJhZ2lsZSwgYnV0IGF0IGxlYXN0IHdlJ3JlIHRlc3RpbmcgaXQuCiAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKE5vbmUsIHBhcnNlX2J1Z19pZCgiaHR0cDovL3d3dy53 ZWJraXQub3JnL2IvMTIzNDUiKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoTm9uZSwgcGFy c2VfYnVnX2lkKCJodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9jdHlwZT14bWwm aWQ9MTIzNDUiKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoTm9uZSwgcGFyc2VfYnVnX2lk KCJodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9jdHlwZT14bWwmaWQ9MTIzNDUm ZXhjbHVkZWZpZWxkPWF0dGFjaG1lbnRkYXRhIikpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KE5vbmUsIHBhcnNlX2J1Z19pZCgiaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ Y3R5cGU9eG1sJmV4Y2x1ZGVmaWVsZD1hdHRhY2htZW50ZGF0YSZpZD0xMjM0NSIpKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhOb25lLCBwYXJzZV9idWdfaWQoImh0dHA6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2V4Y2x1ZGVmaWVsZD1hdHRhY2htZW50ZGF0YSZjdHlwZT14bWwm aWQ9MTIzNDUiKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoTm9uZSwgcGFyc2VfYnVnX2lk KCJodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9leGNsdWRlZmllbGQ9YXR0YWNo bWVudGRhdGEmaWQ9MTIzNDUmY3R5cGU9eG1sIikpCiAKICAgICBkZWYgdGVzdF9wYXJzZV9hdHRh Y2htZW50X2lkKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFscygxMjM0NSwgcGFyc2Vf YXR0YWNobWVudF9pZCgiaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvYXR0YWNobWVudC5jZ2k/aWQ9 MTIzNDUmYWN0aW9uPXJldmlldyIpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5CmluZGV4IDkxZjFkYTY0MjY1MTcxYTUx NjQ5N2MwNTUxZjAzMDgxNjhlN2ExN2QuLjcwNDg5MzJhN2Q5NjMyOTNhN2Y2YmY5MzRkNjNiMjBk ZTZiMDk0MTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9i dWd6aWxsYS9idWd6aWxsYS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvYnVnemlsbGEvYnVnemlsbGEucHkKQEAgLTMwOCw3ICszMDgsNyBAQCBjbGFzcyBCdWd6aWxs YShvYmplY3QpOgogICAgIGRlZiBidWdfdXJsX2Zvcl9idWdfaWQoc2VsZiwgYnVnX2lkLCB4bWw9 RmFsc2UpOgogICAgICAgICBpZiBub3QgYnVnX2lkOgogICAgICAgICAgICAgcmV0dXJuIE5vbmUK LSAgICAgICAgY29udGVudF90eXBlID0gIiZjdHlwZT14bWwiIGlmIHhtbCBlbHNlICIiCisgICAg ICAgIGNvbnRlbnRfdHlwZSA9ICImY3R5cGU9eG1sJmV4Y2x1ZGVmaWVsZD1hdHRhY2htZW50ZGF0 YSIgaWYgeG1sIGVsc2UgIiIKICAgICAgICAgcmV0dXJuICIlc3Nob3dfYnVnLmNnaT9pZD0lcyVz IiAlIChjb25maWdfdXJscy5idWdfc2VydmVyX3VybCwgYnVnX2lkLCBjb250ZW50X3R5cGUpCiAK ICAgICBkZWYgc2hvcnRfYnVnX3VybF9mb3JfYnVnX2lkKHNlbGYsIGJ1Z19pZCk6Cg==