90540 2012-07-04 03:53:08 -0700 [WK2][EFL] Ewk_View needs API to load HTML data 2012-07-15 19:33:10 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61838 1 cdumez cdumez hyerim.bae kenneth ryuan.choi tonikitoo webkit.review.bot oldest_to_newest 662836 0 cdumez 2012-07-04 03:53:08 -0700 Now that the Ewk_View reports load errors, we need to handle them in MiniBrowser to display an error page. 662839 1 150764 cdumez 2012-07-04 03:56:56 -0700 Created attachment 150764 Patch 662851 2 150764 ryuan.choi 2012-07-04 04:13:22 -0700 Comment on attachment 150764 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150764&action=review > Source/WebKit2/ChangeLog:4 > + [WK2][EFL] MiniBrowser needs to handle load errors > + https://bugs.webkit.org/show_bug.cgi?id=90540 IMO, more important change of this patch looks adding new API, right? > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:692 > +Eina_Bool ewk_view_html_load(Evas_Object* ewkView, const char* html, const char* baseUrl, const char* unreachableUrl) In WK1/Efl, we used ewk_frame_contents_set and ewk_frame_contents_alternate_set for same feature. http://trac.webkit.org/browser/trunk/Source/WebKit/efl/ewk/ewk_frame.cpp#L422 662857 3 150764 cdumez 2012-07-04 04:29:10 -0700 Comment on attachment 150764 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150764&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:692 >> +Eina_Bool ewk_view_html_load(Evas_Object* ewkView, const char* html, const char* baseUrl, const char* unreachableUrl) > > In WK1/Efl, we used ewk_frame_contents_set and ewk_frame_contents_alternate_set for same feature. > > http://trac.webkit.org/browser/trunk/Source/WebKit/efl/ewk/ewk_frame.cpp#L422 In WK2, we don't have frame-level APIs anymore so we are breaking compatibility with WK1 API anyway. Since we break compatibility, I decided to simplify the API a bit and propose something similar to what is in Qt port. The method I'm proposing can achieve the same behavior as the 2 methods you mention. We don't loose any functionality. 662866 4 ryuan.choi 2012-07-04 04:50:52 -0700 (In reply to comment #3) > (From update of attachment 150764 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=150764&action=review > > >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:692 > >> +Eina_Bool ewk_view_html_load(Evas_Object* ewkView, const char* html, const char* baseUrl, const char* unreachableUrl) > > > > In WK1/Efl, we used ewk_frame_contents_set and ewk_frame_contents_alternate_set for same feature. > > > > http://trac.webkit.org/browser/trunk/Source/WebKit/efl/ewk/ewk_frame.cpp#L422 > > In WK2, we don't have frame-level APIs anymore so we are breaking compatibility with WK1 API anyway. Since we break compatibility, I decided to simplify the API a bit and propose something similar to what is in Qt port. > The method I'm proposing can achieve the same behavior as the 2 methods you mention. We don't loose any functionality. Although we don't break compatibility, is it better to use similar name for application developers to easily understand ? I think that 1 method looks enough. 662871 5 cdumez 2012-07-04 04:54:47 -0700 (In reply to comment #4) > (In reply to comment #3) > > (From update of attachment 150764 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=150764&action=review > > > > >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:692 > > >> +Eina_Bool ewk_view_html_load(Evas_Object* ewkView, const char* html, const char* baseUrl, const char* unreachableUrl) > > > > > > In WK1/Efl, we used ewk_frame_contents_set and ewk_frame_contents_alternate_set for same feature. > > > > > > http://trac.webkit.org/browser/trunk/Source/WebKit/efl/ewk/ewk_frame.cpp#L422 > > > > In WK2, we don't have frame-level APIs anymore so we are breaking compatibility with WK1 API anyway. Since we break compatibility, I decided to simplify the API a bit and propose something similar to what is in Qt port. > > The method I'm proposing can achieve the same behavior as the 2 methods you mention. We don't loose any functionality. > > Although we don't break compatibility, is it better to use similar name for application developers to easily understand ? > > I think that 1 method looks enough. Yes, I usually try to keep compatibility or at least stay close to the WK1 API. But in this case, I think it is a good opportunity to simplify the API. Also, I don't really like the WK1 function names for this and I don't find them clear enough. Unless there is strong opinion on Samsung side against it, I would like to land this patch as it is. 662909 6 150783 cdumez 2012-07-04 06:22:09 -0700 Created attachment 150783 Patch Update bug title in Changelogs as Ryuan suggested. 663243 7 150783 kenneth 2012-07-04 19:58:43 -0700 Comment on attachment 150783 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150783&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:692 > +Eina_Bool ewk_view_html_load(Evas_Object* ewkView, const char* html, const char* baseUrl, const char* unreachableUrl) html_data_load ? btw, wouldnt it load svg as well? 663307 8 150783 cdumez 2012-07-04 22:25:26 -0700 Comment on attachment 150783 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150783&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:692 >> +Eina_Bool ewk_view_html_load(Evas_Object* ewkView, const char* html, const char* baseUrl, const char* unreachableUrl) > > html_data_load ? btw, wouldnt it load svg as well? html_data_load(), why not if you prefer. I would even go for html_string_load() then. if you look at the methods I'm calling internally: loadHTMLString(), this would map quite closely. If it does load SVG, then the page API is confusing :) 663314 9 kenneth 2012-07-04 22:35:59 -0700 I am all for string_load :-) 663328 10 150881 cdumez 2012-07-04 23:20:02 -0700 Created attachment 150881 Patch Take Kenneth's feedback into consideration. 663380 11 150881 webkit.review.bot 2012-07-05 01:15:15 -0700 Comment on attachment 150881 Patch Clearing flags on attachment: 150881 Committed r121890: <http://trac.webkit.org/changeset/121890> 663381 12 webkit.review.bot 2012-07-05 01:15:20 -0700 All reviewed patches have been landed. Closing bug. 670050 13 hyerim.bae 2012-07-15 19:33:10 -0700 *** Bug 91352 has been marked as a duplicate of this bug. *** 150764 2012-07-04 03:56:56 -0700 2012-07-04 06:22:09 -0700 Patch 90540_minibrowser_load_error.patch text/plain 5398 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkOTEzZjJkLi4zZWM3NzE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAg QEAKIDIwMTItMDctMDQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAorICAgICAgICBbV0syXVtFRkxdIE1pbmlCcm93c2VyIG5lZWRzIHRvIGhhbmRsZSBs b2FkIGVycm9ycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTA1NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgbWV0aG9kIHRvIEV3a19WaWV3IHRvIGxvYWQgcHJvdmlkZWQgSFRNTCBkYXRhLgorICAg ICAgICBUaGlzIGlzIHVzZWQgZm9yIGUuZy4gd2hlbiBhbiBVUkwgY2Fubm90IGJlIHJlYWNoZWQK KyAgICAgICAgYW5kIHdlIG5lZWQgdG8gZGlzcGxheSBhbiBlcnJvciBwYWdlLgorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwOgorICAgICAgICAoZXdrX3ZpZXdfaHRt bF9sb2FkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oOgorCisyMDEy LTA3LTA0ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisK ICAgICAgICAgW0VGTF1bV0syXSBFd2tfVmlldyBzaG91bGQgcmVwb3J0IGxvYWQgZXJyb3JzCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDQ3OQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggZTc5 YmQzMi4uMDYwNDhlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a192aWV3LmNwcApAQCAtNjg5LDYgKzY4OSwxOSBAQCB2b2lkIGV3a192aWV3X2xvYWRfZXJyb3Io RXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IEV3a19XZWJfRXJyb3IqIGVycm9yKQogICAgIGV2 YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwoZXdrVmlldywgImxvYWQsZXJyb3IiLCBjb25z dF9jYXN0PEV3a19XZWJfRXJyb3IqPihlcnJvcikpOwogfQogCitFaW5hX0Jvb2wgZXdrX3ZpZXdf aHRtbF9sb2FkKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBjaGFyKiBodG1sLCBjb25zdCBj aGFyKiBiYXNlVXJsLCBjb25zdCBjaGFyKiB1bnJlYWNoYWJsZVVybCkKK3sKKyAgICBFV0tfVklF V19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOworICAgIEVXS19W SUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKKyAgICBFSU5B X1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoaHRtbCwgZmFsc2UpOworCisgICAgaWYgKHVucmVh Y2hhYmxlVXJsICYmICp1bnJlYWNoYWJsZVVybCkKKyAgICAgICAgcHJpdi0+cGFnZUNsaWVudC0+ cGFnZSgpLT5sb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhTdHJpbmc6OmZyb21VVEY4KGh0bWwpLCBi YXNlVXJsID8gU3RyaW5nOjpmcm9tVVRGOChiYXNlVXJsKSA6ICIiLCBTdHJpbmc6OmZyb21VVEY4 KHVucmVhY2hhYmxlVXJsKSk7CisgICAgZWxzZQorICAgICAgICBwcml2LT5wYWdlQ2xpZW50LT5w YWdlKCktPmxvYWRIVE1MU3RyaW5nKFN0cmluZzo6ZnJvbVVURjgoaHRtbCksIGJhc2VVcmwgPyBT dHJpbmc6OmZyb21VVEY4KGJhc2VVcmwpIDogIiIpOworCisgICAgcmV0dXJuIHRydWU7Cit9CiAK ICNpZiBFTkFCTEUoV0VCX0lOVEVOVFNfVEFHKQogLyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAppbmRleCAzNzUwNmJiLi4zMTMwODRiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKQEAgLTI2Niw2ICsyNjYsMjUg QEAgRUFQSSBjb25zdCBjaGFyICpld2tfdmlld190aXRsZV9nZXQoY29uc3QgRXZhc19PYmplY3Qg Km8pOwogICovCiBFQVBJIGRvdWJsZSBld2tfdmlld19sb2FkX3Byb2dyZXNzX2dldChjb25zdCBF dmFzX09iamVjdCAqbyk7CiAKKy8qKgorICogTG9hZHMgdGhlIHNwZWNpZmllZCBAYSBodG1sIGFz IHRoZSBjb250ZW50IG9mIHRoZSB2aWV3LgorICoKKyAqIEV4dGVybmFsIG9iamVjdHMgc3VjaCBh cyBzdHlsZXNoZWV0cyBvciBpbWFnZXMgcmVmZXJlbmNlZCBpbiB0aGUgSFRNTAorICogZG9jdW1l bnQgYXJlIGxvY2F0ZWQgcmVsYXRpdmUgdG8gQGEgYmFzZVVybC4KKyAqCisgKiBJZiBhbiBAYSB1 bnJlYWNoYWJsZVVybCBpcyBwYXNzZWQgaXQgaXMgdXNlZCBhcyB0aGUgdXJsIGZvciB0aGUgbG9h ZGVkCisgKiBjb250ZW50LiBUaGlzIGlzIHR5cGljYWxseSB1c2VkIHRvIGRpc3BsYXkgZXJyb3Ig cGFnZXMgZm9yIGEgZmFpbGVkCisgKiBsb2FkLgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0 IHRvIGxvYWQgdGhlIEhUTUwgaW50bworICogQHBhcmFtIGh0bWwgSFRNTCBkYXRhIHRvIGxvYWQK KyAqIEBwYXJhbSBiYXNlVXJsIEJhc2UgVVJMIHVzZWQgZm9yIHJlbGF0aXZlIHBhdGhzIHRvIGV4 dGVybmFsIG9iamVjdHMgKG9wdGlvbmFsKQorICogQHBhcmFtIHVucmVhY2hhYmxlVXJsIFVSTCB0 aGF0IGNvdWxkIG5vdCBiZSByZWFjaGVkIChvcHRpb25hbCkKKyAqCisgKiBAcmV0dXJuIEBjIEVJ TkFfVFJVRSBpZiBpdCB0aGUgSFRNTCB3YXMgc3VjY2Vzc2Z1bGx5IGxvYWRlZCwgQGMgRUlOQV9G QUxTRSBvdGhlcndpc2UKKyAqLworRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfaHRtbF9sb2FkKEV2 YXNfT2JqZWN0ICpvLCBjb25zdCBjaGFyICpodG1sLCBjb25zdCBjaGFyICpiYXNlVXJsLCBjb25z dCBjaGFyICp1bnJlYWNoYWJsZVVybCk7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlm CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDIy MjU1ZS4uYzcwNzUwMSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA3LTA0ICBDaHJpc3RvcGhlIER1bWV6ICA8 Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW1dLMl1bRUZMXSBNaW5pQnJv d3NlciBuZWVkcyB0byBoYW5kbGUgbG9hZCBlcnJvcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkwNTQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIEVGTCBNaW5pQnJvd3NlciB0byBjYXRjaCB0 aGUgImxvYWQsZXJyb3IiIHNpZ25hbAorICAgICAgICBvbiB0aGUgdmlldyBhbmQgZGlzcGxheSBh biBlcnJvciBwYWdlLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKyAgICAg ICAgKG9uX2Vycm9yKToKKyAgICAgICAgKGJyb3dzZXJDcmVhdGUpOgorCiAyMDEyLTA3LTA0ICBT ZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtd IFdlYktpdDIgdGVzdGluZyBib3QgdW5hYmxlIHRvIGZpbmQgdGhlIGJ1aWxkIGRpcmVjdG9yeQpk aWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rvb2xzL01pbmlCcm93 c2VyL2VmbC9tYWluLmMKaW5kZXggMjE0NDhkMi4uOGY5MGU1ZiAxMDA2NDQKLS0tIGEvVG9vbHMv TWluaUJyb3dzZXIvZWZsL21haW4uYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5j CkBAIC0xMjUsNiArMTI1LDIwIEBAIG9uX3Byb2dyZXNzKHZvaWQgKnVzZXJfZGF0YSwgRXZhc19P YmplY3QgKndlYnZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgdGl0bGVfc2V0KGFwcC0+ZWUs IGV3a192aWV3X3RpdGxlX2dldChhcHAtPmJyb3dzZXIpLCBwcm9ncmVzcyAqIDEwMCk7CiB9CiAK K3N0YXRpYyB2b2lkCitvbl9lcnJvcih2b2lkICp1c2VyX2RhdGEsIEV2YXNfT2JqZWN0ICp3ZWJ2 aWV3LCB2b2lkICpldmVudF9pbmZvKQoreworICAgIEVpbmFfU3RyYnVmKiBidWZmZXI7CisgICAg Y29uc3QgRXdrX1dlYl9FcnJvciAqZXJyb3IgPSAoY29uc3QgRXdrX1dlYl9FcnJvciAqKWV2ZW50 X2luZm87CisKKyAgICBidWZmZXIgPSBlaW5hX3N0cmJ1Zl9uZXcoKTsKKyAgICBlaW5hX3N0cmJ1 Zl9hcHBlbmRfcHJpbnRmKGJ1ZmZlciwgIjxodG1sPjxib2R5PjxkaXYgc3R5bGU9XCJjb2xvcjoj ZmYwMDAwXCI+RVJST1IhPC9kaXY+PGJyPjxkaXY+Q29kZTogJWQ8YnI+RGVzY3JpcHRpb246ICVz PGJyPlVSTDogJXM8L2Rpdj48L2JvZHk8L2h0bWw+IiwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGV3a193ZWJfZXJyb3JfY29kZV9nZXQoZXJyb3IpLCBld2tfd2ViX2Vycm9yX2Rlc2Ny aXB0aW9uX2dldChlcnJvciksIGV3a193ZWJfZXJyb3JfdXJsX2dldChlcnJvcikpOworCisgICAg ZXdrX3ZpZXdfaHRtbF9sb2FkKHdlYnZpZXcsIGVpbmFfc3RyYnVmX3N0cmluZ19nZXQoYnVmZmVy KSwgMCwgZXdrX3dlYl9lcnJvcl91cmxfZ2V0KGVycm9yKSk7CisgICAgZWluYV9zdHJidWZfZnJl ZShidWZmZXIpOworfQorCiBzdGF0aWMgTWluaUJyb3dzZXIgKmJyb3dzZXJDcmVhdGUoY29uc3Qg Y2hhciAqdXJsKQogewogICAgIE1pbmlCcm93c2VyICphcHAgPSBtYWxsb2Moc2l6ZW9mKE1pbmlC cm93c2VyKSk7CkBAIC0xNTEsNiArMTY1LDcgQEAgc3RhdGljIE1pbmlCcm93c2VyICpicm93c2Vy Q3JlYXRlKGNvbnN0IGNoYXIgKnVybCkKICAgICBhcHAtPmJyb3dzZXIgPSBld2tfdmlld19hZGQo YXBwLT5ldmFzKTsKICAgICBldmFzX29iamVjdF9uYW1lX3NldChhcHAtPmJyb3dzZXIsICJicm93 c2VyIik7CiAKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwLT5icm93c2Vy LCAibG9hZCxlcnJvciIsIG9uX2Vycm9yLCBhcHApOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2Nh bGxiYWNrX2FkZChhcHAtPmJyb3dzZXIsICJsb2FkLHByb2dyZXNzIiwgb25fcHJvZ3Jlc3MsIGFw cCk7CiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKGFwcC0+YnJvd3NlciwgInRp dGxlLGNoYW5nZWQiLCBvbl90aXRsZV9jaGFuZ2VkLCBhcHApOwogCg== 150783 2012-07-04 06:22:09 -0700 2012-07-04 23:20:02 -0700 Patch 90540_minibrowser_load_error.patch text/plain 5392 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkOTEzZjJkLi5jZjU1NDZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAg QEAKIDIwMTItMDctMDQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAorICAgICAgICBbV0syXVtFRkxdIEV3a19WaWV3IG5lZWRzIEFQSSB0byBsb2FkIEhU TUwgZGF0YQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTA1NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgbWV0aG9kIHRvIEV3a19WaWV3IHRvIGxvYWQgcHJvdmlkZWQgSFRNTCBkYXRhLgorICAgICAg ICBUaGlzIGlzIHVzZWQgZm9yIGUuZy4gd2hlbiBhbiBVUkwgY2Fubm90IGJlIHJlYWNoZWQKKyAg ICAgICAgYW5kIHdlIG5lZWQgdG8gZGlzcGxheSBhbiBlcnJvciBwYWdlLgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwOgorICAgICAgICAoZXdrX3ZpZXdfaHRtbF9s b2FkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oOgorCisyMDEyLTA3 LTA0ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKICAg ICAgICAgW0VGTF1bV0syXSBFd2tfVmlldyBzaG91bGQgcmVwb3J0IGxvYWQgZXJyb3JzCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDQ3OQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggZTc5YmQz Mi4uMDYwNDhlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcApAQCAtNjg5LDYgKzY4OSwxOSBAQCB2b2lkIGV3a192aWV3X2xvYWRfZXJyb3IoRXZh c19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IEV3a19XZWJfRXJyb3IqIGVycm9yKQogICAgIGV2YXNf b2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwoZXdrVmlldywgImxvYWQsZXJyb3IiLCBjb25zdF9j YXN0PEV3a19XZWJfRXJyb3IqPihlcnJvcikpOwogfQogCitFaW5hX0Jvb2wgZXdrX3ZpZXdfaHRt bF9sb2FkKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBjaGFyKiBodG1sLCBjb25zdCBjaGFy KiBiYXNlVXJsLCBjb25zdCBjaGFyKiB1bnJlYWNoYWJsZVVybCkKK3sKKyAgICBFV0tfVklFV19T RF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOworICAgIEVXS19WSUVX X1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKKyAgICBFSU5BX1NB RkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoaHRtbCwgZmFsc2UpOworCisgICAgaWYgKHVucmVhY2hh YmxlVXJsICYmICp1bnJlYWNoYWJsZVVybCkKKyAgICAgICAgcHJpdi0+cGFnZUNsaWVudC0+cGFn ZSgpLT5sb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhTdHJpbmc6OmZyb21VVEY4KGh0bWwpLCBiYXNl VXJsID8gU3RyaW5nOjpmcm9tVVRGOChiYXNlVXJsKSA6ICIiLCBTdHJpbmc6OmZyb21VVEY4KHVu cmVhY2hhYmxlVXJsKSk7CisgICAgZWxzZQorICAgICAgICBwcml2LT5wYWdlQ2xpZW50LT5wYWdl KCktPmxvYWRIVE1MU3RyaW5nKFN0cmluZzo6ZnJvbVVURjgoaHRtbCksIGJhc2VVcmwgPyBTdHJp bmc6OmZyb21VVEY4KGJhc2VVcmwpIDogIiIpOworCisgICAgcmV0dXJuIHRydWU7Cit9CiAKICNp ZiBFTkFCTEUoV0VCX0lOVEVOVFNfVEFHKQogLyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuaAppbmRleCAzNzUwNmJiLi4zMTMwODRiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKQEAgLTI2Niw2ICsyNjYsMjUgQEAg RUFQSSBjb25zdCBjaGFyICpld2tfdmlld190aXRsZV9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8p OwogICovCiBFQVBJIGRvdWJsZSBld2tfdmlld19sb2FkX3Byb2dyZXNzX2dldChjb25zdCBFdmFz X09iamVjdCAqbyk7CiAKKy8qKgorICogTG9hZHMgdGhlIHNwZWNpZmllZCBAYSBodG1sIGFzIHRo ZSBjb250ZW50IG9mIHRoZSB2aWV3LgorICoKKyAqIEV4dGVybmFsIG9iamVjdHMgc3VjaCBhcyBz dHlsZXNoZWV0cyBvciBpbWFnZXMgcmVmZXJlbmNlZCBpbiB0aGUgSFRNTAorICogZG9jdW1lbnQg YXJlIGxvY2F0ZWQgcmVsYXRpdmUgdG8gQGEgYmFzZVVybC4KKyAqCisgKiBJZiBhbiBAYSB1bnJl YWNoYWJsZVVybCBpcyBwYXNzZWQgaXQgaXMgdXNlZCBhcyB0aGUgdXJsIGZvciB0aGUgbG9hZGVk CisgKiBjb250ZW50LiBUaGlzIGlzIHR5cGljYWxseSB1c2VkIHRvIGRpc3BsYXkgZXJyb3IgcGFn ZXMgZm9yIGEgZmFpbGVkCisgKiBsb2FkLgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRv IGxvYWQgdGhlIEhUTUwgaW50bworICogQHBhcmFtIGh0bWwgSFRNTCBkYXRhIHRvIGxvYWQKKyAq IEBwYXJhbSBiYXNlVXJsIEJhc2UgVVJMIHVzZWQgZm9yIHJlbGF0aXZlIHBhdGhzIHRvIGV4dGVy bmFsIG9iamVjdHMgKG9wdGlvbmFsKQorICogQHBhcmFtIHVucmVhY2hhYmxlVXJsIFVSTCB0aGF0 IGNvdWxkIG5vdCBiZSByZWFjaGVkIChvcHRpb25hbCkKKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFf VFJVRSBpZiBpdCB0aGUgSFRNTCB3YXMgc3VjY2Vzc2Z1bGx5IGxvYWRlZCwgQGMgRUlOQV9GQUxT RSBvdGhlcndpc2UKKyAqLworRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfaHRtbF9sb2FkKEV2YXNf T2JqZWN0ICpvLCBjb25zdCBjaGFyICpodG1sLCBjb25zdCBjaGFyICpiYXNlVXJsLCBjb25zdCBj aGFyICp1bnJlYWNoYWJsZVVybCk7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRp ZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDIyMjU1 ZS4uY2I5NjMyMCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA3LTA0ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hy aXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW1dLMl1bRUZMXSBFd2tfVmlldyBu ZWVkcyBBUEkgdG8gbG9hZCBIVE1MIGRhdGEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTkwNTQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVXBkYXRlIEVGTCBNaW5pQnJvd3NlciB0byBjYXRjaCB0aGUgImxv YWQsZXJyb3IiIHNpZ25hbAorICAgICAgICBvbiB0aGUgdmlldyBhbmQgZGlzcGxheSBhbiBlcnJv ciBwYWdlLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKyAgICAgICAgKG9u X2Vycm9yKToKKyAgICAgICAgKGJyb3dzZXJDcmVhdGUpOgorCiAyMDEyLTA3LTA0ICBTZXJnaW8g VmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFdlYktp dDIgdGVzdGluZyBib3QgdW5hYmxlIHRvIGZpbmQgdGhlIGJ1aWxkIGRpcmVjdG9yeQpkaWZmIC0t Z2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rvb2xzL01pbmlCcm93c2VyL2Vm bC9tYWluLmMKaW5kZXggMjE0NDhkMi4uOGY5MGU1ZiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJy b3dzZXIvZWZsL21haW4uYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC0x MjUsNiArMTI1LDIwIEBAIG9uX3Byb2dyZXNzKHZvaWQgKnVzZXJfZGF0YSwgRXZhc19PYmplY3Qg KndlYnZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgdGl0bGVfc2V0KGFwcC0+ZWUsIGV3a192 aWV3X3RpdGxlX2dldChhcHAtPmJyb3dzZXIpLCBwcm9ncmVzcyAqIDEwMCk7CiB9CiAKK3N0YXRp YyB2b2lkCitvbl9lcnJvcih2b2lkICp1c2VyX2RhdGEsIEV2YXNfT2JqZWN0ICp3ZWJ2aWV3LCB2 b2lkICpldmVudF9pbmZvKQoreworICAgIEVpbmFfU3RyYnVmKiBidWZmZXI7CisgICAgY29uc3Qg RXdrX1dlYl9FcnJvciAqZXJyb3IgPSAoY29uc3QgRXdrX1dlYl9FcnJvciAqKWV2ZW50X2luZm87 CisKKyAgICBidWZmZXIgPSBlaW5hX3N0cmJ1Zl9uZXcoKTsKKyAgICBlaW5hX3N0cmJ1Zl9hcHBl bmRfcHJpbnRmKGJ1ZmZlciwgIjxodG1sPjxib2R5PjxkaXYgc3R5bGU9XCJjb2xvcjojZmYwMDAw XCI+RVJST1IhPC9kaXY+PGJyPjxkaXY+Q29kZTogJWQ8YnI+RGVzY3JpcHRpb246ICVzPGJyPlVS TDogJXM8L2Rpdj48L2JvZHk8L2h0bWw+IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGV3a193ZWJfZXJyb3JfY29kZV9nZXQoZXJyb3IpLCBld2tfd2ViX2Vycm9yX2Rlc2NyaXB0aW9u X2dldChlcnJvciksIGV3a193ZWJfZXJyb3JfdXJsX2dldChlcnJvcikpOworCisgICAgZXdrX3Zp ZXdfaHRtbF9sb2FkKHdlYnZpZXcsIGVpbmFfc3RyYnVmX3N0cmluZ19nZXQoYnVmZmVyKSwgMCwg ZXdrX3dlYl9lcnJvcl91cmxfZ2V0KGVycm9yKSk7CisgICAgZWluYV9zdHJidWZfZnJlZShidWZm ZXIpOworfQorCiBzdGF0aWMgTWluaUJyb3dzZXIgKmJyb3dzZXJDcmVhdGUoY29uc3QgY2hhciAq dXJsKQogewogICAgIE1pbmlCcm93c2VyICphcHAgPSBtYWxsb2Moc2l6ZW9mKE1pbmlCcm93c2Vy KSk7CkBAIC0xNTEsNiArMTY1LDcgQEAgc3RhdGljIE1pbmlCcm93c2VyICpicm93c2VyQ3JlYXRl KGNvbnN0IGNoYXIgKnVybCkKICAgICBhcHAtPmJyb3dzZXIgPSBld2tfdmlld19hZGQoYXBwLT5l dmFzKTsKICAgICBldmFzX29iamVjdF9uYW1lX3NldChhcHAtPmJyb3dzZXIsICJicm93c2VyIik7 CiAKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwLT5icm93c2VyLCAibG9h ZCxlcnJvciIsIG9uX2Vycm9yLCBhcHApOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNr X2FkZChhcHAtPmJyb3dzZXIsICJsb2FkLHByb2dyZXNzIiwgb25fcHJvZ3Jlc3MsIGFwcCk7CiAg ICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKGFwcC0+YnJvd3NlciwgInRpdGxlLGNo YW5nZWQiLCBvbl90aXRsZV9jaGFuZ2VkLCBhcHApOwogCg== 150881 2012-07-04 23:20:02 -0700 2012-07-05 01:15:15 -0700 Patch 90540_minibrowser_load_error.patch text/plain 5372 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1M2ZhOWI1Li5iZmYwMDNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTItMDctMDQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbV0syXVtFRkxdIEV3a19WaWV3IG5lZWRzIEFQSSB0byBsb2FkIEhU TUwgZGF0YQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTA1NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgbWV0aG9kIHRvIEV3a19WaWV3IHRvIGxvYWQgcHJvdmlkZWQgSFRNTCBkYXRhLgorICAgICAg ICBUaGlzIGlzIHVzZWQgZm9yIGUuZy4gd2hlbiBhbiBVUkwgY2Fubm90IGJlIHJlYWNoZWQKKyAg ICAgICAgYW5kIHdlIG5lZWQgdG8gZGlzcGxheSBhbiBlcnJvciBwYWdlLgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwOgorICAgICAgICAoZXdrX3ZpZXdfaHRtbF9s b2FkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oOgorCiAyMDEyLTA3 LTA0ICBKb2huIE1lbGxvciAgPGpvaG5tZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVGV4dCBB dXRvc2l6aW5nOiBBZGQgY29tcGlsZSBmbGFnIGFuZCBydW50aW1lIHNldHRpbmcKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRleCBlNzliZDMyLi5l NDEwM2QyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf dmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcu Y3BwCkBAIC02ODksNiArNjg5LDE5IEBAIHZvaWQgZXdrX3ZpZXdfbG9hZF9lcnJvcihFdmFzX09i amVjdCogZXdrVmlldywgY29uc3QgRXdrX1dlYl9FcnJvciogZXJyb3IpCiAgICAgZXZhc19vYmpl Y3Rfc21hcnRfY2FsbGJhY2tfY2FsbChld2tWaWV3LCAibG9hZCxlcnJvciIsIGNvbnN0X2Nhc3Q8 RXdrX1dlYl9FcnJvcio+KGVycm9yKSk7CiB9CiAKK0VpbmFfQm9vbCBld2tfdmlld19odG1sX3N0 cmluZ19sb2FkKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBjaGFyKiBodG1sLCBjb25zdCBj aGFyKiBiYXNlVXJsLCBjb25zdCBjaGFyKiB1bnJlYWNoYWJsZVVybCkKK3sKKyAgICBFV0tfVklF V19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOworICAgIEVXS19W SUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKKyAgICBFSU5B X1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoaHRtbCwgZmFsc2UpOworCisgICAgaWYgKHVucmVh Y2hhYmxlVXJsICYmICp1bnJlYWNoYWJsZVVybCkKKyAgICAgICAgcHJpdi0+cGFnZUNsaWVudC0+ cGFnZSgpLT5sb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhTdHJpbmc6OmZyb21VVEY4KGh0bWwpLCBi YXNlVXJsID8gU3RyaW5nOjpmcm9tVVRGOChiYXNlVXJsKSA6ICIiLCBTdHJpbmc6OmZyb21VVEY4 KHVucmVhY2hhYmxlVXJsKSk7CisgICAgZWxzZQorICAgICAgICBwcml2LT5wYWdlQ2xpZW50LT5w YWdlKCktPmxvYWRIVE1MU3RyaW5nKFN0cmluZzo6ZnJvbVVURjgoaHRtbCksIGJhc2VVcmwgPyBT dHJpbmc6OmZyb21VVEY4KGJhc2VVcmwpIDogIiIpOworCisgICAgcmV0dXJuIHRydWU7Cit9CiAK ICNpZiBFTkFCTEUoV0VCX0lOVEVOVFNfVEFHKQogLyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAppbmRleCAzNzUwNmJiLi4yYWJkNjM2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKQEAgLTI2Niw2ICsyNjYsMjUg QEAgRUFQSSBjb25zdCBjaGFyICpld2tfdmlld190aXRsZV9nZXQoY29uc3QgRXZhc19PYmplY3Qg Km8pOwogICovCiBFQVBJIGRvdWJsZSBld2tfdmlld19sb2FkX3Byb2dyZXNzX2dldChjb25zdCBF dmFzX09iamVjdCAqbyk7CiAKKy8qKgorICogTG9hZHMgdGhlIHNwZWNpZmllZCBAYSBodG1sIHN0 cmluZyBhcyB0aGUgY29udGVudCBvZiB0aGUgdmlldy4KKyAqCisgKiBFeHRlcm5hbCBvYmplY3Rz IHN1Y2ggYXMgc3R5bGVzaGVldHMgb3IgaW1hZ2VzIHJlZmVyZW5jZWQgaW4gdGhlIEhUTUwKKyAq IGRvY3VtZW50IGFyZSBsb2NhdGVkIHJlbGF0aXZlIHRvIEBhIGJhc2VVcmwuCisgKgorICogSWYg YW4gQGEgdW5yZWFjaGFibGVVcmwgaXMgcGFzc2VkIGl0IGlzIHVzZWQgYXMgdGhlIHVybCBmb3Ig dGhlIGxvYWRlZAorICogY29udGVudC4gVGhpcyBpcyB0eXBpY2FsbHkgdXNlZCB0byBkaXNwbGF5 IGVycm9yIHBhZ2VzIGZvciBhIGZhaWxlZAorICogbG9hZC4KKyAqCisgKiBAcGFyYW0gbyB2aWV3 IG9iamVjdCB0byBsb2FkIHRoZSBIVE1MIGludG8KKyAqIEBwYXJhbSBodG1sIEhUTUwgZGF0YSB0 byBsb2FkCisgKiBAcGFyYW0gYmFzZVVybCBCYXNlIFVSTCB1c2VkIGZvciByZWxhdGl2ZSBwYXRo cyB0byBleHRlcm5hbCBvYmplY3RzIChvcHRpb25hbCkKKyAqIEBwYXJhbSB1bnJlYWNoYWJsZVVy bCBVUkwgdGhhdCBjb3VsZCBub3QgYmUgcmVhY2hlZCAob3B0aW9uYWwpCisgKgorICogQHJldHVy biBAYyBFSU5BX1RSVUUgaWYgaXQgdGhlIEhUTUwgd2FzIHN1Y2Nlc3NmdWxseSBsb2FkZWQsIEBj IEVJTkFfRkFMU0Ugb3RoZXJ3aXNlCisgKi8KK0VBUEkgRWluYV9Cb29sIGV3a192aWV3X2h0bWxf c3RyaW5nX2xvYWQoRXZhc19PYmplY3QgKm8sIGNvbnN0IGNoYXIgKmh0bWwsIGNvbnN0IGNoYXIg KmJhc2VVcmwsIGNvbnN0IGNoYXIgKnVucmVhY2hhYmxlVXJsKTsKKwogI2lmZGVmIF9fY3BsdXNw bHVzCiB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n ZUxvZwppbmRleCA3MTdmYjBiLi42MDlkZjdjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDctMDQgIENocmlz dG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAgICAgICBbV0sy XVtFRkxdIEV3a19WaWV3IG5lZWRzIEFQSSB0byBsb2FkIEhUTUwgZGF0YQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTA1NDAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgRUZMIE1pbmlCcm93c2Vy IHRvIGNhdGNoIHRoZSAibG9hZCxlcnJvciIgc2lnbmFsCisgICAgICAgIG9uIHRoZSB2aWV3IGFu ZCBkaXNwbGF5IGFuIGVycm9yIHBhZ2UuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9lZmwvbWFp bi5jOgorICAgICAgICAob25fZXJyb3IpOgorICAgICAgICAoYnJvd3NlckNyZWF0ZSk6CisKIDIw MTItMDctMDQgIFlvc2hpZnVtaSBJbm91ZSAgPHlvc2luQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBVbnJldmlld2VkIENocm9taXVtIGdhcmRlbmluZywgRGlzYWJsZSBhbHdheXMgZmFpbGVkIHB5 dGhvbiB0ZXN0cyBvbiBXaW5kb3dzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZs L21haW4uYyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKaW5kZXggMjE0NDhkMi4uZjE2 MTRhYSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysgYi9Ub29s cy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC0xMjUsNiArMTI1LDIwIEBAIG9uX3Byb2dyZXNz KHZvaWQgKnVzZXJfZGF0YSwgRXZhc19PYmplY3QgKndlYnZpZXcsIHZvaWQgKmV2ZW50X2luZm8p CiAgICAgdGl0bGVfc2V0KGFwcC0+ZWUsIGV3a192aWV3X3RpdGxlX2dldChhcHAtPmJyb3dzZXIp LCBwcm9ncmVzcyAqIDEwMCk7CiB9CiAKK3N0YXRpYyB2b2lkCitvbl9lcnJvcih2b2lkICp1c2Vy X2RhdGEsIEV2YXNfT2JqZWN0ICp3ZWJ2aWV3LCB2b2lkICpldmVudF9pbmZvKQoreworICAgIEVp bmFfU3RyYnVmKiBidWZmZXI7CisgICAgY29uc3QgRXdrX1dlYl9FcnJvciAqZXJyb3IgPSAoY29u c3QgRXdrX1dlYl9FcnJvciAqKWV2ZW50X2luZm87CisKKyAgICBidWZmZXIgPSBlaW5hX3N0cmJ1 Zl9uZXcoKTsKKyAgICBlaW5hX3N0cmJ1Zl9hcHBlbmRfcHJpbnRmKGJ1ZmZlciwgIjxodG1sPjxi b2R5PjxkaXYgc3R5bGU9XCJjb2xvcjojZmYwMDAwXCI+RVJST1IhPC9kaXY+PGJyPjxkaXY+Q29k ZTogJWQ8YnI+RGVzY3JpcHRpb246ICVzPGJyPlVSTDogJXM8L2Rpdj48L2JvZHk8L2h0bWw+IiwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV3a193ZWJfZXJyb3JfY29kZV9nZXQoZXJy b3IpLCBld2tfd2ViX2Vycm9yX2Rlc2NyaXB0aW9uX2dldChlcnJvciksIGV3a193ZWJfZXJyb3Jf dXJsX2dldChlcnJvcikpOworCisgICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdfbG9hZCh3ZWJ2aWV3 LCBlaW5hX3N0cmJ1Zl9zdHJpbmdfZ2V0KGJ1ZmZlciksIDAsIGV3a193ZWJfZXJyb3JfdXJsX2dl dChlcnJvcikpOworICAgIGVpbmFfc3RyYnVmX2ZyZWUoYnVmZmVyKTsKK30KKwogc3RhdGljIE1p bmlCcm93c2VyICpicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCkKIHsKICAgICBNaW5pQnJv d3NlciAqYXBwID0gbWFsbG9jKHNpemVvZihNaW5pQnJvd3NlcikpOwpAQCAtMTUxLDYgKzE2NSw3 IEBAIHN0YXRpYyBNaW5pQnJvd3NlciAqYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmwpCiAg ICAgYXBwLT5icm93c2VyID0gZXdrX3ZpZXdfYWRkKGFwcC0+ZXZhcyk7CiAgICAgZXZhc19vYmpl Y3RfbmFtZV9zZXQoYXBwLT5icm93c2VyLCAiYnJvd3NlciIpOwogCisgICAgZXZhc19vYmplY3Rf c21hcnRfY2FsbGJhY2tfYWRkKGFwcC0+YnJvd3NlciwgImxvYWQsZXJyb3IiLCBvbl9lcnJvciwg YXBwKTsKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwLT5icm93c2VyLCAi bG9hZCxwcm9ncmVzcyIsIG9uX3Byb2dyZXNzLCBhcHApOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0 X2NhbGxiYWNrX2FkZChhcHAtPmJyb3dzZXIsICJ0aXRsZSxjaGFuZ2VkIiwgb25fdGl0bGVfY2hh bmdlZCwgYXBwKTsKIAo=