156966 2016-04-24 18:39:45 -0700 [GTK] Use 'http_proxy' environment variable behind proxy circumstance 2019-04-30 08:01:22 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID https://bugs.webkit.org/show_bug.cgi?id=128764 https://bugs.webkit.org/show_bug.cgi?id=128674 P2 Normal --- 1 jh718.park jh718.park berto bugs-noreply cgarcia clopez commit-queue danw gustavo mcatanzaro mrobinson oldest_to_newest 1186819 0 jh718.park 2016-04-24 18:39:45 -0700 When using GTK Minibrowser behind proxy environment, use 'http_proxy' environment variable not to be blocked. 1186820 1 277210 jh718.park 2016-04-24 18:43:02 -0700 Created attachment 277210 Use http_proxy behind proxy wall 1186874 2 277210 cgarcia 2016-04-25 00:02:52 -0700 Comment on attachment 277210 Use http_proxy behind proxy wall View in context: https://bugs.webkit.org/attachment.cgi?id=277210&action=review I think we don't this because the gnome proxy resolver already does this for us. I guess this doesn't work in non gnome environments, maybe we should try to detect that or something. > Source/WebCore/platform/network/soup/SoupNetworkSession.cpp:232 > -#if PLATFORM(EFL) > +#if PLATFORM(EFL) || PLATFORM(GTK) If we do this, we should just remove the ifdefs > Source/WebCore/platform/network/soup/SoupNetworkSession.cpp:233 > // Only for EFL because GTK port uses the default resolver, which uses GIO's proxy resolver. And this comment would not make sense anymore. 1186890 3 277236 jh718.park 2016-04-25 02:18:37 -0700 Created attachment 277236 Remove unneeded PLATFORM ifdefs and annotation 1186902 4 clopez 2016-04-25 04:33:22 -0700 (In reply to comment #2) > I think we don't this because the gnome proxy resolver already does this for > us. I guess this doesn't work in non gnome environments, maybe we should try > to detect that or something. This feature has been requested on the past, see for example bug 128674 I think we should have our own way (be it via en environment variable or via new API) to set the proxy settings. IMHO WebKitGTK+ should not rely on GNOME for working, or have less features outside of a GNOME environment. Personally I find interesting the environment variable way as it allows to change the settings at runtime easily for any WebKitGTK+ application (even if the author of such application didn't thought about using a proxy). The environment variable http_proxy is somehow standard and is honored by several utilities like wget or curl. So is expected that this variable is already set to the right value on any machine that access Internet via a proxy. On the other hand I also see adding new API to set this setting interesting for anyone that wants to control the proxy settings directly on its own application. So maybe we can have the 3 ways of setting a proxy? My doubt is which one(s) should have preference in case of more than one being defined. 1186906 5 277236 jh718.park 2016-04-25 05:06:06 -0700 Comment on attachment 277236 Remove unneeded PLATFORM ifdefs and annotation Overall comments 1186907 6 jh718.park 2016-04-25 05:23:09 -0700 (In reply to comment #4) > (In reply to comment #2) > > I think we don't this because the gnome proxy resolver already does this for > > us. I guess this doesn't work in non gnome environments, maybe we should try > > to detect that or something. > > This feature has been requested on the past, see for example bug 128674 > > I think we should have our own way (be it via en environment variable or via > new API) to set the proxy settings. IMHO WebKitGTK+ should not rely on GNOME > for working, or have less features outside of a GNOME environment. > > Personally I find interesting the environment variable way as it allows to > change the settings at runtime easily for any WebKitGTK+ application (even > if the author of such application didn't thought about using a proxy). > > The environment variable http_proxy is somehow standard and is honored by > several utilities like wget or curl. So is expected that this variable is > already set to the right value on any machine that access Internet via a > proxy. > > On the other hand I also see adding new API to set this setting interesting > for anyone that wants to control the proxy settings directly on its own > application. > > So maybe we can have the 3 ways of setting a proxy? My doubt is which one(s) > should have preference in case of more than one being defined. I agree with both of you. It seems that more independent way would be good rather than using GNOME API here. 1186918 7 mcatanzaro 2016-04-25 06:50:03 -0700 The problem with this patch is that it unconditionally replaces the default GProxyResolver with a GSimpleProxyResolver. This is going to break all proxy settings for anyone not using the env variables, or for anybody using a custom setup with a homebrewed GProxyResolver. (Note this is a Gio extension point; you can inject your own GProxyResolver at runtime with a shared object to be dlopened.) So this needs to be done only conditionally, if the default GProxyResolver is somehow unsuitable. But I'm not quite sure what that condition is, or why this is necessary. As far as I can tell, when using glib-networking (I presume you're using glib-networking), then GLibProxyResolver will be used by default outside of GNOME and Ubuntu, otherwise GProxyResolverGnome will be used. But GLibProxyResolver gets proxy settings from libproxy. I would think libproxy would be smart enough to check these env variables? I wonder, what type of GProxyResolver are you actually getting? (In reply to comment #4) > I think we should have our own way (be it via en environment variable or via > new API) to set the proxy settings. IMHO WebKitGTK+ should not rely on GNOME > for working, or have less features outside of a GNOME environment. Agreed, but we need to understand why it's currently not working. > On the other hand I also see adding new API to set this setting interesting > for anyone that wants to control the proxy settings directly on its own > application. Agreed. In the case the application uses such API, then it would always make sense to overwrite the default GProxyResolver with a GSimpleProxyResolver. But this is a separate issue, not something to be resolved in this bug. > So maybe we can have the 3 ways of setting a proxy? My doubt is which one(s) > should have preference in case of more than one being defined. Well the API should take precedence over anything else. 1186941 8 jh718.park 2016-04-25 08:44:03 -0700 (In reply to comment #7) > The problem with this patch is that it unconditionally replaces the default > GProxyResolver with a GSimpleProxyResolver. This is going to break all proxy > settings for anyone not using the env variables, or for anybody using a > custom setup with a homebrewed GProxyResolver. (Note this is a Gio extension > point; you can inject your own GProxyResolver at runtime with a shared > object to be dlopened.) So this needs to be done only conditionally, if the > default GProxyResolver is somehow unsuitable. > In my case, I'm using Ubuntu 15.10, and without this patch gtk minibrowser cannot access to Internet for now. Maybe I have to take a look which condition could be put in here. > But I'm not quite sure what that condition is, or why this is necessary. As > far as I can tell, when using glib-networking (I presume you're using > glib-networking), then GLibProxyResolver will be used by default outside of > GNOME and Ubuntu, otherwise GProxyResolverGnome will be used. But > GLibProxyResolver gets proxy settings from libproxy. I would think libproxy > would be smart enough to check these env variables? I wonder, what type of > GProxyResolver are you actually getting? > FYI, when I looked into the libproxy source in here, https://github.com/libproxy/libproxy/blob/master/libproxy/modules/config_envvar.cpp I found libproxy is smart enough to figure out what value the environment variable holds. And Ubuntu uses glib-networking, and it uses GproxyResolver as you said, so I think that's the actually one I got. > (In reply to comment #4) > > I think we should have our own way (be it via en environment variable or via > > new API) to set the proxy settings. IMHO WebKitGTK+ should not rely on GNOME > > for working, or have less features outside of a GNOME environment. > > Agreed, but we need to understand why it's currently not working. > That's the point. It would be good to know why it is not working with proxy env in Ubuntu 15.10 in my case. > > On the other hand I also see adding new API to set this setting interesting > > for anyone that wants to control the proxy settings directly on its own > > application. > > Agreed. In the case the application uses such API, then it would always make > sense to overwrite the default GProxyResolver with a GSimpleProxyResolver. > But this is a separate issue, not something to be resolved in this bug. > > > So maybe we can have the 3 ways of setting a proxy? My doubt is which one(s) > > should have preference in case of more than one being defined. > > Well the API should take precedence over anything else. 277210 2016-04-24 18:43:02 -0700 2016-04-25 02:18:29 -0700 Use http_proxy behind proxy wall bug-156966-20160425104327.patch text/plain 3883 jh718.park U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5OTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmM2MmM3NTdkMDFkZmFl ZWZhN2M5NzM4MThmYmMyNjM2NDQ4NmU1Yy4uOTg2NWQ4MTdlMDVjZTBmZDUzN2FlMDMxMDJkOTMx YTg2NDMxZDA0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE2LTA0LTI0ICBKb29u Z2h1biBQYXJrICA8amg3MTgucGFya0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbR1RLXSBVc2Ug J2h0dHBfcHJveHknIGVudmlyb25tZW50IHZhcmlhYmxlIGJlaGluZCBwcm94eSBjaXJjdW1zdGFu Y2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Njk2 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9zb3VwL1NvdXBOZXR3b3JrU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTb3VwTmV0d29ya1Nlc3Npb246OnNldEhUVFBQcm94eSk6CisgICAgICAgIChXZWJDb3Jl OjpTb3VwTmV0d29ya1Nlc3Npb246OnNldHVwSFRUUFByb3h5RnJvbUVudmlyb25tZW50KToKKwog MjAxNi0wNC0yNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEF1 dG9nZW5lcmF0ZWQgSURCRmFjdG9yeS5vcGVuKCkgZG9lcyB0aGUgd3JvbmcgdGhpbmcgaWYgeW91 IHBhc3MgYW4gZXhwbGljaXQgJ3VuZGVmaW5lZCcgYXMgdGhlIHNlY29uZCBhcmd1bWVudApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCmluZGV4IDhlMGU2ZTdkYmVhZGFiYTE3MTc0MjgwZmRjZjMwYWRmZDAzYWE3YjguLmRhYWQw YTQ1YTEzZDQ4NzgyOTgyYjAyYjQwNmY4OWY0NTIxZjA5MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMyBAQAorMjAxNi0wNC0yNCAgSm9vbmdodW4gUGFyayAgPGpoNzE4LnBhcmtAc2Ftc3VuZy5j b20+CisKKyAgICAgICAgW0dUS10gVXNlICdodHRwX3Byb3h5JyBlbnZpcm9ubWVudCB2YXJpYWJs ZSBiZWhpbmQgcHJveHkgY2lyY3Vtc3RhbmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTY5NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2d0ay9OZXR3b3JrUHJvY2Vzc01h aW5HdGsuY3BwOgorICAgICAgICAqIFdlYlByb2Nlc3MvZ3RrL1dlYlByb2Nlc3NNYWluR3RrLmNw cDoKKwogMjAxNi0wNC0yMyAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAg ICAgRml4IGlzc3VlcyBmb3VuZCBieSB0aGUgY2xhbmcgc3RhdGljIGFuYWx5emVyCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvU291cE5ldHdvcmtTZXNz aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb3VwTmV0d29y a1Nlc3Npb24uY3BwCmluZGV4IDc2ODY1NzhhMjk4MjU2MTkxYTMwMGExMWExNzhiZDM4YmZiYjAz YWQuLmI3ZGQxMWFjNzhjNDQwYTQ5MmVmZjI4MGI2NjMyYjI2ODZlMzg4ZjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb3VwTmV0d29ya1Nlc3Npb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb3VwTmV0d29y a1Nlc3Npb24uY3BwCkBAIC0yMjksNyArMjI5LDcgQEAgU291cE5ldHdvcmtTZXNzaW9uOjpTU0xQ b2xpY3kgU291cE5ldHdvcmtTZXNzaW9uOjpzc2xQb2xpY3koKSBjb25zdAogCiB2b2lkIFNvdXBO ZXR3b3JrU2Vzc2lvbjo6c2V0SFRUUFByb3h5KGNvbnN0IGNoYXIqIGh0dHBQcm94eSwgY29uc3Qg Y2hhciogaHR0cFByb3h5RXhjZXB0aW9ucykKIHsKLSNpZiBQTEFURk9STShFRkwpCisjaWYgUExB VEZPUk0oRUZMKSB8fCBQTEFURk9STShHVEspCiAgICAgLy8gT25seSBmb3IgRUZMIGJlY2F1c2Ug R1RLIHBvcnQgdXNlcyB0aGUgZGVmYXVsdCByZXNvbHZlciwgd2hpY2ggdXNlcyBHSU8ncyBwcm94 eSByZXNvbHZlci4KICAgICBHUHJveHlSZXNvbHZlciogcmVzb2x2ZXIgPSBudWxscHRyOwogICAg IGlmIChodHRwUHJveHkpIHsKQEAgLTI1MSw3ICsyNTEsNyBAQCB2b2lkIFNvdXBOZXR3b3JrU2Vz c2lvbjo6c2V0SFRUUFByb3h5KGNvbnN0IGNoYXIqIGh0dHBQcm94eSwgY29uc3QgY2hhciogaHR0 cFBybwogCiB2b2lkIFNvdXBOZXR3b3JrU2Vzc2lvbjo6c2V0dXBIVFRQUHJveHlGcm9tRW52aXJv bm1lbnQoKQogewotI2lmIFBMQVRGT1JNKEVGTCkKKyNpZiBQTEFURk9STShFRkwpIHx8IFBMQVRG T1JNKEdUSykKICAgICBjb25zdCBjaGFyKiBodHRwUHJveHkgPSBnZXRlbnYoImh0dHBfcHJveHki KTsKICAgICBpZiAoIWh0dHBQcm94eSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvZ3RrL05ldHdvcmtQcm9jZXNzTWFpbkd0ay5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9ndGsvTmV0d29ya1Byb2Nlc3NNYWluR3Rr LmNwcAppbmRleCA1NWI5Y2NmOTM5ZTNjY2RhZmU5ODk2OTQ2Nzc1Nzg3Njc5MThmNjYxLi5jNWM3 OWQ0OGQ0YzAxMTQxMTQ3YjJkM2UzMTA4NTY5YmYxN2RlOGYyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9ndGsvTmV0d29ya1Byb2Nlc3NNYWluR3RrLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9ndGsvTmV0d29ya1Byb2Nlc3NNYWluR3Rr LmNwcApAQCAtNDEsNiArNDEsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBwbGF0Zm9ybUluaXRpYWxp emUoKSBvdmVycmlkZQogICAgIHsKICAgICAgICAgU291cE5ldHdvcmtTZXNzaW9uOjpkZWZhdWx0 U2Vzc2lvbigpLnNldFNTTFBvbGljeShTb3VwTmV0d29ya1Nlc3Npb246OlNTTFVzZVN5c3RlbUNB RmlsZSk7CisgICAgICAgIFNvdXBOZXR3b3JrU2Vzc2lvbjo6ZGVmYXVsdFNlc3Npb24oKS5zZXR1 cEhUVFBQcm94eUZyb21FbnZpcm9ubWVudCgpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9 CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9ndGsvV2ViUHJvY2Vz c01haW5HdGsuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9ndGsvV2ViUHJvY2Vzc01h aW5HdGsuY3BwCmluZGV4IDg5NzU0OTg2Y2ZkYTE3OWQ0ODYyYjdmYzU4M2JiYTM2NzhlNjI1NzMu LmFjNThkZWJjNGUyNWMwZDI1NmRlYWFkMTVmZDNkMWYzYTBjZDM2MDcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvZ3RrL1dlYlByb2Nlc3NNYWluR3RrLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9XZWJQcm9jZXNzTWFpbkd0ay5jcHAKQEAgLTYx LDYgKzYxLDcgQEAgcHVibGljOgogICAgICAgICBiaW5kX3RleHRkb21haW5fY29kZXNldChHRVRU RVhUX1BBQ0tBR0UsICJVVEYtOCIpOwogCiAgICAgICAgIFNvdXBOZXR3b3JrU2Vzc2lvbjo6ZGVm YXVsdFNlc3Npb24oKS5zZXRTU0xQb2xpY3koU291cE5ldHdvcmtTZXNzaW9uOjpTU0xVc2VTeXN0 ZW1DQUZpbGUpOworICAgICAgICBTb3VwTmV0d29ya1Nlc3Npb246OmRlZmF1bHRTZXNzaW9uKCku c2V0dXBIVFRQUHJveHlGcm9tRW52aXJvbm1lbnQoKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgfQogCg== 277236 2016-04-25 02:18:37 -0700 2016-04-25 05:06:06 -0700 Remove unneeded PLATFORM ifdefs and annotation bug-156966-20160425181902.patch text/plain 4172 jh718.park U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5OTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjRkNzdjZjI0M2I5OTMz YmQ0MGRjMzIyMjhiZTAyOWZlODE2YzQxZC4uYTBmMTk0ZjJiNzY5YzQ2NmIxOTUyYzMzYzgwM2M2 NWI5MjkyM2QxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE2LTA0LTI1ICBKb29u Z2h1biBQYXJrICA8amg3MTgucGFya0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbR1RLXSBVc2Ug J2h0dHBfcHJveHknIGVudmlyb25tZW50IHZhcmlhYmxlIGJlaGluZCBwcm94eSBjaXJjdW1zdGFu Y2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Njk2 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9zb3VwL1NvdXBOZXR3b3JrU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTb3VwTmV0d29ya1Nlc3Npb246OnNldEhUVFBQcm94eSk6CisgICAgICAgIChXZWJDb3Jl OjpTb3VwTmV0d29ya1Nlc3Npb246OnNldHVwSFRUUFByb3h5RnJvbUVudmlyb25tZW50KToKKwog MjAxNi0wNC0yNSAgRnJlZGVyaWMgV2FuZyAgPGZ3YW5nQGlnYWxpYS5jb20+CiAKICAgICAgICAg TWlub3IgcmVmYWN0b3JpbmcgaW4gUmVuZGVyTWF0aE1MT3BlcmF0b3IKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA5 YTE1MDE0N2Q3MWQ0ZDRmNTMzMTM0NzVhMzg4NzIwOWIzMzRmZjFiLi4xZTY2Yjk0ZWExZTRlY2Jm ZDk2NGM1MWE5OWI2NGI2MTkxZTA1OTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTYtMDQtMjUgIEpvb25naHVuIFBhcmsgIDxqaDcxOC5wYXJrQHNhbXN1bmcuY29tPgorCisgICAg ICAgIFtHVEtdIFVzZSAnaHR0cF9wcm94eScgZW52aXJvbm1lbnQgdmFyaWFibGUgYmVoaW5kIHBy b3h5IGNpcmN1bXN0YW5jZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTU2OTY2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9ndGsvTmV0d29ya1Byb2Nlc3NNYWluR3RrLmNwcDoK KyAgICAgICAgKiBXZWJQcm9jZXNzL2d0ay9XZWJQcm9jZXNzTWFpbkd0ay5jcHA6CisKIDIwMTYt MDQtMjQgIEh1bnNlb3AgSmVvbmcgIDxoczg1Lmplb25nQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFtFRkxdIFVwZGF0ZSB0aGUgZXdrX3NldHRpbmdzX29mZmxpbmVfd2ViX2FwcGxpY2F0aW9uX2Nh Y2hlX2VuYWJsZWRfZ2V0KCkgZXhwZWN0ZWQgdmFsdWUgYWZ0ZXIgcjE5OTg1NC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb3VwTmV0d29ya1Nlc3Np b24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvdXBOZXR3b3Jr U2Vzc2lvbi5jcHAKaW5kZXggNzY4NjU3OGEyOTgyNTYxOTFhMzAwYTExYTE3OGJkMzhiZmJiMDNh ZC4uNzUxZjhkYzg4NzE4MjRlN2I1YTNiMzdkOGZiNjEyMWQyNTczMjYzNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvdXBOZXR3b3JrU2Vzc2lvbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvdXBOZXR3b3Jr U2Vzc2lvbi5jcHAKQEAgLTIyOSw4ICsyMjksNiBAQCBTb3VwTmV0d29ya1Nlc3Npb246OlNTTFBv bGljeSBTb3VwTmV0d29ya1Nlc3Npb246OnNzbFBvbGljeSgpIGNvbnN0CiAKIHZvaWQgU291cE5l dHdvcmtTZXNzaW9uOjpzZXRIVFRQUHJveHkoY29uc3QgY2hhciogaHR0cFByb3h5LCBjb25zdCBj aGFyKiBodHRwUHJveHlFeGNlcHRpb25zKQogewotI2lmIFBMQVRGT1JNKEVGTCkKLSAgICAvLyBP bmx5IGZvciBFRkwgYmVjYXVzZSBHVEsgcG9ydCB1c2VzIHRoZSBkZWZhdWx0IHJlc29sdmVyLCB3 aGljaCB1c2VzIEdJTydzIHByb3h5IHJlc29sdmVyLgogICAgIEdQcm94eVJlc29sdmVyKiByZXNv bHZlciA9IG51bGxwdHI7CiAgICAgaWYgKGh0dHBQcm94eSkgewogICAgICAgICBnY2hhcioqIGln bm9yZUxpc3RzID0gbnVsbHB0cjsKQEAgLTI0MywyMSArMjQxLDE1IEBAIHZvaWQgU291cE5ldHdv cmtTZXNzaW9uOjpzZXRIVFRQUHJveHkoY29uc3QgY2hhciogaHR0cFByb3h5LCBjb25zdCBjaGFy KiBodHRwUHJvCiAgICAgfQogCiAgICAgZ19vYmplY3Rfc2V0KG1fc291cFNlc3Npb24uZ2V0KCks IFNPVVBfU0VTU0lPTl9QUk9YWV9SRVNPTFZFUiwgcmVzb2x2ZXIsIG51bGxwdHIpOwotI2Vsc2UK LSAgICBVTlVTRURfUEFSQU0oaHR0cFByb3h5KTsKLSAgICBVTlVTRURfUEFSQU0oaHR0cFByb3h5 RXhjZXB0aW9ucyk7Ci0jZW5kaWYKIH0KIAogdm9pZCBTb3VwTmV0d29ya1Nlc3Npb246OnNldHVw SFRUUFByb3h5RnJvbUVudmlyb25tZW50KCkKIHsKLSNpZiBQTEFURk9STShFRkwpCiAgICAgY29u c3QgY2hhciogaHR0cFByb3h5ID0gZ2V0ZW52KCJodHRwX3Byb3h5Iik7CiAgICAgaWYgKCFodHRw UHJveHkpCiAgICAgICAgIHJldHVybjsKIAogICAgIHNldEhUVFBQcm94eShodHRwUHJveHksIGdl dGVudigibm9fcHJveHkiKSk7Ci0jZW5kaWYKIH0KIAogc3RhdGljIENTdHJpbmcgYnVpbGRBY2Nl cHRMYW5ndWFnZXMoY29uc3QgVmVjdG9yPFN0cmluZz4mIGxhbmd1YWdlcykKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2d0ay9OZXR3b3JrUHJvY2Vzc01haW5HdGsu Y3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvZ3RrL05ldHdvcmtQcm9jZXNzTWFp bkd0ay5jcHAKaW5kZXggNTViOWNjZjkzOWUzY2NkYWZlOTg5Njk0Njc3NTc4NzY3OTE4ZjY2MS4u YzVjNzlkNDhkNGMwMTE0MTE0N2IyZDNlMzEwODU2OWJmMTdkZThmMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvZ3RrL05ldHdvcmtQcm9jZXNzTWFpbkd0ay5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvZ3RrL05ldHdvcmtQcm9jZXNzTWFp bkd0ay5jcHAKQEAgLTQxLDYgKzQxLDcgQEAgcHVibGljOgogICAgIGJvb2wgcGxhdGZvcm1Jbml0 aWFsaXplKCkgb3ZlcnJpZGUKICAgICB7CiAgICAgICAgIFNvdXBOZXR3b3JrU2Vzc2lvbjo6ZGVm YXVsdFNlc3Npb24oKS5zZXRTU0xQb2xpY3koU291cE5ldHdvcmtTZXNzaW9uOjpTU0xVc2VTeXN0 ZW1DQUZpbGUpOworICAgICAgICBTb3VwTmV0d29ya1Nlc3Npb246OmRlZmF1bHRTZXNzaW9uKCku c2V0dXBIVFRQUHJveHlGcm9tRW52aXJvbm1lbnQoKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvZ3RrL1dlYlBy b2Nlc3NNYWluR3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvZ3RrL1dlYlByb2Nl c3NNYWluR3RrLmNwcAppbmRleCA4OTc1NDk4NmNmZGExNzlkNDg2MmI3ZmM1ODNiYmEzNjc4ZTYy NTczLi5hYzU4ZGViYzRlMjVjMGQyNTZkZWFhZDE1ZmQzZDFmM2EwY2QzNjA3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9XZWJQcm9jZXNzTWFpbkd0ay5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9ndGsvV2ViUHJvY2Vzc01haW5HdGsuY3BwCkBA IC02MSw2ICs2MSw3IEBAIHB1YmxpYzoKICAgICAgICAgYmluZF90ZXh0ZG9tYWluX2NvZGVzZXQo R0VUVEVYVF9QQUNLQUdFLCAiVVRGLTgiKTsKIAogICAgICAgICBTb3VwTmV0d29ya1Nlc3Npb246 OmRlZmF1bHRTZXNzaW9uKCkuc2V0U1NMUG9saWN5KFNvdXBOZXR3b3JrU2Vzc2lvbjo6U1NMVXNl U3lzdGVtQ0FGaWxlKTsKKyAgICAgICAgU291cE5ldHdvcmtTZXNzaW9uOjpkZWZhdWx0U2Vzc2lv bigpLnNldHVwSFRUUFByb3h5RnJvbUVudmlyb25tZW50KCk7CiAgICAgICAgIHJldHVybiB0cnVl OwogICAgIH0KIAo=