116225 2013-05-16 08:11:47 -0700 [GTK] Remote Web Inspector sometimes won't serve any content 2013-05-23 05:45:39 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 spena webkit-unassigned commit-queue gustavo obzhirov oldest_to_newest 889830 0 spena 2013-05-16 08:11:47 -0700 Accessing the remote web inspector sometimes results in an empty page, as it won't serve any content. With WebKit built but not installed, and the environment variable WEBKIT_INSPECTOR_SERVER pointing to a valid address (e.g. 127.0.0.1:2999), launch MiniBrowser and then try to access the access given from a different browser. In my research, this is caused by the WebInspectorServerGtk not finding the needed resources in the expected path. It could probably be fixed by providing an environment variable (in the same fashion done in the InspectorClientGtk) so users can provide their own inspector resources. (Other, maybe more sophisticated, methods could try to guess where this content is stored). 889832 1 obzhirov 2013-05-16 08:15:02 -0700 OK, I'll fix it. I think someone complained about it last year as well. 889883 2 201967 obzhirov 2013-05-16 10:04:33 -0700 Created attachment 201967 Patch 890362 3 spena 2013-05-17 07:44:26 -0700 CCing Gustavo, who reviewed the initial implementation of GTK's remote web inspector in #88094 891248 4 201967 gustavo 2013-05-20 10:42:40 -0700 Comment on attachment 201967 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=201967&action=review > Source/WebKit2/ChangeLog:3 > + [GTK] Remote Web Inspector sometimes won't serve any content I feel this bug title is a bit misleading, perhaps it should say that the remote inspector is only able to serve files from the configured install path. 891250 5 201967 gustavo 2013-05-20 10:44:03 -0700 Comment on attachment 201967 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=201967&action=review > Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.h:76 > + GOwnPtr<gchar> m_inspectorServerFilesPath; Oh, actually, why not just use CString? 891648 6 obzhirov 2013-05-21 01:55:24 -0700 Well, in this case I just wanted smart pointer to own char string. Didn't really need other functionality of CString. Seems to be safer to use GOwnPtr. I think in similar code in InspectorClientGtk they use smart pointer as well. 891720 7 gustavo 2013-05-21 05:41:04 -0700 We used char pointers a lot in the early days of webkitgtk, but we have mostly switched to using CString for storing strings in more recent times to avoid allocation churn and make the code simpler. I don't feel too strongly about this, but I think using a smart pointer is unnecessary in this case. 891759 8 obzhirov 2013-05-21 07:25:16 -0700 ok, point taken. I will resubmit the patch. 891816 9 202438 obzhirov 2013-05-21 09:02:30 -0700 Created attachment 202438 Patch 891866 10 202438 gustavo 2013-05-21 10:13:52 -0700 Comment on attachment 202438 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=202438&action=review > Source/WebKit2/UIProcess/InspectorServer/WebInspectorServer.h:75 > + const char* inspectorServerFilesPath(); I think it doesn't make sense to use a char pointer just here, just return the CString? In fact, you can just use WTFString and avoid the other include IMO. 892207 11 202514 obzhirov 2013-05-22 03:03:36 -0700 Created attachment 202514 Patch 892208 12 obzhirov 2013-05-22 03:06:23 -0700 I used webkit-patch apply-from-bug script option. So it still shows Gustavo as a reviewer. 892761 13 202514 gustavo 2013-05-23 05:24:15 -0700 Comment on attachment 202514 Patch Thanks! 892767 14 202514 commit-queue 2013-05-23 05:45:36 -0700 Comment on attachment 202514 Patch Clearing flags on attachment: 202514 Committed r150582: <http://trac.webkit.org/changeset/150582> 892768 15 commit-queue 2013-05-23 05:45:39 -0700 All reviewed patches have been landed. Closing bug. 201967 2013-05-16 10:04:33 -0700 2013-05-21 09:02:23 -0700 Patch bug-116225-20130516180419.patch text/plain 3706 obzhirov U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMDA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDQ3M2ZhZjg0NTEwZjNm NWY2MzNhNzVmODNiYTczYjY1N2FjZGU1MS4uNTAzZTgzNTc5MTBlOWE0NjNiMjFlZDFjN2JmMDkx MWMzYzIxMjgxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA1LTE2ICBBbnRv biBPYnpoaXJvdiAgPGEub2J6aGlyb3ZAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0dUS10gUmVt b3RlIFdlYiBJbnNwZWN0b3Igc29tZXRpbWVzIHdvbid0IHNlcnZlIGFueSBjb250ZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYyMjUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhbiBvcHRp b24gdG8gdXNlIGVudmlyb25tZW50IHZhcmlhYmxlIHRvIHNldCB1cCBwYXRoIHRvCisgICAgICAg IGluc3BlY3RvciBzZXJ2ZXIgZmlsZXMuIEltcGxlbWVudGF0aW9uIGlzIHNpbWlsYXIgdG8gSW5z cGVjdG9yQ2xpZW50R3RrCisgICAgICAgIGltcGxlbWVudGF0aW9uLgorCisgICAgICAgICogVUlQ cm9jZXNzL0luc3BlY3RvclNlcnZlci9XZWJJbnNwZWN0b3JTZXJ2ZXIuaDoKKyAgICAgICAgKFdl Ykluc3BlY3RvclNlcnZlcik6CisgICAgICAgICogVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9n dGsvV2ViSW5zcGVjdG9yU2VydmVyR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVj dG9yU2VydmVyOjpwbGF0Zm9ybVJlc291cmNlRm9yUGF0aCk6CisgICAgICAgIChXZWJLaXQ6Oldl Ykluc3BlY3RvclNlcnZlcjo6aW5zcGVjdG9yU2VydmVyRmlsZXNQYXRoKToKKyAgICAgICAgKFdl YktpdCk6CisKIDIwMTMtMDUtMTMgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBXZWJQcm9jZXNzIGNvbnN1bWluZyB2ZXJ5IGhpZ2ggQ1BVIG9uIGxpbmtlZGluLmNv bQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9X ZWJJbnNwZWN0b3JTZXJ2ZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9JbnNwZWN0b3JT ZXJ2ZXIvV2ViSW5zcGVjdG9yU2VydmVyLmgKaW5kZXggMTI0YzQ2ZmYyNzc0NWNjYzdhMDdhYmY2 MWI0NGI1MzRlNjI5ODY1Yi4uNDE5YWNmODgwZTBmOTFlM2I4Zjk2YmQ0NjZmZWNkM2FhNjVmODQ1 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9X ZWJJbnNwZWN0b3JTZXJ2ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVj dG9yU2VydmVyL1dlYkluc3BlY3RvclNlcnZlci5oCkBAIC0zNCw2ICszNCwxMCBAQAogI2luY2x1 ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKKyNp ZiBQTEFURk9STShHVEspCisjaW5jbHVkZSA8d3RmL2dvYmplY3QvR093blB0ci5oPgorI2VuZGlm CisKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBXZWJJbnNwZWN0b3JQcm94eTsKQEAgLTY3 LDYgKzcxLDEwIEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGNsb3NlQ29ubmVjdGlvbihXZWJJbnNw ZWN0b3JQcm94eSosIFdlYlNvY2tldFNlcnZlckNvbm5lY3Rpb24qKTsKIAorI2lmIFBMQVRGT1JN KEdUSykKKyAgICBjb25zdCBjaGFyKiBpbnNwZWN0b3JTZXJ2ZXJGaWxlc1BhdGgoKTsKKyAgICBH T3duUHRyPGdjaGFyPiBtX2luc3BlY3RvclNlcnZlckZpbGVzUGF0aDsKKyNlbmRpZgogICAgIHVu c2lnbmVkIG1fbmV4dEF2YWlsYWJsZVBhZ2VJZDsKICAgICBDbGllbnRNYXAgbV9jbGllbnRNYXA7 CiAgICAgSGFzaE1hcDx1bnNpZ25lZCwgV2ViU29ja2V0U2VydmVyQ29ubmVjdGlvbio+IG1fY29u bmVjdGlvbk1hcDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9JbnNwZWN0 b3JTZXJ2ZXIvZ3RrL1dlYkluc3BlY3RvclNlcnZlckd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvSW5zcGVjdG9yU2VydmVyL2d0ay9XZWJJbnNwZWN0b3JTZXJ2ZXJHdGsuY3BwCmlu ZGV4IDBmNWFkMmUwZTA3NDliMmYwOWNiMGJjNmVhMWE2MDI0NzFlYjJmNjUuLmNiZDVhNjdiNGRm YTI5ZTcwY2U2ZDU1MGY5ZWMwZjA5OWQwNWM0NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvZ3RrL1dlYkluc3BlY3RvclNlcnZlckd0ay5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9ndGsvV2ViSW5z cGVjdG9yU2VydmVyR3RrLmNwcApAQCAtNDgsNyArNDgsNyBAQCBib29sIFdlYkluc3BlY3RvclNl cnZlcjo6cGxhdGZvcm1SZXNvdXJjZUZvclBhdGgoY29uc3QgU3RyaW5nJiBwYXRoLCBWZWN0b3I8 Y2hhcgogICAgIH0KIAogICAgIC8vIFBvaW50IHRoZSBkZWZhdWx0IHBhdGggdG8gYSBmb3JtYXR0 ZWQgcGFnZSB0aGF0IHF1ZXJpZXMgdGhlIHBhZ2UgbGlzdCBhbmQgZGlzcGxheSB0aGVtLgotICAg IENTdHJpbmcgbG9jYWxQYXRoID0gV2ViQ29yZTo6ZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKFN0 cmluZyhXZWJDb3JlOjpzaGFyZWRSZXNvdXJjZXNQYXRoKCkuZGF0YSgpKSArICgocGF0aCA9PSAi LyIpID8gIi93ZWJpbnNwZWN0b3IvaW5zcGVjdG9yUGFnZUluZGV4Lmh0bWwiIDogcGF0aCkpOwor ICAgIENTdHJpbmcgbG9jYWxQYXRoID0gV2ViQ29yZTo6ZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9u KFN0cmluZyhpbnNwZWN0b3JTZXJ2ZXJGaWxlc1BhdGgoKSkgKyAoKHBhdGggPT0gIi8iKSA/ICIv d2ViaW5zcGVjdG9yL2luc3BlY3RvclBhZ2VJbmRleC5odG1sIiA6IHBhdGgpKTsKICAgICBpZiAo bG9jYWxQYXRoLmlzTnVsbCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTk1LDUgKzk1 LDE5IEBAIHZvaWQgV2ViSW5zcGVjdG9yU2VydmVyOjpidWlsZFBhZ2VMaXN0KFZlY3RvcjxjaGFy PiYgZGF0YSwgU3RyaW5nJiBjb250ZW50VHlwZSkKICAgICBjb250ZW50VHlwZSA9ICJhcHBsaWNh dGlvbi9qc29uOyBjaGFyc2V0PXV0Zi04IjsKIH0KIAorY29uc3QgY2hhciogV2ViSW5zcGVjdG9y U2VydmVyOjppbnNwZWN0b3JTZXJ2ZXJGaWxlc1BhdGgoKQoreworICAgIGlmIChtX2luc3BlY3Rv clNlcnZlckZpbGVzUGF0aCkKKyAgICAgICAgcmV0dXJuIG1faW5zcGVjdG9yU2VydmVyRmlsZXNQ YXRoLmdldCgpOworCisgICAgY29uc3QgY2hhciogZW52aXJvbm1lbnRQYXRoID0gZ19nZXRlbnYo IldFQktJVF9JTlNQRUNUT1JfU0VSVkVSX1BBVEgiKTsKKyAgICBpZiAoZW52aXJvbm1lbnRQYXRo ICYmIGdfZmlsZV90ZXN0KGVudmlyb25tZW50UGF0aCwgR19GSUxFX1RFU1RfSVNfRElSKSkKKyAg ICAgICAgbV9pbnNwZWN0b3JTZXJ2ZXJGaWxlc1BhdGguc2V0KGdfc3RyZHVwKGVudmlyb25tZW50 UGF0aCkpOworICAgIGVsc2UKKyAgICAgICAgbV9pbnNwZWN0b3JTZXJ2ZXJGaWxlc1BhdGguc2V0 KGdfc3RyZHVwKFdlYkNvcmU6OnNoYXJlZFJlc291cmNlc1BhdGgoKS5kYXRhKCkpKTsKKworICAg IHJldHVybiBtX2luc3BlY3RvclNlcnZlckZpbGVzUGF0aC5nZXQoKTsKK30KKwogfQogI2VuZGlm Cg== 202438 2013-05-21 09:02:30 -0700 2013-05-22 03:03:29 -0700 Patch bug-116225-20130521170212.patch text/plain 3730 obzhirov U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjhhMmY4YTAxOTc5M2Zl MmEyNjUxYWNiMDNiZDc5ZGE5YTYwNzhhMS4uMTEzYWE0ZmI0MGRlZmIzNDNiZDFhYWZhN2MyMjhk YjRhZmMwMzFmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA1LTIxICBBbnRv biBPYnpoaXJvdiAgPGEub2J6aGlyb3ZAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0dUS10gUmVt b3RlIFdlYiBJbnNwZWN0b3Igc29tZXRpbWVzIHdvbid0IHNlcnZlIGFueSBjb250ZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYyMjUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhbiBvcHRp b24gdG8gdXNlIGVudmlyb25tZW50IHZhcmlhYmxlIHRvIHNldCB1cCBwYXRoIHRvCisgICAgICAg IGluc3BlY3RvciBzZXJ2ZXIgZmlsZXMuIEltcGxlbWVudGF0aW9uIGlzIHNpbWlsYXIgdG8gSW5z cGVjdG9yQ2xpZW50R3RrCisgICAgICAgIGltcGxlbWVudGF0aW9uLgorCisgICAgICAgICogVUlQ cm9jZXNzL0luc3BlY3RvclNlcnZlci9XZWJJbnNwZWN0b3JTZXJ2ZXIuaDoKKyAgICAgICAgKFdl Ykluc3BlY3RvclNlcnZlcik6CisgICAgICAgICogVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9n dGsvV2ViSW5zcGVjdG9yU2VydmVyR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVj dG9yU2VydmVyOjpwbGF0Zm9ybVJlc291cmNlRm9yUGF0aCk6CisgICAgICAgIChXZWJLaXQ6Oldl Ykluc3BlY3RvclNlcnZlcjo6aW5zcGVjdG9yU2VydmVyRmlsZXNQYXRoKToKKyAgICAgICAgKFdl YktpdCk6CisKIDIwMTMtMDUtMjEgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxlLmNvbT4K IAogICAgICAgICBFeHBvc2UgYSB3YXkgdG8ga25vdyB3aGVuIGZvcm1zIGFyZSBhZGRlZCB0byBh IHBhZ2Ugb3Igd2hlbiBmb3JtIGNvbnRyb2xzIGFyZSBhZGRlZCB0byBhIGZvcm0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvV2ViSW5zcGVjdG9y U2VydmVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVjdG9yU2VydmVyL1dlYklu c3BlY3RvclNlcnZlci5oCmluZGV4IGM0MTlmMTEzNmMzOTdkOWVmNzQyMzM0ZGFhNDViNTgzZDEx NTlkMDEuLjEwMWI4MTQ4NGUxM2ZmOTZjNWFjYTY0ZWFjNTY1M2MwNjY4MWQxOTkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvV2ViSW5zcGVjdG9y U2VydmVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9X ZWJJbnNwZWN0b3JTZXJ2ZXIuaApAQCAtMzQsNiArMzQsMTAgQEAKICNpbmNsdWRlIDx3dGYvSGFz aE1hcC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCisjaWYgUExBVEZPUk0o R1RLKQorI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KKyNlbmRpZgorCiBuYW1lc3BhY2Ug V2ViS2l0IHsKIAogY2xhc3MgV2ViSW5zcGVjdG9yUHJveHk7CkBAIC02Nyw2ICs3MSwxMCBAQCBw cml2YXRlOgogCiAgICAgdm9pZCBjbG9zZUNvbm5lY3Rpb24oV2ViSW5zcGVjdG9yUHJveHkqLCBX ZWJTb2NrZXRTZXJ2ZXJDb25uZWN0aW9uKik7CiAKKyNpZiBQTEFURk9STShHVEspCisgICAgY29u c3QgY2hhciogaW5zcGVjdG9yU2VydmVyRmlsZXNQYXRoKCk7CisgICAgQ1N0cmluZyBtX2luc3Bl Y3RvclNlcnZlckZpbGVzUGF0aDsKKyNlbmRpZgogICAgIHVuc2lnbmVkIG1fbmV4dEF2YWlsYWJs ZVBhZ2VJZDsKICAgICBDbGllbnRNYXAgbV9jbGllbnRNYXA7CiAgICAgSGFzaE1hcDx1bnNpZ25l ZCwgV2ViU29ja2V0U2VydmVyQ29ubmVjdGlvbio+IG1fY29ubmVjdGlvbk1hcDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvZ3RrL1dlYkluc3Bl Y3RvclNlcnZlckd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVjdG9yU2Vy dmVyL2d0ay9XZWJJbnNwZWN0b3JTZXJ2ZXJHdGsuY3BwCmluZGV4IDBmNWFkMmUwZTA3NDliMmYw OWNiMGJjNmVhMWE2MDI0NzFlYjJmNjUuLjJjNzY3NWFkMzE5ZGFlNDgxYzRlOGQwYmUzYjZhM2Qx YTUxMTEwZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9JbnNwZWN0b3JT ZXJ2ZXIvZ3RrL1dlYkluc3BlY3RvclNlcnZlckd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9ndGsvV2ViSW5zcGVjdG9yU2VydmVyR3RrLmNwcApA QCAtNDgsNyArNDgsNyBAQCBib29sIFdlYkluc3BlY3RvclNlcnZlcjo6cGxhdGZvcm1SZXNvdXJj ZUZvclBhdGgoY29uc3QgU3RyaW5nJiBwYXRoLCBWZWN0b3I8Y2hhcgogICAgIH0KIAogICAgIC8v IFBvaW50IHRoZSBkZWZhdWx0IHBhdGggdG8gYSBmb3JtYXR0ZWQgcGFnZSB0aGF0IHF1ZXJpZXMg dGhlIHBhZ2UgbGlzdCBhbmQgZGlzcGxheSB0aGVtLgotICAgIENTdHJpbmcgbG9jYWxQYXRoID0g V2ViQ29yZTo6ZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKFN0cmluZyhXZWJDb3JlOjpzaGFyZWRS ZXNvdXJjZXNQYXRoKCkuZGF0YSgpKSArICgocGF0aCA9PSAiLyIpID8gIi93ZWJpbnNwZWN0b3Iv aW5zcGVjdG9yUGFnZUluZGV4Lmh0bWwiIDogcGF0aCkpOworICAgIENTdHJpbmcgbG9jYWxQYXRo ID0gV2ViQ29yZTo6ZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKFN0cmluZyhpbnNwZWN0b3JTZXJ2 ZXJGaWxlc1BhdGgoKSkgKyAoKHBhdGggPT0gIi8iKSA/ICIvd2ViaW5zcGVjdG9yL2luc3BlY3Rv clBhZ2VJbmRleC5odG1sIiA6IHBhdGgpKTsKICAgICBpZiAobG9jYWxQYXRoLmlzTnVsbCgpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTk1LDUgKzk1LDE5IEBAIHZvaWQgV2ViSW5zcGVj dG9yU2VydmVyOjpidWlsZFBhZ2VMaXN0KFZlY3RvcjxjaGFyPiYgZGF0YSwgU3RyaW5nJiBjb250 ZW50VHlwZSkKICAgICBjb250ZW50VHlwZSA9ICJhcHBsaWNhdGlvbi9qc29uOyBjaGFyc2V0PXV0 Zi04IjsKIH0KIAorY29uc3QgY2hhciogV2ViSW5zcGVjdG9yU2VydmVyOjppbnNwZWN0b3JTZXJ2 ZXJGaWxlc1BhdGgoKQoreworICAgIGlmICghbV9pbnNwZWN0b3JTZXJ2ZXJGaWxlc1BhdGguaXNO dWxsKCkpCisgICAgICAgIHJldHVybiBtX2luc3BlY3RvclNlcnZlckZpbGVzUGF0aC5kYXRhKCk7 CisKKyAgICBjb25zdCBjaGFyKiBlbnZpcm9ubWVudFBhdGggPSBnX2dldGVudigiV0VCS0lUX0lO U1BFQ1RPUl9TRVJWRVJfUEFUSCIpOworICAgIGlmIChlbnZpcm9ubWVudFBhdGggJiYgZ19maWxl X3Rlc3QoZW52aXJvbm1lbnRQYXRoLCBHX0ZJTEVfVEVTVF9JU19ESVIpKQorICAgICAgICBtX2lu c3BlY3RvclNlcnZlckZpbGVzUGF0aCA9IENTdHJpbmcoZW52aXJvbm1lbnRQYXRoKTsKKyAgICBl bHNlCisgICAgICAgIG1faW5zcGVjdG9yU2VydmVyRmlsZXNQYXRoID0gV2ViQ29yZTo6c2hhcmVk UmVzb3VyY2VzUGF0aCgpOworCisgICAgcmV0dXJuIG1faW5zcGVjdG9yU2VydmVyRmlsZXNQYXRo LmRhdGEoKTsKK30KKwogfQogI2VuZGlmCg== 202514 2013-05-22 03:03:36 -0700 2013-05-23 05:45:36 -0700 Patch bug-116225-20130522110317.patch text/plain 3484 obzhirov U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTNkZDIxNTk1ODE4N2Rk YTRlNmY4Y2M3OTFkMDY1ZTI5YjMwM2VmMS4uMjI2OGI5YmU4MGExZDY2ZTNmYjljNTkxMDZmN2Q2 YTM1Y2RmYWZiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA1LTIzICBBbnRv biBPYnpoaXJvdiAgPGEub2J6aGlyb3ZAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0dUS10gUmVt b3RlIFdlYiBJbnNwZWN0b3Igc29tZXRpbWVzIHdvbid0IHNlcnZlIGFueSBjb250ZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYyMjUKKworICAg ICAgICBSZXZpZXdlZCBieSBHdXN0YXZvIE5vcm9uaGEgU2lsdmEuCisKKyAgICAgICAgQWRkZWQg YW4gb3B0aW9uIHRvIHVzZSBlbnZpcm9ubWVudCB2YXJpYWJsZSB0byBzZXQgdXAgcGF0aCB0bwor ICAgICAgICBpbnNwZWN0b3Igc2VydmVyIGZpbGVzLiBJbXBsZW1lbnRhdGlvbiBpcyBzaW1pbGFy IHRvIEluc3BlY3RvckNsaWVudEd0aworICAgICAgICBpbXBsZW1lbnRhdGlvbi4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvV2ViSW5zcGVjdG9yU2VydmVyLmg6CisgICAg ICAgIChXZWJJbnNwZWN0b3JTZXJ2ZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9JbnNwZWN0b3JT ZXJ2ZXIvZ3RrL1dlYkluc3BlY3RvclNlcnZlckd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl Ykluc3BlY3RvclNlcnZlcjo6cGxhdGZvcm1SZXNvdXJjZUZvclBhdGgpOgorICAgICAgICAoV2Vi S2l0OjpXZWJJbnNwZWN0b3JTZXJ2ZXI6Omluc3BlY3RvclNlcnZlckZpbGVzUGF0aCk6CisgICAg ICAgIChXZWJLaXQpOgorCiAyMDEzLTA1LTIyICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdl YmtpdC5vcmc+CiAKICAgICAgICAgW1F0XVtXSzJdIFVucmV2aWV3ZWQgYnVpbGRmaXggYWZ0ZXIg cjE1MDQ4NC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9JbnNwZWN0b3JT ZXJ2ZXIvV2ViSW5zcGVjdG9yU2VydmVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5z cGVjdG9yU2VydmVyL1dlYkluc3BlY3RvclNlcnZlci5oCmluZGV4IGM0MTlmMTEzNmMzOTdkOWVm NzQyMzM0ZGFhNDViNTgzZDExNTlkMDEuLmZjOGRkZjQ4NWEyODU0ZDBiY2Q5NDBmZDQ2OTYxMWZj NWZhMWM4NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9JbnNwZWN0b3JT ZXJ2ZXIvV2ViSW5zcGVjdG9yU2VydmVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0luc3BlY3RvclNlcnZlci9XZWJJbnNwZWN0b3JTZXJ2ZXIuaApAQCAtNjcsNiArNjcsMTAgQEAg cHJpdmF0ZToKIAogICAgIHZvaWQgY2xvc2VDb25uZWN0aW9uKFdlYkluc3BlY3RvclByb3h5Kiwg V2ViU29ja2V0U2VydmVyQ29ubmVjdGlvbiopOwogCisjaWYgUExBVEZPUk0oR1RLKQorICAgIFN0 cmluZyBpbnNwZWN0b3JTZXJ2ZXJGaWxlc1BhdGgoKTsKKyAgICBTdHJpbmcgbV9pbnNwZWN0b3JT ZXJ2ZXJGaWxlc1BhdGg7CisjZW5kaWYKICAgICB1bnNpZ25lZCBtX25leHRBdmFpbGFibGVQYWdl SWQ7CiAgICAgQ2xpZW50TWFwIG1fY2xpZW50TWFwOwogICAgIEhhc2hNYXA8dW5zaWduZWQsIFdl YlNvY2tldFNlcnZlckNvbm5lY3Rpb24qPiBtX2Nvbm5lY3Rpb25NYXA7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVjdG9yU2VydmVyL2d0ay9XZWJJbnNwZWN0b3JT ZXJ2ZXJHdGsuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9n dGsvV2ViSW5zcGVjdG9yU2VydmVyR3RrLmNwcAppbmRleCAwZjVhZDJlMGUwNzQ5YjJmMDljYjBi YzZlYTFhNjAyNDcxZWIyZjY1Li5jMzFmODIwMTNkYWQ1OWE0NjFlN2UxMmU0NzJmNzEyMzVhZjVm Yzg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVjdG9yU2VydmVy L2d0ay9XZWJJbnNwZWN0b3JTZXJ2ZXJHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvZ3RrL1dlYkluc3BlY3RvclNlcnZlckd0ay5jcHAKQEAgLTQ4 LDcgKzQ4LDcgQEAgYm9vbCBXZWJJbnNwZWN0b3JTZXJ2ZXI6OnBsYXRmb3JtUmVzb3VyY2VGb3JQ YXRoKGNvbnN0IFN0cmluZyYgcGF0aCwgVmVjdG9yPGNoYXIKICAgICB9CiAKICAgICAvLyBQb2lu dCB0aGUgZGVmYXVsdCBwYXRoIHRvIGEgZm9ybWF0dGVkIHBhZ2UgdGhhdCBxdWVyaWVzIHRoZSBw YWdlIGxpc3QgYW5kIGRpc3BsYXkgdGhlbS4KLSAgICBDU3RyaW5nIGxvY2FsUGF0aCA9IFdlYkNv cmU6OmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihTdHJpbmcoV2ViQ29yZTo6c2hhcmVkUmVzb3Vy Y2VzUGF0aCgpLmRhdGEoKSkgKyAoKHBhdGggPT0gIi8iKSA/ICIvd2ViaW5zcGVjdG9yL2luc3Bl Y3RvclBhZ2VJbmRleC5odG1sIiA6IHBhdGgpKTsKKyAgICBDU3RyaW5nIGxvY2FsUGF0aCA9IFdl YkNvcmU6OmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihpbnNwZWN0b3JTZXJ2ZXJGaWxlc1BhdGgo KSArICgocGF0aCA9PSAiLyIpID8gIi93ZWJpbnNwZWN0b3IvaW5zcGVjdG9yUGFnZUluZGV4Lmh0 bWwiIDogcGF0aCkpOwogICAgIGlmIChsb2NhbFBhdGguaXNOdWxsKCkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIApAQCAtOTUsNSArOTUsMTkgQEAgdm9pZCBXZWJJbnNwZWN0b3JTZXJ2ZXI6OmJ1 aWxkUGFnZUxpc3QoVmVjdG9yPGNoYXI+JiBkYXRhLCBTdHJpbmcmIGNvbnRlbnRUeXBlKQogICAg IGNvbnRlbnRUeXBlID0gImFwcGxpY2F0aW9uL2pzb247IGNoYXJzZXQ9dXRmLTgiOwogfQogCitT dHJpbmcgV2ViSW5zcGVjdG9yU2VydmVyOjppbnNwZWN0b3JTZXJ2ZXJGaWxlc1BhdGgoKQorewor ICAgIGlmICghbV9pbnNwZWN0b3JTZXJ2ZXJGaWxlc1BhdGguaXNOdWxsKCkpCisgICAgICAgIHJl dHVybiBtX2luc3BlY3RvclNlcnZlckZpbGVzUGF0aDsKKworICAgIGNvbnN0IGNoYXIqIGVudmly b25tZW50UGF0aCA9IGdfZ2V0ZW52KCJXRUJLSVRfSU5TUEVDVE9SX1NFUlZFUl9QQVRIIik7Cisg ICAgaWYgKGVudmlyb25tZW50UGF0aCAmJiBnX2ZpbGVfdGVzdChlbnZpcm9ubWVudFBhdGgsIEdf RklMRV9URVNUX0lTX0RJUikpCisgICAgICAgIG1faW5zcGVjdG9yU2VydmVyRmlsZXNQYXRoID0g U3RyaW5nKGVudmlyb25tZW50UGF0aCk7CisgICAgZWxzZQorICAgICAgICBtX2luc3BlY3RvclNl cnZlckZpbGVzUGF0aCA9IFN0cmluZyhXZWJDb3JlOjpzaGFyZWRSZXNvdXJjZXNQYXRoKCkuZGF0 YSgpKTsKKworICAgIHJldHVybiBtX2luc3BlY3RvclNlcnZlckZpbGVzUGF0aDsKK30KKwogfQog I2VuZGlmCg==