55266 2011-02-25 14:52:37 -0800 Remove some duplicate code from KURLGoogle.cpp 2011-02-28 13:09:50 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 24683 1 levin levin abarth dglazkov webkit.review.bot oldest_to_newest 358210 0 levin 2011-02-25 14:52:37 -0800 Duplicate code is bad. 358239 1 83891 levin 2011-02-25 15:44:41 -0800 Created attachment 83891 Patch 358327 2 webkit.review.bot 2011-02-25 18:13:55 -0800 Attachment 83891 did not build on chromium: Build output: http://queues.webkit.org/results/8032494 358329 3 83891 levin 2011-02-25 18:17:07 -0800 Comment on attachment 83891 Patch Apparently I need to do some fixes for chromium so cq-. (I suspect they will be minor and if so, I'll use the r+.) 358597 4 webkit.review.bot 2011-02-26 15:23:36 -0800 Attachment 83891 did not build on chromium: Build output: http://queues.webkit.org/results/8043953 359269 5 levin 2011-02-28 13:09:50 -0800 Committed as http://trac.webkit.org/changeset/79906 (with a few minor adjustments to fix the chromium build -- gyp change and moving two constants outside of the ifdef in KURL.cpp). 83891 2011-02-25 15:44:41 -0800 2011-02-25 18:17:07 -0800 Patch bug-55266-20110225154440.patch text/plain 9902 levin U3VidmVyc2lvbiBSZXZpc2lvbjogNzk2OTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzYWJiYWE3ZGM1ZjE3ZmRi YmRjNTg2NjQ3OWI4M2U0OTI4OWMzNWJiLi4zMGIyZDY5NTk3NjI3ZTI3ZjRkY2E5Y2UzN2ZjZWJh M2QzOWU4Njg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDItMjUgIERhdmlk IExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBzb21lIGR1cGxpY2F0ZSBjb2RlIGZyb20gS1VS TEdvb2dsZS5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU1MjY2CisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkgc28gbm8gbmV3 IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vS1VSTC5jcHA6CisgICAgICAgIFNpbXBseSBt b3ZlZCAjaW5jbHVkZSdzIGFuZCBzb21lIGNvZGUgdGhhdCB3YXMgaWRlbnRpY2FsIChpLmUuCisg ICAgICAgIGhhZCBiZWVuIGNvcGllZCkgdG8gS1VSTEdvb2dsZS5jcHAgb3V0c2lkZSBvZiBpZmRl ZiAhVVNFKEdPT0dMRVVSTCkKKyAgICAgICAgdG8gcmVkdWNlIGR1cGxpY2F0aW9uLgorICAgICAg ICAqIHBsYXRmb3JtL0tVUkxHb29nbGUuY3BwOgorICAgICAgICBSZW1vdmVkIHRoZSBkdXBsaWNh dGUgY29kZS4KKwogMjAxMS0wMi0yNSAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0tVUkwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTC5jcHAK aW5kZXggODVhZmM1YjIyZTQyMGI5NDViN2M3MGFjYjZiZWU5MGRlOWJjMGRhMi4uOWE3NDM1ZmE2 NDdhZmFkNGU4N2VkNGVmODA4Y2QzY2EwZjkwYjRhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vS1VSTC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTC5j cHAKQEAgLTI1LDggKzI1LDYgQEAKIAogI2luY2x1ZGUgImNvbmZpZy5oIgogCi0jaWYgIVVTRShH T09HTEVVUkwpCi0KICNpbmNsdWRlICJLVVJMLmgiCiAKICNpbmNsdWRlICJUZXh0RW5jb2Rpbmcu aCIKQEAgLTU0LDYgKzUyLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogdHlwZWRlZiBWZWN0b3I8 Y2hhciwgNTEyPiBDaGFyQnVmZmVyOwogdHlwZWRlZiBWZWN0b3I8VUNoYXIsIDUxMj4gVUNoYXJC dWZmZXI7CiAKKyNpZiAhVVNFKEdPT0dMRVVSTCkKKwogLy8gRklYTUU6IFRoaXMgZmlsZSBtYWtl cyB0b28gbXVjaCB1c2Ugb2YgdGhlICsgb3BlcmF0b3Igb24gU3RyaW5nLgogLy8gV2UgZWl0aGVy IGhhdmUgdG8gb3B0aW1pemUgdGhhdCBvcGVyYXRvciBzbyBpdCBkb2Vzbid0IGludm9sdmUKIC8v IHNvIG1hbnkgYWxsb2NhdGlvbnMsIG9yIGNoYW5nZSB0aGlzIHRvIHVzZSBWZWN0b3I8VUNoYXI+ IGluc3RlYWQuCkBAIC05NjcsMTUgKzk2Nyw2IEBAIFN0cmluZyBkZWNvZGVVUkxFc2NhcGVTZXF1 ZW5jZXMoY29uc3QgU3RyaW5nJiBzdHIsIGNvbnN0IFRleHRFbmNvZGluZyYgZW5jb2RpbmcpCiAg ICAgcmV0dXJuIFN0cmluZzo6YWRvcHQocmVzdWx0KTsKIH0KIAotYm9vbCBLVVJMOjppc0xvY2Fs RmlsZSgpIGNvbnN0Ci17Ci0gICAgLy8gSW5jbHVkaW5nIGZlZWQgaGVyZSBtaWdodCBiZSBhIGJh ZCBpZGVhIHNpbmNlIGRyYWcgYW5kIGRyb3AgdXNlcyB0aGlzIGNoZWNrCi0gICAgLy8gYW5kIGlu Y2x1ZGluZyBmZWVkIHdvdWxkIGFsbG93IGZlZWRzIHRvIHBvdGVudGlhbGx5IGxldCBzb21lb25l J3MgYmxvZwotICAgIC8vIHJlYWQgdGhlIGNvbnRlbnRzIG9mIHRoZSBjbGlwYm9hcmQgb24gYSBk cmFnLCBldmVuIHdpdGhvdXQgYSBkcm9wLgotICAgIC8vIExpa2V3aXNlIHdpdGggdXNpbmcgdGhl IEZyYW1lTG9hZGVyOjpzaG91bGRUcmVhdFVSTEFzTG9jYWwoKSBmdW5jdGlvbi4KLSAgICByZXR1 cm4gcHJvdG9jb2xJcygiZmlsZSIpOwotfQotCiAvLyBDYXV0aW9uOiBUaGlzIGZ1bmN0aW9uIGRv ZXMgbm90IGJvdW5kcyBjaGVjay4KIHN0YXRpYyB2b2lkIGFwcGVuZEVzY2FwZWRDaGFyKGNoYXIq JiBidWZmZXIsIHVuc2lnbmVkIGNoYXIgYykKIHsKQEAgLTE3NTQsMTEgKzE3NDUsNiBAQCBib29s IHByb3RvY29sSXMoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IGNoYXIqIHByb3RvY29sKQogICAg IH0KIH0KIAotYm9vbCBwcm90b2NvbElzSmF2YVNjcmlwdChjb25zdCBTdHJpbmcmIHVybCkKLXsK LSAgICByZXR1cm4gcHJvdG9jb2xJcyh1cmwsICJqYXZhc2NyaXB0Iik7Ci19Ci0KIGJvb2wgaXNW YWxpZFByb3RvY29sKGNvbnN0IFN0cmluZyYgcHJvdG9jb2wpCiB7CiAgICAgLy8gUkZDMzk4Njog QUxQSEEgKiggQUxQSEEgLyBESUdJVCAvICIrIiAvICItIiAvICIuIiApCkBAIC0xNzc0LDYgKzE3 NjAsMzUgQEAgYm9vbCBpc1ZhbGlkUHJvdG9jb2woY29uc3QgU3RyaW5nJiBwcm90b2NvbCkKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIAorI2lmbmRlZiBOREVCVUcKK3ZvaWQgS1VSTDo6cHJpbnQoKSBj b25zdAoreworICAgIHByaW50ZigiJXNcbiIsIG1fc3RyaW5nLnV0ZjgoKS5kYXRhKCkpOworfQor I2VuZGlmCisKKyNlbmRpZiAvLyAhVVNFKEdPT0dMRVVSTCkKKworYm9vbCBLVVJMOjppc0xvY2Fs RmlsZSgpIGNvbnN0Cit7CisgICAgLy8gSW5jbHVkaW5nIGZlZWQgaGVyZSBtaWdodCBiZSBhIGJh ZCBpZGVhIHNpbmNlIGRyYWcgYW5kIGRyb3AgdXNlcyB0aGlzIGNoZWNrCisgICAgLy8gYW5kIGlu Y2x1ZGluZyBmZWVkIHdvdWxkIGFsbG93IGZlZWRzIHRvIHBvdGVudGlhbGx5IGxldCBzb21lb25l J3MgYmxvZworICAgIC8vIHJlYWQgdGhlIGNvbnRlbnRzIG9mIHRoZSBjbGlwYm9hcmQgb24gYSBk cmFnLCBldmVuIHdpdGhvdXQgYSBkcm9wLgorICAgIC8vIExpa2V3aXNlIHdpdGggdXNpbmcgdGhl IEZyYW1lTG9hZGVyOjpzaG91bGRUcmVhdFVSTEFzTG9jYWwoKSBmdW5jdGlvbi4KKyAgICByZXR1 cm4gcHJvdG9jb2xJcygiZmlsZSIpOworfQorCitib29sIHByb3RvY29sSXNKYXZhU2NyaXB0KGNv bnN0IFN0cmluZyYgdXJsKQoreworICAgIHJldHVybiBwcm90b2NvbElzKHVybCwgImphdmFzY3Jp cHQiKTsKK30KKworY29uc3QgS1VSTCYgYmxhbmtVUkwoKQoreworICAgIERFRklORV9TVEFUSUNf TE9DQUwoS1VSTCwgc3RhdGljQmxhbmtVUkwsIChQYXJzZWRVUkxTdHJpbmcsICJhYm91dDpibGFu ayIpKTsKKyAgICByZXR1cm4gc3RhdGljQmxhbmtVUkw7Cit9CisKIGJvb2wgaXNEZWZhdWx0UG9y dEZvclByb3RvY29sKHVuc2lnbmVkIHNob3J0IHBvcnQsIGNvbnN0IFN0cmluZyYgcHJvdG9jb2wp CiB7CiAgICAgaWYgKHByb3RvY29sLmlzRW1wdHkoKSkKQEAgLTE5MDgsMTkgKzE5MjMsNCBAQCBT dHJpbmcgbWltZVR5cGVGcm9tRGF0YVVSTChjb25zdCBTdHJpbmcmIHVybCkKICAgICByZXR1cm4g IiI7CiB9CiAKLWNvbnN0IEtVUkwmIGJsYW5rVVJMKCkKLXsKLSAgICBERUZJTkVfU1RBVElDX0xP Q0FMKEtVUkwsIHN0YXRpY0JsYW5rVVJMLCAoUGFyc2VkVVJMU3RyaW5nLCAiYWJvdXQ6Ymxhbmsi KSk7Ci0gICAgcmV0dXJuIHN0YXRpY0JsYW5rVVJMOwogfQotCi0jaWZuZGVmIE5ERUJVRwotdm9p ZCBLVVJMOjpwcmludCgpIGNvbnN0Ci17Ci0gICAgcHJpbnRmKCIlc1xuIiwgbV9zdHJpbmcudXRm OCgpLmRhdGEoKSk7Ci19Ci0jZW5kaWYKLQotfQotCi0jZW5kaWYgIC8vICFVU0UoR09PR0xFVVJM KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcAppbmRleCAzODdjMWEyNzBhOWI2 NmQ3MjU4NDkwZjI3MGJiM2JjNDEwNGJkYjZlLi4yMzFjNDNkMmZhYjNlYWQ1YTMzOWRlMGMzYmM5 NzZlMGY0ZDI0ODBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29v Z2xlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcApAQCAt NzU4LDE2MSArNzU4LDYgQEAgU3RyaW5nIEtVUkw6OnByZXR0eVVSTCgpIGNvbnN0CiAgICAgcmV0 dXJuIG1fdXJsLnN0cmluZygpOwogfQogCi1ib29sIHByb3RvY29sSXNKYXZhU2NyaXB0KGNvbnN0 IFN0cmluZyYgdXJsKQotewotICAgIHJldHVybiBwcm90b2NvbElzKHVybCwgImphdmFzY3JpcHQi KTsKLX0KLQotLy8gV2UgY29waWVkIHRoZSBLVVJMIHZlcnNpb24gaGVyZSBvbiBEZWMgNCwgMjAw OSB3aGlsZSBkb2luZyBhIFdlYktpdAotLy8gbWVyZ2UuCi0vLwotLy8gRklYTUUgU29tZWhvdyBz aGFyZSB0aGlzIHdpdGggS1VSTD8gTGlrZSB3ZSdkIHRoZW9yZXRpY2FsbHkgbWVyZ2Ugd2l0aAot Ly8gZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzIGJlbG93PwotYm9vbCBpc0RlZmF1bHRQb3J0Rm9y UHJvdG9jb2wodW5zaWduZWQgc2hvcnQgcG9ydCwgY29uc3QgU3RyaW5nJiBwcm90b2NvbCkKLXsK LSAgICBpZiAocHJvdG9jb2wuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAg ICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCB1bnNpZ25lZCwgQ2FzZUZvbGRpbmdIYXNoPiBEZWZh dWx0UG9ydHNNYXA7Ci0gICAgREVGSU5FX1NUQVRJQ19MT0NBTChEZWZhdWx0UG9ydHNNYXAsIGRl ZmF1bHRQb3J0cywgKCkpOwotICAgIGlmIChkZWZhdWx0UG9ydHMuaXNFbXB0eSgpKSB7Ci0gICAg ICAgIGRlZmF1bHRQb3J0cy5zZXQoImh0dHAiLCA4MCk7Ci0gICAgICAgIGRlZmF1bHRQb3J0cy5z ZXQoImh0dHBzIiwgNDQzKTsKLSAgICAgICAgZGVmYXVsdFBvcnRzLnNldCgiZnRwIiwgMjEpOwot ICAgICAgICBkZWZhdWx0UG9ydHMuc2V0KCJmdHBzIiwgOTkwKTsKLSAgICB9Ci0gICAgcmV0dXJu IGRlZmF1bHRQb3J0cy5nZXQocHJvdG9jb2wpID09IHBvcnQ7Ci19Ci0KLS8vIFdlIGNvcGllZCB0 aGUgS1VSTCB2ZXJzaW9uIGhlcmUgb24gRGVjIDQsIDIwMDkgd2hpbGUgZG9pbmcgYSBXZWJLaXQK LS8vIG1lcmdlLgotLy8KLS8vIEZJWE1FIFNvbWVob3cgc2hhcmUgdGhpcyB3aXRoIEtVUkw/IExp a2Ugd2UnZCB0aGVvcmV0aWNhbGx5IG1lcmdlIHdpdGgKLS8vIGRlY29kZVVSTEVzY2FwZVNlcXVl bmNlcyBiZWxvdz8KLWJvb2wgcG9ydEFsbG93ZWQoY29uc3QgS1VSTCYgdXJsKQotewotICAgIHVu c2lnbmVkIHNob3J0IHBvcnQgPSB1cmwucG9ydCgpOwotCi0gICAgLy8gU2luY2UgbW9zdCBVUkxz IGRvbid0IGhhdmUgYSBwb3J0LCByZXR1cm4gZWFybHkgZm9yIHRoZSAibm8gcG9ydCIgY2FzZS4K LSAgICBpZiAoIXBvcnQpCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgLy8gVGhpcyBibG9j a2VkIHBvcnQgbGlzdCBtYXRjaGVzIHRoZSBwb3J0IGJsb2NraW5nIHRoYXQgTW96aWxsYSBpbXBs ZW1lbnRzLgotICAgIC8vIFNlZSBodHRwOi8vd3d3Lm1vemlsbGEub3JnL3Byb2plY3RzL25ldGxp Yi9Qb3J0QmFubmluZy5odG1sIGZvciBtb3JlIGluZm9ybWF0aW9uLgotICAgIHN0YXRpYyBjb25z dCB1bnNpZ25lZCBzaG9ydCBibG9ja2VkUG9ydExpc3RbXSA9IHsKLSAgICAgICAgMSwgICAgLy8g dGNwbXV4Ci0gICAgICAgIDcsICAgIC8vIGVjaG8KLSAgICAgICAgOSwgICAgLy8gZGlzY2FyZAot ICAgICAgICAxMSwgICAvLyBzeXN0YXQKLSAgICAgICAgMTMsICAgLy8gZGF5dGltZQotICAgICAg ICAxNSwgICAvLyBuZXRzdGF0Ci0gICAgICAgIDE3LCAgIC8vIHFvdGQKLSAgICAgICAgMTksICAg Ly8gY2hhcmdlbgotICAgICAgICAyMCwgICAvLyBGVFAtZGF0YQotICAgICAgICAyMSwgICAvLyBG VFAtY29udHJvbAotICAgICAgICAyMiwgICAvLyBTU0gKLSAgICAgICAgMjMsICAgLy8gdGVsbmV0 Ci0gICAgICAgIDI1LCAgIC8vIFNNVFAKLSAgICAgICAgMzcsICAgLy8gdGltZQotICAgICAgICA0 MiwgICAvLyBuYW1lCi0gICAgICAgIDQzLCAgIC8vIG5pY25hbWUKLSAgICAgICAgNTMsICAgLy8g ZG9tYWluCi0gICAgICAgIDc3LCAgIC8vIHByaXYtcmpzCi0gICAgICAgIDc5LCAgIC8vIGZpbmdl cgotICAgICAgICA4NywgICAvLyB0dHlsaW5rCi0gICAgICAgIDk1LCAgIC8vIHN1cGR1cAotICAg ICAgICAxMDEsICAvLyBob3N0cmlhbWUKLSAgICAgICAgMTAyLCAgLy8gaXNvLXRzYXAKLSAgICAg ICAgMTAzLCAgLy8gZ3BwaXRucAotICAgICAgICAxMDQsICAvLyBhY3ItbmVtYQotICAgICAgICAx MDksICAvLyBQT1AyCi0gICAgICAgIDExMCwgIC8vIFBPUDMKLSAgICAgICAgMTExLCAgLy8gc3Vu cnBjCi0gICAgICAgIDExMywgIC8vIGF1dGgKLSAgICAgICAgMTE1LCAgLy8gU0ZUUAotICAgICAg ICAxMTcsICAvLyB1dWNwLXBhdGgKLSAgICAgICAgMTE5LCAgLy8gbm50cAotICAgICAgICAxMjMs ICAvLyBOVFAKLSAgICAgICAgMTM1LCAgLy8gbG9jLXNydiAvIGVwbWFwCi0gICAgICAgIDEzOSwg IC8vIG5ldGJpb3MKLSAgICAgICAgMTQzLCAgLy8gSU1BUDIKLSAgICAgICAgMTc5LCAgLy8gQkdQ Ci0gICAgICAgIDM4OSwgIC8vIExEQVAKLSAgICAgICAgNDY1LCAgLy8gU01UUCtTU0wKLSAgICAg ICAgNTEyLCAgLy8gcHJpbnQgLyBleGVjCi0gICAgICAgIDUxMywgIC8vIGxvZ2luCi0gICAgICAg IDUxNCwgIC8vIHNoZWxsCi0gICAgICAgIDUxNSwgIC8vIHByaW50ZXIKLSAgICAgICAgNTI2LCAg Ly8gdGVtcG8KLSAgICAgICAgNTMwLCAgLy8gY291cmllcgotICAgICAgICA1MzEsICAvLyBDaGF0 Ci0gICAgICAgIDUzMiwgIC8vIG5ldG5ld3MKLSAgICAgICAgNTQwLCAgLy8gVVVDUAotICAgICAg ICA1NTYsICAvLyByZW1vdGVmcwotICAgICAgICA1NjMsICAvLyBOTlRQK1NTTAotICAgICAgICA1 ODcsICAvLyBFU01UUAotICAgICAgICA2MDEsICAvLyBzeXNsb2ctY29ubgotICAgICAgICA2MzYs ICAvLyBMREFQK1NTTAotICAgICAgICA5OTMsICAvLyBJTUFQK1NTTAotICAgICAgICA5OTUsICAv LyBQT1AzK1NTTAotICAgICAgICAyMDQ5LCAvLyBORlMKLSAgICAgICAgMzY1OSwgLy8gYXBwbGUt c2FzbCAvIFBhc3N3b3JkU2VydmVyIFtBcHBsZSBhZGRpdGlvbl0KLSAgICAgICAgNDA0NSwgLy8g bG9ja2QKLSAgICAgICAgNjAwMCwgLy8gWDExCi0gICAgICAgIDY2NjUsIC8vIEFsdGVybmF0ZSBJ UkMgW0FwcGxlIGFkZGl0aW9uXQotICAgICAgICA2NjY2LCAvLyBBbHRlcm5hdGUgSVJDIFtBcHBs ZSBhZGRpdGlvbl0KLSAgICAgICAgNjY2NywgLy8gU3RhbmRhcmQgSVJDIFtBcHBsZSBhZGRpdGlv bl0KLSAgICAgICAgNjY2OCwgLy8gQWx0ZXJuYXRlIElSQyBbQXBwbGUgYWRkaXRpb25dCi0gICAg ICAgIDY2NjksIC8vIEFsdGVybmF0ZSBJUkMgW0FwcGxlIGFkZGl0aW9uXQotICAgICAgICBpbnZh bGlkUG9ydE51bWJlciwgLy8gVXNlZCB0byBibG9jayBhbGwgaW52YWxpZCBwb3J0IG51bWJlcnMK LSAgICB9OwotICAgIGNvbnN0IHVuc2lnbmVkIHNob3J0KiBjb25zdCBibG9ja2VkUG9ydExpc3RF bmQgPSBibG9ja2VkUG9ydExpc3QgKyBXVEZfQVJSQVlfTEVOR1RIKGJsb2NrZWRQb3J0TGlzdCk7 Ci0KLSNpZm5kZWYgTkRFQlVHCi0gICAgLy8gVGhlIHBvcnQgbGlzdCBtdXN0IGJlIHNvcnRlZCBm b3IgYmluYXJ5X3NlYXJjaCB0byB3b3JrLgotICAgIHN0YXRpYyBib29sIGNoZWNrZWRQb3J0TGlz dCA9IGZhbHNlOwotICAgIGlmICghY2hlY2tlZFBvcnRMaXN0KSB7Ci0gICAgICAgIGZvciAoY29u c3QgdW5zaWduZWQgc2hvcnQqIHAgPSBibG9ja2VkUG9ydExpc3Q7IHAgIT0gYmxvY2tlZFBvcnRM aXN0RW5kIC0gMTsgKytwKQotICAgICAgICAgICAgQVNTRVJUKCpwIDwgKihwICsgMSkpOwotICAg ICAgICBjaGVja2VkUG9ydExpc3QgPSB0cnVlOwotICAgIH0KLSNlbmRpZgotCi0gICAgLy8gSWYg dGhlIHBvcnQgaXMgbm90IGluIHRoZSBibG9ja2VkIHBvcnQgbGlzdCwgYWxsb3cgaXQuCi0gICAg aWYgKCFiaW5hcnlfc2VhcmNoKGJsb2NrZWRQb3J0TGlzdCwgYmxvY2tlZFBvcnRMaXN0RW5kLCBw b3J0KSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICAvLyBBbGxvdyBwb3J0cyAyMSBhbmQg MjIgZm9yIEZUUCBVUkxzLCBhcyBNb3ppbGxhIGRvZXMuCi0gICAgaWYgKChwb3J0ID09IDIxIHx8 IHBvcnQgPT0gMjIpICYmIHVybC5wcm90b2NvbElzKCJmdHAiKSkKLSAgICAgICAgcmV0dXJuIHRy dWU7Ci0KLSAgICAvLyBBbGxvdyBhbnkgcG9ydCBudW1iZXIgaW4gYSBmaWxlIFVSTCwgc2luY2Ug dGhlIHBvcnQgbnVtYmVyIGlzIGlnbm9yZWQuCi0gICAgaWYgKHVybC5wcm90b2NvbElzKCJmaWxl IikpCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgcmV0dXJuIGZhbHNlOwotfQotCi0vLyBX ZSBjb3BpZWQgdGhlIEtVUkwgdmVyc2lvbiBoZXJlIG9uIFNlcHQgMTIsIDIwMDggd2hpbGUgZG9p bmcgYSBXZWJLaXQKLS8vIG1lcmdlLgotLy8gCi0vLyBGSVhNRSBTb21laG93IHNoYXJlIHRoaXMg d2l0aCBLVVJMPyBMaWtlIHdlJ2QgdGhlb3JldGljYWxseSBtZXJnZSB3aXRoCi0vLyBkZWNvZGVV UkxFc2NhcGVTZXF1ZW5jZXMgYmVsb3c/Ci1TdHJpbmcgbWltZVR5cGVGcm9tRGF0YVVSTChjb25z dCBTdHJpbmcmIHVybCkKLXsKLSAgICBBU1NFUlQocHJvdG9jb2xJcyh1cmwsICJkYXRhIikpOwot ICAgIGludCBpbmRleCA9IHVybC5maW5kKCc7Jyk7Ci0gICAgaWYgKGluZGV4ID09IC0xKQotICAg ICAgICBpbmRleCA9IHVybC5maW5kKCcsJyk7Ci0gICAgaWYgKGluZGV4ICE9IC0xKSB7Ci0gICAg ICAgIGludCBsZW4gPSBpbmRleCAtIDU7Ci0gICAgICAgIGlmIChsZW4gPiAwKQotICAgICAgICAg ICAgcmV0dXJuIHVybC5zdWJzdHJpbmcoNSwgbGVuKTsKLSAgICAgICAgcmV0dXJuICJ0ZXh0L3Bs YWluIjsgLy8gRGF0YSBVUkxzIHdpdGggbm8gTUlNRSB0eXBlIGFyZSBjb25zaWRlcmVkIHRleHQv cGxhaW4uCi0gICAgfQotICAgIHJldHVybiAiIjsKLX0KLQogU3RyaW5nIGRlY29kZVVSTEVzY2Fw ZVNlcXVlbmNlcyhjb25zdCBTdHJpbmcmIHN0cikKIHsKICAgICByZXR1cm4gZGVjb2RlVVJMRXNj YXBlU2VxdWVuY2VzKHN0ciwgVVRGOEVuY29kaW5nKCkpOwpAQCAtOTY4LDExICs4MTMsNiBAQCBi b29sIEtVUkw6OnByb3RvY29sSXMoY29uc3QgY2hhciogcHJvdG9jb2wpIGNvbnN0CiAgICAgICAg IHByb3RvY29sKTsKIH0KIAotYm9vbCBLVVJMOjppc0xvY2FsRmlsZSgpIGNvbnN0Ci17Ci0gICAg cmV0dXJuIHByb3RvY29sSXMoImZpbGUiKTsKLX0KLQogLy8gVGhpcyBpcyBjYWxsZWQgdG8gZXNj YXBlIGEgVVJMIHN0cmluZy4gSXQgaXMgb25seSB1c2VkIGV4dGVybmFsbHkgd2hlbgogLy8gY29u c3RydWN0aW5nIG1haWx0bzogbGlua3MgdG8gc2V0IHRoZSBxdWVyeSBzZWN0aW9uLiBTaW5jZSBv dXIgcXVlcnkgc2V0dGVyCiAvLyB3aWxsIGF1dG9tYXRpY2FsbHkgZG8gdGhlIGNvcnJlY3QgZXNj YXBpbmcsIHRoaXMgZnVuY3Rpb24gZG9lcyBub3QgaGF2ZSB0bwpAQCAtMTA3NSwxMiArOTE1LDYg QEAgdW5zaWduZWQgS1VSTDo6cGF0aEFmdGVyTGFzdFNsYXNoKCkgY29uc3QKICAgICByZXR1cm4g ZmlsZW5hbWUuYmVnaW47CiB9CiAKLWNvbnN0IEtVUkwmIGJsYW5rVVJMKCkKLXsKLSAgICBzdGF0 aWMgS1VSTCBzdGF0aWNCbGFua1VSTChQYXJzZWRVUkxTdHJpbmcsICJhYm91dDpibGFuayIpOwot ICAgIHJldHVybiBzdGF0aWNCbGFua1VSTDsKLX0KLQogYm9vbCBwcm90b2NvbElzKGNvbnN0IFN0 cmluZyYgdXJsLCBjb25zdCBjaGFyKiBwcm90b2NvbCkKIHsKICAgICAvLyBEbyB0aGUgY29tcGFy aXNvbiB3aXRob3V0IG1ha2luZyBhIG5ldyBzdHJpbmcgb2JqZWN0Lgo=