134560 2014-07-02 14:34:38 -0700 Buffer CSS and JS resources in network process before sending over to web process 2014-07-13 07:28:30 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 134731 134732 134733 1 psolanki psolanki ap beidson bunhere cdumez commit-queue gyuyoung.kim kling koivisto psolanki sergio oldest_to_newest 1020039 0 psolanki 2014-07-02 14:34:38 -0700 Buffer CSS and JS resources in network process before sending over to web process 1020042 1 234280 psolanki 2014-07-02 14:39:13 -0700 Created attachment 234280 Patch 1020043 2 psolanki 2014-07-02 14:40:17 -0700 Initial implementation with USE(CFNETWORK) support for iOS. I'm looking into doing this for mac as well. 1020066 3 beidson 2014-07-02 15:11:14 -0700 Is there actually no advantage to streaming JS and CSS resources as the bytes come in? It seems like the JIT could get started on an incomplete resource, saving time later...? 1020116 4 psolanki 2014-07-02 17:39:01 -0700 (In reply to comment #3) > Is there actually no advantage to streaming JS and CSS resources as the bytes come in? I don't know if it's possible to start parsing,JITting JS or CSS as the bytes come in. It's certainly not something we do right now. > It seems like the JIT could get started on an incomplete resource, saving time later...? I guess if we start doing that and it proves to be a perf win, then we can disable this optimization. 1020117 5 234299 psolanki 2014-07-02 17:39:16 -0700 Created attachment 234299 Patch 1020118 6 psolanki 2014-07-02 17:39:55 -0700 <rdar://problem/17541403> 1020209 7 234299 ap 2014-07-03 01:41:19 -0700 Comment on attachment 234299 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234299&action=review Looks like a good idea, assuming that it doesn't break progress events or resource load timing or Web Inspector (which are all too involved for me to assess at the moment, but at least tests pass). > Source/WebKit2/NetworkProcess/NetworkResourceLoader.h:199 > + RefPtr<WebCore::SharedBuffer> m_bufferedData; It seems super unfortunate that sync loads collect the data in SynchronousNetworkLoaderClient object, but all loads have a data member in NetworkResourceLoader. I think that this should be designed in a uniform way, definitely without having multiple instances of the data member. 1020214 8 koivisto 2014-07-03 02:18:55 -0700 I already had a patch for this in https://bugs.webkit.org/show_bug.cgi?id=132229 also covering image resources. 1020216 9 ap 2014-07-03 02:47:26 -0700 Correct. The problem with that patch was that it coalesced way too much, needlessly and dangerously changing semantics of network loader. 1020387 10 psolanki 2014-07-03 15:29:18 -0700 Yeah, this one is a bit more targeted and simpler. But the idea is the same. 1020390 11 psolanki 2014-07-03 15:33:47 -0700 (In reply to comment #7) > (From update of attachment 234299 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=234299&action=review > > Looks like a good idea, assuming that it doesn't break progress events or resource load timing or Web Inspector (which are all too involved for me to assess at the moment, but at least tests pass). > > > Source/WebKit2/NetworkProcess/NetworkResourceLoader.h:199 > > + RefPtr<WebCore::SharedBuffer> m_bufferedData; > > It seems super unfortunate that sync loads collect the data in SynchronousNetworkLoaderClient object, but all loads have a data member in NetworkResourceLoader. > > I think that this should be designed in a uniform way, definitely without having multiple instances of the data member. Good idea. I can definitely merge them and make the code more efficient for SynchronousLoaderClient. 1021132 12 234574 psolanki 2014-07-08 10:56:23 -0700 Created attachment 234574 Patch This depends on patches from bug 134731, bug 134732 and bug 134733. https://bugs.webkit.org/attachment.cgi?id=234571&action=review https://bugs.webkit.org/attachment.cgi?id=234572&action=review https://bugs.webkit.org/attachment.cgi?id=234573&action=review 1021492 13 234673 psolanki 2014-07-09 17:23:51 -0700 Created attachment 234673 Patch for bots that will apply cleanly now 1021574 14 psolanki 2014-07-09 23:14:58 -0700 Committed r170958: <http://trac.webkit.org/changeset/170958> 1022114 15 koivisto 2014-07-13 07:28:30 -0700 *** Bug 132229 has been marked as a duplicate of this bug. *** 234280 2014-07-02 14:39:13 -0700 2014-07-02 17:39:12 -0700 Patch bug-134560-20140702143854.patch text/plain 7662 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzI4NWNlZGZkOGUyOTc5 NjZkNjY5NzMyOTRlNGE2ZTJmOGEzMWNlMi4uN2IyZmI5OGM2MjJlZjg2OWFmOTVkMzU2NWExZjhk ZDFlZTUwNTkzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA3LTAyICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBCdWZmZXIgQ1NTIGFu ZCBKUyByZXNvdXJjZXMgaW4gbmV0d29yayBwcm9jZXNzIGJlZm9yZSBzZW5kaW5nIG92ZXIgdG8g d2ViIHByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzNDU2MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTc1NDE0MDM+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBTaG91 bGQgYmUgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIFdlYkNvcmUuZXhw LmluOgorCiAyMDE0LTA3LTAyICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVtb3ZlIHNvbWUgY29kZSBvbmx5IG5lZWRlZCBmb3IgdmVyc2lvbnMgb2YgU2FmYXJp IHRoYXQgYXJlIG5vIGxvbmdlciBzdXBwb3J0ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA1YTc3YTc0MWQyZDgz YzNhNDA2MTM5NjkzMTM2OTNlNDNiNTBkOWQ3Li5lZDkwNDkyNzI0ZTljNDE4YjE4YWJkZmE3NDlj MTk1ZmYyNDMyNTUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTQtMDctMDIgIFBy YXRpayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgorCisgICAgICAgIEJ1ZmZlciBDU1Mg YW5kIEpTIHJlc291cmNlcyBpbiBuZXR3b3JrIHByb2Nlc3MgYmVmb3JlIHNlbmRpbmcgb3ZlciB0 byB3ZWIgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTM0NTYwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzU0MTQwMz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3IgQ1NTIGFuZCBKUyBy ZXNvdXJjZXMsIGFzayB0aGUgbmV0d29yayBwcm9jZXNzIHRvIGJ1ZmZlciB0aGUgZW50aXJlIHJl c291cmNlIGluc3RlYWQgb2YKKyAgICAgICAgc2VuZGluZyBpdCB0byB3ZWIgcHJvY2VzcyBpbiBj aHVua3MuIFdlYiBwcm9jZXNzIGNhbid0IGRvIGFueXRoaW5nIHdpdGggYSBwYXJ0aWFsIGNzcyBv ciBqcworICAgICAgICBmaWxlIGFueXdheS4gVGhpcyBpbml0aWFsIGltcGxlbWVudGF0aW9uIHdv cmtzIHdpdGggVVNFKENGTkVUV09SSykgb25seS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNz L05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNv dXJjZUxvYWRlcjo6TmV0d29ya1Jlc291cmNlTG9hZGVyKToKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Jlc291cmNlTG9hZGVyOjpkaWRGaW5pc2hMb2FkaW5nKToKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya1Jlc291cmNlTG9hZGVyOjpzdXBwb3J0c0RhdGFBcnJheSk6CisgICAgICAgIChXZWJL aXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZURhdGFBcnJheSk6CisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmg6CisgICAgICAgICogU2hh cmVkL05ldHdvcmsvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBX ZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpzY2hlZHVsZUxvYWQpOgorCiAyMDE0 LTA3LTAyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAg QWRkIC1bV0tXZWJWaWV3IF9zZXNzaW9uU3RhdGVEYXRhXSBhbmQgLVtXS1dlYlZpZXcgX3Jlc3Rv cmVGcm9tU2Vzc2lvblN0YXRlRGF0YTpdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IGVhMTVjYWZm NmZhZDhjMDJjYzgyN2I5NGYyM2Q1ZjhiMDI1YWM2MWQuLjZhYmE2NWFjNTBiN2FiYzgzZjgyM2Y4 MzI0MzU5MDgyZjBhMTlhMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhw LmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0zNDU3LDMgKzM0NTcs NyBAQCBfX1pON1dlYkNvcmU5UGFnZUdyb3VwMThjYXB0aW9uUHJlZmVyZW5jZXNFdgogI2lmIEVO QUJMRShWSUVXX01PREVfQ1NTX01FRElBKQogX19aTjdXZWJDb3JlNFBhZ2UxMXNldFZpZXdNb2Rl RU5TMF84Vmlld01vZGVFCiAjZW5kaWYKKworI2lmIFVTRShORVRXT1JLX0RBVEFfQVJSQVlfQ0FM TEJBQ0spCitfX1pON1dlYkNvcmUxMlNoYXJlZEJ1ZmZlcjZhcHBlbmRFUEs4X19DRkRhdGEKKyNl bmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jl c291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtS ZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggYzQxOWEzNTRlNDJkNDIwMGRmMDlmZGI4MTVhMzZkYjFk NjY3ODhiNi4uMTQ5YTAwYTE4ZjNlMjM1Y2Y4M2Q5ZmUyODE4NTU1YTBiMzVkNmFiYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VM b2FkZXIuY3BwCkBAIC00OSw2ICs0OSw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZUJ1 ZmZlci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VIYW5kbGUuaD4KICNpbmNsdWRlIDx3 dGYvTWFpblRocmVhZC5oPgorI2luY2x1ZGUgPHd0Zi9jZi9UeXBlQ2FzdHMuaD4KIAogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTcxLDYgKzcyLDcgQEAgTmV0d29ya1Jlc291cmNlTG9h ZGVyOjpOZXR3b3JrUmVzb3VyY2VMb2FkZXIoY29uc3QgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFt ZXRlcnMKICAgICAsIG1fZGVmZXJzTG9hZGluZyhwYXJhbWV0ZXJzLmRlZmVyc0xvYWRpbmcpCiAg ICAgLCBtX3NhbmRib3hFeHRlbnNpb25zQXJlQ29uc3VtZWQoZmFsc2UpCiAgICAgLCBtX2Nvbm5l Y3Rpb24oY29ubmVjdGlvbikKKyAgICAsIG1fc2hvdWxkQnVmZmVyUmVzb3VyY2UocGFyYW1ldGVy cy5zaG91bGRCdWZmZXJSZXNvdXJjZSkKIHsKICAgICAvLyBFaXRoZXIgdGhpcyBsb2FkZXIgaGFz IGJvdGggYSB3ZWJQYWdlSUQgYW5kIHdlYkZyYW1lSUQsIG9yIGl0IGlzIG5vdCBhbGxvd2VkIHRv IGFzayB0aGUgY2xpZW50IGZvciBhdXRoZW50aWNhdGlvbiBjcmVkZW50aWFscy4KICAgICAvLyBG SVhNRTogVGhpcyBpcyBuZWNlc3NhcnkgYmVjYXVzZSBvZiB0aGUgZXhpc3RlbmNlIG9mIEVtcHR5 RnJhbWVMb2FkZXJDbGllbnQgaW4gV2ViQ29yZS4KQEAgLTEwMyw2ICsxMDUsOSBAQCBOZXR3b3Jr UmVzb3VyY2VMb2FkZXI6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcihjb25zdCBOZXR3b3JrUmVzb3Vy Y2VMb2FkUGFyYW1ldGVycwogICAgICAgICBtX25ldHdvcmtMb2FkZXJDbGllbnQgPSBzdGQ6Om1h a2VfdW5pcXVlPFN5bmNocm9ub3VzTmV0d29ya0xvYWRlckNsaWVudD4obV9yZXF1ZXN0LCByZXBs eSk7CiAgICAgZWxzZQogICAgICAgICBtX25ldHdvcmtMb2FkZXJDbGllbnQgPSBzdGQ6Om1ha2Vf dW5pcXVlPEFzeW5jaHJvbm91c05ldHdvcmtMb2FkZXJDbGllbnQ+KCk7CisKKyAgICBpZiAobV9z aG91bGRCdWZmZXJSZXNvdXJjZSkKKyAgICAgICAgbV9idWZmZXJlZERhdGEgPSBXZWJDb3JlOjpT aGFyZWRCdWZmZXI6OmNyZWF0ZSgpOwogfQogCiBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6On5OZXR3 b3JrUmVzb3VyY2VMb2FkZXIoKQpAQCAtMjIxLDYgKzIyNiwxMCBAQCB2b2lkIE5ldHdvcmtSZXNv dXJjZUxvYWRlcjo6ZGlkRmluaXNoTG9hZGluZyhSZXNvdXJjZUhhbmRsZSogaGFuZGxlLCBkb3Vi bGUgZmluaQogewogICAgIEFTU0VSVF9VTlVTRUQoaGFuZGxlLCBoYW5kbGUgPT0gbV9oYW5kbGUp OwogCisgICAgLy8gU2VuZCB0aGUgZnVsbCByZXNvdXJjZSBkYXRhIGlmIHdlIHdlcmUgYnVmZmVy aW5nIGl0LgorICAgIGlmIChtX3Nob3VsZEJ1ZmZlclJlc291cmNlKQorICAgICAgICBtX25ldHdv cmtMb2FkZXJDbGllbnQtPmRpZFJlY2VpdmVCdWZmZXIodGhpcywgbV9idWZmZXJlZERhdGEuZ2V0 KCksIG1fYnVmZmVyZWREYXRhLT5zaXplKCkpOworCiAgICAgbV9uZXR3b3JrTG9hZGVyQ2xpZW50 LT5kaWRGaW5pc2hMb2FkaW5nKHRoaXMsIGZpbmlzaFRpbWUpOwogCiAgICAgY2xlYW51cCgpOwpA QCAtNDAxLDE0ICs0MTAsMTcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmNvbnRpbnVl Q2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZShib29sIHIKICNpZiBVU0UoTkVU V09SS19DRkRBVEFfQVJSQVlfQ0FMTEJBQ0spCiBib29sIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6 c3VwcG9ydHNEYXRhQXJyYXkoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJu IGZhbHNlOworICAgIHJldHVybiBtX3Nob3VsZEJ1ZmZlclJlc291cmNlOwogfQogCi12b2lkIE5l dHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZURhdGFBcnJheShSZXNvdXJjZUhhbmRsZSos IENGQXJyYXlSZWYpCit2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZURhdGFB cnJheShSZXNvdXJjZUhhbmRsZSogaGFuZGxlLCBDRkFycmF5UmVmIGRhdGFBcnJheSkKIHsKLSAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIEFTU0VS VChtX2J1ZmZlcmVkRGF0YSk7CisgICAgQ0ZJbmRleCBjb3VudCA9IENGQXJyYXlHZXRDb3VudChk YXRhQXJyYXkpOworICAgIGZvciAoQ0ZJbmRleCBpbmRleCA9IDA7IGluZGV4IDwgY291bnQ7IGlu ZGV4KyspIHsKKyAgICAgICAgQ0ZEYXRhUmVmIGRhdGEgPSBjaGVja2VkX2NmX2Nhc3Q8Q0ZEYXRh UmVmPihDRkFycmF5R2V0VmFsdWVBdEluZGV4KGRhdGFBcnJheSwgaW5kZXgpKTsKKyAgICAgICAg bV9idWZmZXJlZERhdGEtPmFwcGVuZChkYXRhKTsKKyAgICB9CiB9CiAjZW5kaWYKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVy LmggYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIu aAppbmRleCAyY2E0M2Y0MTc0NDVmNTUwNzZjMjMzYTZjMTYxZTllODllMzRjMmRmLi5lZjhiMzY0 NTIyZTU4ZDQ5ZjJkN2M4NzcwNGVkYTdmNTcxNjJjZDI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaApAQCAtMTk2LDYg KzE5Niw4IEBAIHByaXZhdGU6CiAgICAgUmVmUHRyPE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9j ZXNzPiBtX2Nvbm5lY3Rpb247CiAgICAgCiAgICAgUmVmUHRyPEhvc3RSZWNvcmQ+IG1faG9zdFJl Y29yZDsKKyAgICBSZWZQdHI8V2ViQ29yZTo6U2hhcmVkQnVmZmVyPiBtX2J1ZmZlcmVkRGF0YTsK KyAgICBib29sIG1fc2hvdWxkQnVmZmVyUmVzb3VyY2U7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBX ZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdvcmtS ZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9O ZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oCmluZGV4IDljMzNjZjNmZjk1NDU4NDI0ZTky NDM0MGM2MThjYWE2OTJmMzJlMTcuLjU5Yzc2MWE5Y2NmMTNhYmRkYzZmOTZiM2Q1MTFkMmVhYTk2 ODIzNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdvcmtS ZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdv cmsvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaApAQCAtNjQsNiArNjQsNyBAQCBwdWJs aWM6CiAgICAgYm9vbCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0Owog ICAgIGJvb2wgaXNNYWluUmVzb3VyY2U7CiAgICAgYm9vbCBkZWZlcnNMb2FkaW5nOworICAgIGJv b2wgc2hvdWxkQnVmZmVyUmVzb3VyY2U7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxv YWRTY2hlZHVsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJl c291cmNlTG9hZFNjaGVkdWxlci5jcHAKaW5kZXggNGViN2VlOTJkYzJiYjQ3OGI0M2YzNmI5NWEy ZDkwYmJkMjY0ZTQ5Ny4uYzRhMjRiZjA3YmM4MWI1ZDZlY2VkZTMzMGJjMjMxNDBkNzg0NzQwNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNl TG9hZFNjaGVkdWxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3Jr L1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHAKQEAgLTEzNiw2ICsxMzYsNyBAQCB2b2lkIFdl YlJlc291cmNlTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVMb2FkKFJlc291cmNlTG9hZGVyKiByZXNv dXJjZUxvYWRlciwgQ2FjaAogICAgIGxvYWRQYXJhbWV0ZXJzLnNob3VsZENsZWFyUmVmZXJyZXJP bkhUVFBTVG9IVFRQUmVkaXJlY3QgPSBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJl ZGlyZWN0OwogICAgIGxvYWRQYXJhbWV0ZXJzLmlzTWFpblJlc291cmNlID0gcmVzb3VyY2UgJiYg cmVzb3VyY2UtPnR5cGUoKSA9PSBDYWNoZWRSZXNvdXJjZTo6TWFpblJlc291cmNlOwogICAgIGxv YWRQYXJhbWV0ZXJzLmRlZmVyc0xvYWRpbmcgPSByZXNvdXJjZUxvYWRlci0+ZGVmZXJzTG9hZGlu ZygpOworICAgIGxvYWRQYXJhbWV0ZXJzLnNob3VsZEJ1ZmZlclJlc291cmNlID0gcmVzb3VyY2Ug JiYgKHJlc291cmNlLT50eXBlKCkgPT0gQ2FjaGVkUmVzb3VyY2U6OkNTU1N0eWxlU2hlZXQgfHwg cmVzb3VyY2UtPnR5cGUoKSA9PSBDYWNoZWRSZXNvdXJjZTo6U2NyaXB0KTsKIAogICAgIEFTU0VS VCgobG9hZFBhcmFtZXRlcnMud2ViUGFnZUlEICYmIGxvYWRQYXJhbWV0ZXJzLndlYkZyYW1lSUQp IHx8IGxvYWRQYXJhbWV0ZXJzLmNsaWVudENyZWRlbnRpYWxQb2xpY3kgPT0gRG9Ob3RBc2tDbGll bnRGb3JBbnlDcmVkZW50aWFscyk7CiAK 234299 2014-07-02 17:39:16 -0700 2014-07-08 10:56:23 -0700 Patch bug-134560-20140702173857.patch text/plain 7181 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzI4NWNlZGZkOGUyOTc5 NjZkNjY5NzMyOTRlNGE2ZTJmOGEzMWNlMi4uN2IyZmI5OGM2MjJlZjg2OWFmOTVkMzU2NWExZjhk ZDFlZTUwNTkzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA3LTAyICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBCdWZmZXIgQ1NTIGFu ZCBKUyByZXNvdXJjZXMgaW4gbmV0d29yayBwcm9jZXNzIGJlZm9yZSBzZW5kaW5nIG92ZXIgdG8g d2ViIHByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzNDU2MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTc1NDE0MDM+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBTaG91 bGQgYmUgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIFdlYkNvcmUuZXhw LmluOgorCiAyMDE0LTA3LTAyICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVtb3ZlIHNvbWUgY29kZSBvbmx5IG5lZWRlZCBmb3IgdmVyc2lvbnMgb2YgU2FmYXJp IHRoYXQgYXJlIG5vIGxvbmdlciBzdXBwb3J0ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA1YTc3YTc0MWQyZDgz YzNhNDA2MTM5NjkzMTM2OTNlNDNiNTBkOWQ3Li5kMDY5NDk4OTZiNzk0YzRhZTJkNmY1NDA4YjRj YjE1MTM2YTYyMTE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTQtMDctMDIgIFBy YXRpayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgorCisgICAgICAgIEJ1ZmZlciBDU1Mg YW5kIEpTIHJlc291cmNlcyBpbiBuZXR3b3JrIHByb2Nlc3MgYmVmb3JlIHNlbmRpbmcgb3ZlciB0 byB3ZWIgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTM0NTYwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzU0MTQwMz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3IgQ1NTIGFuZCBKUyBy ZXNvdXJjZXMsIGFzayB0aGUgbmV0d29yayBwcm9jZXNzIHRvIGJ1ZmZlciB0aGUgZW50aXJlIHJl c291cmNlIGluc3RlYWQgb2YKKyAgICAgICAgc2VuZGluZyBpdCB0byB3ZWIgcHJvY2VzcyBpbiBj aHVua3MuIFdlYiBwcm9jZXNzIGNhbid0IGRvIGFueXRoaW5nIHdpdGggYSBwYXJ0aWFsIGNzcyBv ciBqcworICAgICAgICBmaWxlIGFueXdheS4gVGhpcyBpbml0aWFsIGltcGxlbWVudGF0aW9uIHdv cmtzIHdpdGggVVNFKE5FVFdPUktfQ0ZEQVRBX0FSUkFZX0NBTExCQUNLKSBvbmx5LgorCisgICAg ICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAg KFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpOZXR3b3JrUmVzb3VyY2VMb2FkZXIpOgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZEZpbmlzaExvYWRpbmcp OgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnN1cHBvcnRzRGF0YUFy cmF5KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZl RGF0YUFycmF5KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2Fk ZXIuaDoKKyAgICAgICAgKiBTaGFyZWQvTmV0d29yay9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1l dGVycy5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRTY2hl ZHVsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXI6OnNj aGVkdWxlTG9hZCk6CisKIDIwMTQtMDctMDIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KIAogICAgICAgICBBZGQgLVtXS1dlYlZpZXcgX3Nlc3Npb25TdGF0ZURhdGFdIGFu ZCAtW1dLV2ViVmlldyBfcmVzdG9yZUZyb21TZXNzaW9uU3RhdGVEYXRhOl0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5l eHAuaW4KaW5kZXggZWExNWNhZmY2ZmFkOGMwMmNjODI3Yjk0ZjIzZDVmOGIwMjVhYzYxZC4uMzUw Mzg2MGEzNDU5MTg3YmFjYWQ3YTVkMjNkOTcyYmQyZTI3ZDUyMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4KQEAgLTM0NTcsMyArMzQ1Nyw3IEBAIF9fWk43V2ViQ29yZTlQYWdlR3JvdXAxOGNhcHRpb25Q cmVmZXJlbmNlc0V2CiAjaWYgRU5BQkxFKFZJRVdfTU9ERV9DU1NfTUVESUEpCiBfX1pON1dlYkNv cmU0UGFnZTExc2V0Vmlld01vZGVFTlMwXzhWaWV3TW9kZUUKICNlbmRpZgorCisjaWYgVVNFKE5F VFdPUktfQ0ZEQVRBX0FSUkFZX0NBTExCQUNLKQorX19aTjdXZWJDb3JlMTJTaGFyZWRCdWZmZXI2 YXBwZW5kRVBLOF9fQ0ZEYXRhCisjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05l dHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IGM0MTlhMzU0ZTQy ZDQyMDBkZjA5ZmRiODE1YTM2ZGIxZDY2Nzg4YjYuLjdiZDBlMGJiOGEwYWE5MGQwNTM5NTNhNzgy OThhYjNmYWUxNGRlNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApAQCAtNTAsNiArNTAsMTAgQEAKICNpbmNs dWRlIDxXZWJDb3JlL1Jlc291cmNlSGFuZGxlLmg+CiAjaW5jbHVkZSA8d3RmL01haW5UaHJlYWQu aD4KIAorI2lmIFVTRShORVRXT1JLX0NGREFUQV9BUlJBWV9DQUxMQkFDSykKKyNpbmNsdWRlIDx3 dGYvY2YvVHlwZUNhc3RzLmg+CisjZW5kaWYKKwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAK IG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtMTAzLDYgKzEwNyw5IEBAIE5ldHdvcmtSZXNvdXJjZUxv YWRlcjo6TmV0d29ya1Jlc291cmNlTG9hZGVyKGNvbnN0IE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJh bWV0ZXJzCiAgICAgICAgIG1fbmV0d29ya0xvYWRlckNsaWVudCA9IHN0ZDo6bWFrZV91bmlxdWU8 U3luY2hyb25vdXNOZXR3b3JrTG9hZGVyQ2xpZW50PihtX3JlcXVlc3QsIHJlcGx5KTsKICAgICBl bHNlCiAgICAgICAgIG1fbmV0d29ya0xvYWRlckNsaWVudCA9IHN0ZDo6bWFrZV91bmlxdWU8QXN5 bmNocm9ub3VzTmV0d29ya0xvYWRlckNsaWVudD4oKTsKKworICAgIGlmIChwYXJhbWV0ZXJzLnNo b3VsZEJ1ZmZlclJlc291cmNlKQorICAgICAgICBtX2J1ZmZlcmVkRGF0YSA9IFdlYkNvcmU6OlNo YXJlZEJ1ZmZlcjo6Y3JlYXRlKCk7CiB9CiAKIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6fk5ldHdv cmtSZXNvdXJjZUxvYWRlcigpCkBAIC0yMjEsNiArMjI4LDEwIEBAIHZvaWQgTmV0d29ya1Jlc291 cmNlTG9hZGVyOjpkaWRGaW5pc2hMb2FkaW5nKFJlc291cmNlSGFuZGxlKiBoYW5kbGUsIGRvdWJs ZSBmaW5pCiB7CiAgICAgQVNTRVJUX1VOVVNFRChoYW5kbGUsIGhhbmRsZSA9PSBtX2hhbmRsZSk7 CiAKKyAgICAvLyBTZW5kIHRoZSBmdWxsIHJlc291cmNlIGRhdGEgaWYgd2Ugd2VyZSBidWZmZXJp bmcgaXQuCisgICAgaWYgKG1fYnVmZmVyZWREYXRhICYmIG1fYnVmZmVyZWREYXRhLT5zaXplKCkp CisgICAgICAgIG1fbmV0d29ya0xvYWRlckNsaWVudC0+ZGlkUmVjZWl2ZUJ1ZmZlcih0aGlzLCBt X2J1ZmZlcmVkRGF0YS5nZXQoKSwgbV9idWZmZXJlZERhdGEtPnNpemUoKSk7CisKICAgICBtX25l dHdvcmtMb2FkZXJDbGllbnQtPmRpZEZpbmlzaExvYWRpbmcodGhpcywgZmluaXNoVGltZSk7CiAK ICAgICBjbGVhbnVwKCk7CkBAIC00MDEsMTQgKzQxMiwxNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJj ZUxvYWRlcjo6Y29udGludWVDYW5BdXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlKGJv b2wgcgogI2lmIFVTRShORVRXT1JLX0NGREFUQV9BUlJBWV9DQUxMQkFDSykKIGJvb2wgTmV0d29y a1Jlc291cmNlTG9hZGVyOjpzdXBwb3J0c0RhdGFBcnJheSgpCiB7Ci0gICAgbm90SW1wbGVtZW50 ZWQoKTsKLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIG1fYnVmZmVyZWREYXRhOwogfQog Ci12b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZURhdGFBcnJheShSZXNvdXJj ZUhhbmRsZSosIENGQXJyYXlSZWYpCit2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVj ZWl2ZURhdGFBcnJheShSZXNvdXJjZUhhbmRsZSogaGFuZGxlLCBDRkFycmF5UmVmIGRhdGFBcnJh eSkKIHsKLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwor ICAgIEFTU0VSVChtX2J1ZmZlcmVkRGF0YSk7CisgICAgQ0ZJbmRleCBjb3VudCA9IENGQXJyYXlH ZXRDb3VudChkYXRhQXJyYXkpOworICAgIGZvciAoQ0ZJbmRleCBpbmRleCA9IDA7IGluZGV4IDwg Y291bnQ7IGluZGV4KyspIHsKKyAgICAgICAgQ0ZEYXRhUmVmIGRhdGEgPSBjaGVja2VkX2NmX2Nh c3Q8Q0ZEYXRhUmVmPihDRkFycmF5R2V0VmFsdWVBdEluZGV4KGRhdGFBcnJheSwgaW5kZXgpKTsK KyAgICAgICAgbV9idWZmZXJlZERhdGEtPmFwcGVuZChkYXRhKTsKKyAgICB9CiB9CiAjZW5kaWYK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291 cmNlTG9hZGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3Vy Y2VMb2FkZXIuaAppbmRleCAyY2E0M2Y0MTc0NDVmNTUwNzZjMjMzYTZjMTYxZTllODllMzRjMmRm Li4yZjFlOWRlODdiYWZmMThhOTBiMWJlOGEyNDQ3OGRmYzY3Zjc4OTMxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaApA QCAtMTk2LDYgKzE5Niw3IEBAIHByaXZhdGU6CiAgICAgUmVmUHRyPE5ldHdvcmtDb25uZWN0aW9u VG9XZWJQcm9jZXNzPiBtX2Nvbm5lY3Rpb247CiAgICAgCiAgICAgUmVmUHRyPEhvc3RSZWNvcmQ+ IG1faG9zdFJlY29yZDsKKyAgICBSZWZQdHI8V2ViQ29yZTo6U2hhcmVkQnVmZmVyPiBtX2J1ZmZl cmVkRGF0YTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaCBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0 ZXJzLmgKaW5kZXggOWMzM2NmM2ZmOTU0NTg0MjRlOTI0MzQwYzYxOGNhYTY5MmYzMmUxNy4uNTlj NzYxYTljY2YxM2FiZGRjNmY5NmIzZDUxMWQyZWFhOTY4MjM2NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3b3JrUmVzb3VyY2VMb2FkUGFy YW1ldGVycy5oCkBAIC02NCw2ICs2NCw3IEBAIHB1YmxpYzoKICAgICBib29sIHNob3VsZENsZWFy UmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3Q7CiAgICAgYm9vbCBpc01haW5SZXNvdXJjZTsK ICAgICBib29sIGRlZmVyc0xvYWRpbmc7CisgICAgYm9vbCBzaG91bGRCdWZmZXJSZXNvdXJjZTsK IH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcApp bmRleCA0ZWI3ZWU5MmRjMmJiNDc4YjQzZjM2Yjk1YTJkOTBiYmQyNjRlNDk3Li5jNGEyNGJmMDdi YzgxYjVkNmVjZWRlMzMwYmMyMzE0MGQ3ODQ3NDA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVy LmNwcApAQCAtMTM2LDYgKzEzNiw3IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpz Y2hlZHVsZUxvYWQoUmVzb3VyY2VMb2FkZXIqIHJlc291cmNlTG9hZGVyLCBDYWNoCiAgICAgbG9h ZFBhcmFtZXRlcnMuc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCA9IHNo b3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3Q7CiAgICAgbG9hZFBhcmFtZXRl cnMuaXNNYWluUmVzb3VyY2UgPSByZXNvdXJjZSAmJiByZXNvdXJjZS0+dHlwZSgpID09IENhY2hl ZFJlc291cmNlOjpNYWluUmVzb3VyY2U7CiAgICAgbG9hZFBhcmFtZXRlcnMuZGVmZXJzTG9hZGlu ZyA9IHJlc291cmNlTG9hZGVyLT5kZWZlcnNMb2FkaW5nKCk7CisgICAgbG9hZFBhcmFtZXRlcnMu c2hvdWxkQnVmZmVyUmVzb3VyY2UgPSByZXNvdXJjZSAmJiAocmVzb3VyY2UtPnR5cGUoKSA9PSBD YWNoZWRSZXNvdXJjZTo6Q1NTU3R5bGVTaGVldCB8fCByZXNvdXJjZS0+dHlwZSgpID09IENhY2hl ZFJlc291cmNlOjpTY3JpcHQpOwogCiAgICAgQVNTRVJUKChsb2FkUGFyYW1ldGVycy53ZWJQYWdl SUQgJiYgbG9hZFBhcmFtZXRlcnMud2ViRnJhbWVJRCkgfHwgbG9hZFBhcmFtZXRlcnMuY2xpZW50 Q3JlZGVudGlhbFBvbGljeSA9PSBEb05vdEFza0NsaWVudEZvckFueUNyZWRlbnRpYWxzKTsKIAo= 234574 2014-07-08 10:56:23 -0700 2014-07-09 12:08:20 -0700 Patch bug-134560.patch text/plain 6055 psolanki Y29tbWl0IDc2MTllNWEKQXV0aG9yOiBQcmF0aWsgU29sYW5raSA8cHNvbGFua2lAYXBwbGUuY29t PgpEYXRlOiAgIE1vbiBKdWwgNyAxNzo0MzowNiAyMDE0CgogICAgQnVmZmVyIENTUyBhbmQgSlMg cmVzb3VyY2VzIGluIG5ldHdvcmsgcHJvY2VzcyBiZWZvcmUgc2VuZGluZyBvdmVyIHRvIHdlYiBw cm9jZXNzCiAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NTYw CiAgICA8cmRhcjovL3Byb2JsZW0vMTc1NDE0MDM+CiAgICAKICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgogICAgCiAgICBGb3IgQ1NTIGFuZCBKUyByZXNvdXJjZXMsIGFzayB0aGUgbmV0 d29yayBwcm9jZXNzIHRvIGJ1ZmZlciB0aGUgZW50aXJlIHJlc291cmNlIGluc3RlYWQgb2YKICAg IHNlbmRpbmcgaXQgdG8gd2ViIHByb2Nlc3MgaW4gY2h1bmtzIHNpbmNlIHRoZSB3ZWIgcHJvY2Vz cyBjYW4ndCBkbyBhbnl0aGluZyB3aXRoIGEgcGFydGlhbAogICAgY3NzIG9yIGpzIGZpbGUuCiAg ICAKICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKICAgIChX ZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6TmV0d29ya1Jlc291cmNlTG9hZGVyKToKICAg ICogU2hhcmVkL05ldHdvcmsvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwOgogICAg KFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6Ok5ldHdvcmtSZXNvdXJjZUxv YWRQYXJhbWV0ZXJzKToKICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJz OjplbmNvZGUpOgogICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmRl Y29kZSk6CiAgICAqIFNoYXJlZC9OZXR3b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJz Lmg6CiAgICAqIFdlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuY3Bw OgogICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpzY2hlZHVsZUxvYWQpOgoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlMDRiMWEyLi4xY2FiNGJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjcg QEAKIDIwMTQtMDctMDggIFByYXRpayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgogCisg ICAgICAgIEJ1ZmZlciBDU1MgYW5kIEpTIHJlc291cmNlcyBpbiBuZXR3b3JrIHByb2Nlc3MgYmVm b3JlIHNlbmRpbmcgb3ZlciB0byB3ZWIgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NTYwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8x NzU0MTQwMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGb3IgQ1NTIGFuZCBKUyByZXNvdXJjZXMsIGFzayB0aGUgbmV0d29yayBwcm9jZXNzIHRvIGJ1 ZmZlciB0aGUgZW50aXJlIHJlc291cmNlIGluc3RlYWQgb2YKKyAgICAgICAgc2VuZGluZyBpdCB0 byB3ZWIgcHJvY2VzcyBpbiBjaHVua3Mgc2luY2UgdGhlIHdlYiBwcm9jZXNzIGNhbid0IGRvIGFu eXRoaW5nIHdpdGggYSBwYXJ0aWFsCisgICAgICAgIGNzcyBvciBqcyBmaWxlLiAKKworICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChX ZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6TmV0d29ya1Jlc291cmNlTG9hZGVyKToKKyAg ICAgICAgKiBTaGFyZWQvTmV0d29yay9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5jcHA6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzOjpOZXR3b3Jr UmVzb3VyY2VMb2FkUGFyYW1ldGVycyk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJj ZUxvYWRQYXJhbWV0ZXJzOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3Vy Y2VMb2FkUGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvTmV0d29yay9OZXR3 b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29y ay9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNv dXJjZUxvYWRTY2hlZHVsZXI6OnNjaGVkdWxlTG9hZCk6CisKKzIwMTQtMDctMDggIFByYXRpayBT b2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgorCiAgICAgICAgIE1vdmUgcmVzb3VyY2UgYnVm ZmVyaW5nIGZyb20gU3luY2hyb25vdXNOZXR3b3JrTG9hZGVyQ2xpZW50IHRvIE5ldHdvcmtSZXNv dXJjZUxvYWRlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTM0NzMyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05l dHdvcmtSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IGY5OGQ2NDQuLjg5NDMzOTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9h ZGVyLmNwcApAQCAtOTksMTEgKzk5LDEzIEBAIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6TmV0d29y a1Jlc291cmNlTG9hZGVyKGNvbnN0IE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzCiAKICAg ICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogICAgIAotICAgIGlmIChyZXBseSkgeworICAg IGlmIChyZXBseSkKICAgICAgICAgbV9uZXR3b3JrTG9hZGVyQ2xpZW50ID0gc3RkOjptYWtlX3Vu aXF1ZTxTeW5jaHJvbm91c05ldHdvcmtMb2FkZXJDbGllbnQ+KG1fcmVxdWVzdCwgcmVwbHkpOwot ICAgICAgICBtX2J1ZmZlcmVkRGF0YSA9IFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKCk7 Ci0gICAgfSBlbHNlCisgICAgZWxzZQogICAgICAgICBtX25ldHdvcmtMb2FkZXJDbGllbnQgPSBz dGQ6Om1ha2VfdW5pcXVlPEFzeW5jaHJvbm91c05ldHdvcmtMb2FkZXJDbGllbnQ+KCk7CisKKyAg ICBpZiAocmVwbHkgfHwgcGFyYW1ldGVycy5zaG91bGRCdWZmZXJSZXNvdXJjZSkKKyAgICAgICAg bV9idWZmZXJlZERhdGEgPSBXZWJDb3JlOjpTaGFyZWRCdWZmZXI6OmNyZWF0ZSgpOwogfQogCiBO ZXR3b3JrUmVzb3VyY2VMb2FkZXI6On5OZXR3b3JrUmVzb3VyY2VMb2FkZXIoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFt ZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Jlc291cmNl TG9hZFBhcmFtZXRlcnMuY3BwCmluZGV4IDNmN2Q5OWUuLjBjNzVjY2YgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJz LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3b3JrUmVzb3VyY2VM b2FkUGFyYW1ldGVycy5jcHAKQEAgLTQ4LDYgKzQ4LDcgQEAgTmV0d29ya1Jlc291cmNlTG9hZFBh cmFtZXRlcnM6Ok5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzKCkKICAgICAsIHNob3VsZENs ZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QodHJ1ZSkKICAgICAsIGlzTWFpblJlc291 cmNlKGZhbHNlKQogICAgICwgZGVmZXJzTG9hZGluZyhmYWxzZSkKKyAgICAsIHNob3VsZEJ1ZmZl clJlc291cmNlKGZhbHNlKQogewogfQogCkBAIC05Niw2ICs5Nyw3IEBAIHZvaWQgTmV0d29ya1Jl c291cmNlTG9hZFBhcmFtZXRlcnM6OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYgZW5jb2Rl cikgY29uc3QKICAgICBlbmNvZGVyIDw8IHNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQ UmVkaXJlY3Q7CiAgICAgZW5jb2RlciA8PCBpc01haW5SZXNvdXJjZTsKICAgICBlbmNvZGVyIDw8 IGRlZmVyc0xvYWRpbmc7CisgICAgZW5jb2RlciA8PCBzaG91bGRCdWZmZXJSZXNvdXJjZTsKIH0K IAogYm9vbCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVyczo6ZGVjb2RlKElQQzo6QXJndW1l bnREZWNvZGVyJiBkZWNvZGVyLCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYgcmVzdWx0 KQpAQCAtMTQ4LDYgKzE1MCw4IEBAIGJvb2wgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6 OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgTmV0d29yCiAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5kZWZlcnNMb2FkaW5n KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0 LnNob3VsZEJ1ZmZlclJlc291cmNlKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0 dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9O ZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05l dHdvcmsvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaAppbmRleCA5YzMzY2YzLi41OWM3 NjFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3b3JrUmVz b3VyY2VMb2FkUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3Jr L05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmgKQEAgLTY0LDYgKzY0LDcgQEAgcHVibGlj OgogICAgIGJvb2wgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdDsKICAg ICBib29sIGlzTWFpblJlc291cmNlOwogICAgIGJvb2wgZGVmZXJzTG9hZGluZzsKKyAgICBib29s IHNob3VsZEJ1ZmZlclJlc291cmNlOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2Fk U2NoZWR1bGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNv dXJjZUxvYWRTY2hlZHVsZXIuY3BwCmluZGV4IDRlYjdlZTkuLmM0YTI0YmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRTY2hlZHVs ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJj ZUxvYWRTY2hlZHVsZXIuY3BwCkBAIC0xMzYsNiArMTM2LDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxv YWRTY2hlZHVsZXI6OnNjaGVkdWxlTG9hZChSZXNvdXJjZUxvYWRlciogcmVzb3VyY2VMb2FkZXIs IENhY2gKICAgICBsb2FkUGFyYW1ldGVycy5zaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRU UFJlZGlyZWN0ID0gc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdDsKICAg ICBsb2FkUGFyYW1ldGVycy5pc01haW5SZXNvdXJjZSA9IHJlc291cmNlICYmIHJlc291cmNlLT50 eXBlKCkgPT0gQ2FjaGVkUmVzb3VyY2U6Ok1haW5SZXNvdXJjZTsKICAgICBsb2FkUGFyYW1ldGVy cy5kZWZlcnNMb2FkaW5nID0gcmVzb3VyY2VMb2FkZXItPmRlZmVyc0xvYWRpbmcoKTsKKyAgICBs b2FkUGFyYW1ldGVycy5zaG91bGRCdWZmZXJSZXNvdXJjZSA9IHJlc291cmNlICYmIChyZXNvdXJj ZS0+dHlwZSgpID09IENhY2hlZFJlc291cmNlOjpDU1NTdHlsZVNoZWV0IHx8IHJlc291cmNlLT50 eXBlKCkgPT0gQ2FjaGVkUmVzb3VyY2U6OlNjcmlwdCk7CiAKICAgICBBU1NFUlQoKGxvYWRQYXJh bWV0ZXJzLndlYlBhZ2VJRCAmJiBsb2FkUGFyYW1ldGVycy53ZWJGcmFtZUlEKSB8fCBsb2FkUGFy YW1ldGVycy5jbGllbnRDcmVkZW50aWFsUG9saWN5ID09IERvTm90QXNrQ2xpZW50Rm9yQW55Q3Jl ZGVudGlhbHMpOwogCg== 234673 2014-07-09 17:23:51 -0700 2014-07-09 17:23:51 -0700 Patch for bots that will apply cleanly now bug-134560.patch text/plain 5936 psolanki Y29tbWl0IDI0YTA4OWYKQXV0aG9yOiBQcmF0aWsgU29sYW5raSA8cHNvbGFua2lAYXBwbGUuY29t PgpEYXRlOiAgIE1vbiBKdWwgNyAxNzo0MzowNiAyMDE0CgogICAgQnVmZmVyIENTUyBhbmQgSlMg cmVzb3VyY2VzIGluIG5ldHdvcmsgcHJvY2VzcyBiZWZvcmUgc2VuZGluZyBvdmVyIHRvIHdlYiBw cm9jZXNzCiAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NTYw CiAgICA8cmRhcjovL3Byb2JsZW0vMTY3MzcxODY+CiAgICAKICAgIFJldmlld2VkIGJ5IEFudHRp IEtvaXZpc3RvLgogICAgCiAgICBGb3IgQ1NTIGFuZCBKUyByZXNvdXJjZXMsIGFzayB0aGUgbmV0 d29yayBwcm9jZXNzIHRvIGJ1ZmZlciB0aGUgZW50aXJlIHJlc291cmNlIGluc3RlYWQgb2YKICAg IHNlbmRpbmcgaXQgdG8gd2ViIHByb2Nlc3MgaW4gY2h1bmtzIHNpbmNlIHRoZSB3ZWIgcHJvY2Vz cyBjYW4ndCBkbyBhbnl0aGluZyB3aXRoIGEgcGFydGlhbAogICAgY3NzIG9yIGpzIGZpbGUuCiAg ICAKICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKICAgIChX ZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6TmV0d29ya1Jlc291cmNlTG9hZGVyKToKICAg ICogU2hhcmVkL05ldHdvcmsvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwOgogICAg KFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6Ok5ldHdvcmtSZXNvdXJjZUxv YWRQYXJhbWV0ZXJzKToKICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJz OjplbmNvZGUpOgogICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmRl Y29kZSk6CiAgICAqIFNoYXJlZC9OZXR3b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJz Lmg6CiAgICAqIFdlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuY3Bw OgogICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpzY2hlZHVsZUxvYWQpOgoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0N2Q3OTJhLi4wYjEzMjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTQtMDctMDggIFByYXRpayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgorCisg ICAgICAgIEJ1ZmZlciBDU1MgYW5kIEpTIHJlc291cmNlcyBpbiBuZXR3b3JrIHByb2Nlc3MgYmVm b3JlIHNlbmRpbmcgb3ZlciB0byB3ZWIgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NTYwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8x NjczNzE4Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAg ICBGb3IgQ1NTIGFuZCBKUyByZXNvdXJjZXMsIGFzayB0aGUgbmV0d29yayBwcm9jZXNzIHRvIGJ1 ZmZlciB0aGUgZW50aXJlIHJlc291cmNlIGluc3RlYWQgb2YKKyAgICAgICAgc2VuZGluZyBpdCB0 byB3ZWIgcHJvY2VzcyBpbiBjaHVua3Mgc2luY2UgdGhlIHdlYiBwcm9jZXNzIGNhbid0IGRvIGFu eXRoaW5nIHdpdGggYSBwYXJ0aWFsCisgICAgICAgIGNzcyBvciBqcyBmaWxlLgorCisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdl YktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpOZXR3b3JrUmVzb3VyY2VMb2FkZXIpOgorICAg ICAgICAqIFNoYXJlZC9OZXR3b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcDoK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6Ok5ldHdvcmtS ZXNvdXJjZUxvYWRQYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNl TG9hZFBhcmFtZXRlcnM6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJj ZUxvYWRQYXJhbWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9OZXR3b3JrL05ldHdv cmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9OZXR3b3Jr L1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291 cmNlTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVMb2FkKToKKwogMjAxNC0wNy0wOSAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFN1cHBvcnQgdHJhbnNwYXJl bnQgV0tXZWJWaWV3cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggZjk4ZDY0NC4uMWY4ZjcxNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VM b2FkZXIuY3BwCkBAIC05OSwxMCArOTksMTIgQEAgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpOZXR3 b3JrUmVzb3VyY2VMb2FkZXIoY29uc3QgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMKIAog ICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAgICAgCi0gICAgaWYgKHJlcGx5KSB7Ci0g ICAgICAgIG1fbmV0d29ya0xvYWRlckNsaWVudCA9IHN0ZDo6bWFrZV91bmlxdWU8U3luY2hyb25v dXNOZXR3b3JrTG9hZGVyQ2xpZW50PihtX3JlcXVlc3QsIHJlcGx5KTsKKyAgICBpZiAocmVwbHkg fHwgcGFyYW1ldGVycy5zaG91bGRCdWZmZXJSZXNvdXJjZSkKICAgICAgICAgbV9idWZmZXJlZERh dGEgPSBXZWJDb3JlOjpTaGFyZWRCdWZmZXI6OmNyZWF0ZSgpOwotICAgIH0gZWxzZQorCisgICAg aWYgKHJlcGx5KQorICAgICAgICBtX25ldHdvcmtMb2FkZXJDbGllbnQgPSBzdGQ6Om1ha2VfdW5p cXVlPFN5bmNocm9ub3VzTmV0d29ya0xvYWRlckNsaWVudD4obV9yZXF1ZXN0LCByZXBseSk7Cisg ICAgZWxzZQogICAgICAgICBtX25ldHdvcmtMb2FkZXJDbGllbnQgPSBzdGQ6Om1ha2VfdW5pcXVl PEFzeW5jaHJvbm91c05ldHdvcmtMb2FkZXJDbGllbnQ+KCk7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJz LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQ YXJhbWV0ZXJzLmNwcAppbmRleCAzZjdkOTllLi4wYzc1Y2NmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Jlc291cmNlTG9hZFBh cmFtZXRlcnMuY3BwCkBAIC00OCw2ICs0OCw3IEBAIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0 ZXJzOjpOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycygpCiAgICAgLCBzaG91bGRDbGVhclJl ZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0KHRydWUpCiAgICAgLCBpc01haW5SZXNvdXJjZShm YWxzZSkKICAgICAsIGRlZmVyc0xvYWRpbmcoZmFsc2UpCisgICAgLCBzaG91bGRCdWZmZXJSZXNv dXJjZShmYWxzZSkKIHsKIH0KIApAQCAtOTYsNiArOTcsNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJj ZUxvYWRQYXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpBcmd1bWVudEVuY29kZXImIGVuY29kZXIpIGNv bnN0CiAgICAgZW5jb2RlciA8PCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGly ZWN0OwogICAgIGVuY29kZXIgPDwgaXNNYWluUmVzb3VyY2U7CiAgICAgZW5jb2RlciA8PCBkZWZl cnNMb2FkaW5nOworICAgIGVuY29kZXIgPDwgc2hvdWxkQnVmZmVyUmVzb3VyY2U7CiB9CiAKIGJv b2wgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkFyZ3VtZW50RGVj b2RlciYgZGVjb2RlciwgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMmIHJlc3VsdCkKQEAg LTE0OCw2ICsxNTAsOCBAQCBib29sIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzOjpkZWNv ZGUoSVBDOjpBcmd1bWVudERlY29kZXImIGRlY29kZXIsIE5ldHdvcgogICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuZGVmZXJzTG9hZGluZykpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5zaG91 bGRCdWZmZXJSZXNvdXJjZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJldHVybiB0 cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29y a1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3Jr L05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmgKaW5kZXggOWMzM2NmMy4uNTljNzYxYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Jlc291cmNl TG9hZFBhcmFtZXRlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3 b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oCkBAIC02NCw2ICs2NCw3IEBAIHB1YmxpYzoKICAg ICBib29sIHNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3Q7CiAgICAgYm9v bCBpc01haW5SZXNvdXJjZTsKICAgICBib29sIGRlZmVyc0xvYWRpbmc7CisgICAgYm9vbCBzaG91 bGRCdWZmZXJSZXNvdXJjZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVk dWxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VM b2FkU2NoZWR1bGVyLmNwcAppbmRleCA0ZWI3ZWU5Li5jNGEyNGJmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2Fk U2NoZWR1bGVyLmNwcApAQCAtMTM2LDYgKzEzNiw3IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU2No ZWR1bGVyOjpzY2hlZHVsZUxvYWQoUmVzb3VyY2VMb2FkZXIqIHJlc291cmNlTG9hZGVyLCBDYWNo CiAgICAgbG9hZFBhcmFtZXRlcnMuc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRp cmVjdCA9IHNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3Q7CiAgICAgbG9h ZFBhcmFtZXRlcnMuaXNNYWluUmVzb3VyY2UgPSByZXNvdXJjZSAmJiByZXNvdXJjZS0+dHlwZSgp ID09IENhY2hlZFJlc291cmNlOjpNYWluUmVzb3VyY2U7CiAgICAgbG9hZFBhcmFtZXRlcnMuZGVm ZXJzTG9hZGluZyA9IHJlc291cmNlTG9hZGVyLT5kZWZlcnNMb2FkaW5nKCk7CisgICAgbG9hZFBh cmFtZXRlcnMuc2hvdWxkQnVmZmVyUmVzb3VyY2UgPSByZXNvdXJjZSAmJiAocmVzb3VyY2UtPnR5 cGUoKSA9PSBDYWNoZWRSZXNvdXJjZTo6Q1NTU3R5bGVTaGVldCB8fCByZXNvdXJjZS0+dHlwZSgp ID09IENhY2hlZFJlc291cmNlOjpTY3JpcHQpOwogCiAgICAgQVNTRVJUKChsb2FkUGFyYW1ldGVy cy53ZWJQYWdlSUQgJiYgbG9hZFBhcmFtZXRlcnMud2ViRnJhbWVJRCkgfHwgbG9hZFBhcmFtZXRl cnMuY2xpZW50Q3JlZGVudGlhbFBvbGljeSA9PSBEb05vdEFza0NsaWVudEZvckFueUNyZWRlbnRp YWxzKTsKIAo=