92484 2012-07-27 03:32:51 -0700 [EFL][WK2] Add API to Ewk_Cookie_Manager to watch for cookie changes 2012-07-27 06:40:08 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61838 1 cdumez cdumez gustavo gyuyoung.kim hausmann kenneth rakuco ryuan.choi tmpsantos tonikitoo webkit.review.bot oldest_to_newest 680396 0 cdumez 2012-07-27 03:32:51 -0700 There is currently no way for the client to get notified whenever cookies are added, modified or removed. We need to provide such functionality in Ewk_Cookie_Manager. 680399 1 154895 cdumez 2012-07-27 03:38:38 -0700 Created attachment 154895 Patch 680448 2 154895 kenneth 2012-07-27 04:47:34 -0700 Comment on attachment 154895 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154895&action=review > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:44 > +struct Watch_Changes_Callback_Data { > + Ewk_Cookie_Manager_Changes_Watch_Cb callback; I dont think the Data here is such a good addition given that it is containing an actual callback. Is this stuct even needed. It seems as you can only have one callback with user data > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:66 > + Watch_Changes_Callback_Data changeWatcher; The naming seems a bit weird here given the name of the variable and the name of the struct. A watcher indicates something active 680491 3 154895 cdumez 2012-07-27 05:33:48 -0700 Comment on attachment 154895 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154895&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:44 >> + Ewk_Cookie_Manager_Changes_Watch_Cb callback; > > I dont think the Data here is such a good addition given that it is containing an actual callback. Is this stuct even needed. It seems as you can only have one callback with user data I would prefer to keep the struct since this is the approach I have used in order files for callbacks + userData. I think it is more scalable. How about renaming _Data with _Handler then? >> Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:66 >> + Watch_Changes_Callback_Data changeWatcher; > > The naming seems a bit weird here given the name of the variable and the name of the struct. A watcher indicates something active You're right. How about changeHandler then? 680494 4 kenneth 2012-07-27 05:40:10 -0700 ok fine 680497 5 154913 cdumez 2012-07-27 05:45:47 -0700 Created attachment 154913 Patch Take Kenneth's feedback into consideration. 680553 6 154913 webkit.review.bot 2012-07-27 06:40:01 -0700 Comment on attachment 154913 Patch Clearing flags on attachment: 154913 Committed r123870: <http://trac.webkit.org/changeset/123870> 680554 7 webkit.review.bot 2012-07-27 06:40:08 -0700 All reviewed patches have been landed. Closing bug. 154895 2012-07-27 03:38:38 -0700 2012-07-27 05:45:47 -0700 Patch 92484_wk2_cookies_watching.patch text/plain 11410 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMjQ5MWM5Li5lNjdhZWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTItMDctMjcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBBUEkgdG8gRXdrX0Nvb2tpZV9NYW5hZ2Vy IHRvIHdhdGNoIGZvciBjb29raWUgY2hhbmdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI0ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBNYWtlIHVzZSBvZiBzb3VwL0Nvb2tpZVN0b3JhZ2VTb3VwLmNw cCBmb3IgRUZMIHBvcnQgaW5zdGVhZAorICAgICAgICBvZiBkZWZpbmluZyBlbXB0eSBpbXBsZW1l bnRhdGlvbnMgZm9yIGNvb2tpZSBzdG9yYWdlCisgICAgICAgIGZ1bmN0aW9ucy4KKworICAgICAg ICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIFBsYXRmb3Jt RWZsLmNtYWtlOgorICAgICAgICAqIHBsYXRmb3JtL2VmbC9UZW1wb3JhcnlMaW5rU3R1YnMuY3Bw OgorCiAyMDEyLTA3LTI3ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE1vdmUgZm9ybWF0dGluZyBzdXBwb3J0IGZyb20gSmF2 YVNjcmlwdFNvdXJjZSB0byBVSVNvdXJjZUNvZGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9QbGF0Zm9ybUVmbC5jbWFrZSBiL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtRWZsLmNtYWtlCmlu ZGV4IGFlNjAyNGQuLjQ3YjUxMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3Jt RWZsLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtRWZsLmNtYWtlCkBAIC04Miw2 ICs4Miw3IEBAIExJU1QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUwogICBwbGF0Zm9ybS9saW51eC9H YW1lcGFkRGV2aWNlTGludXguY3BwCiAgIHBsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9N ZWRpYVN0cmVhbUNlbnRlckdTdHJlYW1lci5jcHAKICAgcGxhdGZvcm0vbmV0d29yay9zb3VwL0Nv b2tpZUphclNvdXAuY3BwCisgIHBsYXRmb3JtL25ldHdvcmsvc291cC9Db29raWVTdG9yYWdlU291 cC5jcHAKICAgcGxhdGZvcm0vbmV0d29yay9zb3VwL0NyZWRlbnRpYWxTdG9yYWdlU291cC5jcHAK ICAgcGxhdGZvcm0vbmV0d29yay9zb3VwL0ROU1NvdXAuY3BwCiAgIHBsYXRmb3JtL25ldHdvcmsv c291cC9HT3duUHRyU291cC5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2VmbC9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZs L1RlbXBvcmFyeUxpbmtTdHVicy5jcHAKaW5kZXggYmUzODU2NS4uZTkwNTk3YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1RlbXBvcmFyeUxpbmtTdHVicy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1RlbXBvcmFyeUxpbmtTdHVicy5jcHAKQEAg LTU2LDIwICs1Niw1IEBAIFN0cmluZyBzaWduZWRQdWJsaWNLZXlBbmRDaGFsbGVuZ2VTdHJpbmco dW5zaWduZWQga2V5U2l6ZUluZGV4LCBjb25zdCBTdHJpbmcgJmNoCiAgICAgcmV0dXJuIFN0cmlu ZygpOwogfQogCi12b2lkIHNldENvb2tpZVN0b3JhZ2VQcml2YXRlQnJvd3NpbmdFbmFibGVkKGJv b2wpCi17Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLX0KLQotdm9pZCBzdGFydE9ic2VydmluZ0Nv b2tpZUNoYW5nZXMoKQotewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci19Ci0KLXZvaWQgc3RvcE9i c2VydmluZ0Nvb2tpZUNoYW5nZXMoKQotewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci19Ci0KIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCmluZGV4IDU2OWRkNzUuLjc3MGU4MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx OCBAQAorMjAxMi0wNy0yNyAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50 ZWwuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0gQWRkIEFQSSB0byBFd2tfQ29va2llX01hbmFn ZXIgdG8gd2F0Y2ggZm9yIGNvb2tpZSBjaGFuZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjQ4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBBUEkgdHAgRXdrX0Nvb2tpZV9NYW5hZ2VyIHNvIHRo YXQgdGhlIGNsaWVudCBjYW4gd2F0Y2gKKyAgICAgICAgZm9yIGNvb2tpZSBjaGFuZ2VzLgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyLmNwcDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXIuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29va2llX21hbmFnZXIuY3BwOiBBZGQg dW5pdCB0ZXN0cworICAgICAgICBmb3IgY29va2llIGNoYW5nZXMgd2F0Y2hpbmcuCisKIDIwMTIt MDctMjYgIFplbm8gQWxiaXNzZXIgIDx6ZW5vQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZp ZXdlZCBRdCBidWlsZGZpeCBhZnRlciByMTIzNzg2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlci5jcHAKaW5kZXggMDJmMWZi ZC4uZDNjYTEyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2Nvb2tpZV9tYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfY29va2llX21hbmFnZXIuY3BwCkBAIC00MCwxNiArNDAsNDcgQEAKIAogdXNpbmcg bmFtZXNwYWNlIFdlYktpdDsKIAorc3RydWN0IFdhdGNoX0NoYW5nZXNfQ2FsbGJhY2tfRGF0YSB7 CisgICAgRXdrX0Nvb2tpZV9NYW5hZ2VyX0NoYW5nZXNfV2F0Y2hfQ2IgY2FsbGJhY2s7CisgICAg dm9pZCogdXNlckRhdGE7CisKKyAgICBXYXRjaF9DaGFuZ2VzX0NhbGxiYWNrX0RhdGEoKQorICAg ICAgICA6IGNhbGxiYWNrKDApCisgICAgICAgICwgdXNlckRhdGEoMCkKKyAgICB7IH0KKworICAg IFdhdGNoX0NoYW5nZXNfQ2FsbGJhY2tfRGF0YShFd2tfQ29va2llX01hbmFnZXJfQ2hhbmdlc19X YXRjaF9DYiBfY2FsbGJhY2ssIHZvaWQqIF91c2VyRGF0YSkKKyAgICAgICAgOiBjYWxsYmFjayhf Y2FsbGJhY2spCisgICAgICAgICwgdXNlckRhdGEoX3VzZXJEYXRhKQorICAgIHsgfQorfTsKKwor c3RhdGljIHZvaWQgY29va2llc0RpZENoYW5nZShXS0Nvb2tpZU1hbmFnZXJSZWYsIGNvbnN0IHZv aWQqIGNsaWVudEluZm8pOworCiAvKioKICAqIFxzdHJ1Y3QgIF9Fd2tfQ29va2llX01hbmFnZXIK ICAqIEBicmllZiAgIENvbnRhaW5zIHRoZSBjb29raWUgbWFuYWdlciBkYXRhLgogICovCiBzdHJ1 Y3QgX0V3a19Db29raWVfTWFuYWdlciB7CiAgICAgV0tSZXRhaW5QdHI8V0tDb29raWVNYW5hZ2Vy UmVmPiB3a0Nvb2tpZU1hbmFnZXI7CisgICAgV2F0Y2hfQ2hhbmdlc19DYWxsYmFja19EYXRhIGNo YW5nZVdhdGNoZXI7CiAKICAgICBfRXdrX0Nvb2tpZV9NYW5hZ2VyKFdLQ29va2llTWFuYWdlclJl ZiBjb29raWVNYW5hZ2VyUmVmKQogICAgICAgICA6IHdrQ29va2llTWFuYWdlcihjb29raWVNYW5h Z2VyUmVmKQotICAgIHsgfQorICAgIHsKKyAgICAgICAgV0tDb29raWVNYW5hZ2VyQ2xpZW50IHdr Q29va2llTWFuYWdlckNsaWVudCA9IHsKKyAgICAgICAgICAgIGtXS0Nvb2tpZU1hbmFnZXJDbGll bnRDdXJyZW50VmVyc2lvbiwKKyAgICAgICAgICAgIHRoaXMsIC8vIGNsaWVudEluZm8KKyAgICAg ICAgICAgIGNvb2tpZXNEaWRDaGFuZ2UKKyAgICAgICAgfTsKKyAgICAgICAgV0tDb29raWVNYW5h Z2VyU2V0Q2xpZW50KHdrQ29va2llTWFuYWdlci5nZXQoKSwgJndrQ29va2llTWFuYWdlckNsaWVu dCk7CisgICAgfQorCisgICAgfl9Fd2tfQ29va2llX01hbmFnZXIoKQorICAgIHsKKyAgICAgICAg aWYgKGNoYW5nZVdhdGNoZXIuY2FsbGJhY2spCisgICAgICAgICAgICBXS0Nvb2tpZU1hbmFnZXJT dG9wT2JzZXJ2aW5nQ29va2llQ2hhbmdlcyh3a0Nvb2tpZU1hbmFnZXIuZ2V0KCkpOworICAgIH0K IH07CiAKICNkZWZpbmUgRVdLX0NPT0tJRV9NQU5BR0VSX1dLX0dFVF9PUl9SRVRVUk4obWFuYWdl ciwgd2tNYW5hZ2VyXywgLi4uKSAgICBcCkBAIC03MiwxMiArMTAzLDI2IEBAIENPTVBJTEVfQVNT RVJUX01BVENISU5HX0VOVU0oRVdLX0NPT0tJRV9BQ0NFUFRfUE9MSUNZX05PX1RISVJEX1BBUlRZ LCBrV0tIVFRQQ29vCiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19DT09LSUVfUEVS U0lTVEVOVF9TVE9SQUdFX1RFWFQsIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVRleHQpOwog Q09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09PS0lFX1BFUlNJU1RFTlRfU1RPUkFH RV9TUUxJVEUsIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVNRTGl0ZSk7CiAKK3N0YXRpYyB2 b2lkIGNvb2tpZXNEaWRDaGFuZ2UoV0tDb29raWVNYW5hZ2VyUmVmLCBjb25zdCB2b2lkKiBjbGll bnRJbmZvKQoreworICAgIEV3a19Db29raWVfTWFuYWdlciogbWFuYWdlciA9IHN0YXRpY19jYXN0 PEV3a19Db29raWVfTWFuYWdlcio+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVudEluZm8pKTsKKwor ICAgIEFTU0VSVChtYW5hZ2VyLT5jaGFuZ2VXYXRjaGVyLmNhbGxiYWNrKTsKKyAgICBtYW5hZ2Vy LT5jaGFuZ2VXYXRjaGVyLmNhbGxiYWNrKG1hbmFnZXItPmNoYW5nZVdhdGNoZXIudXNlckRhdGEp OworfQorCiB2b2lkIGV3a19jb29raWVfbWFuYWdlcl9wZXJzaXN0ZW50X3N0b3JhZ2Vfc2V0KEV3 a19Db29raWVfTWFuYWdlciogbWFuYWdlciwgY29uc3QgY2hhciogZmlsZW5hbWUsIEV3a19Db29r aWVfUGVyc2lzdGVudF9TdG9yYWdlIHN0b3JhZ2UpCiB7CiAgICAgRVdLX0NPT0tJRV9NQU5BR0VS X1dLX0dFVF9PUl9SRVRVUk4obWFuYWdlciwgd2tNYW5hZ2VyKTsKICAgICBFSU5BX1NBRkVUWV9P Tl9OVUxMX1JFVFVSTihmaWxlbmFtZSk7CiAKKyAgICBpZiAobWFuYWdlci0+Y2hhbmdlV2F0Y2hl ci5jYWxsYmFjaykKKyAgICAgICAgV0tDb29raWVNYW5hZ2VyU3RvcE9ic2VydmluZ0Nvb2tpZUNo YW5nZXMod2tNYW5hZ2VyKTsKKwogICAgIHRvSW1wbCh3a01hbmFnZXIpLT5zZXRDb29raWVQZXJz aXN0ZW50U3RvcmFnZShTdHJpbmc6OmZyb21VVEY4KGZpbGVuYW1lKSwgc3RvcmFnZSk7CisKKyAg ICBpZiAobWFuYWdlci0+Y2hhbmdlV2F0Y2hlci5jYWxsYmFjaykKKyAgICAgICAgV0tDb29raWVN YW5hZ2VyU3RhcnRPYnNlcnZpbmdDb29raWVDaGFuZ2VzKHdrTWFuYWdlcik7CiB9CiAKIHZvaWQg ZXdrX2Nvb2tpZV9tYW5hZ2VyX2FjY2VwdF9wb2xpY3lfc2V0KEV3a19Db29raWVfTWFuYWdlciog bWFuYWdlciwgRXdrX0Nvb2tpZV9BY2NlcHRfUG9saWN5IHBvbGljeSkKQEAgLTE3NCw2ICsyMTks MTggQEAgdm9pZCBld2tfY29va2llX21hbmFnZXJfY29va2llc19jbGVhcihFd2tfQ29va2llX01h bmFnZXIqIG1hbmFnZXIpCiAgICAgV0tDb29raWVNYW5hZ2VyRGVsZXRlQWxsQ29va2llcyh3a01h bmFnZXIpOwogfQogCit2b2lkIGV3a19jb29raWVfbWFuYWdlcl9jaGFuZ2VzX3dhdGNoKEV3a19D b29raWVfTWFuYWdlciogbWFuYWdlciwgRXdrX0Nvb2tpZV9NYW5hZ2VyX0NoYW5nZXNfV2F0Y2hf Q2IgY2FsbGJhY2ssIHZvaWQqIGRhdGEpCit7CisgICAgRVdLX0NPT0tJRV9NQU5BR0VSX1dLX0dF VF9PUl9SRVRVUk4obWFuYWdlciwgd2tNYW5hZ2VyKTsKKworICAgIG1hbmFnZXItPmNoYW5nZVdh dGNoZXIgPSBXYXRjaF9DaGFuZ2VzX0NhbGxiYWNrX0RhdGEoY2FsbGJhY2ssIGRhdGEpOworCisg ICAgaWYgKGNhbGxiYWNrKQorICAgICAgICBXS0Nvb2tpZU1hbmFnZXJTdGFydE9ic2VydmluZ0Nv b2tpZUNoYW5nZXMod2tNYW5hZ2VyKTsKKyAgICBlbHNlCisgICAgICAgIFdLQ29va2llTWFuYWdl clN0b3BPYnNlcnZpbmdDb29raWVDaGFuZ2VzKHdrTWFuYWdlcik7Cit9CisKIC8qKgogICogQGlu dGVybmFsCiAgKiBGcmVlcyBhIEV3a19Db29raWVfTWFuYWdlciBvYmplY3QuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXIuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlci5oCmlu ZGV4IGU5M2VkOGUuLmUzNzc4MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlci5oCkBAIC05MCw2ICs5MCwxMiBAQCB0eXBl ZGVmIHZvaWQgKCpFd2tfQ29va2llX01hbmFnZXJfQXN5bmNfUG9saWN5X0dldF9DYikoRXdrX0Nv b2tpZV9BY2NlcHRfUG9saWN5CiB0eXBlZGVmIHZvaWQgKCpFd2tfQ29va2llX01hbmFnZXJfQXN5 bmNfSG9zdG5hbWVzX0dldF9DYikoRWluYV9MaXN0KiBob3N0bmFtZXMsIEV3a19XZWJfRXJyb3Ig KmVycm9yLCB2b2lkICpldmVudF9pbmZvKTsKIAogLyoqCisgKiBAdHlwZWRlZiBFd2tfQ29va2ll X01hbmFnZXJfQ2hhbmdlc19XYXRjaF9DYiBFd2tfQ29va2llX01hbmFnZXJfQ2hhbmdlc19XYXRj aF9DYgorICogQGJyaWVmIENhbGxiYWNrIHR5cGUgZm9yIHVzZSB3aXRoIGV3a19jb29raWVfbWFu YWdlcl9jaGFuZ2VzX3dhdGNoKCkKKyAqLwordHlwZWRlZiB2b2lkICgqRXdrX0Nvb2tpZV9NYW5h Z2VyX0NoYW5nZXNfV2F0Y2hfQ2IpKHZvaWQgKmV2ZW50X2luZm8pOworCisvKioKICAqIFNldCB0 aGUgQGEgZmlsZW5hbWUgd2hlcmUgbm9uLXNlc3Npb24gY29va2llcyBhcmUgc3RvcmVkIHBlcnNp c3RlbnRseSB1c2luZyBAYSBzdG9yYWdlIGFzIHRoZSBmb3JtYXQgdG8gcmVhZC93cml0ZSB0aGUg Y29va2llcy4KICAqCiAgKiBDb29raWVzIGFyZSBpbml0aWFsbHkgcmVhZCBmcm9tIEBmaWxlbmFt ZSB0byBjcmVhdGUgYW4gaW5pdGlhbCBzZXQgb2YgY29va2llcy4KQEAgLTE0NCw2ICsxNTAsMTcg QEAgRUFQSSB2b2lkIGV3a19jb29raWVfbWFuYWdlcl9hc3luY19ob3N0bmFtZXNfd2l0aF9jb29r aWVzX2dldChjb25zdCBFd2tfQ29va2llX00KIEVBUEkgdm9pZCBld2tfY29va2llX21hbmFnZXJf aG9zdG5hbWVfY29va2llc19jbGVhcihFd2tfQ29va2llX01hbmFnZXIgKm1hbmFnZXIsIGNvbnN0 IGNoYXIgKmhvc3RuYW1lKTsKIAogLyoqCisgKiBXYXRjaCBmb3IgY29va2llcyBjaGFuZ2VzIGlu IEBhIG1hbmFnZXIuCisgKgorICogUGFzcyBAYyBOVUxMIGFzIHZhbHVlIGZvciBAYSBjYWxsYmFj ayB0byBzdG9wIHdhdGNoaW5nIGZvciBjaGFuZ2VzLgorICoKKyAqIEBwYXJhbSBtYW5hZ2VyIFRo ZSBjb29raWUgbWFuYWdlciB0byB3YXRjaC4KKyAqIEBwYXJhbSBjYWxsYmFjayBmdW5jdGlvbiB0 aGF0IHdpbGwgYmUgY2FsbGVkIGV2ZXJ5IHRpbWUgY29va2llcyBhcmUgYWRkZWQsIHJlbW92ZWQg b3IgbW9kaWZpZWQuCisgKiBAcGFyYW0gZGF0YSBVc2VyIGRhdGEgKG1heSBiZSBAYyBOVUxMKS4K KyAqLworRUFQSSB2b2lkIGV3a19jb29raWVfbWFuYWdlcl9jaGFuZ2VzX3dhdGNoKEV3a19Db29r aWVfTWFuYWdlciAqbWFuYWdlciwgRXdrX0Nvb2tpZV9NYW5hZ2VyX0NoYW5nZXNfV2F0Y2hfQ2Ig Y2FsbGJhY2ssIHZvaWQgKmRhdGEpOworCisvKioKICAqIERlbGV0ZSBhbGwgY29va2llcyBvZiBA YSBtYW5hZ2VyLgogICoKICAqIEBwYXJhbSBtYW5hZ2VyIFRoZSBjb29raWUgbWFuYWdlciB0byB1 cGRhdGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0 cy90ZXN0X2V3azJfY29va2llX21hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2Nvb2tpZV9tYW5hZ2VyLmNwcAppbmRleCA4NjgxNWI0 Li43ZGJkNDk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90 ZXN0cy90ZXN0X2V3azJfY29va2llX21hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb29raWVfbWFuYWdlci5jcHAKQEAgLTE1 Myw2ICsxNTMsNzUgQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a19jb29raWVfbWFuYWdl cl9hY2NlcHRfcG9saWN5KQogICAgIEFTU0VSVF9FUShjb3VudEhvc3RuYW1lc1dpdGhDb29raWVz KGNvb2tpZU1hbmFnZXIpLCAwKTsKIH0KIAordm9pZCBvbkNvb2tpZXNDaGFuZ2VkKHZvaWQgKmV2 ZW50SW5mbykKK3sKKyAgICBib29sKiBjb29raWVzQ2hhbmdlZCA9IHN0YXRpY19jYXN0PGJvb2wq PihldmVudEluZm8pOworICAgICpjb29raWVzQ2hhbmdlZCA9IHRydWU7Cit9CisKK1RFU1RfRihF V0syVW5pdFRlc3RCYXNlLCBld2tfY29va2llX21hbmFnZXJfY2hhbmdlc193YXRjaCkKK3sKKyAg ICBPd25QdHI8RVdLMlVuaXRUZXN0U2VydmVyPiBodHRwU2VydmVyID0gYWRvcHRQdHIobmV3IEVX SzJVbml0VGVzdFNlcnZlcik7CisgICAgaHR0cFNlcnZlci0+cnVuKHNlcnZlckNhbGxiYWNrKTsK KworICAgIEV3a19Db29raWVfTWFuYWdlciogY29va2llTWFuYWdlciA9IGV3a19jb250ZXh0X2Nv b2tpZV9tYW5hZ2VyX2dldChld2tfY29udGV4dF9kZWZhdWx0X2dldCgpKTsKKyAgICBBU1NFUlRf VFJVRShjb29raWVNYW5hZ2VyKTsKKworICAgIGV3a19jb29raWVfbWFuYWdlcl9hY2NlcHRfcG9s aWN5X3NldChjb29raWVNYW5hZ2VyLCBFV0tfQ09PS0lFX0FDQ0VQVF9QT0xJQ1lfQUxXQVlTKTsK KyAgICBBU1NFUlRfRVEoZ2V0QWNjZXB0UG9saWN5KGNvb2tpZU1hbmFnZXIpLCBFV0tfQ09PS0lF X0FDQ0VQVF9QT0xJQ1lfQUxXQVlTKTsKKworICAgIC8vIFdhdGNoIGZvciBjaGFuZ2VzCisgICAg Ym9vbCBjb29raWVzQ2hhbmdlZCA9IGZhbHNlOworICAgIGV3a19jb29raWVfbWFuYWdlcl9jaGFu Z2VzX3dhdGNoKGNvb2tpZU1hbmFnZXIsIG9uQ29va2llc0NoYW5nZWQsICZjb29raWVzQ2hhbmdl ZCk7CisKKyAgICAvLyBDaGVjayBmb3IgY29va2llIGNoYW5nZXMgbm90aWZpY2F0aW9ucworICAg IGxvYWRVcmxTeW5jKGh0dHBTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9pbmRleC5odG1sIikuZGF0 YSgpKTsKKworICAgIHdoaWxlICghY29va2llc0NoYW5nZWQpCisgICAgICAgIGVjb3JlX21haW5f bG9vcF9pdGVyYXRlKCk7CisgICAgQVNTRVJUX1RSVUUoY29va2llc0NoYW5nZWQpOworCisgICAg Y29va2llc0NoYW5nZWQgPSBmYWxzZTsKKyAgICBld2tfY29va2llX21hbmFnZXJfY29va2llc19j bGVhcihjb29raWVNYW5hZ2VyKTsKKyAgICB3aGlsZSAoIWNvb2tpZXNDaGFuZ2VkKQorICAgICAg ICBlY29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOworICAgIEFTU0VSVF9UUlVFKGNvb2tpZXNDaGFu Z2VkKTsKKworICAgIC8vIFN0b3Agd2F0Y2hpbmcgZm9yIG5vdGlmaWNhdGlvbnMKKyAgICBld2tf Y29va2llX21hbmFnZXJfY2hhbmdlc193YXRjaChjb29raWVNYW5hZ2VyLCAwLCAwKTsKKyAgICBj b29raWVzQ2hhbmdlZCA9IGZhbHNlOworICAgIGxvYWRVcmxTeW5jKGh0dHBTZXJ2ZXItPmdldFVS SUZvclBhdGgoIi9pbmRleC5odG1sIikuZGF0YSgpKTsKKyAgICBBU1NFUlRfRVEoY291bnRIb3N0 bmFtZXNXaXRoQ29va2llcyhjb29raWVNYW5hZ2VyKSwgMik7CisgICAgQVNTRVJUX0ZBTFNFKGNv b2tpZXNDaGFuZ2VkKTsKKworICAgIC8vIFdhdGNoIGFnYWluIGZvciBub3RpZmljYXRpb25zCisg ICAgZXdrX2Nvb2tpZV9tYW5hZ2VyX2NoYW5nZXNfd2F0Y2goY29va2llTWFuYWdlciwgb25Db29r aWVzQ2hhbmdlZCwgJmNvb2tpZXNDaGFuZ2VkKTsKKworICAgIC8vIE1ha2Ugc3VyZSB3ZSBkb24n dCBnZXQgbm90aWZpY2F0aW9ucyB3aGVuIGxvYWRpbmcgc2V0dGluZyBhbiBleGlzdGluZyBwZXJz aXN0ZW50IHN0b3JhZ2UKKyAgICBjaGFyIHRleHRTdG9yYWdlMVtdID0gIi90bXAvdHh0LWNvb2tp ZS5YWFhYWFgiOworICAgIEFTU0VSVF9UUlVFKG1rdGVtcCh0ZXh0U3RvcmFnZTEpKTsKKyAgICBj aGFyIHRleHRTdG9yYWdlMltdID0gIi90bXAvdHh0LWNvb2tpZS5YWFhYWFgiOworICAgIEFTU0VS VF9UUlVFKG1rdGVtcCh0ZXh0U3RvcmFnZTIpKTsKKworICAgIGV3a19jb29raWVfbWFuYWdlcl9w ZXJzaXN0ZW50X3N0b3JhZ2Vfc2V0KGNvb2tpZU1hbmFnZXIsIHRleHRTdG9yYWdlMSwgRVdLX0NP T0tJRV9QRVJTSVNURU5UX1NUT1JBR0VfVEVYVCk7CisgICAgbG9hZFVybFN5bmMoaHR0cFNlcnZl ci0+Z2V0VVJJRm9yUGF0aCgiL2luZGV4Lmh0bWwiKS5kYXRhKCkpOworICAgIEFTU0VSVF9FUShj b3VudEhvc3RuYW1lc1dpdGhDb29raWVzKGNvb2tpZU1hbmFnZXIpLCAyKTsKKworICAgIGNvb2tp ZXNDaGFuZ2VkID0gZmFsc2U7CisgICAgZXdrX2Nvb2tpZV9tYW5hZ2VyX3BlcnNpc3RlbnRfc3Rv cmFnZV9zZXQoY29va2llTWFuYWdlciwgdGV4dFN0b3JhZ2UyLCBFV0tfQ09PS0lFX1BFUlNJU1RF TlRfU1RPUkFHRV9URVhUKTsKKyAgICBBU1NFUlRfRVEoY291bnRIb3N0bmFtZXNXaXRoQ29va2ll cyhjb29raWVNYW5hZ2VyKSwgMCk7CisKKyAgICBld2tfY29va2llX21hbmFnZXJfcGVyc2lzdGVu dF9zdG9yYWdlX3NldChjb29raWVNYW5hZ2VyLCB0ZXh0U3RvcmFnZTEsIEVXS19DT09LSUVfUEVS U0lTVEVOVF9TVE9SQUdFX1RFWFQpOworICAgIEFTU0VSVF9FUShjb3VudEhvc3RuYW1lc1dpdGhD b29raWVzKGNvb2tpZU1hbmFnZXIpLCAyKTsKKworICAgIEFTU0VSVF9GQUxTRShjb29raWVzQ2hh bmdlZCk7CisKKyAgICAvLyBGaW5hbCBjbGVhbiB1cC4KKyAgICBld2tfY29va2llX21hbmFnZXJf Y2hhbmdlc193YXRjaChjb29raWVNYW5hZ2VyLCAwLCAwKTsKKyAgICB1bmxpbmsodGV4dFN0b3Jh Z2UxKTsKKyAgICB1bmxpbmsodGV4dFN0b3JhZ2UyKTsKK30KKwogVEVTVF9GKEVXSzJVbml0VGVz dEJhc2UsIGV3a19jb29raWVfbWFuYWdlcl9jb29raWVzX2RlbGV0ZSkKIHsKICAgICBPd25QdHI8 RVdLMlVuaXRUZXN0U2VydmVyPiBodHRwU2VydmVyID0gYWRvcHRQdHIobmV3IEVXSzJVbml0VGVz dFNlcnZlcik7Cg== 154913 2012-07-27 05:45:47 -0700 2012-07-27 06:40:01 -0700 Patch 92484_wk2_cookies_watching.patch text/plain 11489 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkNmZmZTI2Li4wYTRjOTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTItMDctMjcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBBUEkgdG8gRXdrX0Nvb2tpZV9NYW5hZ2Vy IHRvIHdhdGNoIGZvciBjb29raWUgY2hhbmdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI0ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBNYWtlIHVzZSBvZiBzb3VwL0Nvb2tpZVN0b3JhZ2VTb3VwLmNw cCBmb3IgRUZMIHBvcnQgaW5zdGVhZAorICAgICAgICBvZiBkZWZpbmluZyBlbXB0eSBpbXBsZW1l bnRhdGlvbnMgZm9yIGNvb2tpZSBzdG9yYWdlCisgICAgICAgIGZ1bmN0aW9ucy4KKworICAgICAg ICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIFBsYXRmb3Jt RWZsLmNtYWtlOgorICAgICAgICAqIHBsYXRmb3JtL2VmbC9UZW1wb3JhcnlMaW5rU3R1YnMuY3Bw OgorCiAyMDEyLTA3LTI3ICBLZWlzaGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgogCiAg ICAgICAgIFJlcGxhY2UgQ29sb3JDaG9vc2VyQ2xpZW50OjplbGVtZW50UmVjdFJlbGF0aXZlVG9X aW5kb3cgd2l0aCBlbGVtZW50UmVjdFJlbGF0aXZlVG9Sb290VmlldwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvUGxhdGZvcm1FZmwuY21ha2UgYi9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUVm bC5jbWFrZQppbmRleCAzZDNjYzcwLi4wYjE4NDc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9QbGF0Zm9ybUVmbC5jbWFrZQorKysgYi9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUVmbC5jbWFr ZQpAQCAtODIsNiArODIsNyBAQCBMSVNUKEFQUEVORCBXZWJDb3JlX1NPVVJDRVMKICAgcGxhdGZv cm0vbGludXgvR2FtZXBhZERldmljZUxpbnV4LmNwcAogICBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9n c3RyZWFtZXIvTWVkaWFTdHJlYW1DZW50ZXJHU3RyZWFtZXIuY3BwCiAgIHBsYXRmb3JtL25ldHdv cmsvc291cC9Db29raWVKYXJTb3VwLmNwcAorICBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvQ29va2ll U3RvcmFnZVNvdXAuY3BwCiAgIHBsYXRmb3JtL25ldHdvcmsvc291cC9DcmVkZW50aWFsU3RvcmFn ZVNvdXAuY3BwCiAgIHBsYXRmb3JtL25ldHdvcmsvc291cC9ETlNTb3VwLmNwcAogICBwbGF0Zm9y bS9uZXR3b3JrL3NvdXAvR093blB0clNvdXAuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9lZmwvVGVtcG9yYXJ5TGlua1N0dWJzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2VmbC9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwCmluZGV4IGJlMzg1NjUuLmU5MDU5N2Ig MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9UZW1wb3JhcnlMaW5rU3R1 YnMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9UZW1wb3JhcnlMaW5rU3R1 YnMuY3BwCkBAIC01NiwyMCArNTYsNSBAQCBTdHJpbmcgc2lnbmVkUHVibGljS2V5QW5kQ2hhbGxl bmdlU3RyaW5nKHVuc2lnbmVkIGtleVNpemVJbmRleCwgY29uc3QgU3RyaW5nICZjaAogICAgIHJl dHVybiBTdHJpbmcoKTsKIH0KIAotdm9pZCBzZXRDb29raWVTdG9yYWdlUHJpdmF0ZUJyb3dzaW5n RW5hYmxlZChib29sKQotewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci19Ci0KLXZvaWQgc3RhcnRP YnNlcnZpbmdDb29raWVDaGFuZ2VzKCkKLXsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotfQotCi12 b2lkIHN0b3BPYnNlcnZpbmdDb29raWVDaGFuZ2VzKCkKLXsKLSAgICBub3RJbXBsZW1lbnRlZCgp OwotfQotCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBkNGZlMDkyLi4xZmRjYzk0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBA IC0xLDUgKzEsMjAgQEAKIDIwMTItMDctMjcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhl LmR1bWV6QGludGVsLmNvbT4KIAorICAgICAgICBbRUZMXVtXSzJdIEFkZCBBUEkgdG8gRXdrX0Nv b2tpZV9NYW5hZ2VyIHRvIHdhdGNoIGZvciBjb29raWUgY2hhbmdlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI0ODQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgQVBJIHRwIEV3a19Db29raWVfTWFu YWdlciBzbyB0aGF0IHRoZSBjbGllbnQgY2FuIHdhdGNoCisgICAgICAgIGZvciBjb29raWUgY2hh bmdlcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlci5j cHA6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2Nvb2tpZV9tYW5hZ2Vy LmNwcDogQWRkIHVuaXQgdGVzdHMKKyAgICAgICAgZm9yIGNvb2tpZSBjaGFuZ2VzIHdhdGNoaW5n LgorCisyMDEyLTA3LTI3ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRl bC5jb20+CisKICAgICAgICAgW0VGTF1bV0syXSBTdG9wIHVzaW5nIEMgQVBJIHRvIGludGVyYWN0 IHdpdGggdGhlIHBhZ2UgaW4gRXdrX1ZpZXcKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTkyNDYzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXIuY3BwCmluZGV4IDAyZjFmYmQuLjBj YzMwMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19j b29raWVfbWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2Nvb2tpZV9tYW5hZ2VyLmNwcApAQCAtNDAsMTYgKzQwLDQ3IEBACiAKIHVzaW5nIG5hbWVz cGFjZSBXZWJLaXQ7CiAKK3N0cnVjdCBDb29raWVfQ2hhbmdlX0hhbmRsZXIgeworICAgIEV3a19D b29raWVfTWFuYWdlcl9DaGFuZ2VzX1dhdGNoX0NiIGNhbGxiYWNrOworICAgIHZvaWQqIHVzZXJE YXRhOworCisgICAgQ29va2llX0NoYW5nZV9IYW5kbGVyKCkKKyAgICAgICAgOiBjYWxsYmFjaygw KQorICAgICAgICAsIHVzZXJEYXRhKDApCisgICAgeyB9CisKKyAgICBDb29raWVfQ2hhbmdlX0hh bmRsZXIoRXdrX0Nvb2tpZV9NYW5hZ2VyX0NoYW5nZXNfV2F0Y2hfQ2IgX2NhbGxiYWNrLCB2b2lk KiBfdXNlckRhdGEpCisgICAgICAgIDogY2FsbGJhY2soX2NhbGxiYWNrKQorICAgICAgICAsIHVz ZXJEYXRhKF91c2VyRGF0YSkKKyAgICB7IH0KK307CisKK3N0YXRpYyB2b2lkIGNvb2tpZXNEaWRD aGFuZ2UoV0tDb29raWVNYW5hZ2VyUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKKwogLyoq CiAgKiBcc3RydWN0ICBfRXdrX0Nvb2tpZV9NYW5hZ2VyCiAgKiBAYnJpZWYgICBDb250YWlucyB0 aGUgY29va2llIG1hbmFnZXIgZGF0YS4KICAqLwogc3RydWN0IF9Fd2tfQ29va2llX01hbmFnZXIg ewogICAgIFdLUmV0YWluUHRyPFdLQ29va2llTWFuYWdlclJlZj4gd2tDb29raWVNYW5hZ2VyOwor ICAgIENvb2tpZV9DaGFuZ2VfSGFuZGxlciBjaGFuZ2VIYW5kbGVyOwogCiAgICAgX0V3a19Db29r aWVfTWFuYWdlcihXS0Nvb2tpZU1hbmFnZXJSZWYgY29va2llTWFuYWdlclJlZikKICAgICAgICAg OiB3a0Nvb2tpZU1hbmFnZXIoY29va2llTWFuYWdlclJlZikKLSAgICB7IH0KKyAgICB7CisgICAg ICAgIFdLQ29va2llTWFuYWdlckNsaWVudCB3a0Nvb2tpZU1hbmFnZXJDbGllbnQgPSB7CisgICAg ICAgICAgICBrV0tDb29raWVNYW5hZ2VyQ2xpZW50Q3VycmVudFZlcnNpb24sCisgICAgICAgICAg ICB0aGlzLCAvLyBjbGllbnRJbmZvCisgICAgICAgICAgICBjb29raWVzRGlkQ2hhbmdlCisgICAg ICAgIH07CisgICAgICAgIFdLQ29va2llTWFuYWdlclNldENsaWVudCh3a0Nvb2tpZU1hbmFnZXIu Z2V0KCksICZ3a0Nvb2tpZU1hbmFnZXJDbGllbnQpOworICAgIH0KKworICAgIH5fRXdrX0Nvb2tp ZV9NYW5hZ2VyKCkKKyAgICB7CisgICAgICAgIGlmIChjaGFuZ2VIYW5kbGVyLmNhbGxiYWNrKQor ICAgICAgICAgICAgV0tDb29raWVNYW5hZ2VyU3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMod2tD b29raWVNYW5hZ2VyLmdldCgpKTsKKyAgICB9CiB9OwogCiAjZGVmaW5lIEVXS19DT09LSUVfTUFO QUdFUl9XS19HRVRfT1JfUkVUVVJOKG1hbmFnZXIsIHdrTWFuYWdlcl8sIC4uLikgICAgXApAQCAt NzIsMTIgKzEwMywyNiBAQCBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19DT09LSUVf QUNDRVBUX1BPTElDWV9OT19USElSRF9QQVJUWSwga1dLSFRUUENvbwogQ09NUElMRV9BU1NFUlRf TUFUQ0hJTkdfRU5VTShFV0tfQ09PS0lFX1BFUlNJU1RFTlRfU1RPUkFHRV9URVhULCBTb3VwQ29v a2llUGVyc2lzdGVudFN0b3JhZ2VUZXh0KTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0o RVdLX0NPT0tJRV9QRVJTSVNURU5UX1NUT1JBR0VfU1FMSVRFLCBTb3VwQ29va2llUGVyc2lzdGVu dFN0b3JhZ2VTUUxpdGUpOwogCitzdGF0aWMgdm9pZCBjb29raWVzRGlkQ2hhbmdlKFdLQ29va2ll TWFuYWdlclJlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3sKKyAgICBFd2tfQ29va2llX01h bmFnZXIqIG1hbmFnZXIgPSBzdGF0aWNfY2FzdDxFd2tfQ29va2llX01hbmFnZXIqPihjb25zdF9j YXN0PHZvaWQqPihjbGllbnRJbmZvKSk7CisKKyAgICBBU1NFUlQobWFuYWdlci0+Y2hhbmdlSGFu ZGxlci5jYWxsYmFjayk7CisgICAgbWFuYWdlci0+Y2hhbmdlSGFuZGxlci5jYWxsYmFjayhtYW5h Z2VyLT5jaGFuZ2VIYW5kbGVyLnVzZXJEYXRhKTsKK30KKwogdm9pZCBld2tfY29va2llX21hbmFn ZXJfcGVyc2lzdGVudF9zdG9yYWdlX3NldChFd2tfQ29va2llX01hbmFnZXIqIG1hbmFnZXIsIGNv bnN0IGNoYXIqIGZpbGVuYW1lLCBFd2tfQ29va2llX1BlcnNpc3RlbnRfU3RvcmFnZSBzdG9yYWdl KQogewogICAgIEVXS19DT09LSUVfTUFOQUdFUl9XS19HRVRfT1JfUkVUVVJOKG1hbmFnZXIsIHdr TWFuYWdlcik7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4oZmlsZW5hbWUpOwogCisg ICAgaWYgKG1hbmFnZXItPmNoYW5nZUhhbmRsZXIuY2FsbGJhY2spCisgICAgICAgIFdLQ29va2ll TWFuYWdlclN0b3BPYnNlcnZpbmdDb29raWVDaGFuZ2VzKHdrTWFuYWdlcik7CisKICAgICB0b0lt cGwod2tNYW5hZ2VyKS0+c2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UoU3RyaW5nOjpmcm9tVVRG OChmaWxlbmFtZSksIHN0b3JhZ2UpOworCisgICAgaWYgKG1hbmFnZXItPmNoYW5nZUhhbmRsZXIu Y2FsbGJhY2spCisgICAgICAgIFdLQ29va2llTWFuYWdlclN0YXJ0T2JzZXJ2aW5nQ29va2llQ2hh bmdlcyh3a01hbmFnZXIpOwogfQogCiB2b2lkIGV3a19jb29raWVfbWFuYWdlcl9hY2NlcHRfcG9s aWN5X3NldChFd2tfQ29va2llX01hbmFnZXIqIG1hbmFnZXIsIEV3a19Db29raWVfQWNjZXB0X1Bv bGljeSBwb2xpY3kpCkBAIC0xNzQsNiArMjE5LDE4IEBAIHZvaWQgZXdrX2Nvb2tpZV9tYW5hZ2Vy X2Nvb2tpZXNfY2xlYXIoRXdrX0Nvb2tpZV9NYW5hZ2VyKiBtYW5hZ2VyKQogICAgIFdLQ29va2ll TWFuYWdlckRlbGV0ZUFsbENvb2tpZXMod2tNYW5hZ2VyKTsKIH0KIAordm9pZCBld2tfY29va2ll X21hbmFnZXJfY2hhbmdlc193YXRjaChFd2tfQ29va2llX01hbmFnZXIqIG1hbmFnZXIsIEV3a19D b29raWVfTWFuYWdlcl9DaGFuZ2VzX1dhdGNoX0NiIGNhbGxiYWNrLCB2b2lkKiBkYXRhKQorewor ICAgIEVXS19DT09LSUVfTUFOQUdFUl9XS19HRVRfT1JfUkVUVVJOKG1hbmFnZXIsIHdrTWFuYWdl cik7CisKKyAgICBtYW5hZ2VyLT5jaGFuZ2VIYW5kbGVyID0gQ29va2llX0NoYW5nZV9IYW5kbGVy KGNhbGxiYWNrLCBkYXRhKTsKKworICAgIGlmIChjYWxsYmFjaykKKyAgICAgICAgV0tDb29raWVN YW5hZ2VyU3RhcnRPYnNlcnZpbmdDb29raWVDaGFuZ2VzKHdrTWFuYWdlcik7CisgICAgZWxzZQor ICAgICAgICBXS0Nvb2tpZU1hbmFnZXJTdG9wT2JzZXJ2aW5nQ29va2llQ2hhbmdlcyh3a01hbmFn ZXIpOworfQorCiAvKioKICAqIEBpbnRlcm5hbAogICogRnJlZXMgYSBFd2tfQ29va2llX01hbmFn ZXIgb2JqZWN0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2Nvb2tpZV9tYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfY29va2llX21hbmFnZXIuaAppbmRleCBlOTNlZDhlLi5lMzc3ODA4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXIuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXIuaApA QCAtOTAsNiArOTAsMTIgQEAgdHlwZWRlZiB2b2lkICgqRXdrX0Nvb2tpZV9NYW5hZ2VyX0FzeW5j X1BvbGljeV9HZXRfQ2IpKEV3a19Db29raWVfQWNjZXB0X1BvbGljeQogdHlwZWRlZiB2b2lkICgq RXdrX0Nvb2tpZV9NYW5hZ2VyX0FzeW5jX0hvc3RuYW1lc19HZXRfQ2IpKEVpbmFfTGlzdCogaG9z dG5hbWVzLCBFd2tfV2ViX0Vycm9yICplcnJvciwgdm9pZCAqZXZlbnRfaW5mbyk7CiAKIC8qKgor ICogQHR5cGVkZWYgRXdrX0Nvb2tpZV9NYW5hZ2VyX0NoYW5nZXNfV2F0Y2hfQ2IgRXdrX0Nvb2tp ZV9NYW5hZ2VyX0NoYW5nZXNfV2F0Y2hfQ2IKKyAqIEBicmllZiBDYWxsYmFjayB0eXBlIGZvciB1 c2Ugd2l0aCBld2tfY29va2llX21hbmFnZXJfY2hhbmdlc193YXRjaCgpCisgKi8KK3R5cGVkZWYg dm9pZCAoKkV3a19Db29raWVfTWFuYWdlcl9DaGFuZ2VzX1dhdGNoX0NiKSh2b2lkICpldmVudF9p bmZvKTsKKworLyoqCiAgKiBTZXQgdGhlIEBhIGZpbGVuYW1lIHdoZXJlIG5vbi1zZXNzaW9uIGNv b2tpZXMgYXJlIHN0b3JlZCBwZXJzaXN0ZW50bHkgdXNpbmcgQGEgc3RvcmFnZSBhcyB0aGUgZm9y bWF0IHRvIHJlYWQvd3JpdGUgdGhlIGNvb2tpZXMuCiAgKgogICogQ29va2llcyBhcmUgaW5pdGlh bGx5IHJlYWQgZnJvbSBAZmlsZW5hbWUgdG8gY3JlYXRlIGFuIGluaXRpYWwgc2V0IG9mIGNvb2tp ZXMuCkBAIC0xNDQsNiArMTUwLDE3IEBAIEVBUEkgdm9pZCBld2tfY29va2llX21hbmFnZXJfYXN5 bmNfaG9zdG5hbWVzX3dpdGhfY29va2llc19nZXQoY29uc3QgRXdrX0Nvb2tpZV9NCiBFQVBJIHZv aWQgZXdrX2Nvb2tpZV9tYW5hZ2VyX2hvc3RuYW1lX2Nvb2tpZXNfY2xlYXIoRXdrX0Nvb2tpZV9N YW5hZ2VyICptYW5hZ2VyLCBjb25zdCBjaGFyICpob3N0bmFtZSk7CiAKIC8qKgorICogV2F0Y2gg Zm9yIGNvb2tpZXMgY2hhbmdlcyBpbiBAYSBtYW5hZ2VyLgorICoKKyAqIFBhc3MgQGMgTlVMTCBh cyB2YWx1ZSBmb3IgQGEgY2FsbGJhY2sgdG8gc3RvcCB3YXRjaGluZyBmb3IgY2hhbmdlcy4KKyAq CisgKiBAcGFyYW0gbWFuYWdlciBUaGUgY29va2llIG1hbmFnZXIgdG8gd2F0Y2guCisgKiBAcGFy YW0gY2FsbGJhY2sgZnVuY3Rpb24gdGhhdCB3aWxsIGJlIGNhbGxlZCBldmVyeSB0aW1lIGNvb2tp ZXMgYXJlIGFkZGVkLCByZW1vdmVkIG9yIG1vZGlmaWVkLgorICogQHBhcmFtIGRhdGEgVXNlciBk YXRhIChtYXkgYmUgQGMgTlVMTCkuCisgKi8KK0VBUEkgdm9pZCBld2tfY29va2llX21hbmFnZXJf Y2hhbmdlc193YXRjaChFd2tfQ29va2llX01hbmFnZXIgKm1hbmFnZXIsIEV3a19Db29raWVfTWFu YWdlcl9DaGFuZ2VzX1dhdGNoX0NiIGNhbGxiYWNrLCB2b2lkICpkYXRhKTsKKworLyoqCiAgKiBE ZWxldGUgYWxsIGNvb2tpZXMgb2YgQGEgbWFuYWdlci4KICAqCiAgKiBAcGFyYW0gbWFuYWdlciBU aGUgY29va2llIG1hbmFnZXIgdG8gdXBkYXRlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2Nvb2tpZV9tYW5hZ2VyLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb29raWVfbWFu YWdlci5jcHAKaW5kZXggODY4MTViNC4uN2RiZDQ5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2Nvb2tpZV9tYW5hZ2VyLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29v a2llX21hbmFnZXIuY3BwCkBAIC0xNTMsNiArMTUzLDc1IEBAIFRFU1RfRihFV0syVW5pdFRlc3RC YXNlLCBld2tfY29va2llX21hbmFnZXJfYWNjZXB0X3BvbGljeSkKICAgICBBU1NFUlRfRVEoY291 bnRIb3N0bmFtZXNXaXRoQ29va2llcyhjb29raWVNYW5hZ2VyKSwgMCk7CiB9CiAKK3ZvaWQgb25D b29raWVzQ2hhbmdlZCh2b2lkICpldmVudEluZm8pCit7CisgICAgYm9vbCogY29va2llc0NoYW5n ZWQgPSBzdGF0aWNfY2FzdDxib29sKj4oZXZlbnRJbmZvKTsKKyAgICAqY29va2llc0NoYW5nZWQg PSB0cnVlOworfQorCitURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX2Nvb2tpZV9tYW5hZ2Vy X2NoYW5nZXNfd2F0Y2gpCit7CisgICAgT3duUHRyPEVXSzJVbml0VGVzdFNlcnZlcj4gaHR0cFNl cnZlciA9IGFkb3B0UHRyKG5ldyBFV0syVW5pdFRlc3RTZXJ2ZXIpOworICAgIGh0dHBTZXJ2ZXIt PnJ1bihzZXJ2ZXJDYWxsYmFjayk7CisKKyAgICBFd2tfQ29va2llX01hbmFnZXIqIGNvb2tpZU1h bmFnZXIgPSBld2tfY29udGV4dF9jb29raWVfbWFuYWdlcl9nZXQoZXdrX2NvbnRleHRfZGVmYXVs dF9nZXQoKSk7CisgICAgQVNTRVJUX1RSVUUoY29va2llTWFuYWdlcik7CisKKyAgICBld2tfY29v a2llX21hbmFnZXJfYWNjZXB0X3BvbGljeV9zZXQoY29va2llTWFuYWdlciwgRVdLX0NPT0tJRV9B Q0NFUFRfUE9MSUNZX0FMV0FZUyk7CisgICAgQVNTRVJUX0VRKGdldEFjY2VwdFBvbGljeShjb29r aWVNYW5hZ2VyKSwgRVdLX0NPT0tJRV9BQ0NFUFRfUE9MSUNZX0FMV0FZUyk7CisKKyAgICAvLyBX YXRjaCBmb3IgY2hhbmdlcworICAgIGJvb2wgY29va2llc0NoYW5nZWQgPSBmYWxzZTsKKyAgICBl d2tfY29va2llX21hbmFnZXJfY2hhbmdlc193YXRjaChjb29raWVNYW5hZ2VyLCBvbkNvb2tpZXND aGFuZ2VkLCAmY29va2llc0NoYW5nZWQpOworCisgICAgLy8gQ2hlY2sgZm9yIGNvb2tpZSBjaGFu Z2VzIG5vdGlmaWNhdGlvbnMKKyAgICBsb2FkVXJsU3luYyhodHRwU2VydmVyLT5nZXRVUklGb3JQ YXRoKCIvaW5kZXguaHRtbCIpLmRhdGEoKSk7CisKKyAgICB3aGlsZSAoIWNvb2tpZXNDaGFuZ2Vk KQorICAgICAgICBlY29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOworICAgIEFTU0VSVF9UUlVFKGNv b2tpZXNDaGFuZ2VkKTsKKworICAgIGNvb2tpZXNDaGFuZ2VkID0gZmFsc2U7CisgICAgZXdrX2Nv b2tpZV9tYW5hZ2VyX2Nvb2tpZXNfY2xlYXIoY29va2llTWFuYWdlcik7CisgICAgd2hpbGUgKCFj b29raWVzQ2hhbmdlZCkKKyAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsKKyAgICBB U1NFUlRfVFJVRShjb29raWVzQ2hhbmdlZCk7CisKKyAgICAvLyBTdG9wIHdhdGNoaW5nIGZvciBu b3RpZmljYXRpb25zCisgICAgZXdrX2Nvb2tpZV9tYW5hZ2VyX2NoYW5nZXNfd2F0Y2goY29va2ll TWFuYWdlciwgMCwgMCk7CisgICAgY29va2llc0NoYW5nZWQgPSBmYWxzZTsKKyAgICBsb2FkVXJs U3luYyhodHRwU2VydmVyLT5nZXRVUklGb3JQYXRoKCIvaW5kZXguaHRtbCIpLmRhdGEoKSk7Cisg ICAgQVNTRVJUX0VRKGNvdW50SG9zdG5hbWVzV2l0aENvb2tpZXMoY29va2llTWFuYWdlciksIDIp OworICAgIEFTU0VSVF9GQUxTRShjb29raWVzQ2hhbmdlZCk7CisKKyAgICAvLyBXYXRjaCBhZ2Fp biBmb3Igbm90aWZpY2F0aW9ucworICAgIGV3a19jb29raWVfbWFuYWdlcl9jaGFuZ2VzX3dhdGNo KGNvb2tpZU1hbmFnZXIsIG9uQ29va2llc0NoYW5nZWQsICZjb29raWVzQ2hhbmdlZCk7CisKKyAg ICAvLyBNYWtlIHN1cmUgd2UgZG9uJ3QgZ2V0IG5vdGlmaWNhdGlvbnMgd2hlbiBsb2FkaW5nIHNl dHRpbmcgYW4gZXhpc3RpbmcgcGVyc2lzdGVudCBzdG9yYWdlCisgICAgY2hhciB0ZXh0U3RvcmFn ZTFbXSA9ICIvdG1wL3R4dC1jb29raWUuWFhYWFhYIjsKKyAgICBBU1NFUlRfVFJVRShta3RlbXAo dGV4dFN0b3JhZ2UxKSk7CisgICAgY2hhciB0ZXh0U3RvcmFnZTJbXSA9ICIvdG1wL3R4dC1jb29r aWUuWFhYWFhYIjsKKyAgICBBU1NFUlRfVFJVRShta3RlbXAodGV4dFN0b3JhZ2UyKSk7CisKKyAg ICBld2tfY29va2llX21hbmFnZXJfcGVyc2lzdGVudF9zdG9yYWdlX3NldChjb29raWVNYW5hZ2Vy LCB0ZXh0U3RvcmFnZTEsIEVXS19DT09LSUVfUEVSU0lTVEVOVF9TVE9SQUdFX1RFWFQpOworICAg IGxvYWRVcmxTeW5jKGh0dHBTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9pbmRleC5odG1sIikuZGF0 YSgpKTsKKyAgICBBU1NFUlRfRVEoY291bnRIb3N0bmFtZXNXaXRoQ29va2llcyhjb29raWVNYW5h Z2VyKSwgMik7CisKKyAgICBjb29raWVzQ2hhbmdlZCA9IGZhbHNlOworICAgIGV3a19jb29raWVf bWFuYWdlcl9wZXJzaXN0ZW50X3N0b3JhZ2Vfc2V0KGNvb2tpZU1hbmFnZXIsIHRleHRTdG9yYWdl MiwgRVdLX0NPT0tJRV9QRVJTSVNURU5UX1NUT1JBR0VfVEVYVCk7CisgICAgQVNTRVJUX0VRKGNv dW50SG9zdG5hbWVzV2l0aENvb2tpZXMoY29va2llTWFuYWdlciksIDApOworCisgICAgZXdrX2Nv b2tpZV9tYW5hZ2VyX3BlcnNpc3RlbnRfc3RvcmFnZV9zZXQoY29va2llTWFuYWdlciwgdGV4dFN0 b3JhZ2UxLCBFV0tfQ09PS0lFX1BFUlNJU1RFTlRfU1RPUkFHRV9URVhUKTsKKyAgICBBU1NFUlRf RVEoY291bnRIb3N0bmFtZXNXaXRoQ29va2llcyhjb29raWVNYW5hZ2VyKSwgMik7CisKKyAgICBB U1NFUlRfRkFMU0UoY29va2llc0NoYW5nZWQpOworCisgICAgLy8gRmluYWwgY2xlYW4gdXAuCisg ICAgZXdrX2Nvb2tpZV9tYW5hZ2VyX2NoYW5nZXNfd2F0Y2goY29va2llTWFuYWdlciwgMCwgMCk7 CisgICAgdW5saW5rKHRleHRTdG9yYWdlMSk7CisgICAgdW5saW5rKHRleHRTdG9yYWdlMik7Cit9 CisKIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfY29va2llX21hbmFnZXJfY29va2llc19k ZWxldGUpCiB7CiAgICAgT3duUHRyPEVXSzJVbml0VGVzdFNlcnZlcj4gaHR0cFNlcnZlciA9IGFk b3B0UHRyKG5ldyBFV0syVW5pdFRlc3RTZXJ2ZXIpOwo=