151601 2015-11-25 07:17:47 -0800 [GTK] Add webkit_uri_request_get_http_method 2015-12-07 04:36:39 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Enhancement --- 1 jon.orebro webkit-unassigned bugs-noreply cgarcia commit-queue oldest_to_newest 1144424 0 266159 jon.orebro 2015-11-25 07:17:47 -0800 Created attachment 266159 Patch against 2.10.3 Make it possible to find out the HTTP method of a request. Patch contains no ChangeLog entry and I need help creating a testcase and possibly making the function return an interned string as suggested by Carlos Garcia Campo. 1146814 1 266765 cgarcia 2015-12-07 03:27:23 -0800 Created attachment 266765 Updated patch Added ChangeLog entries and unit tests and changed to use intern string to be able to compare pointer returned with SOUP_METHOD macros. 1146832 2 266765 commit-queue 2015-12-07 04:36:36 -0800 Comment on attachment 266765 Updated patch Clearing flags on attachment: 266765 Committed r193622: <http://trac.webkit.org/changeset/193622> 1146833 3 commit-queue 2015-12-07 04:36:39 -0800 All reviewed patches have been landed. Closing bug. 266159 2015-11-25 07:17:47 -0800 2015-12-07 03:27:23 -0800 Patch against 2.10.3 get-http-method.2.10.3.diff text/plain 2774 jon.orebro ZGlmZiAtdXIgd2Via2l0LTIuMTAuMy5vcmlnL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL2RvY3Mvd2Via2l0Mmd0ay00LjAtc2VjdGlvbnMudHh0IHdlYmtpdC0yLjEwLjMvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLTQuMC1zZWN0aW9ucy50 eHQKLS0tIHdlYmtpdC0yLjEwLjMub3JpZy9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9kb2NzL3dlYmtpdDJndGstNC4wLXNlY3Rpb25zLnR4dAkyMDE1LTEwLTMwIDE0OjE3OjIwLjAw MDAwMDAwMCArMDEwMAorKysgd2Via2l0LTIuMTAuMy9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9kb2NzL3dlYmtpdDJndGstNC4wLXNlY3Rpb25zLnR4dAkyMDE1LTExLTIyIDEwOjQ2 OjI4LjAwNzc0MDg5NiArMDEwMApAQCAtNDYyLDYgKzQ2Miw3IEBACiB3ZWJraXRfdXJpX3JlcXVl c3RfbmV3CiB3ZWJraXRfdXJpX3JlcXVlc3RfZ2V0X3VyaQogd2Via2l0X3VyaV9yZXF1ZXN0X3Nl dF91cmkKK3dlYmtpdF91cmlfcmVxdWVzdF9nZXRfaHR0cF9tZXRob2QKIHdlYmtpdF91cmlfcmVx dWVzdF9nZXRfaHR0cF9oZWFkZXJzCiAKIDxTVUJTRUNUSU9OIFN0YW5kYXJkPgpkaWZmIC11ciB3 ZWJraXQtMi4xMC4zLm9yaWcvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 VVJJUmVxdWVzdC5jcHAgd2Via2l0LTIuMTAuMy9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRVUklSZXF1ZXN0LmNwcAotLS0gd2Via2l0LTIuMTAuMy5vcmlnL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVJlcXVlc3QuY3BwCTIwMTUtMTAtMzAg MTQ6MTc6MjAuMDAwMDAwMDAwICswMTAwCisrKyB3ZWJraXQtMi4xMC4zL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVJlcXVlc3QuY3BwCTIwMTUtMTEtMjUgMDk6Mjg6 MjkuMzU4NTA0ODg3ICswMTAwCkBAIC00OCw2ICs0OCw3IEBACiBzdHJ1Y3QgX1dlYktpdFVSSVJl cXVlc3RQcml2YXRlIHsKICAgICBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgcmVzb3VyY2VSZXF1 ZXN0OwogICAgIENTdHJpbmcgdXJpOworICAgIENTdHJpbmcgaHR0cE1ldGhvZDsKICAgICBHVW5p cXVlUHRyPFNvdXBNZXNzYWdlSGVhZGVycz4gaHR0cEhlYWRlcnM7CiB9OwogCkBAIC0xNzEsNiAr MTcyLDI2IEBACiAgICAgcmV0dXJuIHJlcXVlc3QtPnByaXYtPmh0dHBIZWFkZXJzLmdldCgpOwog fQogCisvKioKKyAqIHdlYmtpdF91cmlfcmVxdWVzdF9nZXRfaHR0cF9tZXRob2Q6CisgKiBAcmVx dWVzdDogYSAjV2ViS2l0VVJJUmVxdWVzdAorICoKKyAqIFJldHVybnM6IHRoZSBIVFRQIG1ldGhv ZCBvZiB0aGUgI1dlYktpdFVSSVJlcXVlc3Qgb3IgJU5VTEwgaWYgQHJlcXVlc3QgaXMgbm90Cisg KiAgICBhbiBIVFRQIHJlcXVlc3QuCisgKgorICogU2luY2U6IDIuMTIKKyAqLworY29uc3QgZ2No YXIqIHdlYmtpdF91cmlfcmVxdWVzdF9nZXRfaHR0cF9tZXRob2QoV2ViS2l0VVJJUmVxdWVzdCog cmVxdWVzdCkKK3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfVVJJX1JFUVVF U1QocmVxdWVzdCksIG51bGxwdHIpOworCisgICAgaWYgKCFyZXF1ZXN0LT5wcml2LT5yZXNvdXJj ZVJlcXVlc3QudXJsKCkucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpKQorICAgICAgICByZXR1cm4g bnVsbHB0cjsKKworICAgIHJlcXVlc3QtPnByaXYtPmh0dHBNZXRob2QgPSByZXF1ZXN0LT5wcml2 LT5yZXNvdXJjZVJlcXVlc3QuaHR0cE1ldGhvZCgpLnV0ZjgoKTsKKyAgICByZXR1cm4gcmVxdWVz dC0+cHJpdi0+aHR0cE1ldGhvZC5kYXRhKCk7Cit9CisKIFdlYktpdFVSSVJlcXVlc3QqIHdlYmtp dFVSSVJlcXVlc3RDcmVhdGVGb3JSZXNvdXJjZVJlcXVlc3QoY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiByZXNvdXJjZVJlcXVlc3QpCiB7CiAgICAgV2ViS2l0VVJJUmVxdWVzdCogdXJpUmVxdWVzdCA9 IFdFQktJVF9VUklfUkVRVUVTVChnX29iamVjdF9uZXcoV0VCS0lUX1RZUEVfVVJJX1JFUVVFU1Qs IE5VTEwpKTsKZGlmZiAtdXIgd2Via2l0LTIuMTAuMy5vcmlnL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVJlcXVlc3QuaCB3ZWJraXQtMi4xMC4zL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVJlcXVlc3QuaAotLS0gd2Via2l0LTIuMTAu My5vcmlnL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVJlcXVlc3Qu aAkyMDE1LTEwLTMwIDE0OjE3OjIyLjAwMDAwMDAwMCArMDEwMAorKysgd2Via2l0LTIuMTAuMy9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklSZXF1ZXN0LmgJMjAxNS0x MS0yMiAxMDo0MzozNC40OTE3Mzg4NjkgKzAxMDAKQEAgLTcwLDYgKzcwLDkgQEAKIHdlYmtpdF91 cmlfcmVxdWVzdF9zZXRfdXJpICAgICAgICAgIChXZWJLaXRVUklSZXF1ZXN0ICpyZXF1ZXN0LAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgKnVy aSk7CiAKK1dFQktJVF9BUEkgY29uc3QgZ2NoYXIgKgord2Via2l0X3VyaV9yZXF1ZXN0X2dldF9o dHRwX21ldGhvZCAgICAgICAgICAoV2ViS2l0VVJJUmVxdWVzdCAqcmVxdWVzdCk7CisKIFdFQktJ VF9BUEkgU291cE1lc3NhZ2VIZWFkZXJzICoKIHdlYmtpdF91cmlfcmVxdWVzdF9nZXRfaHR0cF9o ZWFkZXJzIChXZWJLaXRVUklSZXF1ZXN0ICpyZXF1ZXN0KTsKIAo= 266765 2015-12-07 03:27:23 -0800 2015-12-07 04:36:36 -0800 Updated patch wk2-http-method.diff text/plain 8445 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1YjBmZDc1Li5jMTQ5ZTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTUtMTItMDcgIEpvbiBGb3JzYmVyZyAgPGpvbi5vcmVicm9AZ21haWwuY29tPgorCisg ICAgICAgIFtHVEtdIEFkZCB3ZWJraXRfdXJpX3JlcXVlc3RfZ2V0X2h0dHBfbWV0aG9kCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTE2MDEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBtZXRob2Qg dG8gZ2V0IHRoZSBIVFRQIG1ldGhvZCBvZiBhIFdlYktpdFVSSVJlcXVlc3QuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklSZXF1ZXN0LmNwcDoKKyAgICAgICAgKHdlYmtp dF91cmlfcmVxdWVzdF9nZXRfaHR0cF9tZXRob2QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFVSSVJlcXVlc3QuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9kb2Nz L3dlYmtpdDJndGstNC4wLXNlY3Rpb25zLnR4dDoKKwogMjAxNS0xMi0wNyAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gVUkgcHJvY2Vz cyBjcmFzaGVzIGlmIHdlYmtpdF93ZWJfdmlld19nZXRfdGxzX2luZm8gaXMgY2FsbGVkIGJlZm9y ZSBpbnRlcm5hbCBsb2FkLWNvbW1pdHRlZCBldmVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklSZXF1ZXN0LmNwcAppbmRleCAyYzU5Y2Q4Li5l MmZmMDRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRVUklSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRVUklSZXF1ZXN0LmNwcApAQCAtNDgsNiArNDgsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2Vi Q29yZTsKIHN0cnVjdCBfV2ViS2l0VVJJUmVxdWVzdFByaXZhdGUgewogICAgIFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCByZXNvdXJjZVJlcXVlc3Q7CiAgICAgQ1N0cmluZyB1cmk7CisgICAgY29u c3QgY2hhciogaHR0cE1ldGhvZDsKICAgICBHVW5pcXVlUHRyPFNvdXBNZXNzYWdlSGVhZGVycz4g aHR0cEhlYWRlcnM7CiB9OwogCkBAIC0xNzEsNiArMTcyLDMyIEBAIFNvdXBNZXNzYWdlSGVhZGVy cyogd2Via2l0X3VyaV9yZXF1ZXN0X2dldF9odHRwX2hlYWRlcnMoV2ViS2l0VVJJUmVxdWVzdCog cmVxdWVzCiAgICAgcmV0dXJuIHJlcXVlc3QtPnByaXYtPmh0dHBIZWFkZXJzLmdldCgpOwogfQog CisvKioKKyAqIHdlYmtpdF91cmlfcmVxdWVzdF9nZXRfaHR0cF9tZXRob2Q6CisgKiBAcmVxdWVz dDogYSAjV2ViS2l0VVJJUmVxdWVzdAorICoKKyAqIEdldCB0aGUgSFRUUCBtZXRob2Qgb2YgdGhl ICNXZWJLaXRVUklSZXF1ZXN0LgorICoKKyAqIFJldHVybnM6IHRoZSBIVFRQIG1ldGhvZCBvZiB0 aGUgI1dlYktpdFVSSVJlcXVlc3Qgb3IgJU5VTEwgaWYgQHJlcXVlc3QgaXMgbm90CisgKiAgICBh biBIVFRQIHJlcXVlc3QuCisgKgorICogU2luY2U6IDIuMTIKKyAqLworY29uc3QgZ2NoYXIqIHdl YmtpdF91cmlfcmVxdWVzdF9nZXRfaHR0cF9tZXRob2QoV2ViS2l0VVJJUmVxdWVzdCogcmVxdWVz dCkKK3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfVVJJX1JFUVVFU1QocmVx dWVzdCksIG51bGxwdHIpOworCisgICAgaWYgKCFyZXF1ZXN0LT5wcml2LT5yZXNvdXJjZVJlcXVl c3QudXJsKCkucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpKQorICAgICAgICByZXR1cm4gbnVsbHB0 cjsKKworICAgIGlmIChyZXF1ZXN0LT5wcml2LT5yZXNvdXJjZVJlcXVlc3QuaHR0cE1ldGhvZCgp LmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBpZiAoIXJlcXVlc3Qt PnByaXYtPmh0dHBNZXRob2QpCisgICAgICAgIHJlcXVlc3QtPnByaXYtPmh0dHBNZXRob2QgPSBn X2ludGVybl9zdHJpbmcocmVxdWVzdC0+cHJpdi0+cmVzb3VyY2VSZXF1ZXN0Lmh0dHBNZXRob2Qo KS51dGY4KCkuZGF0YSgpKTsKKyAgICByZXR1cm4gcmVxdWVzdC0+cHJpdi0+aHR0cE1ldGhvZDsK K30KKwogV2ViS2l0VVJJUmVxdWVzdCogd2Via2l0VVJJUmVxdWVzdENyZWF0ZUZvclJlc291cmNl UmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlc291cmNlUmVxdWVzdCkKIHsKICAgICBX ZWJLaXRVUklSZXF1ZXN0KiB1cmlSZXF1ZXN0ID0gV0VCS0lUX1VSSV9SRVFVRVNUKGdfb2JqZWN0 X25ldyhXRUJLSVRfVFlQRV9VUklfUkVRVUVTVCwgTlVMTCkpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJUmVxdWVzdC5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJUmVxdWVzdC5oCmluZGV4IGNhYzNiMzMu LjEwY2Y2MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFVSSVJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRVUklSZXF1ZXN0LmgKQEAgLTcwLDYgKzcwLDkgQEAgV0VCS0lUX0FQSSB2b2lkCiB3ZWJr aXRfdXJpX3JlcXVlc3Rfc2V0X3VyaSAgICAgICAgICAoV2ViS2l0VVJJUmVxdWVzdCAqcmVxdWVz dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAg ICp1cmkpOwogCitXRUJLSVRfQVBJIGNvbnN0IGdjaGFyICoKK3dlYmtpdF91cmlfcmVxdWVzdF9n ZXRfaHR0cF9tZXRob2QgIChXZWJLaXRVUklSZXF1ZXN0ICpyZXF1ZXN0KTsKKwogV0VCS0lUX0FQ SSBTb3VwTWVzc2FnZUhlYWRlcnMgKgogd2Via2l0X3VyaV9yZXF1ZXN0X2dldF9odHRwX2hlYWRl cnMgKFdlYktpdFVSSVJlcXVlc3QgKnJlcXVlc3QpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstNC4wLXNlY3Rpb25zLnR4dCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay00LjAtc2Vj dGlvbnMudHh0CmluZGV4IDMyNzQ5OTUuLjMyYmM5MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay00LjAtc2VjdGlvbnMudHh0Cisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay00LjAt c2VjdGlvbnMudHh0CkBAIC00NjIsNiArNDYyLDcgQEAgV2ViS2l0VVJJUmVxdWVzdAogd2Via2l0 X3VyaV9yZXF1ZXN0X25ldwogd2Via2l0X3VyaV9yZXF1ZXN0X2dldF91cmkKIHdlYmtpdF91cmlf cmVxdWVzdF9zZXRfdXJpCit3ZWJraXRfdXJpX3JlcXVlc3RfZ2V0X2h0dHBfbWV0aG9kCiB3ZWJr aXRfdXJpX3JlcXVlc3RfZ2V0X2h0dHBfaGVhZGVycwogCiA8U1VCU0VDVElPTiBTdGFuZGFyZD4K ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhYjIw ZjFhLi5iZDQ2NDMyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTUtMTItMDcgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEFkZCB3ZWJraXRfdXJpX3Jl cXVlc3RfZ2V0X2h0dHBfbWV0aG9kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTE2MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgdGVzdCBjYXNlIHRvIGNoZWNrIEhUVFAgbWV0aG9kIG9mIFdlYktp dFVSSVJlcXVlc3QuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsv VGVzdExvYWRlckNsaWVudC5jcHA6CisgICAgICAgICh0ZXN0VVJJUmVxdWVzdEhUVFBNZXRob2Qp OgorICAgICAgICAoc2VydmVyQ2FsbGJhY2spOgorICAgICAgICAoYmVmb3JlQWxsKToKKyAgICAg ICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvV2ViRXh0ZW5zaW9uVGVzdC5jcHA6 CisgICAgICAgIChzZW5kUmVxdWVzdENhbGxiYWNrKToKKwogMjAxNS0xMi0wNyAgUGhpbGlwcGUg Tm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bTWFjXSBsaWJX ZWJFeHRlbnNpb25UZXN0IGxpbmsgZXJyb3IKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0TG9hZGVyQ2xpZW50LmNwcCBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0TG9hZGVyQ2xpZW50LmNwcAppbmRleCAwZTg2OGNi Li5iYWIwMGVkIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJH dGsvVGVzdExvYWRlckNsaWVudC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQyR3RrL1Rlc3RMb2FkZXJDbGllbnQuY3BwCkBAIC00MDQsNiArNDA0LDIwIEBAIHN0YXRp YyB2b2lkIHRlc3RVUklSZXF1ZXN0SFRUUEhlYWRlcnMoV2ViVmlld1Rlc3QqIHRlc3QsIGdjb25z dHBvaW50ZXIpCiAgICAgZ19hc3NlcnQoIXN0cm5jbXAobWFpblJlc291cmNlRGF0YSwgIjEiLCBt YWluUmVzb3VyY2VEYXRhU2l6ZSkpOwogfQogCitzdGF0aWMgdm9pZCB0ZXN0VVJJUmVxdWVzdEhU VFBNZXRob2QoV2ViVmlld1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCit7CisgICAgR1JlZlB0 cjxXZWJLaXRVUklSZXF1ZXN0PiB1cmlSZXF1ZXN0ID0gYWRvcHRHUmVmKHdlYmtpdF91cmlfcmVx dWVzdF9uZXcoImZpbGU6Ly8vZm9vL2JhciIpKTsKKyAgICBnX2Fzc2VydCh1cmlSZXF1ZXN0Lmdl dCgpKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIod2Via2l0X3VyaV9yZXF1ZXN0X2dldF91cmkodXJp UmVxdWVzdC5nZXQoKSksID09LCAiZmlsZTovLy9mb28vYmFyIik7CisgICAgZ19hc3NlcnQoIXdl YmtpdF91cmlfcmVxdWVzdF9nZXRfaHR0cF9tZXRob2QodXJpUmVxdWVzdC5nZXQoKSkpOworCisg ICAgd2Via2l0X3VyaV9yZXF1ZXN0X3NldF91cmkodXJpUmVxdWVzdC5nZXQoKSwga1NlcnZlci0+ Z2V0VVJJRm9yUGF0aCgiL2h0dHAtZ2V0LW1ldGhvZCIpLmRhdGEoKSk7CisgICAgdGVzdC0+bG9h ZFJlcXVlc3QodXJpUmVxdWVzdC5nZXQoKSk7CisgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlz aGVkKCk7CisKKyAgICB0ZXN0LT5ydW5KYXZhU2NyaXB0QW5kV2FpdFVudGlsRmluaXNoZWQoInho ciA9IG5ldyBYTUxIdHRwUmVxdWVzdDsgeGhyLm9wZW4oJ1BPU1QnLCAnL2h0dHAtcG9zdC1tZXRo b2QnLCBmYWxzZSk7IHhoci5zZW5kKCk7IiwgbnVsbHB0cik7Cit9CisKIHN0YXRpYyB2b2lkIHRl c3RVUklSZXNwb25zZUhUVFBIZWFkZXJzKFdlYlZpZXdUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVy KQogewogICAgIHRlc3QtPmxvYWRIdG1sKCI8aHRtbD48Ym9keT5ObyBIVFRQIGhlYWRlcnM8L2Jv ZHk+PC9odG1sPiIsICJmaWxlOi8vLyIpOwpAQCAtNDU1LDcgKzQ2OSw3IEBAIHN0YXRpYyB2b2lk IHNlcnZlckNhbGxiYWNrKFNvdXBTZXJ2ZXIqIHNlcnZlciwgU291cE1lc3NhZ2UqIG1lc3NhZ2Us IGNvbnN0IGNoYXIqCiAKICAgICBzb3VwX21lc3NhZ2Vfc2V0X3N0YXR1cyhtZXNzYWdlLCBTT1VQ X1NUQVRVU19PSyk7CiAKLSAgICBpZiAoZ19zdHJfaGFzX3ByZWZpeChwYXRoLCAiL25vcm1hbCIp KQorICAgIGlmIChnX3N0cl9oYXNfcHJlZml4KHBhdGgsICIvbm9ybWFsIikgfHwgZ19zdHJfaGFz X3ByZWZpeChwYXRoLCAiL2h0dHAtZ2V0LW1ldGhvZCIpKQogICAgICAgICBzb3VwX21lc3NhZ2Vf Ym9keV9hcHBlbmQobWVzc2FnZS0+cmVzcG9uc2VfYm9keSwgU09VUF9NRU1PUllfU1RBVElDLCBy ZXNwb25zZVN0cmluZywgc3RybGVuKHJlc3BvbnNlU3RyaW5nKSk7CiAgICAgZWxzZSBpZiAoZ19z dHJfZXF1YWwocGF0aCwgIi9lcnJvciIpKQogICAgICAgICBzb3VwX21lc3NhZ2Vfc2V0X3N0YXR1 cyhtZXNzYWdlLCBTT1VQX1NUQVRVU19DQU5UX0NPTk5FQ1QpOwpAQCAtNTE2LDYgKzUzMCw3IEBA IHZvaWQgYmVmb3JlQWxsKCkKICAgICBWaWV3SXNMb2FkaW5nVGVzdDo6YWRkKCJXZWJLaXRXZWJW aWV3IiwgImlzLWxvYWRpbmciLCB0ZXN0V2ViVmlld0lzTG9hZGluZyk7CiAgICAgV2ViUGFnZVVS SVRlc3Q6OmFkZCgiV2ViS2l0V2ViUGFnZSIsICJnZXQtdXJpIiwgdGVzdFdlYlBhZ2VVUkkpOwog ICAgIFdlYlZpZXdUZXN0OjphZGQoIldlYktpdFVSSVJlcXVlc3QiLCAiaHR0cC1oZWFkZXJzIiwg dGVzdFVSSVJlcXVlc3RIVFRQSGVhZGVycyk7CisgICAgV2ViVmlld1Rlc3Q6OmFkZCgiV2ViS2l0 VVJJUmVxdWVzdCIsICJodHRwLW1ldGhvZCIsIHRlc3RVUklSZXF1ZXN0SFRUUE1ldGhvZCk7CiAg ICAgV2ViVmlld1Rlc3Q6OmFkZCgiV2ViS2l0VVJJUmVzcG9uc2UiLCAiaHR0cC1oZWFkZXJzIiwg dGVzdFVSSVJlc3BvbnNlSFRUUEhlYWRlcnMpOwogICAgIFdlYlZpZXdUZXN0OjphZGQoIldlYktp dFdlYlBhZ2UiLCAicmVkaXJlY3QtdG8tZGF0YS11cmkiLCB0ZXN0UmVkaXJlY3RUb0RhdGFVUkkp OwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1dl YkV4dGVuc2lvblRlc3QuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3Rr L1dlYkV4dGVuc2lvblRlc3QuY3BwCmluZGV4IDM4YzdkOTQuLmEyODZiMWMgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9XZWJFeHRlbnNpb25UZXN0LmNw cAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvV2ViRXh0ZW5zaW9u VGVzdC5jcHAKQEAgLTE0Myw2ICsxNDMsNyBAQCBzdGF0aWMgdm9pZCB1cmlDaGFuZ2VkQ2FsbGJh Y2soV2ViS2l0V2ViUGFnZSogd2ViUGFnZSwgR1BhcmFtU3BlYyogcHNwZWMsIFdlYktpdAogCiBz dGF0aWMgZ2Jvb2xlYW4gc2VuZFJlcXVlc3RDYWxsYmFjayhXZWJLaXRXZWJQYWdlKiwgV2ViS2l0 VVJJUmVxdWVzdCogcmVxdWVzdCwgV2ViS2l0VVJJUmVzcG9uc2UqIHJlZGlyZWN0UmVzcG9uc2Us IGdwb2ludGVyKQogeworICAgIGdib29sZWFuIHJldHVyblZhbHVlID0gRkFMU0U7CiAgICAgY29u c3QgY2hhciogcmVxdWVzdFVSSSA9IHdlYmtpdF91cmlfcmVxdWVzdF9nZXRfdXJpKHJlcXVlc3Qp OwogICAgIGdfYXNzZXJ0KHJlcXVlc3RVUkkpOwogCkBAIC0xNjUsMTAgKzE2NiwxNyBAQCBzdGF0 aWMgZ2Jvb2xlYW4gc2VuZFJlcXVlc3RDYWxsYmFjayhXZWJLaXRXZWJQYWdlKiwgV2ViS2l0VVJJ UmVxdWVzdCogcmVxdWVzdCwgVwogICAgICAgICBTb3VwTWVzc2FnZUhlYWRlcnMqIGhlYWRlcnMg PSB3ZWJraXRfdXJpX3JlcXVlc3RfZ2V0X2h0dHBfaGVhZGVycyhyZXF1ZXN0KTsKICAgICAgICAg Z19hc3NlcnQoaGVhZGVycyk7CiAgICAgICAgIHNvdXBfbWVzc2FnZV9oZWFkZXJzX2FwcGVuZCho ZWFkZXJzLCAiRE5UIiwgIjEiKTsKKyAgICB9IGVsc2UgaWYgKGdfc3RyX2hhc19zdWZmaXgocmVx dWVzdFVSSSwgIi9odHRwLWdldC1tZXRob2QiKSkgeworICAgICAgICBnX2Fzc2VydF9jbXBzdHIo d2Via2l0X3VyaV9yZXF1ZXN0X2dldF9odHRwX21ldGhvZChyZXF1ZXN0KSwgPT0sICJHRVQiKTsK KyAgICAgICAgZ19hc3NlcnQod2Via2l0X3VyaV9yZXF1ZXN0X2dldF9odHRwX21ldGhvZChyZXF1 ZXN0KSA9PSBTT1VQX01FVEhPRF9HRVQpOworICAgIH0gZWxzZSBpZiAoZ19zdHJfaGFzX3N1ZmZp eChyZXF1ZXN0VVJJLCAiL2h0dHAtcG9zdC1tZXRob2QiKSkgeworICAgICAgICBnX2Fzc2VydF9j bXBzdHIod2Via2l0X3VyaV9yZXF1ZXN0X2dldF9odHRwX21ldGhvZChyZXF1ZXN0KSwgPT0sICJQ T1NUIik7CisgICAgICAgIGdfYXNzZXJ0KHdlYmtpdF91cmlfcmVxdWVzdF9nZXRfaHR0cF9tZXRo b2QocmVxdWVzdCkgPT0gU09VUF9NRVRIT0RfUE9TVCk7CisgICAgICAgIHJldHVyblZhbHVlID0g VFJVRTsKICAgICB9IGVsc2UgaWYgKGdfc3RyX2hhc19zdWZmaXgocmVxdWVzdFVSSSwgIi9jYW5j ZWwtdGhpcy5qcyIpKQotICAgICAgICByZXR1cm4gVFJVRTsKKyAgICAgICAgcmV0dXJuVmFsdWUg PSBUUlVFOwogCi0gICAgcmV0dXJuIEZBTFNFOworICAgIHJldHVybiByZXR1cm5WYWx1ZTsKIH0K IAogc3RhdGljIEdWYXJpYW50KiBzZXJpYWxpemVDb250ZXh0TWVudShXZWJLaXRDb250ZXh0TWVu dSogbWVudSkK