18832 2008-05-01 13:17:38 -0700 [curl] file upload does not work 2008-10-03 21:24:42 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Curl, Gtk P2 Normal --- 1 a.renevier marco.barisione ahya365 jchaffraix marco.barisione mike.emmel oldest_to_newest 79380 0 a.renevier 2008-05-01 13:17:38 -0700 Hi, I'm compiled gtk-webkit with curl backend on a debian unstable. 79385 1 a.renevier 2008-05-01 13:32:59 -0700 Hi, I'm compiled gtk-webkit with curl backend on a debian unstable, and file upload does not work. In send a negative Content-Length header to the server. For example, "Content-Length: -5191020756686863821" (with a file of 369 bytes). Then, I usually get a message error from the server. I think that's because libcurl is build with large file support (making sizeof(curl_off_t) equal to 8), while webkit is not (making sizeof(curl_off_t) equal to 4). So, in libcurl (lib/http.c): #if SIZEOF_CURL_OFF_T > 4 #define FORMAT_OFF_T "lld" #else #define FORMAT_OFF_T "ld" #endif [...] result = add_bufferf(req_buffer, "Content-Length: %" FORMAT_OFF_T "\r\n", http->postsize); outputs a negative value. In WebCore/platform/network/curl/ResourceHandleManager.cpp, if I use, in function ResourceHandleManager::setupPOST: curl_easy_setopt(d->m_handle, CURLOPT_POSTFIELDSIZE, size); instead of curl_easy_setopt(d->m_handle, CURLOPT_POSTFIELDSIZE_LARGE, size) Content-Length header is correct, and file upload works. I tried to add AC_SYS_LARGEFILE in configure.ac, but it seems to create aconfig.h which is not sourced by WebCore/platform/network/curl/ResourceHandleManager.cpp For testing purpose, I have tried to put #define _FILE_OFFSET_BITS 64 at the very top of WebCore/platform/network/curl/ResourceHandleManager.cpp and it fixes the bug. 88821 2 marco.barisione 2008-08-19 10:12:28 -0700 Definining _FILE_OFFSET_BITS is not enough as CURL could be compiled without large files support even if it's available on your system, so you would get the opposite problem: passing a 64-bit integer when curl is expecting a 32-bit integer. IMO this is a problem in the CURL API but we can workaround it checking at run-time for large file support and passing a different type based on the check. I will write a patch in the next days. 89105 3 jchaffraix 2008-08-22 07:46:06 -0700 > IMO this is a problem in the CURL API but we can workaround it checking at > run-time for large file support and passing a different type based on the > check. I am not sure it is the right thing to do. What you want is to have the same size for curl_off_t in WebKit and in libcURL. It could be done by checking for LFS in libcURL at compile time and enable it in WebKit too (including aconfig.h if necessary). I have tried something along that path that I could post here if you want to try it. As you said, it is an issue with libcurl but it is currently been tackled [1] and the next release should provide a specific header which should solve this problem and avoid a work-around. [1] http://curl.haxx.se/lxr/source/TODO-RELEASE 89108 4 marco.barisione 2008-08-22 07:56:42 -0700 (In reply to comment #3) > I am not sure it is the right thing to do. What you want is to have the same > size for curl_off_t in WebKit and in libcURL. It could be done by checking for > LFS in libcURL at compile time and enable it in WebKit too (including aconfig.h > if necessary). I have tried something along that path that I could post here if > you want to try it. What happens if your distro is using a curl library without large file support when you compile WebKit and that it switches to one with LFS? aconfig.h should be included by config.h (see bug #20380) but for now we can include it directly if needed. 89113 5 jchaffraix 2008-08-22 08:52:20 -0700 > What happens if your distro is using a curl library without large file support > when you compile WebKit and that it switches to one with LFS? Indeed, we may have this problem again. I was thinking of adding a runtime assertion to detect that kind of (corner?) case but it would not show up for release build and would have a hard time finding the cause. The runtime check for LFS seems to be the way to go for this use case. However the issue here is that curl_off_t does not have the right size because WebKit did not enable LFS when libcURL did. This is why I proposed the compile time check (and later use the new header). Your runtime solution will not detect that as the problem is at compile time. > aconfig.h should be included by config.h (see bug #20380) but for now we can > include it directly if needed. Nice idea. 92547 6 marco.barisione 2008-09-24 10:12:02 -0700 Mike, what do you think about this? 92548 7 mike.emmel 2008-09-24 10:19:28 -0700 (In reply to comment #6) > Mike, what do you think about this? > I think it should be handled in curl itself. But the best fix is probably to static link the right version of curl instead of depending on the shared library. So at the minimum a static link option for curl should be added that should clear this up. 92699 8 marco.barisione 2008-09-25 03:58:45 -0700 (In reply to comment #7) > But the best fix is probably to static link the right version of curl instead > of depending on the shared library. So at the minimum a static link option for > curl should be added that should clear this up. Distros would hate us for that. Why not a dynamic check as the solution for this and then also add AC_SYS_LARGEFILE so also other parts of WebKit GTK can benefit from this? 92732 9 mike.emmel 2008-09-25 09:24:53 -0700 (In reply to comment #8) > (In reply to comment #7) > > But the best fix is probably to static link the right version of curl instead > > of depending on the shared library. So at the minimum a static link option for > > curl should be added that should clear this up. > > Distros would hate us for that. Why not a dynamic check as the solution for > this and then also add AC_SYS_LARGEFILE so also other parts of WebKit GTK can > benefit from this? > I just suggested it should be and option so we can opt to use the features of the latest version of curl before it gets into distros. Curl itself could use a bit of work to turn it into a good library for browsers static linking and co-development is a good way to move both projects forward. As and example content detection using a "file" command library is missing among other things. This capability should be implemented in Curl IMHO. They may hate us but realistically curl needs work and we need to move ahead of the distro for a while if you want to have a excellent connection library. 92734 10 marco.barisione 2008-09-25 09:28:08 -0700 (In reply to comment #9) > They may hate us but realistically curl needs work and we need to move ahead of > the distro for a while if you want to have a excellent connection library. More than hate us they would completely ignore the statically linked library. Most distros do that even when it means to lose functionalities or have bugs, so I really think that a workaround is better. 92754 11 mike.emmel 2008-09-25 10:31:35 -0700 (In reply to comment #10) > (In reply to comment #9) > > They may hate us but realistically curl needs work and we need to move ahead of > > the distro for a while if you want to have a excellent connection library. > > More than hate us they would completely ignore the statically linked library. > Most distros do that even when it means to lose functionalities or have bugs, > so I really think that a workaround is better. > No problem I'm just pointing out that curl/webkit integration has bigger issues that need to be resolved and a route that would allow both groups to work together until they are resolved. I'm not suggesting you not put the workaround in but I felt that this was a good place to insert my overall observation that curl needs refactoring to work well with browsers. Temporarily static linking in a development version of curl focused on browser support puts the project on the right track. Sorry to give a big picture answer its better I guess to keep hacking. I tried to take this approach with my ncurl patch and it looks like we are simply not going to build a good solution using curl. And sorry for the rant but you need to be aware that curl is it stands now is not a good solution. Its got a number of serious problems that need to be fixed. Rant off and I'll go back to my hidey hole. 93048 12 23876 marco.barisione 2008-09-27 09:09:28 -0700 Created attachment 23876 Pass an integer of the right size based on curl's compile options 93132 13 23876 alp 2008-09-28 01:25:08 -0700 Comment on attachment 23876 Pass an integer of the right size based on curl's compile options I agree this change is necessary since we have no control over which versions of libraries distributors will link against. >Index: WebCore/platform/network/curl/ResourceHandleManager.cpp >=================================================================== >--- WebCore/platform/network/curl/ResourceHandleManager.cpp (revisione 36996) >+++ WebCore/platform/network/curl/ResourceHandleManager.cpp (copia locale) >@@ -3,6 +3,7 @@ > * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com > * Copyright (C) 2007 Alp Toker <alp.toker@collabora.co.uk> > * Copyright (C) 2007 Holger Hans Peter Freyther >+ * Copyright (C) 2008 Collabora Ltd. > * All rights reserved. > * > * Redistribution and use in source and binary forms, with or without >@@ -377,12 +378,24 @@ > } > > // Obtain the total size of the POST >+ // The size of a curl_off_t could be different in WebKit and in cURL depending on >+ // compilation flags of both. For CURLOPT_POSTFIELDSIZE_LARGE we have to pass the >+ // right size or random data will be used as the size. >+ int expectedSizeOfCurlOffT = 0; >+ if (!expectedSizeOfCurlOffT) { >+ curl_version_info_data *infoData = curl_version_info(CURLVERSION_NOW); >+ if (infoData->features & CURL_VERSION_LARGEFILE) >+ expectedSizeOfCurlOffT = sizeof(long long); >+ else >+ expectedSizeOfCurlOffT = sizeof(int); >+ } >+ Looks like there's something wrong above, since !expectedSizeOfCurlOffT will always be true. perhaps 'int expectedSizeOfCurlOffT' should be static? I won't be able to test this one against different versions of curl myself but I'm guessing Marco has already tested it. Looks good otherwise. 93214 14 23904 marco.barisione 2008-09-29 03:28:47 -0700 Created attachment 23904 Pass an integer of the right size based on curl's compile options Yeah, I forgot a static. I tested the patch with curl compiled with and without LFS and with WebKit compiled with and without LFS. 93248 15 23904 alp 2008-09-29 11:49:34 -0700 Comment on attachment 23904 Pass an integer of the right size based on curl's compile options r=me 94031 16 jmalonzo 2008-10-03 21:24:42 -0700 Landed in r37281 23876 2008-09-27 09:09:28 -0700 2008-09-29 03:28:47 -0700 Pass an integer of the right size based on curl's compile options curl-upload.patch text/plain 3544 marco.barisione SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdl ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3Vy Y2VIYW5kbGVNYW5hZ2VyLmNwcAkocmV2aXNpb25lIDM2OTk2KQorKysgV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAkoY29waWEgbG9jYWxlKQpA QCAtMyw2ICszLDcgQEAKICAqIENvcHlyaWdodCAoQykgMjAwNiBNaWNoYWVsIEVtbWVsIG1pa2Uu ZW1tZWxAZ21haWwuY29tCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDcgQWxwIFRva2VyIDxhbHAudG9r ZXJAY29sbGFib3JhLmNvLnVrPgogICogQ29weXJpZ2h0IChDKSAyMDA3IEhvbGdlciBIYW5zIFBl dGVyIEZyZXl0aGVyCisgKiBDb3B5cmlnaHQgKEMpIDIwMDggQ29sbGFib3JhIEx0ZC4KICAqIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0zNzcsMTIgKzM3OCwyNCBA QAogICAgIH0KIAogICAgIC8vIE9idGFpbiB0aGUgdG90YWwgc2l6ZSBvZiB0aGUgUE9TVAorICAg IC8vIFRoZSBzaXplIG9mIGEgY3VybF9vZmZfdCBjb3VsZCBiZSBkaWZmZXJlbnQgaW4gV2ViS2l0 IGFuZCBpbiBjVVJMIGRlcGVuZGluZyBvbgorICAgIC8vIGNvbXBpbGF0aW9uIGZsYWdzIG9mIGJv dGguIEZvciBDVVJMT1BUX1BPU1RGSUVMRFNJWkVfTEFSR0Ugd2UgaGF2ZSB0byBwYXNzIHRoZQor ICAgIC8vIHJpZ2h0IHNpemUgb3IgcmFuZG9tIGRhdGEgd2lsbCBiZSB1c2VkIGFzIHRoZSBzaXpl LgorICAgIGludCBleHBlY3RlZFNpemVPZkN1cmxPZmZUID0gMDsKKyAgICBpZiAoIWV4cGVjdGVk U2l6ZU9mQ3VybE9mZlQpIHsKKyAgICAgICAgY3VybF92ZXJzaW9uX2luZm9fZGF0YSAqaW5mb0Rh dGEgPSBjdXJsX3ZlcnNpb25faW5mbyhDVVJMVkVSU0lPTl9OT1cpOworICAgICAgICBpZiAoaW5m b0RhdGEtPmZlYXR1cmVzICYgQ1VSTF9WRVJTSU9OX0xBUkdFRklMRSkKKyAgICAgICAgICAgIGV4 cGVjdGVkU2l6ZU9mQ3VybE9mZlQgPSBzaXplb2YobG9uZyBsb25nKTsKKyAgICAgICAgZWxzZQor ICAgICAgICAgICAgZXhwZWN0ZWRTaXplT2ZDdXJsT2ZmVCA9IHNpemVvZihpbnQpOworICAgIH0K KwogI2lmIENPTVBJTEVSKE1TVkMpCiAgICAgLy8gd29yayBhcm91bmQgY29tcGlsZXIgZXJyb3Ig aW4gVmlzdWFsIFN0dWRpbyAyMDA1LiAgSXQgY2FuJ3QgcHJvcGVybHkKICAgICAvLyBoYW5kbGUg bWF0aCB3aXRoIDY0LWJpdCBjb25zdGFudCBkZWNsYXJhdGlvbnMuCiAjcHJhZ21hIHdhcm5pbmco ZGlzYWJsZTogNDMwNykKICNlbmRpZgotICAgIHN0YXRpYyBjb25zdCBsb25nIGxvbmcgbWF4Q3Vy bE9mZlQgPSAoMUxMIDw8IChzaXplb2YoY3VybF9vZmZfdCkgKiA4IC0gMSkpIC0gMTsKKyAgICBz dGF0aWMgY29uc3QgbG9uZyBsb25nIG1heEN1cmxPZmZUID0gKDFMTCA8PCAoZXhwZWN0ZWRTaXpl T2ZDdXJsT2ZmVCAqIDggLSAxKSkgLSAxOwogICAgIGN1cmxfb2ZmX3Qgc2l6ZSA9IDA7CiAgICAg Ym9vbCBjaHVua2VkVHJhbnNmZXIgPSBmYWxzZTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IG51bUVsZW1lbnRzOyBpKyspIHsKQEAgLTQwOSw4ICs0MjIsMTIgQEAKICAgICAvLyBjVVJMIGd1 ZXNzZXMgdGhhdCB3ZSB3YW50IGNodW5rZWQgZW5jb2RpbmcgYXMgbG9uZyBhcyB3ZSBzcGVjaWZ5 IHRoZSBoZWFkZXIKICAgICBpZiAoY2h1bmtlZFRyYW5zZmVyKQogICAgICAgICAqaGVhZGVycyA9 IGN1cmxfc2xpc3RfYXBwZW5kKCpoZWFkZXJzLCAiVHJhbnNmZXItRW5jb2Rpbmc6IGNodW5rZWQi KTsKLSAgICBlbHNlCi0gICAgICAgIGN1cmxfZWFzeV9zZXRvcHQoZC0+bV9oYW5kbGUsIENVUkxP UFRfUE9TVEZJRUxEU0laRV9MQVJHRSwgc2l6ZSk7CisgICAgZWxzZSB7CisgICAgICAgIGlmIChz aXplb2YobG9uZyBsb25nKSA9PSBleHBlY3RlZFNpemVPZkN1cmxPZmZUKQorICAgICAgICAgIGN1 cmxfZWFzeV9zZXRvcHQoZC0+bV9oYW5kbGUsIENVUkxPUFRfUE9TVEZJRUxEU0laRV9MQVJHRSwg KGxvbmcgbG9uZylzaXplKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgIGN1cmxfZWFzeV9zZXRv cHQoZC0+bV9oYW5kbGUsIENVUkxPUFRfUE9TVEZJRUxEU0laRV9MQVJHRSwgKGludClzaXplKTsK KyAgICB9CiAKICAgICBjdXJsX2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxlLCBDVVJMT1BUX1JFQURG VU5DVElPTiwgcmVhZENhbGxiYWNrKTsKICAgICBjdXJsX2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxl LCBDVVJMT1BUX1JFQUREQVRBLCBqb2IpOwpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uZSAzNjk5NikKKysrIFdlYkNvcmUv Q2hhbmdlTG9nCShjb3BpYSBsb2NhbGUpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDgtMDktMjcgIE1h cmNvIEJhcmlzaW9uZSAgPG1hcmNvLmJhcmlzaW9uZUBjb2xsYWJvcmEuY28udWs+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0FSTklORzogTk8gVEVT VCBDQVNFUyBBRERFRCBPUiBDSEFOR0VECisKKyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTg4MzIKKyAgICAgICAgW2N1cmxdIGZpbGUgdXBsb2FkIGRvZXMg bm90IHdvcmsKKworICAgICAgICBUaGUgY3VybF9vZmZfdCBpbnRlZ2VyIHR5cGUgaGFzIGEgZGlm ZmVyZW50IHNpemUgZGVwZW5kaW5nIGlmIGxhcmdlCisgICAgICAgIGZpbGUgc3VwcG9ydCBpcyBl bmFibGVkIG9yIG5vdC4gVGhlcmUgaXMgbm8gZGlmZmVyZW50IHB1YmxpYyBBUEkgZm9yCisgICAg ICAgIHRoZSB0d28gY2FzZXMsIHNvIHRoZSBzYW1lIGZ1bmN0aW9uIGFjY2VwdHMgYSBkaWZmZXJl bnQgdHlwZSBiYXNlZCBvbgorICAgICAgICBhIGNvbXBpbGF0aW9uIG9wdGlvbiB0aGUgY291bGQg YmUgZGlmZmVyZW50IGluIFdlYktpdCBhbmQgbGliY3VybC4KKyAgICAgICAgVG8gZml4IHRoZSBi dWcgd2UgcXVlcnkgbGliY3VybCBhdCBydW50aW1lIGZvciBsYXJnZSBmaWxlIHN1cHBvcnQgYW5k CisgICAgICAgIHBhc3MgdGhlIHJpZ2h0IHR5cGUgYmFzZWQgb24gdGhhdC4KKworICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpzZXR1cFBPU1QpOgorCiAyMDA4LTA5 LTI3ICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUgZnJh bWVHZW9tZXRyeSB0byBmcmFtZVJlY3QuICBSZW5hbWUgc2V0RnJhbWVHZW9tZXRyeSB0byBzZXRG cmFtZVJlY3QuCg== 23904 2008-09-29 03:28:47 -0700 2008-09-29 11:49:34 -0700 Pass an integer of the right size based on curl's compile options curl-upload.patch text/plain 3459 marco.barisione SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdl ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3Vy Y2VIYW5kbGVNYW5hZ2VyLmNwcAkocmV2aXNpb25lIDM3MDU5KQorKysgV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAkoY29waWEgbG9jYWxlKQpA QCAtMyw2ICszLDcgQEAKICAqIENvcHlyaWdodCAoQykgMjAwNiBNaWNoYWVsIEVtbWVsIG1pa2Uu ZW1tZWxAZ21haWwuY29tCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDcgQWxwIFRva2VyIDxhbHAudG9r ZXJAY29sbGFib3JhLmNvLnVrPgogICogQ29weXJpZ2h0IChDKSAyMDA3IEhvbGdlciBIYW5zIFBl dGVyIEZyZXl0aGVyCisgKiBDb3B5cmlnaHQgKEMpIDIwMDggQ29sbGFib3JhIEx0ZC4KICAqIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0zNzcsMTIgKzM3OCwyNCBA QAogICAgIH0KIAogICAgIC8vIE9idGFpbiB0aGUgdG90YWwgc2l6ZSBvZiB0aGUgUE9TVAorICAg IC8vIFRoZSBzaXplIG9mIGEgY3VybF9vZmZfdCBjb3VsZCBiZSBkaWZmZXJlbnQgaW4gV2ViS2l0 IGFuZCBpbiBjVVJMIGRlcGVuZGluZyBvbgorICAgIC8vIGNvbXBpbGF0aW9uIGZsYWdzIG9mIGJv dGguIEZvciBDVVJMT1BUX1BPU1RGSUVMRFNJWkVfTEFSR0Ugd2UgaGF2ZSB0byBwYXNzIHRoZQor ICAgIC8vIHJpZ2h0IHNpemUgb3IgcmFuZG9tIGRhdGEgd2lsbCBiZSB1c2VkIGFzIHRoZSBzaXpl LgorICAgIHN0YXRpYyBpbnQgZXhwZWN0ZWRTaXplT2ZDdXJsT2ZmVCA9IDA7CisgICAgaWYgKCFl eHBlY3RlZFNpemVPZkN1cmxPZmZUKSB7CisgICAgICAgIGN1cmxfdmVyc2lvbl9pbmZvX2RhdGEg KmluZm9EYXRhID0gY3VybF92ZXJzaW9uX2luZm8oQ1VSTFZFUlNJT05fTk9XKTsKKyAgICAgICAg aWYgKGluZm9EYXRhLT5mZWF0dXJlcyAmIENVUkxfVkVSU0lPTl9MQVJHRUZJTEUpCisgICAgICAg ICAgICBleHBlY3RlZFNpemVPZkN1cmxPZmZUID0gc2l6ZW9mKGxvbmcgbG9uZyk7CisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIGV4cGVjdGVkU2l6ZU9mQ3VybE9mZlQgPSBzaXplb2YoaW50KTsK KyAgICB9CisKICNpZiBDT01QSUxFUihNU1ZDKQogICAgIC8vIHdvcmsgYXJvdW5kIGNvbXBpbGVy IGVycm9yIGluIFZpc3VhbCBTdHVkaW8gMjAwNS4gIEl0IGNhbid0IHByb3Blcmx5CiAgICAgLy8g aGFuZGxlIG1hdGggd2l0aCA2NC1iaXQgY29uc3RhbnQgZGVjbGFyYXRpb25zLgogI3ByYWdtYSB3 YXJuaW5nKGRpc2FibGU6IDQzMDcpCiAjZW5kaWYKLSAgICBzdGF0aWMgY29uc3QgbG9uZyBsb25n IG1heEN1cmxPZmZUID0gKDFMTCA8PCAoc2l6ZW9mKGN1cmxfb2ZmX3QpICogOCAtIDEpKSAtIDE7 CisgICAgc3RhdGljIGNvbnN0IGxvbmcgbG9uZyBtYXhDdXJsT2ZmVCA9ICgxTEwgPDwgKGV4cGVj dGVkU2l6ZU9mQ3VybE9mZlQgKiA4IC0gMSkpIC0gMTsKICAgICBjdXJsX29mZl90IHNpemUgPSAw OwogICAgIGJvb2wgY2h1bmtlZFRyYW5zZmVyID0gZmFsc2U7CiAgICAgZm9yIChzaXplX3QgaSA9 IDA7IGkgPCBudW1FbGVtZW50czsgaSsrKSB7CkBAIC00MDksOCArNDIyLDEyIEBACiAgICAgLy8g Y1VSTCBndWVzc2VzIHRoYXQgd2Ugd2FudCBjaHVua2VkIGVuY29kaW5nIGFzIGxvbmcgYXMgd2Ug c3BlY2lmeSB0aGUgaGVhZGVyCiAgICAgaWYgKGNodW5rZWRUcmFuc2ZlcikKICAgICAgICAgKmhl YWRlcnMgPSBjdXJsX3NsaXN0X2FwcGVuZCgqaGVhZGVycywgIlRyYW5zZmVyLUVuY29kaW5nOiBj aHVua2VkIik7Ci0gICAgZWxzZQotICAgICAgICBjdXJsX2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxl LCBDVVJMT1BUX1BPU1RGSUVMRFNJWkVfTEFSR0UsIHNpemUpOworICAgIGVsc2UgeworICAgICAg ICBpZiAoc2l6ZW9mKGxvbmcgbG9uZykgPT0gZXhwZWN0ZWRTaXplT2ZDdXJsT2ZmVCkKKyAgICAg ICAgICBjdXJsX2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxlLCBDVVJMT1BUX1BPU1RGSUVMRFNJWkVf TEFSR0UsIChsb25nIGxvbmcpc2l6ZSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICBjdXJsX2Vh c3lfc2V0b3B0KGQtPm1faGFuZGxlLCBDVVJMT1BUX1BPU1RGSUVMRFNJWkVfTEFSR0UsIChpbnQp c2l6ZSk7CisgICAgfQogCiAgICAgY3VybF9lYXN5X3NldG9wdChkLT5tX2hhbmRsZSwgQ1VSTE9Q VF9SRUFERlVOQ1RJT04sIHJlYWRDYWxsYmFjayk7CiAgICAgY3VybF9lYXN5X3NldG9wdChkLT5t X2hhbmRsZSwgQ1VSTE9QVF9SRUFEREFUQSwgam9iKTsKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbmUgMzcwNTkpCisrKyBX ZWJDb3JlL0NoYW5nZUxvZwkoY29waWEgbG9jYWxlKQpAQCAtMSwzICsxLDIwIEBACisyMDA4LTA5 LTI3ICBNYXJjbyBCYXJpc2lvbmUgIDxtYXJjby5iYXJpc2lvbmVAY29sbGFib3JhLmNvLnVrPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHA6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4ODMyCisgICAgICAgIFtjdXJsXSBmaWxl IHVwbG9hZCBkb2VzIG5vdCB3b3JrCisKKyAgICAgICAgVGhlIGN1cmxfb2ZmX3QgaW50ZWdlciB0 eXBlIGhhcyBhIGRpZmZlcmVudCBzaXplIGRlcGVuZGluZyBpZiBsYXJnZQorICAgICAgICBmaWxl IHN1cHBvcnQgaXMgZW5hYmxlZCBvciBub3QuIFRoZXJlIGlzIG5vIGRpZmZlcmVudCBwdWJsaWMg QVBJIGZvcgorICAgICAgICB0aGUgdHdvIGNhc2VzLCBzbyB0aGUgc2FtZSBmdW5jdGlvbiBhY2Nl cHRzIGEgZGlmZmVyZW50IHR5cGUgYmFzZWQgb24KKyAgICAgICAgYSBjb21waWxhdGlvbiBvcHRp b24gdGhlIGNvdWxkIGJlIGRpZmZlcmVudCBpbiBXZWJLaXQgYW5kIGxpYmN1cmwuCisgICAgICAg IFRvIGZpeCB0aGUgYnVnIHdlIHF1ZXJ5IGxpYmN1cmwgYXQgcnVudGltZSBmb3IgbGFyZ2UgZmls ZSBzdXBwb3J0IGFuZAorICAgICAgICBwYXNzIHRoZSByaWdodCB0eXBlIGJhc2VkIG9uIHRoYXQu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2Vy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlTWFuYWdlcjo6c2V0dXBQT1NU KToKKwogMjAwOC0wOS0yOSAgVGhpYWdvIE1hY2llaXJhICA8dGhpYWdvLm1hY2llaXJhQHRyb2xs dGVjaC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24K