80225 2012-03-04 13:01:25 -0800 Web Inspector: CSS inactive property check should account for vendor prefixes 2012-03-05 10:58:25 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 timothy apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 570286 0 130030 timothy 2012-03-04 13:01:25 -0800 Created attachment 130030 Test case Given this CSS, only "opacity" is active. The others should be inactive. -apple-opacity: 0.75; -khtml-opacity: 0.25; -webkit-opacity: 0.5; opacity: 1; I think InspectorStyle::populateObjectWithStyleProperties is responsible for marking these properties as inactive. 570290 1 timothy 2012-03-04 13:09:20 -0800 In the real world I ran into this on http://theverge.com where they specify many properties with prefixes for multiple vendors and without prefixes. A common practice for advanced CSS3 sites. 570291 2 timothy 2012-03-04 13:11:11 -0800 Note: -apple-, and -khtml- are supported by WebKit. Though I think internally they get turned into -webkit- by the parser. 570650 3 130121 apavlov 2012-03-05 06:54:57 -0800 Created attachment 130121 Patch 570663 4 130121 pfeldman 2012-03-05 07:08:20 -0800 Comment on attachment 130121 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=130121&action=review > Source/WebCore/inspector/InspectorStyleSheet.cpp:484 > + CSSPropertyID propertyId = static_cast<CSSPropertyID>(cssPropertyID(name)); This does not seem to cover the computed style trace. > LayoutTests/inspector/elements/elements-panel-styles-expected.txt:13 > + .foo, .foo::before - blue elements-panel-styles.css:25 Please prefer adding new tests for new features / regressions. 570766 5 130151 apavlov 2012-03-05 09:16:48 -0800 Created attachment 130151 Patch 570773 6 130152 apavlov 2012-03-05 09:26:15 -0800 Created attachment 130152 [PATCH] Test expectation updated 570845 7 130152 webkit.review.bot 2012-03-05 10:58:15 -0800 Comment on attachment 130152 [PATCH] Test expectation updated Clearing flags on attachment: 130152 Committed r109772: <http://trac.webkit.org/changeset/109772> 570846 8 webkit.review.bot 2012-03-05 10:58:25 -0800 All reviewed patches have been landed. Closing bug. 130030 2012-03-04 13:01:25 -0800 2012-03-04 13:01:25 -0800 Test case test.html text/html 224 timothy PHN0eWxlPgpkaXYgewoJLWFwcGxlLW9wYWNpdHk6IDAuNzU7Cgkta2h0bWwtb3BhY2l0eTogMC4y NTsKCS13ZWJraXQtb3BhY2l0eTogMC41OwoJb3BhY2l0eTogMTsKCgktbW96LWJveC1zaGFkb3c6 IGJsYWNrIDAgMnB4IDJweDsKCWJveC1zaGFkb3c6IHJlZCAwIDJweCAycHg7Cgktd2Via2l0LWJv eC1zaGFkb3c6IGdyZWVuIDAgMnB4IDJweDsKfQo8L3N0eWxlPgo8ZGl2PkZvbzwvZGl2Pgo= 130121 2012-03-05 06:54:57 -0800 2012-03-05 09:16:38 -0800 Patch bug-80225-20120305185455.patch text/plain 7395 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5NzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYThhNWEyYzU1MGIzZmI1 MjBiNzU1ODllMGY3ZGExOWU2NGI5MzU0YS4uMmQwZmViOWJkYzc0ZmI4Y2ZlNjYyZjdmNzhlNGE5 ZWM2OGM1ZWQxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE1IEBACiAyMDEyLTAzLTA1ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogQ1NTIGluYWN0aXZlIHByb3BlcnR5IGNoZWNrIHNob3VsZCBhY2NvdW50IGZvciB2ZW5k b3IgcHJlZml4ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTgwMjI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JTdHlsZTo6cG9wdWxhdGVPYmplY3RXaXRoU3R5bGVQcm9wZXJ0aWVzKToKKwor MjAxMi0wMy0wNSAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IEluY29ycmVjdCBhcHByb3ByaWF0ZVNlbGVjdG9yRm9yKCkg c3VnZ2VzdGlvbiBmb3Igd2hlbiBhIERPTU5vZGUgaGFzIG1vcmUgdGhhbiAyIENTUyBjbGFzc2Vz CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDI1OAog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVl dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAK aW5kZXggODk4YTdkNTdlM2ViMzhhMzZmNDA1YWExMzdmYzc5YmE0ZDk4NDFkZC4uNzVlYmU1ZTA3 NTE3Y2Q4YWNjNjExMGEyOTc1MzZkZjk4ZmQzNTMxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcApAQCAtMzAsNiArMzAsNyBAQAogI2lu Y2x1ZGUgIkNTU0ltcG9ydFJ1bGUuaCIKICNpbmNsdWRlICJDU1NNZWRpYVJ1bGUuaCIKICNpbmNs dWRlICJDU1NQYXJzZXIuaCIKKyNpbmNsdWRlICJDU1NQcm9wZXJ0eU5hbWVzLmgiCiAjaW5jbHVk ZSAiQ1NTUHJvcGVydHlTb3VyY2VEYXRhLmgiCiAjaW5jbHVkZSAiQ1NTUnVsZS5oIgogI2luY2x1 ZGUgIkNTU1J1bGVMaXN0LmgiCkBAIC00ODAsNyArNDgxLDEwIEBAIHZvaWQgSW5zcGVjdG9yU3R5 bGU6OnBvcHVsYXRlT2JqZWN0V2l0aFN0eWxlUHJvcGVydGllcyhJbnNwZWN0b3JPYmplY3QqIHJl c3VsdCkKICAgICAgICAgICAgICAgICAvLyBQYXJzZWQgcHJvcGVydHkgb3ZlcnJpZGVzIGFueSBw cm9wZXJ0eSB3aXRoIHRoZSBzYW1lIG5hbWUuIE5vbi1wYXJzZWQgcHJvcGVydHkgb3ZlcnJpZGVz CiAgICAgICAgICAgICAgICAgLy8gcHJldmlvdXMgbm9uLXBhcnNlZCBwcm9wZXJ0eSB3aXRoIHRo ZSBzYW1lIG5hbWUgKGlmIGFueSkuCiAgICAgICAgICAgICAgICAgYm9vbCBzaG91bGRJbmFjdGl2 YXRlID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgSGFzaE1hcDxTdHJpbmcsIFJlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+ID46Oml0ZXJhdG9yIGFjdGl2ZUl0ID0gcHJvcGVydHlOYW1lVG9QcmV2aW91 c0FjdGl2ZVByb3BlcnR5LmZpbmQobmFtZSk7CisgICAgICAgICAgICAgICAgQ1NTUHJvcGVydHlJ RCBwcm9wZXJ0eUlkID0gc3RhdGljX2Nhc3Q8Q1NTUHJvcGVydHlJRD4oY3NzUHJvcGVydHlJRChu YW1lKSk7CisgICAgICAgICAgICAgICAgLy8gQ2Fub25pY2FsaXplIHByb3BlcnR5IG5hbWVzIHRv IHRyZWF0IG5vbi1wcmVmaXhlZCBhbmQgdmVuZG9yLXByZWZpeGVkIHByb3BlcnR5IG5hbWVzIHRo ZSBzYW1lIChvcGFjaXR5IHZzLiAtd2Via2l0LW9wYWNpdHkpLgorICAgICAgICAgICAgICAgIFN0 cmluZyBjYW5vbmljYWxQcm9wZXJ0eU5hbWUgPSBwcm9wZXJ0eUlkID8gU3RyaW5nKGdldFByb3Bl cnR5TmFtZShwcm9wZXJ0eUlkKSkgOiBuYW1lOworICAgICAgICAgICAgICAgIEhhc2hNYXA8U3Ry aW5nLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiA+OjppdGVyYXRvciBhY3RpdmVJdCA9IHByb3Bl cnR5TmFtZVRvUHJldmlvdXNBY3RpdmVQcm9wZXJ0eS5maW5kKGNhbm9uaWNhbFByb3BlcnR5TmFt ZSk7CiAgICAgICAgICAgICAgICAgaWYgKGFjdGl2ZUl0ICE9IHByb3BlcnR5TmFtZVRvUHJldmlv dXNBY3RpdmVQcm9wZXJ0eS5lbmQoKSkgewogICAgICAgICAgICAgICAgICAgICBpZiAocHJvcGVy dHlFbnRyeS5wYXJzZWRPaykKICAgICAgICAgICAgICAgICAgICAgICAgIHNob3VsZEluYWN0aXZh dGUgPSB0cnVlOwpAQCAtNDkxLDEyICs0OTUsMTIgQEAgdm9pZCBJbnNwZWN0b3JTdHlsZTo6cG9w dWxhdGVPYmplY3RXaXRoU3R5bGVQcm9wZXJ0aWVzKEluc3BlY3Rvck9iamVjdCogcmVzdWx0KQog ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNob3VsZEluYWN0aXZhdGUgPSB0cnVlOwogICAg ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAg ICAgICAgIHByb3BlcnR5TmFtZVRvUHJldmlvdXNBY3RpdmVQcm9wZXJ0eS5zZXQobmFtZSwgcHJv cGVydHkpOworICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0eU5hbWVUb1ByZXZpb3VzQWN0aXZl UHJvcGVydHkuc2V0KGNhbm9uaWNhbFByb3BlcnR5TmFtZSwgcHJvcGVydHkpOwogCiAgICAgICAg ICAgICAgICAgaWYgKHNob3VsZEluYWN0aXZhdGUpIHsKICAgICAgICAgICAgICAgICAgICAgYWN0 aXZlSXQtPnNlY29uZC0+c2V0U3RyaW5nKCJzdGF0dXMiLCAiaW5hY3RpdmUiKTsKICAgICAgICAg ICAgICAgICAgICAgYWN0aXZlSXQtPnNlY29uZC0+cmVtb3ZlKCJzaG9ydGhhbmROYW1lIik7Ci0g ICAgICAgICAgICAgICAgICAgIHByb3BlcnR5TmFtZVRvUHJldmlvdXNBY3RpdmVQcm9wZXJ0eS5z ZXQobmFtZSwgcHJvcGVydHkpOworICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0eU5hbWVUb1By ZXZpb3VzQWN0aXZlUHJvcGVydHkuc2V0KGNhbm9uaWNhbFByb3BlcnR5TmFtZSwgcHJvcGVydHkp OwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAg ICAgYm9vbCBpbXBsaWNpdCA9IG1fc3R5bGUtPmlzUHJvcGVydHlJbXBsaWNpdChuYW1lKTsKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCA2N2YzNmI4YzQyNWQyMzI2NzIxOTMxNjk0NmZhNGExODA1ZWM0MzE3Li5hNmI3MmNkMTgx Y2M4M2E3NzZiNGU5OTU0MmQ3ODNhNjgxZjUxNzczIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIw MTItMDMtMDUgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBDU1MgaW5hY3RpdmUgcHJvcGVydHkgY2hlY2sgc2hvdWxkIGFj Y291bnQgZm9yIHZlbmRvciBwcmVmaXhlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODAyMjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9lbGVtZW50cy9lbGVtZW50cy1wYW5lbC1zdHls ZXMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9lbGVtZW50cy9yZXNvdXJjZXMv ZWxlbWVudHMtcGFuZWwtc3R5bGVzLmNzczoKKyAgICAgICAgKC5mb28pOgorCiAyMDEyLTAzLTAy ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogW1N0eWxlc10gW0NSQVNIXSBIYW5kbGUgcnVsZSBhZGRpdGlvbiBhbmQgaW5s aW5lIHN0eWxlIGVkaXRpbmcgZmFpbHVyZSBkdWUgdG8gQ29udGVudC1TZWN1cml0eS1Qb2xpY3kg aW4gdGhlIHBhZ2UKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9l bGVtZW50cy1wYW5lbC1zdHlsZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXN0eWxlcy1leHBlY3RlZC50eHQKaW5kZXggM2RlN2I2 ZWYyMDc1MDZjYWM5MDcwNTA2ODg0YjI0ZDUwODAzYzc4OC4uYjJmMTU2Mzk5ZjViMGE5MDZiNzM2 M2YxNjlmYzFiZjNjNDJmZDlmYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Vs ZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXN0eWxlcy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXN0eWxlcy1leHBlY3RlZC50eHQK QEAgLTEwLDcgKzEwLDcgQEAgYm9yZGVyLXRvcC1sZWZ0LXJhZGl1czogNXB4OwogYm9yZGVyLXRv cC1yaWdodC1yYWRpdXM6IDVweDsKICAgICAuZm9vIC0gNXB4IGVsZW1lbnRzLXBhbmVsLXN0eWxl cy5jc3M6MTQKIGNvbG9yOiBibHVlOwotICAgIC5mb28sIC5mb286OmJlZm9yZSAtIGJsdWUgZWxl bWVudHMtcGFuZWwtc3R5bGVzLmNzczoyMQorICAgIC5mb28sIC5mb286OmJlZm9yZSAtIGJsdWUg ZWxlbWVudHMtcGFuZWwtc3R5bGVzLmNzczoyNQogICAgIC8tLSBvdmVybG9hZGVkIC0tLyAuZm9v IC0gYmxhY2sgZWxlbWVudHMtcGFuZWwtc3R5bGVzLmNzczoxNAogZGlzcGxheTogbm9uZTsKICAg ICBlbGVtZW50LnN0eWxlIC0gbm9uZSAKQEAgLTMxLDYgKzMxLDggQEAgbWFyZ2luLXJpZ2h0OiAw cHg7CiAgICAgLmZvbyAtIDBweCBlbGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzOjE0CiBtYXJnaW4t dG9wOiAxMHB4OwogICAgIC5mb28gLSAxMHB4IGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MTQK K29wYWNpdHk6IDE7CisgICAgLmZvbyAtIDEgZWxlbWVudHMtcGFuZWwtc3R5bGVzLmNzczoxNAog dGV4dC1hbGlnbjogLXdlYmtpdC1sZWZ0OwogICAgIGRpdltBdHRyaWJ1dGVzIFN0eWxlXSAtIC13 ZWJraXQtbGVmdCAKIApAQCAtNDQsMTAgKzQ2LDEwIEBAIGRpc3BsYXk6IG5vbmU7CiBmb250LXN0 eWxlOiBpdGFsaWMgIWltcG9ydGFudDsKIAogW2V4cGFuZGVkXSAKLS5mb28gIHsgKGVsZW1lbnRz LXBhbmVsLXN0eWxlcy5jc3M6MzkpCisuZm9vICB7IChlbGVtZW50cy1wYW5lbC1zdHlsZXMuY3Nz OjQzKQogCiBbZXhwYW5kZWRdIAotLmZvbywgLmZvbzo6YmVmb3JlICB7IChlbGVtZW50cy1wYW5l bC1zdHlsZXMuY3NzOjIxKQorLmZvbywgLmZvbzo6YmVmb3JlICB7IChlbGVtZW50cy1wYW5lbC1z dHlsZXMuY3NzOjI1KQogY29udGVudDogIltiZWZvcmUgRm9vXSI7CiBjb2xvcjogYmx1ZTsKIApA QCAtNjUsNiArNjcsMTAgQEAgYm9yZGVyLXJhZGl1czogNXB4OwogICAgIGJvcmRlci1ib3R0b20t cmlnaHQtcmFkaXVzOiA1cHg7CiAgICAgYm9yZGVyLWJvdHRvbS1sZWZ0LXJhZGl1czogNXB4Owog Ly0tIG92ZXJsb2FkZWQgLS0vIGZvbnQtc3R5bGU6IG5vcm1hbCAhaW1wb3J0YW50OworLy0tIG92 ZXJsb2FkZWQgLS0vIC1hcHBsZS1vcGFjaXR5OiAwLjc1OworLy0tIG92ZXJsb2FkZWQgLS0vIC1r aHRtbC1vcGFjaXR5OiAwLjI1OworLy0tIG92ZXJsb2FkZWQgLS0vIC13ZWJraXQtb3BhY2l0eTog MC41Oworb3BhY2l0eTogMTsKIAogW2V4cGFuZGVkXSAKIGRpdltBdHRyaWJ1dGVzIFN0eWxlXSAg eyAoKQpAQCAtODgsMjYgKzk0LDI2IEBAIGJvZHkgIHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5j c3M6MSkKIAogPT09PT09PT0gUHNldWRvIDo6YmVmb3JlIGVsZW1lbnQgPT09PT09PT0KIFtleHBh bmRlZF0gCi0uZm9vOjpiZWZvcmUgIHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6NDMpCisu Zm9vOjpiZWZvcmUgIHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6NDcpCiAKIFtleHBhbmRl ZF0gCi0uZm9vOjpiZWZvcmUgIHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MjYpCisuZm9v OjpiZWZvcmUgIHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MzApCiBjb2xvcjogcmVkOwog CiBbZXhwYW5kZWRdIAotLmZvbywgLmZvbzo6YmVmb3JlICB7IChlbGVtZW50cy1wYW5lbC1zdHls ZXMuY3NzOjIxKQorLmZvbywgLmZvbzo6YmVmb3JlICB7IChlbGVtZW50cy1wYW5lbC1zdHlsZXMu Y3NzOjI1KQogY29udGVudDogIltiZWZvcmUgRm9vXSI7CiAvLS0gb3ZlcmxvYWRlZCAtLS8gY29s b3I6IGJsdWU7CiAKIAogPT09PT09PT0gUHNldWRvIDo6YWZ0ZXIgZWxlbWVudCA9PT09PT09PQog W2V4cGFuZGVkXSAKLS5mb286OmFmdGVyICB7IChlbGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzOjM0 KQorLmZvbzo6YWZ0ZXIgIHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MzgpCiBmb250LWZh bWlseTogY291cmllcjsKIGNvbnRlbnQ6ICJbYWZ0ZXIgRm9vIDJdIjsKIAogW2V4cGFuZGVkXSAK LS5mb286OmFmdGVyICB7IChlbGVtZW50cy1wYW5lbC1zdHlsZXMuY3NzOjMwKQorLmZvbzo6YWZ0 ZXIgIHsgKGVsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3M6MzQpCiAvLS0gb3ZlcmxvYWRlZCAtLS8g Y29udGVudDogIlthZnRlciBGb29dIjsKIGNvbG9yOiBncmVlbjsKIApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL3Jlc291cmNlcy9lbGVtZW50cy1wYW5lbC1zdHls ZXMuY3NzIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL3Jlc291cmNlcy9lbGVtZW50 cy1wYW5lbC1zdHlsZXMuY3NzCmluZGV4IGZkNzI3MTBkNzljZjc4NzAwZTVjNGMyZDY2Mzg3ZTMx N2ZjNjNhMTAuLjczN2RhNzBjMTM4YjBhNTVmM2QwMjVhNjI4YjRlMzIyNjdkMzNlZjUgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9yZXNvdXJjZXMvZWxlbWVudHMt cGFuZWwtc3R5bGVzLmNzcworKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvcmVz b3VyY2VzL2VsZW1lbnRzLXBhbmVsLXN0eWxlcy5jc3MKQEAgLTE2LDYgKzE2LDEwIEBAIGJvZHkg ewogICAgIG1hcmdpbjogMTBweCAwIDJweDsKICAgICBib3JkZXItcmFkaXVzOiA1cHg7CiAgICAg Zm9udC1zdHlsZTogbm9ybWFsICFpbXBvcnRhbnQ7CisgICAgLWFwcGxlLW9wYWNpdHk6IDAuNzU7 CisgICAgLWtodG1sLW9wYWNpdHk6IDAuMjU7CisgICAgLXdlYmtpdC1vcGFjaXR5OiAwLjU7Cisg ICAgb3BhY2l0eTogMTsKIH0KIAogLmZvbywgLmZvbzo6YmVmb3JlIHsK 130151 2012-03-05 09:16:48 -0800 2012-03-05 09:26:06 -0800 Patch bug-80225-20120305211645.patch text/plain 11662 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5NzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYThhNWEyYzU1MGIzZmI1 MjBiNzU1ODllMGY3ZGExOWU2NGI5MzU0YS4uNTE3OTIyYzQzNTJhNTA4MGM0OGZkOTM3ZTVlMmZh NmQwZDY1MzI0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEyLTAzLTA1ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogQ1NTIGluYWN0aXZlIHByb3BlcnR5IGNoZWNrIHNob3VsZCBhY2NvdW50IGZvciB2ZW5k b3IgcHJlZml4ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTgwMjI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGVzdDogaW5zcGVjdG9yL3N0eWxlcy92ZW5kb3ItcHJlZml4ZXMuaHRtbAorCisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yU3R5bGU6OnBvcHVsYXRlT2JqZWN0V2l0aFN0eWxlUHJvcGVydGllcyk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5hbHRlcmVkSGV4TnVtYmVyKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5jYW5vbmljYWxQcm9wZXJ0eU5hbWUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnByb3RvdHlwZS5fbWFy a1VzZWRQcm9wZXJ0aWVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNT ZWN0aW9uLnByb3RvdHlwZS5pc1Byb3BlcnR5T3ZlcmxvYWRlZCk6CisKKzIwMTItMDMtMDUgIEFs ZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5z cGVjdG9yOiBJbmNvcnJlY3QgYXBwcm9wcmlhdGVTZWxlY3RvckZvcigpIHN1Z2dlc3Rpb24gZm9y IHdoZW4gYSBET01Ob2RlIGhhcyBtb3JlIHRoYW4gMiBDU1MgY2xhc3NlcwogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODAyNTgKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCmluZGV4IDg5OGE3ZDU3 ZTNlYjM4YTM2ZjQwNWFhMTM3ZmM3OWJhNGQ5ODQxZGQuLjc1ZWJlNWUwNzUxN2NkOGFjYzYxMTBh Mjk3NTM2ZGY5OGZkMzUzMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JTdHlsZVNoZWV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yU3R5bGVTaGVldC5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJDU1NJbXBv cnRSdWxlLmgiCiAjaW5jbHVkZSAiQ1NTTWVkaWFSdWxlLmgiCiAjaW5jbHVkZSAiQ1NTUGFyc2Vy LmgiCisjaW5jbHVkZSAiQ1NTUHJvcGVydHlOYW1lcy5oIgogI2luY2x1ZGUgIkNTU1Byb3BlcnR5 U291cmNlRGF0YS5oIgogI2luY2x1ZGUgIkNTU1J1bGUuaCIKICNpbmNsdWRlICJDU1NSdWxlTGlz dC5oIgpAQCAtNDgwLDcgKzQ4MSwxMCBAQCB2b2lkIEluc3BlY3RvclN0eWxlOjpwb3B1bGF0ZU9i amVjdFdpdGhTdHlsZVByb3BlcnRpZXMoSW5zcGVjdG9yT2JqZWN0KiByZXN1bHQpCiAgICAgICAg ICAgICAgICAgLy8gUGFyc2VkIHByb3BlcnR5IG92ZXJyaWRlcyBhbnkgcHJvcGVydHkgd2l0aCB0 aGUgc2FtZSBuYW1lLiBOb24tcGFyc2VkIHByb3BlcnR5IG92ZXJyaWRlcwogICAgICAgICAgICAg ICAgIC8vIHByZXZpb3VzIG5vbi1wYXJzZWQgcHJvcGVydHkgd2l0aCB0aGUgc2FtZSBuYW1lIChp ZiBhbnkpLgogICAgICAgICAgICAgICAgIGJvb2wgc2hvdWxkSW5hY3RpdmF0ZSA9IGZhbHNlOwot ICAgICAgICAgICAgICAgIEhhc2hNYXA8U3RyaW5nLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiA+ OjppdGVyYXRvciBhY3RpdmVJdCA9IHByb3BlcnR5TmFtZVRvUHJldmlvdXNBY3RpdmVQcm9wZXJ0 eS5maW5kKG5hbWUpOworICAgICAgICAgICAgICAgIENTU1Byb3BlcnR5SUQgcHJvcGVydHlJZCA9 IHN0YXRpY19jYXN0PENTU1Byb3BlcnR5SUQ+KGNzc1Byb3BlcnR5SUQobmFtZSkpOworICAgICAg ICAgICAgICAgIC8vIENhbm9uaWNhbGl6ZSBwcm9wZXJ0eSBuYW1lcyB0byB0cmVhdCBub24tcHJl Zml4ZWQgYW5kIHZlbmRvci1wcmVmaXhlZCBwcm9wZXJ0eSBuYW1lcyB0aGUgc2FtZSAob3BhY2l0 eSB2cy4gLXdlYmtpdC1vcGFjaXR5KS4KKyAgICAgICAgICAgICAgICBTdHJpbmcgY2Fub25pY2Fs UHJvcGVydHlOYW1lID0gcHJvcGVydHlJZCA/IFN0cmluZyhnZXRQcm9wZXJ0eU5hbWUocHJvcGVy dHlJZCkpIDogbmFtZTsKKyAgICAgICAgICAgICAgICBIYXNoTWFwPFN0cmluZywgUmVmUHRyPElu c3BlY3Rvck9iamVjdD4gPjo6aXRlcmF0b3IgYWN0aXZlSXQgPSBwcm9wZXJ0eU5hbWVUb1ByZXZp b3VzQWN0aXZlUHJvcGVydHkuZmluZChjYW5vbmljYWxQcm9wZXJ0eU5hbWUpOwogICAgICAgICAg ICAgICAgIGlmIChhY3RpdmVJdCAhPSBwcm9wZXJ0eU5hbWVUb1ByZXZpb3VzQWN0aXZlUHJvcGVy dHkuZW5kKCkpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKHByb3BlcnR5RW50cnkucGFyc2Vk T2spCiAgICAgICAgICAgICAgICAgICAgICAgICBzaG91bGRJbmFjdGl2YXRlID0gdHJ1ZTsKQEAg LTQ5MSwxMiArNDk1LDEyIEBAIHZvaWQgSW5zcGVjdG9yU3R5bGU6OnBvcHVsYXRlT2JqZWN0V2l0 aFN0eWxlUHJvcGVydGllcyhJbnNwZWN0b3JPYmplY3QqIHJlc3VsdCkKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzaG91bGRJbmFjdGl2YXRlID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0 eU5hbWVUb1ByZXZpb3VzQWN0aXZlUHJvcGVydHkuc2V0KG5hbWUsIHByb3BlcnR5KTsKKyAgICAg ICAgICAgICAgICAgICAgcHJvcGVydHlOYW1lVG9QcmV2aW91c0FjdGl2ZVByb3BlcnR5LnNldChj YW5vbmljYWxQcm9wZXJ0eU5hbWUsIHByb3BlcnR5KTsKIAogICAgICAgICAgICAgICAgIGlmIChz aG91bGRJbmFjdGl2YXRlKSB7CiAgICAgICAgICAgICAgICAgICAgIGFjdGl2ZUl0LT5zZWNvbmQt PnNldFN0cmluZygic3RhdHVzIiwgImluYWN0aXZlIik7CiAgICAgICAgICAgICAgICAgICAgIGFj dGl2ZUl0LT5zZWNvbmQtPnJlbW92ZSgic2hvcnRoYW5kTmFtZSIpOwotICAgICAgICAgICAgICAg ICAgICBwcm9wZXJ0eU5hbWVUb1ByZXZpb3VzQWN0aXZlUHJvcGVydHkuc2V0KG5hbWUsIHByb3Bl cnR5KTsKKyAgICAgICAgICAgICAgICAgICAgcHJvcGVydHlOYW1lVG9QcmV2aW91c0FjdGl2ZVBy b3BlcnR5LnNldChjYW5vbmljYWxQcm9wZXJ0eU5hbWUsIHByb3BlcnR5KTsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIGJvb2wgaW1wbGlj aXQgPSBtX3N0eWxlLT5pc1Byb3BlcnR5SW1wbGljaXQobmFtZSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRl eCA4MDU4ZmI2YzdkOWY2NzhhZTQxZmFmN2RmNTEyZmZkZTExZTMxODYwLi42MTEzYmIxYjVmOTBk YWFmYjViNjJhOTkxZTYyZWFiZTE5OGFhMDMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKQEAgLTE4OSw3ICsx ODksMTcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLmFsdGVyZWRIZXhOdW1iZXIg PSBmdW5jdGlvbihoZXhTdHJpbmcsIGV2ZW50KQogICAgIGZvciAodmFyIGkgPSAwLCBsZW5ndGhE ZWx0YSA9IGhleFN0cmluZy5sZW5ndGggLSByZXN1bHRTdHJpbmcubGVuZ3RoOyBpIDwgbGVuZ3Ro RGVsdGE7ICsraSkKICAgICAgICAgcmVzdWx0U3RyaW5nID0gIjAiICsgcmVzdWx0U3RyaW5nOwog ICAgIHJldHVybiByZXN1bHRTdHJpbmc7Ci19LAorfQorCitXZWJJbnNwZWN0b3IuU3R5bGVzU2lk ZWJhclBhbmUuY2Fub25pY2FsUHJvcGVydHlOYW1lID0gZnVuY3Rpb24obmFtZSkKK3sKKyAgICBp ZiAoIW5hbWUgfHwgbmFtZS5sZW5ndGggPCA5IHx8IG5hbWUuY2hhckF0KDApICE9PSAiLSIpCisg ICAgICAgIHJldHVybiBuYW1lOworICAgIHZhciBtYXRjaCA9IG5hbWUubWF0Y2goLyg/Oi13ZWJr aXQtfC1raHRtbC18LWFwcGxlLSkoLispLyk7CisgICAgaWYgKCFtYXRjaCkKKyAgICAgICAgcmV0 dXJuIG5hbWU7CisgICAgcmV0dXJuIG1hdGNoWzFdOworfQogCiBXZWJJbnNwZWN0b3IuU3R5bGVz U2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgIF9jb250ZXh0TWVudUV2ZW50RmlyZWQ6IGZ1 bmN0aW9uKGV2ZW50KQpAQCAtNTYzLDI2ICs1NzMsMjYgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1Np ZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB2YXIgcHJvcGVydHkgPSBh bGxQcm9wZXJ0aWVzW2pdOwogICAgICAgICAgICAgICAgIGlmICghcHJvcGVydHkuaXNMaXZlIHx8 ICFwcm9wZXJ0eS5wYXJzZWRPaykKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAg ICAgICAgICAgICAgdmFyIG5hbWUgPSBwcm9wZXJ0eS5uYW1lOworICAgICAgICAgICAgICAgIHZh ciBjYW5vbmljYWxOYW1lID0gV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLmNhbm9uaWNh bFByb3BlcnR5TmFtZShwcm9wZXJ0eS5uYW1lKTsKIAogICAgICAgICAgICAgICAgIGlmICghcHJp b3JpdHlVc2VkICYmIHByb3BlcnR5LnByaW9yaXR5Lmxlbmd0aCkKICAgICAgICAgICAgICAgICAg ICAgcHJpb3JpdHlVc2VkID0gdHJ1ZTsKIAogICAgICAgICAgICAgICAgIC8vIElmIHRoZSBwcm9w ZXJ0eSBuYW1lIGlzIGFscmVhZHkgdXNlZCBieSBhbm90aGVyIHJ1bGUgdGhlbiB0aGlzIHJ1bGUn cwogICAgICAgICAgICAgICAgIC8vIHByb3BlcnR5IGlzIG92ZXJsb2FkZWQsIHNvIGRvbid0IGFk ZCBpdCB0byB0aGUgcnVsZSdzIHVzZWRQcm9wZXJ0aWVzLgotICAgICAgICAgICAgICAgIGlmICgh KG5hbWUgaW4gdXNlZFByb3BlcnRpZXMpKQotICAgICAgICAgICAgICAgICAgICBzdHlsZVJ1bGUu dXNlZFByb3BlcnRpZXNbbmFtZV0gPSB0cnVlOworICAgICAgICAgICAgICAgIGlmICghKGNhbm9u aWNhbE5hbWUgaW4gdXNlZFByb3BlcnRpZXMpKQorICAgICAgICAgICAgICAgICAgICBzdHlsZVJ1 bGUudXNlZFByb3BlcnRpZXNbY2Fub25pY2FsTmFtZV0gPSB0cnVlOwogICAgICAgICAgICAgfQog CiAgICAgICAgICAgICAvLyBBZGQgYWxsIHRoZSBwcm9wZXJ0aWVzIGZvdW5kIGluIHRoaXMgc3R5 bGUgdG8gdGhlIHVzZWQgcHJvcGVydGllcyBsaXN0LgogICAgICAgICAgICAgLy8gRG8gdGhpcyBo ZXJlIHNvIG9ubHkgZnV0dXJlIHJ1bGVzIGFyZSBhZmZlY3QgYnkgcHJvcGVydGllcyB1c2VkIGlu IHRoaXMgcnVsZS4KLSAgICAgICAgICAgIGZvciAodmFyIG5hbWUgaW4gc3R5bGVSdWxlc1tpXS51 c2VkUHJvcGVydGllcykKLSAgICAgICAgICAgICAgICB1c2VkUHJvcGVydGllc1tuYW1lXSA9IHRy dWU7CisgICAgICAgICAgICBmb3IgKHZhciBjYW5vbmljYWxOYW1lIGluIHN0eWxlUnVsZXNbaV0u dXNlZFByb3BlcnRpZXMpCisgICAgICAgICAgICAgICAgdXNlZFByb3BlcnRpZXNbY2Fub25pY2Fs TmFtZV0gPSB0cnVlOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKHByaW9yaXR5VXNlZCkgewog ICAgICAgICAgICAgLy8gV2FsayB0aGUgcHJvcGVydGllcyBhZ2FpbiBhbmQgYWNjb3VudCBmb3Ig IWltcG9ydGFudC4KLSAgICAgICAgICAgIHZhciBmb3VuZFByaW9yaXR5UHJvcGVydGllcyA9IFtd OworICAgICAgICAgICAgdmFyIGZvdW5kUHJpb3JpdHlQcm9wZXJ0aWVzID0ge307CiAKICAgICAg ICAgICAgIC8vIFdhbGsgaW4gZGlyZWN0IG9yZGVyIHRvIGRldGVjdCB0aGUgYWN0aXZlL21vc3Qg c3BlY2lmaWMgcnVsZSBwcm92aWRpbmcgYSBwcmlvcml0eQogICAgICAgICAgICAgLy8gKGluIHRo aXMgY2FzZSBhbGwgc3Vic2VxdWVudCAhaW1wb3J0YW50IHZhbHVlcyBnZXQgY2FuY2VsZWQuKQpA QCAtNTk2LDE1ICs2MDYsMTUgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgICAgICAgICAgdmFyIHByb3BlcnR5ID0gYWxsUHJvcGVydGll c1tqXTsKICAgICAgICAgICAgICAgICAgICAgaWYgKCFwcm9wZXJ0eS5pc0xpdmUpCiAgICAgICAg ICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICAgICAgdmFyIG5hbWUg PSBwcm9wZXJ0eS5uYW1lOworICAgICAgICAgICAgICAgICAgICB2YXIgY2Fub25pY2FsTmFtZSA9 IFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5jYW5vbmljYWxQcm9wZXJ0eU5hbWUocHJv cGVydHkubmFtZSk7CiAgICAgICAgICAgICAgICAgICAgIGlmIChwcm9wZXJ0eS5wcmlvcml0eS5s ZW5ndGgpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmICghKG5hbWUgaW4gZm91bmRQcmlv cml0eVByb3BlcnRpZXMpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0eWxlUnVsZXNb aV0udXNlZFByb3BlcnRpZXNbbmFtZV0gPSB0cnVlOworICAgICAgICAgICAgICAgICAgICAgICAg aWYgKCEoY2Fub25pY2FsTmFtZSBpbiBmb3VuZFByaW9yaXR5UHJvcGVydGllcykpCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgc3R5bGVSdWxlc1tpXS51c2VkUHJvcGVydGllc1tjYW5vbmlj YWxOYW1lXSA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgZGVsZXRlIHN0eWxlUnVsZXNbaV0udXNlZFByb3BlcnRpZXNbbmFt ZV07Ci0gICAgICAgICAgICAgICAgICAgICAgICBmb3VuZFByaW9yaXR5UHJvcGVydGllc1tuYW1l XSA9IHRydWU7Ci0gICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAobmFtZSBpbiBmb3VuZFBy aW9yaXR5UHJvcGVydGllcykKLSAgICAgICAgICAgICAgICAgICAgICAgIGRlbGV0ZSBzdHlsZVJ1 bGVzW2ldLnVzZWRQcm9wZXJ0aWVzW25hbWVdOworICAgICAgICAgICAgICAgICAgICAgICAgICAg IGRlbGV0ZSBzdHlsZVJ1bGVzW2ldLnVzZWRQcm9wZXJ0aWVzW2Nhbm9uaWNhbE5hbWVdOworICAg ICAgICAgICAgICAgICAgICAgICAgZm91bmRQcmlvcml0eVByb3BlcnRpZXNbY2Fub25pY2FsTmFt ZV0gPSB0cnVlOworICAgICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGNhbm9uaWNhbE5hbWUg aW4gZm91bmRQcmlvcml0eVByb3BlcnRpZXMpCisgICAgICAgICAgICAgICAgICAgICAgICBkZWxl dGUgc3R5bGVSdWxlc1tpXS51c2VkUHJvcGVydGllc1tjYW5vbmljYWxOYW1lXTsKICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTEwMzIsNyArMTA0Miw4IEBA IFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQogCi0gICAgICAgIHZhciB1c2VkID0gKHBy b3BlcnR5TmFtZSBpbiB0aGlzLl91c2VkUHJvcGVydGllcyk7CisgICAgICAgIHZhciBjYW5vbmlj YWxOYW1lID0gV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLmNhbm9uaWNhbFByb3BlcnR5 TmFtZShwcm9wZXJ0eU5hbWUpOworICAgICAgICB2YXIgdXNlZCA9IChjYW5vbmljYWxOYW1lIGlu IHRoaXMuX3VzZWRQcm9wZXJ0aWVzKTsKICAgICAgICAgaWYgKHVzZWQgfHwgIXNob3J0aGFuZCkK ICAgICAgICAgICAgIHJldHVybiAhdXNlZDsKIApAQCAtMTA0MSw3ICsxMDUyLDcgQEAgV2ViSW5z cGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICB2YXIg bG9uZ2hhbmRQcm9wZXJ0aWVzID0gdGhpcy5zdHlsZVJ1bGUuc3R5bGUuZ2V0TG9uZ2hhbmRQcm9w ZXJ0aWVzKHByb3BlcnR5TmFtZSk7CiAgICAgICAgIGZvciAodmFyIGogPSAwOyBqIDwgbG9uZ2hh bmRQcm9wZXJ0aWVzLmxlbmd0aDsgKytqKSB7CiAgICAgICAgICAgICB2YXIgaW5kaXZpZHVhbFBy b3BlcnR5ID0gbG9uZ2hhbmRQcm9wZXJ0aWVzW2pdOwotICAgICAgICAgICAgaWYgKGluZGl2aWR1 YWxQcm9wZXJ0eS5uYW1lIGluIHRoaXMuX3VzZWRQcm9wZXJ0aWVzKQorICAgICAgICAgICAgaWYg KFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5jYW5vbmljYWxQcm9wZXJ0eU5hbWUoaW5k aXZpZHVhbFByb3BlcnR5Lm5hbWUpIGluIHRoaXMuX3VzZWRQcm9wZXJ0aWVzKQogICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjdmMzZiOGM0MjVkMjMy NjcyMTkzMTY5NDZmYTRhMTgwNWVjNDMxNy4uOTdhMjNhNzU0NmZiY2U5N2JmM2U2YzFkZjhiM2Rj OGI2MDM4ODQ4ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTAzLTA1ICBBbGV4YW5kZXIg UGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog Q1NTIGluYWN0aXZlIHByb3BlcnR5IGNoZWNrIHNob3VsZCBhY2NvdW50IGZvciB2ZW5kb3IgcHJl Zml4ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgw MjI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBp bnNwZWN0b3Ivc3R5bGVzL3ZlbmRvci1wcmVmaXhlcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIGluc3BlY3Rvci9zdHlsZXMvdmVuZG9yLXByZWZpeGVzLmh0bWw6IEFkZGVkLgorCiAy MDEyLTAzLTAyICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogW1N0eWxlc10gW0NSQVNIXSBIYW5kbGUgcnVsZSBhZGRpdGlv biBhbmQgaW5saW5lIHN0eWxlIGVkaXRpbmcgZmFpbHVyZSBkdWUgdG8gQ29udGVudC1TZWN1cml0 eS1Qb2xpY3kgaW4gdGhlIHBhZ2UKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9z dHlsZXMvdmVuZG9yLXByZWZpeGVzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9zdHlsZXMvdmVuZG9yLXByZWZpeGVzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jMmMwMGJi OThlMmY2OTY4YWE2MWZmY2Y4OTdhODgwMTVmMmY1MjZmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy92ZW5kb3ItcHJlZml4ZXMtZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsMjYgQEAKK1Rlc3RzIHRoYXQgcHJvcGVydGllcyB3aXRoIFdlYktpdCB2ZW5kb3It c3BlY2lmaWMgcHJlZml4ZXMgKCItYXBwbGUtIiwgIi13ZWJraXQtIiwgYW5kICIta2h0bWwtIikg YXJlIHRyZWF0ZWQgdGhlIHNhbWUgYXMgdGhvc2Ugd2l0aG91dCB0aGUgcHJlZml4LgorCitUZXh0 CitbZXhwYW5kZWRdIAorCitbZXhwYW5kZWRdIAorZWxlbWVudC5zdHlsZSAgeyAoKQorCis9PT09 PT09PSBNYXRjaGVkIENTUyBSdWxlcyA9PT09PT09PQorW2V4cGFuZGVkXSAKKyNpbnNwZWN0ZWQg IHsgKHZlbmRvci1wcmVmaXhlcy5odG1sOjExKQorLWFwcGxlLW9wYWNpdHk6IDAuNzU7CisKK1tl eHBhbmRlZF0gCisjaW5zcGVjdGVkICB7ICh2ZW5kb3ItcHJlZml4ZXMuaHRtbDo0KQorLy0tIG92 ZXJsb2FkZWQgLS0vIC1hcHBsZS1vcGFjaXR5OiAwLjM1OworLy0tIG92ZXJsb2FkZWQgLS0vIC13 ZWJraXQtb3BhY2l0eTogMC41OworLy0tIG92ZXJsb2FkZWQgLS0vIG9wYWNpdHk6IDE7CisvLS0g b3ZlcmxvYWRlZCAtLS8gLWtodG1sLW9wYWNpdHk6IDAuMjU7CisKK1tleHBhbmRlZF0gCitkaXYg IHsgKHVzZXIgYWdlbnQgc3R5bGVzaGVldCkKK2Rpc3BsYXk6IGJsb2NrOworCisKKwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy92ZW5kb3ItcHJlZml4ZXMuaHRtbCBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvdmVuZG9yLXByZWZpeGVzLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uZWE0NzQzMTI3MmJhN2FkZjhjYjlmNTdkMzdmZWU3N2MxODhiYWFmOQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvdmVuZG9yLXByZWZpeGVzLmh0 bWwKQEAgLTAsMCArMSw0NCBAQAorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKyNpbnNwZWN0ZWQg eworICAgIC1hcHBsZS1vcGFjaXR5OiAwLjM1OworICAgIC13ZWJraXQtb3BhY2l0eTogMC41Owor ICAgIG9wYWNpdHk6IDE7CisgICAgLWtodG1sLW9wYWNpdHk6IDAuMjU7Cit9CisKKyNpbnNwZWN0 ZWQgeworICAgIC1hcHBsZS1vcGFjaXR5OiAwLjc1OworfQorCis8L3N0eWxlPgorPHNjcmlwdCBz cmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2luc3BlY3Rvci10ZXN0LmpzIj48L3Njcmlw dD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci9lbGVtZW50cy10ZXN0 LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CisKK2Z1bmN0aW9uIHRlc3QoKQoreworICAgIFdlYklu c3BlY3Rvci5zaG93UGFuZWwoImVsZW1lbnRzIik7CisgICAgSW5zcGVjdG9yVGVzdC5zZWxlY3RO b2RlQW5kV2FpdEZvclN0eWxlc1dpdGhDb21wdXRlZCgiaW5zcGVjdGVkIiwgZHVtcEFsbFN0eWxl cyk7CisKKyAgICBmdW5jdGlvbiBkdW1wQWxsU3R5bGVzKCkKKyAgICB7CisgICAgICAgIEluc3Bl Y3RvclRlc3QuZHVtcFNlbGVjdGVkRWxlbWVudFN0eWxlcygpOworICAgICAgICBJbnNwZWN0b3JU ZXN0LmNvbXBsZXRlVGVzdCgpOworICAgIH0KK30KKworPC9zY3JpcHQ+Cis8L2hlYWQ+CisKKzxi b2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KKzxwPgorVGVzdHMgdGhhdCBwcm9wZXJ0aWVzIHdpdGgg V2ViS2l0IHZlbmRvci1zcGVjaWZpYyBwcmVmaXhlcyAoIi1hcHBsZS0iLCAiLXdlYmtpdC0iLCBh bmQgIi1raHRtbC0iKSBhcmUgdHJlYXRlZCB0aGUgc2FtZSBhcyB0aG9zZSB3aXRob3V0IHRoZSBw cmVmaXguCis8L3A+CisKKzxkaXYgaWQ9Imluc3BlY3RlZCI+VGV4dDwvZGl2PgorPGRpdiBpZD0i b3RoZXIiPjwvZGl2PgorCis8L2JvZHk+Cis8L2h0bWw+Cg== 130152 2012-03-05 09:26:15 -0800 2012-03-05 10:58:15 -0800 [PATCH] Test expectation updated bug-80225-20120305212613.patch text/plain 11843 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5NzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYThhNWEyYzU1MGIzZmI1 MjBiNzU1ODllMGY3ZGExOWU2NGI5MzU0YS4uNTE3OTIyYzQzNTJhNTA4MGM0OGZkOTM3ZTVlMmZh NmQwZDY1MzI0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEyLTAzLTA1ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogQ1NTIGluYWN0aXZlIHByb3BlcnR5IGNoZWNrIHNob3VsZCBhY2NvdW50IGZvciB2ZW5k b3IgcHJlZml4ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTgwMjI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGVzdDogaW5zcGVjdG9yL3N0eWxlcy92ZW5kb3ItcHJlZml4ZXMuaHRtbAorCisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yU3R5bGU6OnBvcHVsYXRlT2JqZWN0V2l0aFN0eWxlUHJvcGVydGllcyk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5hbHRlcmVkSGV4TnVtYmVyKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5jYW5vbmljYWxQcm9wZXJ0eU5hbWUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnByb3RvdHlwZS5fbWFy a1VzZWRQcm9wZXJ0aWVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNT ZWN0aW9uLnByb3RvdHlwZS5pc1Byb3BlcnR5T3ZlcmxvYWRlZCk6CisKKzIwMTItMDMtMDUgIEFs ZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5z cGVjdG9yOiBJbmNvcnJlY3QgYXBwcm9wcmlhdGVTZWxlY3RvckZvcigpIHN1Z2dlc3Rpb24gZm9y IHdoZW4gYSBET01Ob2RlIGhhcyBtb3JlIHRoYW4gMiBDU1MgY2xhc3NlcwogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODAyNTgKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCmluZGV4IDg5OGE3ZDU3 ZTNlYjM4YTM2ZjQwNWFhMTM3ZmM3OWJhNGQ5ODQxZGQuLjc1ZWJlNWUwNzUxN2NkOGFjYzYxMTBh Mjk3NTM2ZGY5OGZkMzUzMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JTdHlsZVNoZWV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yU3R5bGVTaGVldC5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJDU1NJbXBv cnRSdWxlLmgiCiAjaW5jbHVkZSAiQ1NTTWVkaWFSdWxlLmgiCiAjaW5jbHVkZSAiQ1NTUGFyc2Vy LmgiCisjaW5jbHVkZSAiQ1NTUHJvcGVydHlOYW1lcy5oIgogI2luY2x1ZGUgIkNTU1Byb3BlcnR5 U291cmNlRGF0YS5oIgogI2luY2x1ZGUgIkNTU1J1bGUuaCIKICNpbmNsdWRlICJDU1NSdWxlTGlz dC5oIgpAQCAtNDgwLDcgKzQ4MSwxMCBAQCB2b2lkIEluc3BlY3RvclN0eWxlOjpwb3B1bGF0ZU9i amVjdFdpdGhTdHlsZVByb3BlcnRpZXMoSW5zcGVjdG9yT2JqZWN0KiByZXN1bHQpCiAgICAgICAg ICAgICAgICAgLy8gUGFyc2VkIHByb3BlcnR5IG92ZXJyaWRlcyBhbnkgcHJvcGVydHkgd2l0aCB0 aGUgc2FtZSBuYW1lLiBOb24tcGFyc2VkIHByb3BlcnR5IG92ZXJyaWRlcwogICAgICAgICAgICAg ICAgIC8vIHByZXZpb3VzIG5vbi1wYXJzZWQgcHJvcGVydHkgd2l0aCB0aGUgc2FtZSBuYW1lIChp ZiBhbnkpLgogICAgICAgICAgICAgICAgIGJvb2wgc2hvdWxkSW5hY3RpdmF0ZSA9IGZhbHNlOwot ICAgICAgICAgICAgICAgIEhhc2hNYXA8U3RyaW5nLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiA+ OjppdGVyYXRvciBhY3RpdmVJdCA9IHByb3BlcnR5TmFtZVRvUHJldmlvdXNBY3RpdmVQcm9wZXJ0 eS5maW5kKG5hbWUpOworICAgICAgICAgICAgICAgIENTU1Byb3BlcnR5SUQgcHJvcGVydHlJZCA9 IHN0YXRpY19jYXN0PENTU1Byb3BlcnR5SUQ+KGNzc1Byb3BlcnR5SUQobmFtZSkpOworICAgICAg ICAgICAgICAgIC8vIENhbm9uaWNhbGl6ZSBwcm9wZXJ0eSBuYW1lcyB0byB0cmVhdCBub24tcHJl Zml4ZWQgYW5kIHZlbmRvci1wcmVmaXhlZCBwcm9wZXJ0eSBuYW1lcyB0aGUgc2FtZSAob3BhY2l0 eSB2cy4gLXdlYmtpdC1vcGFjaXR5KS4KKyAgICAgICAgICAgICAgICBTdHJpbmcgY2Fub25pY2Fs UHJvcGVydHlOYW1lID0gcHJvcGVydHlJZCA/IFN0cmluZyhnZXRQcm9wZXJ0eU5hbWUocHJvcGVy dHlJZCkpIDogbmFtZTsKKyAgICAgICAgICAgICAgICBIYXNoTWFwPFN0cmluZywgUmVmUHRyPElu c3BlY3Rvck9iamVjdD4gPjo6aXRlcmF0b3IgYWN0aXZlSXQgPSBwcm9wZXJ0eU5hbWVUb1ByZXZp b3VzQWN0aXZlUHJvcGVydHkuZmluZChjYW5vbmljYWxQcm9wZXJ0eU5hbWUpOwogICAgICAgICAg ICAgICAgIGlmIChhY3RpdmVJdCAhPSBwcm9wZXJ0eU5hbWVUb1ByZXZpb3VzQWN0aXZlUHJvcGVy dHkuZW5kKCkpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKHByb3BlcnR5RW50cnkucGFyc2Vk T2spCiAgICAgICAgICAgICAgICAgICAgICAgICBzaG91bGRJbmFjdGl2YXRlID0gdHJ1ZTsKQEAg LTQ5MSwxMiArNDk1LDEyIEBAIHZvaWQgSW5zcGVjdG9yU3R5bGU6OnBvcHVsYXRlT2JqZWN0V2l0 aFN0eWxlUHJvcGVydGllcyhJbnNwZWN0b3JPYmplY3QqIHJlc3VsdCkKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzaG91bGRJbmFjdGl2YXRlID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0 eU5hbWVUb1ByZXZpb3VzQWN0aXZlUHJvcGVydHkuc2V0KG5hbWUsIHByb3BlcnR5KTsKKyAgICAg ICAgICAgICAgICAgICAgcHJvcGVydHlOYW1lVG9QcmV2aW91c0FjdGl2ZVByb3BlcnR5LnNldChj YW5vbmljYWxQcm9wZXJ0eU5hbWUsIHByb3BlcnR5KTsKIAogICAgICAgICAgICAgICAgIGlmIChz aG91bGRJbmFjdGl2YXRlKSB7CiAgICAgICAgICAgICAgICAgICAgIGFjdGl2ZUl0LT5zZWNvbmQt PnNldFN0cmluZygic3RhdHVzIiwgImluYWN0aXZlIik7CiAgICAgICAgICAgICAgICAgICAgIGFj dGl2ZUl0LT5zZWNvbmQtPnJlbW92ZSgic2hvcnRoYW5kTmFtZSIpOwotICAgICAgICAgICAgICAg ICAgICBwcm9wZXJ0eU5hbWVUb1ByZXZpb3VzQWN0aXZlUHJvcGVydHkuc2V0KG5hbWUsIHByb3Bl cnR5KTsKKyAgICAgICAgICAgICAgICAgICAgcHJvcGVydHlOYW1lVG9QcmV2aW91c0FjdGl2ZVBy b3BlcnR5LnNldChjYW5vbmljYWxQcm9wZXJ0eU5hbWUsIHByb3BlcnR5KTsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIGJvb2wgaW1wbGlj aXQgPSBtX3N0eWxlLT5pc1Byb3BlcnR5SW1wbGljaXQobmFtZSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRl eCA4MDU4ZmI2YzdkOWY2NzhhZTQxZmFmN2RmNTEyZmZkZTExZTMxODYwLi42MTEzYmIxYjVmOTBk YWFmYjViNjJhOTkxZTYyZWFiZTE5OGFhMDMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKQEAgLTE4OSw3ICsx ODksMTcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLmFsdGVyZWRIZXhOdW1iZXIg PSBmdW5jdGlvbihoZXhTdHJpbmcsIGV2ZW50KQogICAgIGZvciAodmFyIGkgPSAwLCBsZW5ndGhE ZWx0YSA9IGhleFN0cmluZy5sZW5ndGggLSByZXN1bHRTdHJpbmcubGVuZ3RoOyBpIDwgbGVuZ3Ro RGVsdGE7ICsraSkKICAgICAgICAgcmVzdWx0U3RyaW5nID0gIjAiICsgcmVzdWx0U3RyaW5nOwog ICAgIHJldHVybiByZXN1bHRTdHJpbmc7Ci19LAorfQorCitXZWJJbnNwZWN0b3IuU3R5bGVzU2lk ZWJhclBhbmUuY2Fub25pY2FsUHJvcGVydHlOYW1lID0gZnVuY3Rpb24obmFtZSkKK3sKKyAgICBp ZiAoIW5hbWUgfHwgbmFtZS5sZW5ndGggPCA5IHx8IG5hbWUuY2hhckF0KDApICE9PSAiLSIpCisg ICAgICAgIHJldHVybiBuYW1lOworICAgIHZhciBtYXRjaCA9IG5hbWUubWF0Y2goLyg/Oi13ZWJr aXQtfC1raHRtbC18LWFwcGxlLSkoLispLyk7CisgICAgaWYgKCFtYXRjaCkKKyAgICAgICAgcmV0 dXJuIG5hbWU7CisgICAgcmV0dXJuIG1hdGNoWzFdOworfQogCiBXZWJJbnNwZWN0b3IuU3R5bGVz U2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgIF9jb250ZXh0TWVudUV2ZW50RmlyZWQ6IGZ1 bmN0aW9uKGV2ZW50KQpAQCAtNTYzLDI2ICs1NzMsMjYgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1Np ZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB2YXIgcHJvcGVydHkgPSBh bGxQcm9wZXJ0aWVzW2pdOwogICAgICAgICAgICAgICAgIGlmICghcHJvcGVydHkuaXNMaXZlIHx8 ICFwcm9wZXJ0eS5wYXJzZWRPaykKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAg ICAgICAgICAgICAgdmFyIG5hbWUgPSBwcm9wZXJ0eS5uYW1lOworICAgICAgICAgICAgICAgIHZh ciBjYW5vbmljYWxOYW1lID0gV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLmNhbm9uaWNh bFByb3BlcnR5TmFtZShwcm9wZXJ0eS5uYW1lKTsKIAogICAgICAgICAgICAgICAgIGlmICghcHJp b3JpdHlVc2VkICYmIHByb3BlcnR5LnByaW9yaXR5Lmxlbmd0aCkKICAgICAgICAgICAgICAgICAg ICAgcHJpb3JpdHlVc2VkID0gdHJ1ZTsKIAogICAgICAgICAgICAgICAgIC8vIElmIHRoZSBwcm9w ZXJ0eSBuYW1lIGlzIGFscmVhZHkgdXNlZCBieSBhbm90aGVyIHJ1bGUgdGhlbiB0aGlzIHJ1bGUn cwogICAgICAgICAgICAgICAgIC8vIHByb3BlcnR5IGlzIG92ZXJsb2FkZWQsIHNvIGRvbid0IGFk ZCBpdCB0byB0aGUgcnVsZSdzIHVzZWRQcm9wZXJ0aWVzLgotICAgICAgICAgICAgICAgIGlmICgh KG5hbWUgaW4gdXNlZFByb3BlcnRpZXMpKQotICAgICAgICAgICAgICAgICAgICBzdHlsZVJ1bGUu dXNlZFByb3BlcnRpZXNbbmFtZV0gPSB0cnVlOworICAgICAgICAgICAgICAgIGlmICghKGNhbm9u aWNhbE5hbWUgaW4gdXNlZFByb3BlcnRpZXMpKQorICAgICAgICAgICAgICAgICAgICBzdHlsZVJ1 bGUudXNlZFByb3BlcnRpZXNbY2Fub25pY2FsTmFtZV0gPSB0cnVlOwogICAgICAgICAgICAgfQog CiAgICAgICAgICAgICAvLyBBZGQgYWxsIHRoZSBwcm9wZXJ0aWVzIGZvdW5kIGluIHRoaXMgc3R5 bGUgdG8gdGhlIHVzZWQgcHJvcGVydGllcyBsaXN0LgogICAgICAgICAgICAgLy8gRG8gdGhpcyBo ZXJlIHNvIG9ubHkgZnV0dXJlIHJ1bGVzIGFyZSBhZmZlY3QgYnkgcHJvcGVydGllcyB1c2VkIGlu IHRoaXMgcnVsZS4KLSAgICAgICAgICAgIGZvciAodmFyIG5hbWUgaW4gc3R5bGVSdWxlc1tpXS51 c2VkUHJvcGVydGllcykKLSAgICAgICAgICAgICAgICB1c2VkUHJvcGVydGllc1tuYW1lXSA9IHRy dWU7CisgICAgICAgICAgICBmb3IgKHZhciBjYW5vbmljYWxOYW1lIGluIHN0eWxlUnVsZXNbaV0u dXNlZFByb3BlcnRpZXMpCisgICAgICAgICAgICAgICAgdXNlZFByb3BlcnRpZXNbY2Fub25pY2Fs TmFtZV0gPSB0cnVlOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKHByaW9yaXR5VXNlZCkgewog ICAgICAgICAgICAgLy8gV2FsayB0aGUgcHJvcGVydGllcyBhZ2FpbiBhbmQgYWNjb3VudCBmb3Ig IWltcG9ydGFudC4KLSAgICAgICAgICAgIHZhciBmb3VuZFByaW9yaXR5UHJvcGVydGllcyA9IFtd OworICAgICAgICAgICAgdmFyIGZvdW5kUHJpb3JpdHlQcm9wZXJ0aWVzID0ge307CiAKICAgICAg ICAgICAgIC8vIFdhbGsgaW4gZGlyZWN0IG9yZGVyIHRvIGRldGVjdCB0aGUgYWN0aXZlL21vc3Qg c3BlY2lmaWMgcnVsZSBwcm92aWRpbmcgYSBwcmlvcml0eQogICAgICAgICAgICAgLy8gKGluIHRo aXMgY2FzZSBhbGwgc3Vic2VxdWVudCAhaW1wb3J0YW50IHZhbHVlcyBnZXQgY2FuY2VsZWQuKQpA QCAtNTk2LDE1ICs2MDYsMTUgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgICAgICAgICAgdmFyIHByb3BlcnR5ID0gYWxsUHJvcGVydGll c1tqXTsKICAgICAgICAgICAgICAgICAgICAgaWYgKCFwcm9wZXJ0eS5pc0xpdmUpCiAgICAgICAg ICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICAgICAgdmFyIG5hbWUg PSBwcm9wZXJ0eS5uYW1lOworICAgICAgICAgICAgICAgICAgICB2YXIgY2Fub25pY2FsTmFtZSA9 IFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5jYW5vbmljYWxQcm9wZXJ0eU5hbWUocHJv cGVydHkubmFtZSk7CiAgICAgICAgICAgICAgICAgICAgIGlmIChwcm9wZXJ0eS5wcmlvcml0eS5s ZW5ndGgpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmICghKG5hbWUgaW4gZm91bmRQcmlv cml0eVByb3BlcnRpZXMpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0eWxlUnVsZXNb aV0udXNlZFByb3BlcnRpZXNbbmFtZV0gPSB0cnVlOworICAgICAgICAgICAgICAgICAgICAgICAg aWYgKCEoY2Fub25pY2FsTmFtZSBpbiBmb3VuZFByaW9yaXR5UHJvcGVydGllcykpCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgc3R5bGVSdWxlc1tpXS51c2VkUHJvcGVydGllc1tjYW5vbmlj YWxOYW1lXSA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgZGVsZXRlIHN0eWxlUnVsZXNbaV0udXNlZFByb3BlcnRpZXNbbmFt ZV07Ci0gICAgICAgICAgICAgICAgICAgICAgICBmb3VuZFByaW9yaXR5UHJvcGVydGllc1tuYW1l XSA9IHRydWU7Ci0gICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAobmFtZSBpbiBmb3VuZFBy aW9yaXR5UHJvcGVydGllcykKLSAgICAgICAgICAgICAgICAgICAgICAgIGRlbGV0ZSBzdHlsZVJ1 bGVzW2ldLnVzZWRQcm9wZXJ0aWVzW25hbWVdOworICAgICAgICAgICAgICAgICAgICAgICAgICAg IGRlbGV0ZSBzdHlsZVJ1bGVzW2ldLnVzZWRQcm9wZXJ0aWVzW2Nhbm9uaWNhbE5hbWVdOworICAg ICAgICAgICAgICAgICAgICAgICAgZm91bmRQcmlvcml0eVByb3BlcnRpZXNbY2Fub25pY2FsTmFt ZV0gPSB0cnVlOworICAgICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGNhbm9uaWNhbE5hbWUg aW4gZm91bmRQcmlvcml0eVByb3BlcnRpZXMpCisgICAgICAgICAgICAgICAgICAgICAgICBkZWxl dGUgc3R5bGVSdWxlc1tpXS51c2VkUHJvcGVydGllc1tjYW5vbmljYWxOYW1lXTsKICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTEwMzIsNyArMTA0Miw4IEBA IFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQogCi0gICAgICAgIHZhciB1c2VkID0gKHBy b3BlcnR5TmFtZSBpbiB0aGlzLl91c2VkUHJvcGVydGllcyk7CisgICAgICAgIHZhciBjYW5vbmlj YWxOYW1lID0gV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLmNhbm9uaWNhbFByb3BlcnR5 TmFtZShwcm9wZXJ0eU5hbWUpOworICAgICAgICB2YXIgdXNlZCA9IChjYW5vbmljYWxOYW1lIGlu IHRoaXMuX3VzZWRQcm9wZXJ0aWVzKTsKICAgICAgICAgaWYgKHVzZWQgfHwgIXNob3J0aGFuZCkK ICAgICAgICAgICAgIHJldHVybiAhdXNlZDsKIApAQCAtMTA0MSw3ICsxMDUyLDcgQEAgV2ViSW5z cGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICB2YXIg bG9uZ2hhbmRQcm9wZXJ0aWVzID0gdGhpcy5zdHlsZVJ1bGUuc3R5bGUuZ2V0TG9uZ2hhbmRQcm9w ZXJ0aWVzKHByb3BlcnR5TmFtZSk7CiAgICAgICAgIGZvciAodmFyIGogPSAwOyBqIDwgbG9uZ2hh bmRQcm9wZXJ0aWVzLmxlbmd0aDsgKytqKSB7CiAgICAgICAgICAgICB2YXIgaW5kaXZpZHVhbFBy b3BlcnR5ID0gbG9uZ2hhbmRQcm9wZXJ0aWVzW2pdOwotICAgICAgICAgICAgaWYgKGluZGl2aWR1 YWxQcm9wZXJ0eS5uYW1lIGluIHRoaXMuX3VzZWRQcm9wZXJ0aWVzKQorICAgICAgICAgICAgaWYg KFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5jYW5vbmljYWxQcm9wZXJ0eU5hbWUoaW5k aXZpZHVhbFByb3BlcnR5Lm5hbWUpIGluIHRoaXMuX3VzZWRQcm9wZXJ0aWVzKQogICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjdmMzZiOGM0MjVkMjMy NjcyMTkzMTY5NDZmYTRhMTgwNWVjNDMxNy4uOTdhMjNhNzU0NmZiY2U5N2JmM2U2YzFkZjhiM2Rj OGI2MDM4ODQ4ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTAzLTA1ICBBbGV4YW5kZXIg UGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog Q1NTIGluYWN0aXZlIHByb3BlcnR5IGNoZWNrIHNob3VsZCBhY2NvdW50IGZvciB2ZW5kb3IgcHJl Zml4ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgw MjI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBp bnNwZWN0b3Ivc3R5bGVzL3ZlbmRvci1wcmVmaXhlcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIGluc3BlY3Rvci9zdHlsZXMvdmVuZG9yLXByZWZpeGVzLmh0bWw6IEFkZGVkLgorCiAy MDEyLTAzLTAyICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogW1N0eWxlc10gW0NSQVNIXSBIYW5kbGUgcnVsZSBhZGRpdGlv biBhbmQgaW5saW5lIHN0eWxlIGVkaXRpbmcgZmFpbHVyZSBkdWUgdG8gQ29udGVudC1TZWN1cml0 eS1Qb2xpY3kgaW4gdGhlIHBhZ2UKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9z dHlsZXMvdmVuZG9yLXByZWZpeGVzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9zdHlsZXMvdmVuZG9yLXByZWZpeGVzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kZDFlZTIx YjgwMzBlMDAyNGU2Y2MwNzY3NzNjYjQ2N2JkYjYzMmMxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy92ZW5kb3ItcHJlZml4ZXMtZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsMzEgQEAKK1Rlc3RzIHRoYXQgcHJvcGVydGllcyB3aXRoIFdlYktpdCB2ZW5kb3It c3BlY2lmaWMgcHJlZml4ZXMgKCItYXBwbGUtIiwgIi13ZWJraXQtIiwgYW5kICIta2h0bWwtIikg YXJlIHRyZWF0ZWQgdGhlIHNhbWUgYXMgdGhvc2Ugd2l0aG91dCB0aGUgcHJlZml4LgorCitUZXh0 CitbZXhwYW5kZWRdIAorZGlzcGxheTogYmxvY2s7CisgICAgZGl2IC0gYmxvY2sgdXNlciBhZ2Vu dCBzdHlsZXNoZWV0CitvcGFjaXR5OiAwLjc1OworICAgICNpbnNwZWN0ZWQgLSAwLjc1IHZlbmRv ci1wcmVmaXhlcy5odG1sOjExCisgICAgLy0tIG92ZXJsb2FkZWQgLS0vICNpbnNwZWN0ZWQgLSAx IHZlbmRvci1wcmVmaXhlcy5odG1sOjQKKworW2V4cGFuZGVkXSAKK2VsZW1lbnQuc3R5bGUgIHsg KCkKKworPT09PT09PT0gTWF0Y2hlZCBDU1MgUnVsZXMgPT09PT09PT0KK1tleHBhbmRlZF0gCisj aW5zcGVjdGVkICB7ICh2ZW5kb3ItcHJlZml4ZXMuaHRtbDoxMSkKKy1hcHBsZS1vcGFjaXR5OiAw Ljc1OworCitbZXhwYW5kZWRdIAorI2luc3BlY3RlZCAgeyAodmVuZG9yLXByZWZpeGVzLmh0bWw6 NCkKKy8tLSBvdmVybG9hZGVkIC0tLyAtYXBwbGUtb3BhY2l0eTogMC4zNTsKKy8tLSBvdmVybG9h ZGVkIC0tLyAtd2Via2l0LW9wYWNpdHk6IDAuNTsKKy8tLSBvdmVybG9hZGVkIC0tLyBvcGFjaXR5 OiAxOworLy0tIG92ZXJsb2FkZWQgLS0vIC1raHRtbC1vcGFjaXR5OiAwLjI1OworCitbZXhwYW5k ZWRdIAorZGl2ICB7ICh1c2VyIGFnZW50IHN0eWxlc2hlZXQpCitkaXNwbGF5OiBibG9jazsKKwor CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvdmVuZG9yLXByZWZp eGVzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3ZlbmRvci1wcmVmaXhlcy5o dG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLmVhNDc0MzEyNzJiYTdhZGY4Y2I5ZjU3ZDM3ZmVlNzdjMTg4YmFhZjkK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3ZlbmRvci1w cmVmaXhlcy5odG1sCkBAIC0wLDAgKzEsNDQgQEAKKzxodG1sPgorPGhlYWQ+Cis8c3R5bGU+Cisj aW5zcGVjdGVkIHsKKyAgICAtYXBwbGUtb3BhY2l0eTogMC4zNTsKKyAgICAtd2Via2l0LW9wYWNp dHk6IDAuNTsKKyAgICBvcGFjaXR5OiAxOworICAgIC1raHRtbC1vcGFjaXR5OiAwLjI1OworfQor CisjaW5zcGVjdGVkIHsKKyAgICAtYXBwbGUtb3BhY2l0eTogMC43NTsKK30KKworPC9zdHlsZT4K KzxzY3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci9pbnNwZWN0b3ItdGVzdC5q cyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvZWxl bWVudHMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorCitmdW5jdGlvbiB0ZXN0KCkKK3sK KyAgICBXZWJJbnNwZWN0b3Iuc2hvd1BhbmVsKCJlbGVtZW50cyIpOworICAgIEluc3BlY3RvclRl c3Quc2VsZWN0Tm9kZUFuZFdhaXRGb3JTdHlsZXNXaXRoQ29tcHV0ZWQoImluc3BlY3RlZCIsIGR1 bXBBbGxTdHlsZXMpOworCisgICAgZnVuY3Rpb24gZHVtcEFsbFN0eWxlcygpCisgICAgeworICAg ICAgICBJbnNwZWN0b3JUZXN0LmR1bXBTZWxlY3RlZEVsZW1lbnRTdHlsZXMoKTsKKyAgICAgICAg SW5zcGVjdG9yVGVzdC5jb21wbGV0ZVRlc3QoKTsKKyAgICB9Cit9CisKKzwvc2NyaXB0PgorPC9o ZWFkPgorCis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8cD4KK1Rlc3RzIHRoYXQgcHJvcGVy dGllcyB3aXRoIFdlYktpdCB2ZW5kb3Itc3BlY2lmaWMgcHJlZml4ZXMgKCItYXBwbGUtIiwgIi13 ZWJraXQtIiwgYW5kICIta2h0bWwtIikgYXJlIHRyZWF0ZWQgdGhlIHNhbWUgYXMgdGhvc2Ugd2l0 aG91dCB0aGUgcHJlZml4LgorPC9wPgorCis8ZGl2IGlkPSJpbnNwZWN0ZWQiPlRleHQ8L2Rpdj4K KzxkaXYgaWQ9Im90aGVyIj48L2Rpdj4KKworPC9ib2R5PgorPC9odG1sPgo=