42721 2010-07-20 19:38:40 -0700 [EFL] Set proxy address for Soup 2010-07-23 07:34:53 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 gyuyoung.kim webkit-unassigned barbieri commit-queue hyuki.kim kenneth leandro lucas.de.marchi oldest_to_newest 254111 0 gyuyoung.kim 2010-07-20 19:38:40 -0700 If PC network needs to use proxy address, EWebLauncher cannot use network without proxy address setting. 254127 1 62145 gyuyoung.kim 2010-07-20 22:44:02 -0700 Created attachment 62145 Patch Patch 254222 2 lucas.de.marchi 2010-07-21 05:09:12 -0700 (In reply to comment #0) > If PC network needs to use proxy address, EWebLauncher cannot use network without proxy address setting. Nice, but this breaks when libsoub is not enabled (bug 42286, which did not get in yet because of a problem with changelogs). I'd rather let the part of getting the environment variable to browser and add a method to set proxy. This way browser might decide for whatever reason to ask for a proxy to be used (be the environment var or because user explicitly configured browser for this). Then we would have 2 implementations surrounded by ifdefs, 1 for libsoup and another for libcurl (which can be let blank for now). 254226 3 lucas.de.marchi 2010-07-21 05:14:39 -0700 More or less what QT guys did: bug 27495 254230 4 gyuyoung.kim 2010-07-21 05:27:15 -0700 Thank you lucas, I understand your point as below, void ewk_XXX_proxy_uri_set(...) { #if USE(SOUP) .... #elif USE(CURL) .... #endif } And, EWebLauncher invokes the API. In my opinion, this API is located in ewk_settings.cpp. How do you think about it ? 254251 5 lucas.de.marchi 2010-07-21 06:28:41 -0700 (In reply to comment #4) > Thank you lucas, > > I understand your point as below, > > void ewk_XXX_proxy_uri_set(...) > { > #if USE(SOUP) > .... > #elif USE(CURL) > .... > #endif > } > > And, EWebLauncher invokes the API. > > In my opinion, this API is located in ewk_settings.cpp. How do you think about it ? I think ewk_settings.cpp is indeed the best place. 254676 6 62267 gyuyoung.kim 2010-07-22 00:40:51 -0700 Created attachment 62267 Patch I modify this patch according to Lucas's opinion. However, I don't support libcurl yet. WebKit's Libcurl port already has proxy method. In order to use the function, proxy address needs to be modified. I will support it later. 254679 7 62268 gyuyoung.kim 2010-07-22 00:42:26 -0700 Created attachment 62268 Patch Oops, sorry. Other patch was uploaded. This is new patch. 254739 8 62268 lucas.de.marchi 2010-07-22 05:37:20 -0700 Comment on attachment 62268 Patch > Index: WebKit/efl/ChangeLog > =================================================================== > --- WebKit/efl/ChangeLog (revision 63877) > +++ WebKit/efl/ChangeLog (working copy) > @@ -1,3 +1,18 @@ > +2010-07-22 Gyuyoung Kim <gyuyoung.kim@samsung.com> > + > + Reviewed by NOBODY (OOPS!). > + > + [EFL] Set proxy address for Soup > + https://bugs.webkit.org/show_bug.cgi?id=42721 > + > + Set proxy address by http_proxy enviroment variable. Now the description doesn't make much sense. > Index: WebKit/efl/ewk/ewk_settings.cpp > =================================================================== > --- WebKit/efl/ewk/ewk_settings.cpp (revision 63876) > +++ WebKit/efl/ewk/ewk_settings.cpp (working copy) > @@ -29,6 +29,7 @@ > #include "Image.h" > #include "IntSize.h" > #include "KURL.h" > +#include "NotImplemented.h" There's no other place inside WebKit/efl/ewk/ where we use notImplemented(). I'd rather let this out and use a warning in eina_log or an EINA_SAFETY_ON_TRUE_RETURN(1). > +/** > + * Sets proxy address. > + * > + * @param proxy address. If proxy address is null, proxy address isn't set. > + */ > +void ewk_settings_proxy_uri_set(const char* proxy) > +{ > +#ifdef WTF_USE_SOUP > + SoupSession* session = WebCore::ResourceHandle::defaultSession(); > + g_object_set(session, SOUP_SESSION_PROXY_URI, soup_uri_new(proxy), NULL); You are leaking the SoupURI struct here, since g_object_set always copies. Change to something like: SoupURI* uri = soup_uri_new(proxy); EINA_SAFETY_ON_NULL_RETURN(uri); g_object_set(session, SOUP_SESSION_PROXY_URI, uri, NULL); soup_uri_free(soupUri); 254742 9 62268 lucas.de.marchi 2010-07-22 05:43:13 -0700 Comment on attachment 62268 Patch Not so important, but: > +/** > + * Sets proxy address. > + * > + * @param proxy address. If proxy address is null, proxy address isn't set. > + */ > +void ewk_settings_proxy_uri_set(const char* proxy) > +{ > +#ifdef WTF_USE_SOUP #if USE(SOUP) > + SoupSession* session = WebCore::ResourceHandle::defaultSession(); > + g_object_set(session, SOUP_SESSION_PROXY_URI, soup_uri_new(proxy), NULL); > +#elif defined WTF_USE_CURL #elif USE(CURL) 254751 10 62290 gyuyoung.kim 2010-07-22 06:09:27 -0700 Created attachment 62290 Patch Hello lucas, Thank you for your advice. I modify this patch. If there are still nits, please let me know. 255171 11 gyuyoung.kim 2010-07-22 19:58:24 -0700 Hello 255327 12 62290 kenneth 2010-07-23 05:05:16 -0700 Comment on attachment 62290 Patch Looks fine to me. If leandro is ok with this, please cq+ 255353 13 62290 leandro 2010-07-23 06:43:29 -0700 Comment on attachment 62290 Patch LGTM 255363 14 62290 commit-queue 2010-07-23 07:34:41 -0700 Comment on attachment 62290 Patch Clearing flags on attachment: 62290 Committed r63972: <http://trac.webkit.org/changeset/63972> 255364 15 commit-queue 2010-07-23 07:34:53 -0700 All reviewed patches have been landed. Closing bug. 62145 2010-07-20 22:44:02 -0700 2010-07-22 00:40:51 -0700 Patch patch.txt text/plain 1342 gyuyoung.kim SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L0NoYW5nZUxvZwko cmV2aXNpb24gNjM3OTgpCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTUgQEAKKzIwMTAtMDctMjAgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1z dW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBbRUZMXSBTZXQgcHJveHkgYWRkcmVzcyBmb3IgU291cAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI3MjEKKworICAgICAgICBTZXQgcHJveHkgYWRk cmVzcyBieSBodHRwX3Byb3h5IGVudmlyb21lbnQgdmFyaWFibGUuCisKKyAgICAgICAgKiBlZmwv ZXdrL2V3a19tYWluLmNwcDoKKyAgICAgICAgKGV3a19pbml0KTogU2V0IHByb3h5IGFkZHJlc3Mu CisKIDIwMTAtMDctMjAgIEx1Y2FzIERlIE1hcmNoaSAgPGx1Y2FzLmRlbWFyY2hpQHByb2Z1c2lv bi5tb2JpPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2Vu LgpJbmRleDogV2ViS2l0L2VmbC9ld2svZXdrX21haW4uY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9lZmwvZXdrL2V3a19tYWluLmNwcAkocmV2aXNpb24gNjM3OTUpCisrKyBXZWJLaXQvZWZsL2V3 ay9ld2tfbWFpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMiw2ICsxMjIsMTEgQEAgaW50IGV3 a19pbml0KHZvaWQpCiAgICAgaWYgKDEpIHsKICAgICAgICAgU291cFNlc3Npb24qIHNlc3Npb24g PSBXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6ZGVmYXVsdFNlc3Npb24oKTsKICAgICAgICAgc291 cF9zZXNzaW9uX2FkZF9mZWF0dXJlX2J5X3R5cGUoc2Vzc2lvbiwgU09VUF9UWVBFX0NPTlRFTlRf U05JRkZFUik7CisKKyAgICAgICAgLy8gU2V0IHByb3h5IGFkZHJlc3MgYnkgaHR0cF9wcm94eSBl bnZpcm9ubWVudCB2YXJpYWJsZS4KKyAgICAgICAgV2ViQ29yZTo6U3RyaW5nIHByb3h5VXJpID0g Z2V0ZW52KCJodHRwX3Byb3h5Iik7CisgICAgICAgIGlmIChwcm94eVVyaS5sZW5ndGgoKSA+IDAp CisgICAgICAgICAgICBnX29iamVjdF9zZXQoc2Vzc2lvbiwgU09VUF9TRVNTSU9OX1BST1hZX1VS SSwgc291cF91cmlfbmV3KHByb3h5VXJpLnV0ZjgoKS5kYXRhKCkpLCBOVUxMKTsKICAgICB9CiAK ICAgICByZXR1cm4gKytfZXdrX2luaXRfY291bnQ7Cg== 62267 2010-07-22 00:40:51 -0700 2010-07-22 00:42:26 -0700 Patch patch.txt text/plain 1342 gyuyoung.kim SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L0NoYW5nZUxvZwko cmV2aXNpb24gNjM3OTgpCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTUgQEAKKzIwMTAtMDctMjAgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1z dW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBbRUZMXSBTZXQgcHJveHkgYWRkcmVzcyBmb3IgU291cAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI3MjEKKworICAgICAgICBTZXQgcHJveHkgYWRk cmVzcyBieSBodHRwX3Byb3h5IGVudmlyb21lbnQgdmFyaWFibGUuCisKKyAgICAgICAgKiBlZmwv ZXdrL2V3a19tYWluLmNwcDoKKyAgICAgICAgKGV3a19pbml0KTogU2V0IHByb3h5IGFkZHJlc3Mu CisKIDIwMTAtMDctMjAgIEx1Y2FzIERlIE1hcmNoaSAgPGx1Y2FzLmRlbWFyY2hpQHByb2Z1c2lv bi5tb2JpPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2Vu LgpJbmRleDogV2ViS2l0L2VmbC9ld2svZXdrX21haW4uY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9lZmwvZXdrL2V3a19tYWluLmNwcAkocmV2aXNpb24gNjM3OTUpCisrKyBXZWJLaXQvZWZsL2V3 ay9ld2tfbWFpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMiw2ICsxMjIsMTEgQEAgaW50IGV3 a19pbml0KHZvaWQpCiAgICAgaWYgKDEpIHsKICAgICAgICAgU291cFNlc3Npb24qIHNlc3Npb24g PSBXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6ZGVmYXVsdFNlc3Npb24oKTsKICAgICAgICAgc291 cF9zZXNzaW9uX2FkZF9mZWF0dXJlX2J5X3R5cGUoc2Vzc2lvbiwgU09VUF9UWVBFX0NPTlRFTlRf U05JRkZFUik7CisKKyAgICAgICAgLy8gU2V0IHByb3h5IGFkZHJlc3MgYnkgaHR0cF9wcm94eSBl bnZpcm9ubWVudCB2YXJpYWJsZS4KKyAgICAgICAgV2ViQ29yZTo6U3RyaW5nIHByb3h5VXJpID0g Z2V0ZW52KCJodHRwX3Byb3h5Iik7CisgICAgICAgIGlmIChwcm94eVVyaS5sZW5ndGgoKSA+IDAp CisgICAgICAgICAgICBnX29iamVjdF9zZXQoc2Vzc2lvbiwgU09VUF9TRVNTSU9OX1BST1hZX1VS SSwgc291cF91cmlfbmV3KHByb3h5VXJpLnV0ZjgoKS5kYXRhKCkpLCBOVUxMKTsKICAgICB9CiAK ICAgICByZXR1cm4gKytfZXdrX2luaXRfY291bnQ7Cg== 62268 2010-07-22 00:42:26 -0700 2010-07-22 06:09:27 -0700 Patch patch.txt text/plain 3348 gyuyoung.kim SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2Mzg3NykKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDctMjIgIEd5dXlvdW5nIEtpbSAgPGd5dXlv dW5nLmtpbUBzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbRUZMXSBTZXQgcHJveHkgYWRkcmVzcyBmb3IgU291cAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI3MjEKKworICAgICAgICBT ZXQgcHJveHkgYWRkcmVzcyBieSBodHRwX3Byb3h5IGVudmlyb21lbnQgdmFyaWFibGUuCisKKyAg ICAgICAgKiBFV2ViTGF1bmNoZXIvbWFpbi5jOgorICAgICAgICAobWFpbik6IEludm9rZSBwcm94 eSBzZXQgbWV0aG9kLiAKKyAgICAgICAgKiBld2svZXdrX3NldHRpbmdzLmNwcDoKKyAgICAgICAg KGV3a19zZXR0aW5nc19wcm94eV91cmlfc2V0KTogU2V0IHByb3h5IGFkZHJlc3MuCisgICAgICAg ICogZXdrL2V3a19zZXR0aW5ncy5oOgorCiAyMDEwLTA3LTE2ICBMZWFuZHJvIFBlcmVpcmEgIDxs ZWFuZHJvQHByb2Z1c2lvbi5tb2JpPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEd1c3Rhdm8gTm9y b25oYSBTaWx2YS4KSW5kZXg6IFdlYktpdC9lZmwvRVdlYkxhdW5jaGVyL21haW4uYwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvZWZsL0VXZWJMYXVuY2hlci9tYWluLmMJKHJldmlzaW9uIDYzODc2KQor KysgV2ViS2l0L2VmbC9FV2ViTGF1bmNoZXIvbWFpbi5jCSh3b3JraW5nIGNvcHkpCkBAIC03NTYs NiArNzU2LDcgQEAgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgIGNoYXIgKnVybCA9 IE5VTEw7CiAgICAgY2hhciAqdXNlckFnZW50ID0gTlVMTDsKICAgICBjb25zdCBjaGFyICp0bXA7 CisgICAgY29uc3QgY2hhciAqcHJveHlVcmk7CiAgICAgY2hhciBwYXRoW1BBVEhfTUFYXTsKIAog ICAgIGNoYXIgKmVuZ2luZSA9IE5VTEw7CkBAIC04MTcsNiArODE4LDEwIEBAIG1haW4oaW50IGFy Z2MsIGNoYXIgKmFyZ3ZbXSkKICAgICBlY29yZV9maWxlX21rcGF0aChwYXRoKTsKICAgICBld2tf c2V0dGluZ3NfaWNvbl9kYXRhYmFzZV9wYXRoX3NldChwYXRoKTsKICAgICBld2tfc2V0dGluZ3Nf d2ViX2RhdGFiYXNlX3BhdGhfc2V0KHBhdGgpOworICAgIAorICAgIHByb3h5VXJpID0gZ2V0ZW52 KCJodHRwX3Byb3h5Iik7CisgICAgaWYgKHByb3h5VXJpKQorICAgICAgICBld2tfc2V0dGluZ3Nf cHJveHlfdXJpX3NldChwcm94eVVyaSk7CiAKICAgICBicm93c2VyQ3JlYXRlKHVybCwgdGhlbWUs IHVzZXJBZ2VudCwgZ2VvbWV0cnksIGVuZ2luZSwgaXNGdWxsc2NyZWVuKTsKICAgICBlY29yZV9l dmVudF9oYW5kbGVyX2FkZChFQ09SRV9FVkVOVF9TSUdOQUxfRVhJVCwgbWFpbl9zaWduYWxfZXhp dCwgJndpbmRvd3MpOwpJbmRleDogV2ViS2l0L2VmbC9ld2svZXdrX3NldHRpbmdzLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvZWZsL2V3ay9ld2tfc2V0dGluZ3MuY3BwCShyZXZpc2lvbiA2Mzg3 NikKKysrIFdlYktpdC9lZmwvZXdrL2V3a19zZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI5LDYgKzI5LDcgQEAKICNpbmNsdWRlICJJbWFnZS5oIgogI2luY2x1ZGUgIkludFNpemUuaCIK ICNpbmNsdWRlICJLVVJMLmgiCisjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRl ICJld2tfcHJpdmF0ZS5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIApAQCAtMzks NiArNDAsMTEgQEAKICNpbmNsdWRlIDxzeXMvdHlwZXMuaD4KICNpbmNsdWRlIDx1bmlzdGQuaD4K IAorI2lmZGVmIFdURl9VU0VfU09VUAorI2luY2x1ZGUgIlJlc291cmNlSGFuZGxlLmgiCisjaW5j bHVkZSA8bGlic291cC9zb3VwLmg+CisjZW5kaWYKKwogc3RhdGljIHVpbnQ2NF90IF9ld2tfZGVm YXVsdF93ZWJfZGF0YWJhc2VfcXVvdGEgPSAxICogMTAyNCAqIDEwMjQ7CiAKIC8qKgpAQCAtMjIz LDMgKzIyOSwxOCBAQCBFdmFzX09iamVjdCogZXdrX3NldHRpbmdzX2ljb25fZGF0YWJhc2VfCiAg ICAgc3VyZmFjZSA9IGljb24tPm5hdGl2ZUltYWdlRm9yQ3VycmVudEZyYW1lKCk7CiAgICAgcmV0 dXJuIGV3a191dGlsX2ltYWdlX2Zyb21fY2Fpcm9fc3VyZmFjZV9hZGQoY2FudmFzLCBzdXJmYWNl KTsKIH0KKworLyoqCisgKiBTZXRzIHByb3h5IGFkZHJlc3MuCisgKgorICogQHBhcmFtIHByb3h5 IGFkZHJlc3MuIElmIHByb3h5IGFkZHJlc3MgaXMgbnVsbCwgcHJveHkgYWRkcmVzcyBpc24ndCBz ZXQuCisgKi8KK3ZvaWQgZXdrX3NldHRpbmdzX3Byb3h5X3VyaV9zZXQoY29uc3QgY2hhciogcHJv eHkpCit7CisjaWZkZWYgV1RGX1VTRV9TT1VQCisgICAgU291cFNlc3Npb24qIHNlc3Npb24gPSBX ZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6ZGVmYXVsdFNlc3Npb24oKTsKKyAgICBnX29iamVjdF9z ZXQoc2Vzc2lvbiwgU09VUF9TRVNTSU9OX1BST1hZX1VSSSwgc291cF91cmlfbmV3KHByb3h5KSwg TlVMTCk7CisjZWxpZiBkZWZpbmVkIFdURl9VU0VfQ1VSTAorICAgIG5vdEltcGxlbWVudGVkKCk7 CisjZW5kaWYKK30KSW5kZXg6IFdlYktpdC9lZmwvZXdrL2V3a19zZXR0aW5ncy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9lZmwvZXdrL2V3a19zZXR0aW5ncy5oCShyZXZpc2lvbiA2Mzg3NikKKysr IFdlYktpdC9lZmwvZXdrL2V3a19zZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0 OCw3IEBAIEVBUEkgRWluYV9Cb29sICAgICAgICBld2tfc2V0dGluZ3NfaWNvbl8KIEVBUEkgY2Fp cm9fc3VyZmFjZV90ICpld2tfc2V0dGluZ3NfaWNvbl9kYXRhYmFzZV9pY29uX3N1cmZhY2VfZ2V0 KGNvbnN0IGNoYXIgKnVybCk7CiBFQVBJIEV2YXNfT2JqZWN0ICAgICAqZXdrX3NldHRpbmdzX2lj b25fZGF0YWJhc2VfaWNvbl9vYmplY3RfYWRkKGNvbnN0IGNoYXIgKnVybCwgRXZhcyAqY2FudmFz KTsKIAorRUFQSSB2b2lkICAgICAgICAgICAgZXdrX3NldHRpbmdzX3Byb3h5X3VyaV9zZXQoY29u c3QgY2hhciogcHJveHkpOwogCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0K 62290 2010-07-22 06:09:27 -0700 2010-07-23 07:34:41 -0700 Patch patch-proxy.txt text/plain 3260 gyuyoung.kim SW5kZXg6IFdlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvQ2hh bmdlTG9nCShyZXZpc2lvbiA2Mzg4MykKKysrIFdlYktpdC9lZmwvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDctMjIgIEd5dXlvdW5nIEtpbSAgPGd5dXlv dW5nLmtpbUBzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbRUZMXSBTZXQgcHJveHkgYWRkcmVzcyBmb3IgU291cAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI3MjEKKworICAgICAgICBT ZXRzIHRoZSBnaXZlbiBwcm94eSBVUkkgZm9yIGxpYnNvdXAgbmV0d29yayBiYWNrZW5kLiBUaGlz IG1ldGhvZCB3aWxsCisgICAgICAgIHN1cHBvcnQgbGliY3VybCBuZXR3b3JrIGJhY2tlbmQgbGF0 ZXIuCisKKyAgICAgICAgKiBFV2ViTGF1bmNoZXIvbWFpbi5jOgorICAgICAgICAobWFpbik6IElu dm9rZSBwcm94eSBzZXQgbWV0aG9kCisgICAgICAgICogZXdrL2V3a19zZXR0aW5ncy5jcHA6Cisg ICAgICAgIChld2tfc2V0dGluZ3NfcHJveHlfdXJpX3NldCk6IFNldHMgcHJveHkgVVJJLgorICAg ICAgICAqIGV3ay9ld2tfc2V0dGluZ3MuaDoKKwogMjAxMC0wNy0xNiAgTGVhbmRybyBQZXJlaXJh ICA8bGVhbmRyb0Bwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHdXN0YXZv IE5vcm9uaGEgU2lsdmEuCkluZGV4OiBXZWJLaXQvZWZsL0VXZWJMYXVuY2hlci9tYWluLmMKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L2VmbC9FV2ViTGF1bmNoZXIvbWFpbi5jCShyZXZpc2lvbiA2Mzg4 MSkKKysrIFdlYktpdC9lZmwvRVdlYkxhdW5jaGVyL21haW4uYwkod29ya2luZyBjb3B5KQpAQCAt NzU2LDYgKzc1Niw3IEBAIG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAgICBjaGFyICp1 cmwgPSBOVUxMOwogICAgIGNoYXIgKnVzZXJBZ2VudCA9IE5VTEw7CiAgICAgY29uc3QgY2hhciAq dG1wOworICAgIGNvbnN0IGNoYXIgKnByb3h5VXJpOwogICAgIGNoYXIgcGF0aFtQQVRIX01BWF07 CiAKICAgICBjaGFyICplbmdpbmUgPSBOVUxMOwpAQCAtODE4LDYgKzgxOSwxMCBAQCBtYWluKGlu dCBhcmdjLCBjaGFyICphcmd2W10pCiAgICAgZXdrX3NldHRpbmdzX2ljb25fZGF0YWJhc2VfcGF0 aF9zZXQocGF0aCk7CiAgICAgZXdrX3NldHRpbmdzX3dlYl9kYXRhYmFzZV9wYXRoX3NldChwYXRo KTsKIAorICAgIHByb3h5VXJpID0gZ2V0ZW52KCJodHRwX3Byb3h5Iik7CisgICAgaWYgKHByb3h5 VXJpKQorICAgICAgICBld2tfc2V0dGluZ3NfcHJveHlfdXJpX3NldChwcm94eVVyaSk7CisKICAg ICBicm93c2VyQ3JlYXRlKHVybCwgdGhlbWUsIHVzZXJBZ2VudCwgZ2VvbWV0cnksIGVuZ2luZSwg aXNGdWxsc2NyZWVuKTsKICAgICBlY29yZV9ldmVudF9oYW5kbGVyX2FkZChFQ09SRV9FVkVOVF9T SUdOQUxfRVhJVCwgbWFpbl9zaWduYWxfZXhpdCwgJndpbmRvd3MpOwogCkluZGV4OiBXZWJLaXQv ZWZsL2V3ay9ld2tfc2V0dGluZ3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvZXdrL2V3 a19zZXR0aW5ncy5jcHAJKHJldmlzaW9uIDYzODgxKQorKysgV2ViS2l0L2VmbC9ld2svZXdrX3Nl dHRpbmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzksNiArMzksMTEgQEAKICNpbmNsdWRlIDxz eXMvdHlwZXMuaD4KICNpbmNsdWRlIDx1bmlzdGQuaD4KIAorI2lmIFVTRShTT1VQKQorI2luY2x1 ZGUgIlJlc291cmNlSGFuZGxlLmgiCisjaW5jbHVkZSA8bGlic291cC9zb3VwLmg+CisjZW5kaWYK Kwogc3RhdGljIHVpbnQ2NF90IF9ld2tfZGVmYXVsdF93ZWJfZGF0YWJhc2VfcXVvdGEgPSAxICog MTAyNCAqIDEwMjQ7CiAKIC8qKgpAQCAtMjIzLDMgKzIyOCwyMiBAQCBFdmFzX09iamVjdCogZXdr X3NldHRpbmdzX2ljb25fZGF0YWJhc2VfCiAgICAgc3VyZmFjZSA9IGljb24tPm5hdGl2ZUltYWdl Rm9yQ3VycmVudEZyYW1lKCk7CiAgICAgcmV0dXJuIGV3a191dGlsX2ltYWdlX2Zyb21fY2Fpcm9f c3VyZmFjZV9hZGQoY2FudmFzLCBzdXJmYWNlKTsKIH0KKworLyoqCisgKiBTZXRzIHRoZSBnaXZl biBwcm94eSBVUkkgdG8gbmV0d29yayBiYWNrZW5kLgorICoKKyAqIEBwYXJhbSBwcm94eSBVUkku CisgKi8KK3ZvaWQgZXdrX3NldHRpbmdzX3Byb3h5X3VyaV9zZXQoY29uc3QgY2hhciogcHJveHkp Cit7CisjaWYgVVNFKFNPVVApCisgICAgU291cFVSSSogdXJpID0gc291cF91cmlfbmV3KHByb3h5 KTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTih1cmkpOworCisgICAgU291cFNlc3Np b24qIHNlc3Npb24gPSBXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6ZGVmYXVsdFNlc3Npb24oKTsK KyAgICBnX29iamVjdF9zZXQoc2Vzc2lvbiwgU09VUF9TRVNTSU9OX1BST1hZX1VSSSwgdXJpLCBO VUxMKTsKKyAgICBzb3VwX3VyaV9mcmVlKHVyaSk7CisjZWxpZiBVU0UoQ1VSTCkKKyAgICBFSU5B X1NBRkVUWV9PTl9UUlVFX1JFVFVSTigxKTsKKyNlbmRpZgorfQpJbmRleDogV2ViS2l0L2VmbC9l d2svZXdrX3NldHRpbmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2VmbC9ld2svZXdrX3NldHRp bmdzLmgJKHJldmlzaW9uIDYzODgxKQorKysgV2ViS2l0L2VmbC9ld2svZXdrX3NldHRpbmdzLmgJ KHdvcmtpbmcgY29weSkKQEAgLTQ4LDYgKzQ4LDcgQEAgRUFQSSBFaW5hX0Jvb2wgICAgICAgIGV3 a19zZXR0aW5nc19pY29uXwogRUFQSSBjYWlyb19zdXJmYWNlX3QgKmV3a19zZXR0aW5nc19pY29u X2RhdGFiYXNlX2ljb25fc3VyZmFjZV9nZXQoY29uc3QgY2hhciAqdXJsKTsKIEVBUEkgRXZhc19P YmplY3QgICAgICpld2tfc2V0dGluZ3NfaWNvbl9kYXRhYmFzZV9pY29uX29iamVjdF9hZGQoY29u c3QgY2hhciAqdXJsLCBFdmFzICpjYW52YXMpOwogCitFQVBJIHZvaWQgICAgICAgICAgICBld2tf c2V0dGluZ3NfcHJveHlfdXJpX3NldChjb25zdCBjaGFyKiBwcm94eSk7CiAKICNpZmRlZiBfX2Nw bHVzcGx1cwogfQo=