88763 2012-06-11 00:24:53 -0700 [Qt] Add configure test for zlib and set WTF_USE_ZLIB if found 2012-06-13 07:41:39 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hausmann qi.2.zhang laszlo.gombos qi.2.zhang vestbo webkit.review.bot oldest_to_newest 645783 0 hausmann 2012-06-11 00:24:53 -0700 The websocket code can use zlib directory for compressiond/decompression. We should enable that and unskip the corresponding layout tests LayoutTests/http/tests/websocket/tests/hybi/compressed-control-frame.html LayoutTests/http/tests/websocket/tests/hybi/deflate-frame-invalid-parameter.html LayoutTests/http/tests/websocket/tests/hybi/deflate-frame-parameter.html LayoutTests/http/tests/websocket/tests/hybi/extensions.html LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header.html 646014 1 146861 qi.2.zhang 2012-06-11 08:51:47 -0700 Created attachment 146861 patch zlib should be included in qt5, so by default websocket extension should work now in qt5. I don't know how about qt4.8, so I move the test cases into qt-4.8 skipped. 646110 2 146861 hausmann 2012-06-11 11:12:54 -0700 Comment on attachment 146861 patch View in context: https://bugs.webkit.org/attachment.cgi?id=146861&action=review > Tools/qmake/config.tests/libzlib/libzlib.pro:2 > +OBJECTS_DIR = obj Don't you also need a LIBS += -lz here? 646120 3 qi.2.zhang 2012-06-11 11:23:35 -0700 Yes, I didn't include the lib by myself, it just work. Looks like qt5 already include it: qt5/qtbase/src/3rdparty/zlib/ 646134 4 hausmann 2012-06-11 11:35:35 -0700 (In reply to comment #3) > Yes, I didn't include the lib by myself, it just work. Looks like qt5 already include it: > > qt5/qtbase/src/3rdparty/zlib/ Right, but that's not going to work anymore after https://codereview.qt-project.org/#change,28141 We should not be using the zlib symbols from QtCore, we should use the system one. 646174 5 qi.2.zhang 2012-06-11 12:41:31 -0700 I updated my qt5, but I still didn't get that patch. And from the comments: This commit does not in itself solve the issue of how to let Qt libraries outside of qtbase use the same bundled zlib, but it is a prerequisite for that. Looks like we have to wait for a while to really get the fix. Question: if I used LIBS += -lz, how do I know I use qt symbols or system symbols now? 646179 6 hausmann 2012-06-11 12:46:50 -0700 (In reply to comment #5) > I updated my qt5, but I still didn't get that patch. And from the comments: > > This commit does not in itself solve the issue of how to let Qt > libraries outside of qtbase use the same bundled zlib, but it is > a prerequisite for that. > > Looks like we have to wait for a while to really get the fix. > > Question: if I used LIBS += -lz, how do I know I use qt symbols or system symbols now? On Linux (or more specifically ELF) this is only determined at load time (or when prelinking). I think we should do the right thing and use -lz because we also _do_ use the system zlib _header_ files that come with it - we don't use the headers shipped inside Qt. Anyway, in the common case Qt should also be using the system zlib anyway instead. 646909 7 147078 qi.2.zhang 2012-06-12 07:21:16 -0700 Created attachment 147078 patch2 I am just wondering if we use system symbols then we have new depend. I have another stupid question: why -lz not -lzlib (I suppose is this one, but doesn't work) 646942 8 hausmann 2012-06-12 08:02:14 -0700 (In reply to comment #7) > Created an attachment (id=147078) [details] > patch2 > > I am just wondering if we use system symbols then we have new depend. Yes, we do, we should and will depend on the system z library. > I have another stupid question: why -lz not -lzlib (I suppose is this one, but doesn't work) Because the library is called libz.so, not libzlib.so :) 646943 9 147078 hausmann 2012-06-12 08:03:57 -0700 Comment on attachment 147078 patch2 r=me, but please set cq+ manually or land it manually and watch the bots closely. 647955 10 qi.2.zhang 2012-06-13 05:55:19 -0700 Manually Committed r120193: <http://trac.webkit.org/changeset/120193> 648002 11 147078 laszlo.gombos 2012-06-13 07:40:52 -0700 Comment on attachment 147078 patch2 Setting the patch obsolete as it is landed. 146861 2012-06-11 08:51:47 -0700 2012-06-12 07:21:16 -0700 patch 88763.patch text/plain 6516 qi.2.zhang SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDExOTk4MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDEyLTA2LTExICBRaSBaaGFuZyAgPHFpLjIuemhhbmdAbm9raWEuY29tPgor CisgICAgICAgIFtRdF0gQWRkIGNvbmZpZ3VyZSB0ZXN0IGZvciB6bGliIGFuZCBzZXQgV1RGX1VT RV9aTElCIGlmIGZvdW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04ODc2MworCisgICAgICAgIEFkZCBjb25maWd1cmUgdGVzdCBmb3IgemxpYiBhbmQg c2V0IFdURl9VU0VfWkxJQiBpZiBmb3VuZCB0byBlbmFibGUgd2Vic29ja2V0CisgICAgICAgIGV4 dGVuc2lvbi4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHFtYWtlL2NvbmZpZy50ZXN0cy9saWJ6bGliOiBBZGRlZC4KKyAgICAgICAgKiBxbWFrZS9j b25maWcudGVzdHMvbGliemxpYi9saWJ6bGliLmNwcDogQWRkZWQuCisgICAgICAgIChtYWluKToK KyAgICAgICAgKiBxbWFrZS9jb25maWcudGVzdHMvbGliemxpYi9saWJ6bGliLnBybzogQWRkZWQu CisgICAgICAgICogcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mZWF0dXJlcy5wcmY6CisgICAgICAg ICogcW1ha2Uvc3luYy5wcm9maWxlOgorCiAyMDEyLTA2LTExICBab2x0YW4gSG9ydmF0aCAgPHpv bHRhbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF0gQWRkIGNvbmZpZyB0ZXN0cyBmb3IgV0VC UCBpbWFnZWRlY29kZXIgbGlicmFyeSwgbW9kaWZ5IEhBVkUoZGVjb2RlcmxpYnJhcnkpIHRvIFVT RSguLi4pCkluZGV4OiBUb29scy9xbWFrZS9zeW5jLnByb2ZpbGUKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvcW1ha2Uvc3luYy5wcm9maWxlCShyZXZpc2lvbiAxMTk1ODkpCisrKyBUb29scy9xbWFrZS9z eW5jLnByb2ZpbGUJKHdvcmtpbmcgY29weSkKQEAgLTYsNCArNiw1IEBACiAgICAgbGlianBlZyA9 PiB7fSwKICAgICBsaWJ4bWwyID0+IHt9LAogICAgIGxpYnhzbHQgPT4ge30sCisgICAgbGliemxp YiA9PiB7fSwKICk7CkluZGV4OiBUb29scy9xbWFrZS9jb25maWcudGVzdHMvbGliemxpYi9saWJ6 bGliLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9xbWFrZS9jb25maWcudGVzdHMvbGliemxpYi9s aWJ6bGliLmNwcAkocmV2aXNpb24gMCkKKysrIFRvb2xzL3FtYWtlL2NvbmZpZy50ZXN0cy9saWJ6 bGliL2xpYnpsaWIuY3BwCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDMyIEBACisvKgorICogQ29w eXJpZ2h0IChDKSAyMDEwIE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgt aWVzKQorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4g UmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5 cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBt dXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAg ICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUg ZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENP UFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyAqICJBUyBJUyIgQU5EIEFOWSBFWFBS RVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVE IFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVT UyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVO VCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxF IEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyAqIFNQRUNJQUwsIEVYRU1Q TEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJ TUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExP U1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9O KSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisgKiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVU SEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5H IE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgPHpsaWIuaD4KKworaW50IG1haW4o aW50LCBjaGFyKiopCit7CisgICAgKHZvaWQpemxpYlZlcnNpb24oKTsKKyAgICByZXR1cm4gMDsK K30KSW5kZXg6IFRvb2xzL3FtYWtlL2NvbmZpZy50ZXN0cy9saWJ6bGliL2xpYnpsaWIucHJvCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL3FtYWtlL2NvbmZpZy50ZXN0cy9saWJ6bGliL2xpYnpsaWIucHJv CShyZXZpc2lvbiAwKQorKysgVG9vbHMvcW1ha2UvY29uZmlnLnRlc3RzL2xpYnpsaWIvbGliemxp Yi5wcm8JKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMiBAQAorU09VUkNFUyA9IGxpYnpsaWIuY3Bw CitPQkpFQ1RTX0RJUiA9IG9iagpJbmRleDogVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9m ZWF0dXJlcy5wcmYKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9m ZWF0dXJlcy5wcmYJKHJldmlzaW9uIDExOTU4OSkKKysrIFRvb2xzL3FtYWtlL21rc3BlY3MvZmVh dHVyZXMvZmVhdHVyZXMucHJmCSh3b3JraW5nIGNvcHkpCkBAIC03Myw2ICs3MywxMSBAQCBoYXZl UXQoNSkgewogICAgIGhhdmVRdCg1KTpjb250YWlucyhjb25maWdfdGVzdF9saWJ4c2x0LCB5ZXMp OiBERUZJTkVTICs9IEVOQUJMRV9YU0xUPTEKIH0KIAorIyBXZSBuZWVkIGxpYnpsaWIgY29uZmln IHRlc3QgdG8gZGV0ZXJtaW5lIHRvIHVzZSBlbmFibGUgd2Vic29ja2V0IGV4dGVuc2lvbiBvciBu b3QKKyFjb250YWlucyhERUZJTkVTLCBXVEZfVVNFX1pMSUI9LikgeworICAgIGhhdmVRdCg1KTpj b250YWlucyhjb25maWdfdGVzdF9saWJ6bGliLCB5ZXMpOiBERUZJTkVTICs9IFdURl9VU0VfWkxJ Qj0xCit9CisKICFjb250YWlucyhERUZJTkVTLCBXVEZfVVNFX1FUX0lNQUdFX0RFQ09ERVI9Lik6 IERFRklORVMgKz0gV1RGX1VTRV9RVF9JTUFHRV9ERUNPREVSPTEKIAogIyBUaWxlZCBCYWNraW5n IFN0b3JlIHN1cHBvcnQKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDExOTk4MSkKKysrIExheW91dFRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA2LTExICBR aSBaaGFuZyAgPHFpLjIuemhhbmdAbm9raWEuY29tPgorCisgICAgICAgIFtRdF0gQWRkIGNvbmZp Z3VyZSB0ZXN0IGZvciB6bGliIGFuZCBzZXQgV1RGX1VTRV9aTElCIGlmIGZvdW5kCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODc2MworCisgICAgICAg IE1vdmUgZmFpbGVkIHdlYnNvY2tldCBleHRlbnNpb24gdGVzdCBjYXNlIHRvIHF0LTQuOCBhZnRl ciBlbmFibGUgaXQgaW4gcXQ1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC00LjgvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0Zm9y bS9xdC9Ta2lwcGVkOgorCiAyMDEyLTA2LTExICBEb21pbmljIENvb25leSAgPGRvbWluaWNjQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIFVucmV2aWV3ZWQ6IFJlYmFzZWxpbmUg bW9yZSBTVkcgdGVzdHMgb24gV2luZG93cy4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL3F0 LTQuOC9Ta2lwcGVkCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL3F0LTQuOC9T a2lwcGVkCShyZXZpc2lvbiAxMTk1ODkpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC00Ljgv U2tpcHBlZAkod29ya2luZyBjb3B5KQpAQCAtNDcsNiArNDcsMTcgQEAgZWRpdGluZy9zZWxlY3Rp b24vY2xpY2stbGVmdC1vZi1ydGwtd3JhcAogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIwogCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjCisjIE1vdmVkIGZyb20gcXQvU2tpcHBlZCBhZnRlcjoKKyMgW1F0XSBB ZGQgY29uZmlndXJlIHRlc3QgZm9yIHpsaWIgYW5kIHNldCBXVEZfVVNFX1pMSUIgaWYgZm91bmQK KyMgVVNFKFpMSUIpIGlzIGRpc2FibGVkLgoraHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHli aS9jb21wcmVzc2VkLWNvbnRyb2wtZnJhbWUuaHRtbAoraHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVz dHMvaHliaS9kZWZsYXRlLWZyYW1lLWludmFsaWQtcGFyYW1ldGVyLmh0bWwKK2h0dHAvdGVzdHMv d2Vic29ja2V0L3Rlc3RzL2h5YmkvZGVmbGF0ZS1mcmFtZS1wYXJhbWV0ZXIuaHRtbAoraHR0cC90 ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9leHRlbnNpb25zLmh0bWwKK2h0dHAvdGVzdHMvd2Vi c29ja2V0L3Rlc3RzL2h5YmkvaGFuZHNoYWtlLWZhaWwtYnktZXh0ZW5zaW9ucy1oZWFkZXIuaHRt bAorIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIworCisj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiAjIFRlc3Rz IGZhaWxpbmcgb24gV0sxIG9ubHkgKHdvcmtpbmcgb24gV0syKSAtIGNvcGllZCBmcm9tIHRoZSBv bGQgcXQtd2sxL1NraXBwZWQgbGlzdAogCiAjIE5ldyB0ZXN0IGludHJvZHVjZWQgaW4gcjEwMjA0 OCBmYWlscyBvbiBRdC1XSzEKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAkocmV2aXNpb24g MTE5NTg5KQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAkod29ya2luZyBjb3B5 KQpAQCAtMzIwLDEzICszMjAsNiBAQCBmYXN0L211dGF0aW9uL3NoYWRvdy1kb20uaHRtbAogZmFz dC9tdXRhdGlvbi90YWtlUmVjb3Jkcy5odG1sCiBmYXN0L211dGF0aW9uL3RyYW5zaWVudC1nYy1j cmFzaC5odG1sCiAKLSMgVVNFKFpMSUIpIGlzIGRpc2FibGVkLgotaHR0cC90ZXN0cy93ZWJzb2Nr ZXQvdGVzdHMvaHliaS9jb21wcmVzc2VkLWNvbnRyb2wtZnJhbWUuaHRtbAotaHR0cC90ZXN0cy93 ZWJzb2NrZXQvdGVzdHMvaHliaS9kZWZsYXRlLWZyYW1lLWludmFsaWQtcGFyYW1ldGVyLmh0bWwK LWh0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvZGVmbGF0ZS1mcmFtZS1wYXJhbWV0ZXIu aHRtbAotaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9leHRlbnNpb25zLmh0bWwKLWh0 dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvaGFuZHNoYWtlLWZhaWwtYnktZXh0ZW5zaW9u cy1oZWFkZXIuaHRtbAotCiAjIERpc2FibGUgcHJpdmF0ZSBuYW1lcyBieSBkZWZhdWx0IGluIFdl YkNvcmUKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MDg4CiBm YXN0L2pzL25hbWVzLmh0bWwK 147078 2012-06-12 07:21:16 -0700 2012-06-13 07:40:50 -0700 patch2 88763_2.patch text/plain 6957 qi.2.zhang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJpCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL1dlYkNvcmUucHJpCShyZXZpc2lvbiAxMTk1ODkpCisrKyBTb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLnByaQkod29ya2luZyBjb3B5KQpAQCAtMTM0LDYgKzEzNCwxMCBAQCBjb250YWlucyhE RUZJTkVTLCBXVEZfVVNFX0xJQlhNTDI9MSkgewogICAgIFBLR0NPTkZJRyArPSBsaWJ4bWwtMi4w CiB9CiAKK2NvbnRhaW5zKERFRklORVMsIFdURl9VU0VfWkxJQj0xKSB7CisgICAgTElCUyArPSAt bHoKK30KKwogY29udGFpbnMoREVGSU5FUywgRU5BQkxFX05FVFNDQVBFX1BMVUdJTl9BUEk9MSkg ewogICAgIHVuaXggewogICAgICAgICBtYWMgewpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTE5OTgxKQorKysgVG9vbHMvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMDYtMTEgIFFpIFpo YW5nICA8cWkuMi56aGFuZ0Bub2tpYS5jb20+CisKKyAgICAgICAgW1F0XSBBZGQgY29uZmlndXJl IHRlc3QgZm9yIHpsaWIgYW5kIHNldCBXVEZfVVNFX1pMSUIgaWYgZm91bmQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4NzYzCisKKyAgICAgICAgQWRk IGNvbmZpZ3VyZSB0ZXN0IGZvciB6bGliIGFuZCBzZXQgV1RGX1VTRV9aTElCIGlmIGZvdW5kIHRv IGVuYWJsZSB3ZWJzb2NrZXQKKyAgICAgICAgZXh0ZW5zaW9uLgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcW1ha2UvY29uZmlnLnRlc3RzL2xpYnps aWI6IEFkZGVkLgorICAgICAgICAqIHFtYWtlL2NvbmZpZy50ZXN0cy9saWJ6bGliL2xpYnpsaWIu Y3BwOiBBZGRlZC4KKyAgICAgICAgKG1haW4pOgorICAgICAgICAqIHFtYWtlL2NvbmZpZy50ZXN0 cy9saWJ6bGliL2xpYnpsaWIucHJvOiBBZGRlZC4KKyAgICAgICAgKiBxbWFrZS9ta3NwZWNzL2Zl YXR1cmVzL2ZlYXR1cmVzLnByZjoKKyAgICAgICAgKiBxbWFrZS9zeW5jLnByb2ZpbGU6CisKIDIw MTItMDYtMTEgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CiAKICAgICAgICAg W1F0XSBBZGQgY29uZmlnIHRlc3RzIGZvciBXRUJQIGltYWdlZGVjb2RlciBsaWJyYXJ5LCBtb2Rp ZnkgSEFWRShkZWNvZGVybGlicmFyeSkgdG8gVVNFKC4uLikKSW5kZXg6IFRvb2xzL3FtYWtlL3N5 bmMucHJvZmlsZQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9xbWFrZS9zeW5jLnByb2ZpbGUJKHJldmlz aW9uIDExOTU4OSkKKysrIFRvb2xzL3FtYWtlL3N5bmMucHJvZmlsZQkod29ya2luZyBjb3B5KQpA QCAtNiw0ICs2LDUgQEAKICAgICBsaWJqcGVnID0+IHt9LAogICAgIGxpYnhtbDIgPT4ge30sCiAg ICAgbGlieHNsdCA9PiB7fSwKKyAgICBsaWJ6bGliID0+IHt9LAogKTsKSW5kZXg6IFRvb2xzL3Ft YWtlL2NvbmZpZy50ZXN0cy9saWJ6bGliL2xpYnpsaWIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L3FtYWtlL2NvbmZpZy50ZXN0cy9saWJ6bGliL2xpYnpsaWIuY3BwCShyZXZpc2lvbiAwKQorKysg VG9vbHMvcW1ha2UvY29uZmlnLnRlc3RzL2xpYnpsaWIvbGliemxpYi5jcHAJKHJldmlzaW9uIDAp CkBAIC0wLDAgKzEsMzIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAgTm9raWEgQ29ycG9y YXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1pZXMpCisgKgorICogUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNv ZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxp c3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVk aXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5 cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVy IG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBT T0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJV VE9SUworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJ TkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMg T0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBP U0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9X TkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFH RVMgKElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9G SVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkK KyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFC SUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFS SVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZF TiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisj aW5jbHVkZSA8emxpYi5oPgorCitpbnQgbWFpbihpbnQsIGNoYXIqKikKK3sKKyAgICAodm9pZCl6 bGliVmVyc2lvbigpOworICAgIHJldHVybiAwOworfQpJbmRleDogVG9vbHMvcW1ha2UvY29uZmln LnRlc3RzL2xpYnpsaWIvbGliemxpYi5wcm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvcW1ha2UvY29u ZmlnLnRlc3RzL2xpYnpsaWIvbGliemxpYi5wcm8JKHJldmlzaW9uIDApCisrKyBUb29scy9xbWFr ZS9jb25maWcudGVzdHMvbGliemxpYi9saWJ6bGliLnBybwkocmV2aXNpb24gMCkKQEAgLTAsMCAr MSwzIEBACitTT1VSQ0VTID0gbGliemxpYi5jcHAKK09CSkVDVFNfRElSID0gb2JqCitMSUJTICs9 IC1segpJbmRleDogVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mZWF0dXJlcy5wcmYKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mZWF0dXJlcy5wcmYJKHJl dmlzaW9uIDExOTU4OSkKKysrIFRvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvZmVhdHVyZXMu cHJmCSh3b3JraW5nIGNvcHkpCkBAIC03Myw2ICs3MywxMSBAQCBoYXZlUXQoNSkgewogICAgIGhh dmVRdCg1KTpjb250YWlucyhjb25maWdfdGVzdF9saWJ4c2x0LCB5ZXMpOiBERUZJTkVTICs9IEVO QUJMRV9YU0xUPTEKIH0KIAorIyBXZSBuZWVkIGxpYnpsaWIgY29uZmlnIHRlc3QgdG8gZGV0ZXJt aW5lIHRvIHVzZSBlbmFibGUgd2Vic29ja2V0IGV4dGVuc2lvbiBvciBub3QKKyFjb250YWlucyhE RUZJTkVTLCBXVEZfVVNFX1pMSUI9LikgeworICAgIGhhdmVRdCg1KTpjb250YWlucyhjb25maWdf dGVzdF9saWJ6bGliLCB5ZXMpOiBERUZJTkVTICs9IFdURl9VU0VfWkxJQj0xCit9CisKICFjb250 YWlucyhERUZJTkVTLCBXVEZfVVNFX1FUX0lNQUdFX0RFQ09ERVI9Lik6IERFRklORVMgKz0gV1RG X1VTRV9RVF9JTUFHRV9ERUNPREVSPTEKIAogIyBUaWxlZCBCYWNraW5nIFN0b3JlIHN1cHBvcnQK SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDExOTk4MSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA2LTExICBRaSBaaGFuZyAgPHFpLjIu emhhbmdAbm9raWEuY29tPgorCisgICAgICAgIFtRdF0gQWRkIGNvbmZpZ3VyZSB0ZXN0IGZvciB6 bGliIGFuZCBzZXQgV1RGX1VTRV9aTElCIGlmIGZvdW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODc2MworCisgICAgICAgIE1vdmUgZmFpbGVkIHdl YnNvY2tldCBleHRlbnNpb24gdGVzdCBjYXNlIHRvIHF0LTQuOCBhZnRlciBlbmFibGUgaXQgaW4g cXQ1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9xdC00LjgvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOgor CiAyMDEyLTA2LTExICBEb21pbmljIENvb25leSAgPGRvbWluaWNjQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBbQ2hyb21pdW1dIFVucmV2aWV3ZWQ6IFJlYmFzZWxpbmUgbW9yZSBTVkcgdGVzdHMg b24gV2luZG93cy4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL3F0LTQuOC9Ta2lwcGVkCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL3F0LTQuOC9Ta2lwcGVkCShyZXZpc2lv biAxMTk1ODkpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC00LjgvU2tpcHBlZAkod29ya2lu ZyBjb3B5KQpAQCAtNDcsNiArNDcsMTcgQEAgZWRpdGluZy9zZWxlY3Rpb24vY2xpY2stbGVmdC1v Zi1ydGwtd3JhcAogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIwogCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj CisjIE1vdmVkIGZyb20gcXQvU2tpcHBlZCBhZnRlcjoKKyMgW1F0XSBBZGQgY29uZmlndXJlIHRl c3QgZm9yIHpsaWIgYW5kIHNldCBXVEZfVVNFX1pMSUIgaWYgZm91bmQKKyMgVVNFKFpMSUIpIGlz IGRpc2FibGVkLgoraHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9jb21wcmVzc2VkLWNv bnRyb2wtZnJhbWUuaHRtbAoraHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9kZWZsYXRl LWZyYW1lLWludmFsaWQtcGFyYW1ldGVyLmh0bWwKK2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3Rz L2h5YmkvZGVmbGF0ZS1mcmFtZS1wYXJhbWV0ZXIuaHRtbAoraHR0cC90ZXN0cy93ZWJzb2NrZXQv dGVzdHMvaHliaS9leHRlbnNpb25zLmh0bWwKK2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5 YmkvaGFuZHNoYWtlLWZhaWwtYnktZXh0ZW5zaW9ucy1oZWFkZXIuaHRtbAorIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIworCisjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiAjIFRlc3RzIGZhaWxpbmcgb24gV0sx IG9ubHkgKHdvcmtpbmcgb24gV0syKSAtIGNvcGllZCBmcm9tIHRoZSBvbGQgcXQtd2sxL1NraXBw ZWQgbGlzdAogCiAjIE5ldyB0ZXN0IGludHJvZHVjZWQgaW4gcjEwMjA0OCBmYWlscyBvbiBRdC1X SzEKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAkocmV2aXNpb24gMTE5NTg5KQorKysgTGF5 b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAkod29ya2luZyBjb3B5KQpAQCAtMzIwLDEzICsz MjAsNiBAQCBmYXN0L211dGF0aW9uL3NoYWRvdy1kb20uaHRtbAogZmFzdC9tdXRhdGlvbi90YWtl UmVjb3Jkcy5odG1sCiBmYXN0L211dGF0aW9uL3RyYW5zaWVudC1nYy1jcmFzaC5odG1sCiAKLSMg VVNFKFpMSUIpIGlzIGRpc2FibGVkLgotaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9j b21wcmVzc2VkLWNvbnRyb2wtZnJhbWUuaHRtbAotaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMv aHliaS9kZWZsYXRlLWZyYW1lLWludmFsaWQtcGFyYW1ldGVyLmh0bWwKLWh0dHAvdGVzdHMvd2Vi c29ja2V0L3Rlc3RzL2h5YmkvZGVmbGF0ZS1mcmFtZS1wYXJhbWV0ZXIuaHRtbAotaHR0cC90ZXN0 cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9leHRlbnNpb25zLmh0bWwKLWh0dHAvdGVzdHMvd2Vic29j a2V0L3Rlc3RzL2h5YmkvaGFuZHNoYWtlLWZhaWwtYnktZXh0ZW5zaW9ucy1oZWFkZXIuaHRtbAot CiAjIERpc2FibGUgcHJpdmF0ZSBuYW1lcyBieSBkZWZhdWx0IGluIFdlYkNvcmUKICMgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MDg4CiBmYXN0L2pzL25hbWVzLmh0 bWwK