111034 2013-02-27 20:42:39 -0800 ResourceRequestCFNet.cpp won't compile after r144216 2013-02-28 01:41:21 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 110900 1 ddkilzer ddkilzer ap beidson jberlin roger_fong webkit.review.bot oldest_to_newest 843675 0 ddkilzer 2013-02-27 20:42:39 -0800 ResourceRequestCFNet.cpp won't compile on iOS (or probably Windows) after r144216 for Bug 110900. <http://trac.webkit.org/changeset/144216> There was also a bad typo ("Contemt-Length") in ResourceRequestCFNet.cpp. I'm working on testing a fix now. 843677 1 ddkilzer 2013-02-27 20:47:24 -0800 Here are the compiler errors generated: Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:200:30: error: use of undeclared identifier 'nsRequest' WebCore::setHTTPBody(nsRequest, formData); ^ Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:202:95: error: use of undeclared identifier 'request' if (RetainPtr<CFReadStreamRef> bodyStream = adoptCF(CFURLRequestCopyHTTPRequestBodyStream(request))) { ^ Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:206:84: error: too many arguments provided to function-like macro invocation CFURLRequestSetHTTPHeaderFieldValue(cfRequest, CFSTR("Contemt-Length", lengthString.get())); ^ In file included from Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:1: In file included from Source/WebCore/WebCorePrefix.h:136: In file included from /System/Library/Frameworks/CoreFoundation.framework/Headers/CoreFoundation.h:44: In file included from /System/Library/Frameworks/CoreFoundation.framework/Headers/CFCalendar.h:11: In file included from /System/Library/Frameworks/CoreFoundation.framework/Headers/CFTimeZone.h:13: /System/Library/Frameworks/CoreFoundation.framework/Headers/CFString.h:149:9: note: macro 'CFSTR' defined here #define CFSTR(cStr) ((CFStringRef) __builtin___CFStringMakeConstantString ("" cStr "")) ^ Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:206:60: error: use of undeclared identifier 'CFSTR' CFURLRequestSetHTTPHeaderFieldValue(cfRequest, CFSTR("Contemt-Length", lengthString.get())); ^ Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:287:100: error: use of undeclared identifier 'request' else if (RetainPtr<CFReadStreamRef> bodyStream = adoptCF(CFURLRequestCopyHTTPRequestBodyStream(request))) { ^ In file included from Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:29: In file included from Source/WebCore/platform/network/ResourceHandle.h:37: In file included from Source/WebCore/platform/network/ios/QuickLook.h:13: In file included from Source/WebCore/platform/network/cf/ResourceRequest.h:32: WebKitBuild/Release-iphoneos/usr/local/include/wtf/RetainPtr.h:129:11: error: cannot initialize a member subobject of type 'PtrType' (aka 'const __CFString *') with an rvalue of type 'PtrType' (aka 'const void *') : m_ptr(o.get()) ^ ~~~~~~~ Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:204:47: note: in instantiation of function template specialization 'WTF::RetainPtr<const __CFString *>::RetainPtr<const void *>' requested here RetainPtr<CFStringRef> lengthString = adoptCF(CFReadStreamCopyProperty(bodyStream.get(), formDataStreamLengthPropertyName())); ^ 6 errors generated. 843680 2 ap 2013-02-27 20:54:05 -0800 Sorry about this - the plan was to fix errors after landing, but we couldn't do it this afternoon. > There was also a bad typo ("Contemt-Length") in ResourceRequestCFNet.cpp. Oops! 843681 3 ap 2013-02-27 20:54:50 -0800 (note that the patch is _still_ #92 on Windows EWS) 843701 4 ddkilzer 2013-02-27 21:27:47 -0800 And some linker failures: Undefined symbols for architecture armv7: "__ZN7WebCore15ResourceRequest39updateFromDelegatePreservingOldHTTPBodyERKS0_", referenced from: -exported_symbol[s_list] command line option "__ZNK7WebCore15ResourceRequest12cfURLRequestEv", referenced from: -exported_symbol[s_list] command line option ld: symbol(s) not found for architecture armv7 clang: error: linker command failed with exit code 1 (use -v to see invocation) 843704 5 ddkilzer 2013-02-27 21:34:29 -0800 I also don't see where this method is implemented: + void updateFromDelegatePreservingOldHTTPBody(CFURLRequestRef); Although it doesn't appear to be used, so maybe that doesn't matter. 843706 6 ap 2013-02-27 21:39:49 -0800 Yes, updateFromDelegatePreservingOldHTTPBody is only needed for WebKit2 (and in fact, its signature is now different, I should have removed it from CF part). 843708 7 190648 ddkilzer 2013-02-27 21:42:14 -0800 Created attachment 190648 Patch v1 Fixes the compiler and linker errors for iOS. 843711 8 190648 ddkilzer 2013-02-27 21:52:09 -0800 Comment on attachment 190648 Patch v1 I have a better patch with a ChangeLog. 843720 9 190651 ddkilzer 2013-02-27 21:56:22 -0800 Created attachment 190651 Patch v2 843883 10 190651 webkit.review.bot 2013-02-28 01:41:17 -0800 Comment on attachment 190651 Patch v2 Clearing flags on attachment: 190651 Committed r144278: <http://trac.webkit.org/changeset/144278> 843884 11 webkit.review.bot 2013-02-28 01:41:21 -0800 All reviewed patches have been landed. Closing bug. 190648 2013-02-27 21:42:14 -0800 2013-02-27 21:52:09 -0800 Patch v1 bug-111034-v1.diff text/plain 5304 ddkilzer ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5leHAuaW4KaW5kZXggYWNmOTNlNC4uODgxM2YwYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5l eHAuaW4KQEAgLTQ1MSw3ICs0NTEsNiBAQCBfX1pON1dlYkNvcmUxNVByb3RlY3Rpb25TcGFjZUMx RVJLTjNXVEY2U3RyaW5nRWlOU18yNVByb3RlY3Rpb25TcGFjZVNlcnZlclR5cGVFUwogX19aTjdX ZWJDb3JlMTVQcm90ZWN0aW9uU3BhY2VDMUV2CiBfX1pON1dlYkNvcmUxNVJlc291cmNlUmVxdWVz dDIxaHR0cFBpcGVsaW5pbmdFbmFibGVkRXYKIF9fWk43V2ViQ29yZTE1UmVzb3VyY2VSZXF1ZXN0 MjRzZXRIVFRQUGlwZWxpbmluZ0VuYWJsZWRFYgotX19aTjdXZWJDb3JlMTVSZXNvdXJjZVJlcXVl c3QzOXVwZGF0ZUZyb21EZWxlZ2F0ZVByZXNlcnZpbmdPbGRIVFRQQm9keUVSS1MwXwogX19aTjdX ZWJDb3JlMTVTY3JvbGxBbGlnbm1lbnQxN2FsaWduQ2VudGVyQWx3YXlzRQogX19aTjdXZWJDb3Jl MTVTY3JvbGxBbGlnbm1lbnQxOWFsaWduVG9FZGdlSWZOZWVkZWRFCiBfX1pON1dlYkNvcmUxNVN0 b3JhZ2VTdHJhdGVneTIxbG9jYWxTdG9yYWdlTmFtZXNwYWNlRVJLTjNXVEY2U3RyaW5nRWoKQEAg LTE3MjcsNiArMTcyNiw3IEBAIF9fWk43V2ViQ29yZTEyUG9wdXBNZW51TWFjQzFFUE5TXzE1UG9w dXBNZW51Q2xpZW50RQogX19aTjdXZWJDb3JlMTN0b0RldmljZVNwYWNlRVJLTlNfOUZsb2F0UmVj dEVQOE5TV2luZG93CiBfX1pON1dlYkNvcmUxNUdyYXBoaWNzQ29udGV4dEMxRVA5Q0dDb250ZXh0 CiBfX1pON1dlYkNvcmUxNUdyYXBoaWNzQ29udGV4dDE1ZHJhd05hdGl2ZUltYWdlRVA3Q0dJbWFn ZVJLTlNfOUZsb2F0U2l6ZUVOU18xMENvbG9yU3BhY2VFUktOU185RmxvYXRSZWN0RVM5X05TXzE3 Q29tcG9zaXRlT3BlcmF0b3JFTlNfOUJsZW5kTW9kZUVOU18xNkltYWdlT3JpZW50YXRpb25FCitf X1pON1dlYkNvcmUxNVJlc291cmNlUmVxdWVzdDM5dXBkYXRlRnJvbURlbGVnYXRlUHJlc2Vydmlu Z09sZEhUVFBCb2R5RVJLUzBfCiAjaWYgRU5BQkxFKFNQRUVDSF9TWU5USEVTSVMpCiBfX1pON1dl YkNvcmUxNVNwZWVjaFN5bnRoZXNpczIyc2V0UGxhdGZvcm1TeW50aGVzaXplckVOM1dURjEwUGFz c093blB0cklOU18yNVBsYXRmb3JtU3BlZWNoU3ludGhlc2l6ZXJFRUUKICNlbmRpZgpAQCAtMjM0 Nyw3ICsyMzQ3LDcgQEAgX19aTjdXZWJDb3JlOFNldHRpbmdzMTVzZXRRVEtpdEVuYWJsZWRFYgog I2lmIFVTRShDRk5FVFdPUkspCiBfX1pOSzdXZWJDb3JlMTNSZXNvdXJjZUVycm9yY3ZQOV9fQ0ZF cnJvckV2CiBfX1pON1dlYkNvcmUxMlNjaGVkdWxlUGFpckMxRVAxMV9fQ0ZSdW5Mb29wUEsxMF9f Q0ZTdHJpbmcKLV9fWk5LN1dlYkNvcmUxNVJlc291cmNlUmVxdWVzdDEyY2ZVUkxSZXF1ZXN0RXYK K19fWk5LN1dlYkNvcmUxNVJlc291cmNlUmVxdWVzdDEyY2ZVUkxSZXF1ZXN0RU5TXzIwSFRUUEJv ZHlVcGRhdGVQb2xpY3lFCiBfX1pOSzdXZWJDb3JlMTZSZXNvdXJjZVJlc3BvbnNlMTNjZlVSTFJl c3BvbnNlRXYKIF9fWk43V2ViQ29yZTE0UmVzb3VyY2VIYW5kbGUyOHJlbGVhc2VDb25uZWN0aW9u Rm9yRG93bmxvYWRFdgogX19aTjdXZWJDb3JlMTVSZXNvdXJjZVJlcXVlc3RDMUVQMTJOU1VSTFJl cXVlc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvUmVz b3VyY2VSZXF1ZXN0Q0ZOZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9j Zi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHAKaW5kZXggNzBhOTZjYS4uZjQ1YTQzZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RD Rk5ldC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJj ZVJlcXVlc3RDRk5ldC5jcHAKQEAgLTE4MywzNiArMTgzLDM2IEBAIHZvaWQgUmVzb3VyY2VSZXF1 ZXN0Ojpkb1VwZGF0ZVBsYXRmb3JtUmVxdWVzdCgpCiB2b2lkIFJlc291cmNlUmVxdWVzdDo6ZG9V cGRhdGVQbGF0Zm9ybUhUVFBCb2R5KCkKIHsKICAgICBDRk11dGFibGVVUkxSZXF1ZXN0UmVmIGNm UmVxdWVzdDsKIAogICAgIFJldGFpblB0cjxDRlVSTFJlZj4gdXJsKEFkb3B0Q0YsIFJlc291cmNl UmVxdWVzdDo6dXJsKCkuY3JlYXRlQ0ZVUkwoKSk7CiAgICAgUmV0YWluUHRyPENGVVJMUmVmPiBm aXJzdFBhcnR5Rm9yQ29va2llcyhBZG9wdENGLCBSZXNvdXJjZVJlcXVlc3Q6OmZpcnN0UGFydHlG b3JDb29raWVzKCkuY3JlYXRlQ0ZVUkwoKSk7CiAgICAgaWYgKG1fY2ZSZXF1ZXN0KSB7CiAgICAg ICAgIGNmUmVxdWVzdCA9IENGVVJMUmVxdWVzdENyZWF0ZU11dGFibGVDb3B5KDAsIG1fY2ZSZXF1 ZXN0LmdldCgpKTsKICAgICAgICAgQ0ZVUkxSZXF1ZXN0U2V0VVJMKGNmUmVxdWVzdCwgdXJsLmdl dCgpKTsKICAgICAgICAgQ0ZVUkxSZXF1ZXN0U2V0TWFpbkRvY3VtZW50VVJMKGNmUmVxdWVzdCwg Zmlyc3RQYXJ0eUZvckNvb2tpZXMuZ2V0KCkpOwogICAgICAgICBDRlVSTFJlcXVlc3RTZXRDYWNo ZVBvbGljeShjZlJlcXVlc3QsIChDRlVSTFJlcXVlc3RDYWNoZVBvbGljeSljYWNoZVBvbGljeSgp KTsKICAgICAgICAgQ0ZVUkxSZXF1ZXN0U2V0VGltZW91dEludGVydmFsKGNmUmVxdWVzdCwgdGlt ZW91dEludGVydmFsKCkpOwogICAgIH0gZWxzZQogICAgICAgICBjZlJlcXVlc3QgPSBDRlVSTFJl cXVlc3RDcmVhdGVNdXRhYmxlKDAsIHVybC5nZXQoKSwgKENGVVJMUmVxdWVzdENhY2hlUG9saWN5 KWNhY2hlUG9saWN5KCksIHRpbWVvdXRJbnRlcnZhbCgpLCBmaXJzdFBhcnR5Rm9yQ29va2llcy5n ZXQoKSk7CiAKICAgICBSZWZQdHI8Rm9ybURhdGE+IGZvcm1EYXRhID0gaHR0cEJvZHkoKTsKICAg ICBpZiAoZm9ybURhdGEgJiYgIWZvcm1EYXRhLT5pc0VtcHR5KCkpCi0gICAgICAgIFdlYkNvcmU6 OnNldEhUVFBCb2R5KG5zUmVxdWVzdCwgZm9ybURhdGEpOworICAgICAgICBXZWJDb3JlOjpzZXRI VFRQQm9keShjZlJlcXVlc3QsIGZvcm1EYXRhKTsKIAotICAgIGlmIChSZXRhaW5QdHI8Q0ZSZWFk U3RyZWFtUmVmPiBib2R5U3RyZWFtID0gYWRvcHRDRihDRlVSTFJlcXVlc3RDb3B5SFRUUFJlcXVl c3RCb2R5U3RyZWFtKHJlcXVlc3QpKSkgeworICAgIGlmIChSZXRhaW5QdHI8Q0ZSZWFkU3RyZWFt UmVmPiBib2R5U3RyZWFtID0gYWRvcHRDRihDRlVSTFJlcXVlc3RDb3B5SFRUUFJlcXVlc3RCb2R5 U3RyZWFtKGNmUmVxdWVzdCkpKSB7CiAgICAgICAgIC8vIEZvciBzdHJlYW1zLCBwcm92aWRlIGEg Q29udGVudC1MZW5ndGggdG8gYXZvaWQgdXNpbmcgY2h1bmtlZCBlbmNvZGluZywgYW5kIHRvIGdl dCBhY2N1cmF0ZSB0b3RhbCBsZW5ndGggaW4gY2FsbGJhY2tzLgotICAgICAgICBSZXRhaW5QdHI8 Q0ZTdHJpbmdSZWY+IGxlbmd0aFN0cmluZyA9IGFkb3B0Q0YoQ0ZSZWFkU3RyZWFtQ29weVByb3Bl cnR5KGJvZHlTdHJlYW0uZ2V0KCksIGZvcm1EYXRhU3RyZWFtTGVuZ3RoUHJvcGVydHlOYW1lKCkp KTsKKyAgICAgICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBsZW5ndGhTdHJpbmcgPSBhZG9wdENG KHN0YXRpY19jYXN0PENGU3RyaW5nUmVmPihDRlJlYWRTdHJlYW1Db3B5UHJvcGVydHkoYm9keVN0 cmVhbS5nZXQoKSwgZm9ybURhdGFTdHJlYW1MZW5ndGhQcm9wZXJ0eU5hbWUoKSkpKTsKICAgICAg ICAgaWYgKGxlbmd0aFN0cmluZykgewotICAgICAgICAgICAgQ0ZVUkxSZXF1ZXN0U2V0SFRUUEhl YWRlckZpZWxkVmFsdWUoY2ZSZXF1ZXN0LCBDRlNUUigiQ29udGVtdC1MZW5ndGgiLCBsZW5ndGhT dHJpbmcuZ2V0KCkpKTsKKyAgICAgICAgICAgIENGVVJMUmVxdWVzdFNldEhUVFBIZWFkZXJGaWVs ZFZhbHVlKGNmUmVxdWVzdCwgQ0ZTVFIoIkNvbnRlbnQtTGVuZ3RoIiksIGxlbmd0aFN0cmluZy5n ZXQoKSk7CiAgICAgICAgICAgICAvLyBTaW5jZSByZXNvdXJjZSByZXF1ZXN0IGlzIGFscmVhZHkg bWFya2VkIHVwZGF0ZWQsIHdlIG5lZWQgdG8ga2VlcCBpdCB1cCB0byBkYXRlIHRvby4KICAgICAg ICAgICAgIEFTU0VSVChtX3Jlc291cmNlUmVxdWVzdFVwZGF0ZWQpOwogICAgICAgICAgICAgbV9o dHRwSGVhZGVyRmllbGRzLnNldCgiQ29udGVudC1MZW5ndGgiLCBsZW5ndGhTdHJpbmcuZ2V0KCkp OwogICAgICAgICB9CiAgICAgfQogCiAgICAgbV9jZlJlcXVlc3QuYWRvcHRDRihjZlJlcXVlc3Qp OwogI2lmIFBMQVRGT1JNKE1BQykKICAgICB1cGRhdGVOU1VSTFJlcXVlc3QoKTsKICNlbmRpZgog fQogCkBAIC0yNzgsMjAgKzI3OCwyMCBAQCB2b2lkIFJlc291cmNlUmVxdWVzdDo6ZG9VcGRhdGVS ZXNvdXJjZVJlcXVlc3QoKQogdm9pZCBSZXNvdXJjZVJlcXVlc3Q6OmRvVXBkYXRlUmVzb3VyY2VI VFRQQm9keSgpCiB7CiAgICAgaWYgKCFtX2NmUmVxdWVzdCkgewogICAgICAgICBtX2h0dHBCb2R5 ID0gMDsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlmIChSZXRhaW5QdHI8Q0ZEYXRh UmVmPiBib2R5RGF0YSA9IGFkb3B0Q0YoQ0ZVUkxSZXF1ZXN0Q29weUhUVFBSZXF1ZXN0Qm9keSht X2NmUmVxdWVzdC5nZXQoKSkpKQogICAgICAgICBtX2h0dHBCb2R5ID0gRm9ybURhdGE6OmNyZWF0 ZShDRkRhdGFHZXRCeXRlUHRyKGJvZHlEYXRhLmdldCgpKSwgQ0ZEYXRhR2V0TGVuZ3RoKGJvZHlE YXRhLmdldCgpKSk7Ci0gICAgZWxzZSBpZiAoUmV0YWluUHRyPENGUmVhZFN0cmVhbVJlZj4gYm9k eVN0cmVhbSA9IGFkb3B0Q0YoQ0ZVUkxSZXF1ZXN0Q29weUhUVFBSZXF1ZXN0Qm9keVN0cmVhbShy ZXF1ZXN0KSkpIHsKKyAgICBlbHNlIGlmIChSZXRhaW5QdHI8Q0ZSZWFkU3RyZWFtUmVmPiBib2R5 U3RyZWFtID0gYWRvcHRDRihDRlVSTFJlcXVlc3RDb3B5SFRUUFJlcXVlc3RCb2R5U3RyZWFtKG1f Y2ZSZXF1ZXN0LmdldCgpKSkpIHsKICAgICAgICAgRm9ybURhdGEqIGZvcm1EYXRhID0gaHR0cEJv ZHlGcm9tU3RyZWFtKGJvZHlTdHJlYW0uZ2V0KCkpOwogICAgICAgICAvLyBUaGVyZSBpcyBubyBG b3JtRGF0YSBvYmplY3QgaWYgYSBjbGllbnQgcHJvdmlkZWQgYSBjdXN0b20gZGF0YSBzdHJlYW0u CiAgICAgICAgIC8vIFdlIHNob3VsZG4ndCBiZSBsb29raW5nIGF0IGh0dHAgYm9keSBhZnRlciBj bGllbnQgY2FsbGJhY2tzLgogICAgICAgICBBU1NFUlQoZm9ybURhdGEpOwogICAgICAgICBpZiAo Zm9ybURhdGEpCiAgICAgICAgICAgICBtX2h0dHBCb2R5ID0gZm9ybURhdGE7CiAgICAgfQogfQog CiAK 190651 2013-02-27 21:56:22 -0800 2013-02-28 01:41:17 -0800 Patch v2 bug-111034-20130227215235.patch text/plain 5927 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0MjU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGI4ZjBiOTgyMTJiOTJl NjE0MjNjMjVjMzQzZDZiZjcwNGFkYTc4Ny4uYWI1ZGNhNGY0YWI1MGY0MjViZjY1MjQyNWQ0YWNm MDE5NTczNWU1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAyLTI3ICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2VSZXF1ZXN0 Q0ZOZXQuY3BwIHdvbid0IGNvbXBpbGUgYWZ0ZXIgcjE0NDIxNgorICAgICAgICA8aHR0cDovL3dl YmtpdC5vcmcvYi8xMTEwMzQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjogTW92ZSBNYWMtb25seSBzeW1ib2wgaW50byAh UExBVEZPUk0oSU9TKQorICAgICAgICBzZWN0aW9uLiAgVXBkYXRlIGlPUy1vbmx5IHN5bWJvbCB0 byBhZGQgYXJndW1lbnQuCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJl cXVlc3QuaDogUmVtb3ZlIHVudXNlZCBtZXRob2QKKyAgICAgICAgZGVjbGFyYXRpb24uCisgICAg ICAgICogcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OmRvVXBkYXRlUGxhdGZvcm1IVFRQQm9keSk6 IEZpeCB0eXBvcy4KKyAgICAgICAgQWRkIHN0YXRpY19jYXN0PENGU3RyaW5nUmVmPigpLgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVJlc291cmNlSFRUUEJvZHkp OiBGaXggYW5vdGhlcgorICAgICAgICB0eXBvLgorCiAyMDEzLTAyLTI3ICBIYW5zIE11bGxlciAg PGhtdWxsZXJAYWRvYmUuY29tPgogCiAgICAgICAgIFtDU1MgRXhjbHVzaW9uc10gRW5hYmxlIHNo YXBlLWluc2lkZSByZWN0YW5nbGUgc3VwcG9ydCBmb3Igc2hhcGUtcGFkZGluZwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LmV4cC5pbgppbmRleCBiYTU1MmZhNzU2YTU0ZTQyNGMxOWM3MGY0YzY0NjBiNDYwNWVjZTJkLi5m ZjJhMzZhNDUyYWE3OWY3MmViOGU1Y2ZjNGEwMTdkZjBmNzAxOWRlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4 cC5pbgpAQCAtNDQ4LDcgKzQ0OCw2IEBAIF9fWk43V2ViQ29yZTE1UHJvdGVjdGlvblNwYWNlQzFF UktOM1dURjZTdHJpbmdFaU5TXzI1UHJvdGVjdGlvblNwYWNlU2VydmVyVHlwZUVTCiBfX1pON1dl YkNvcmUxNVByb3RlY3Rpb25TcGFjZUMxRXYKIF9fWk43V2ViQ29yZTE1UmVzb3VyY2VSZXF1ZXN0 MjFodHRwUGlwZWxpbmluZ0VuYWJsZWRFdgogX19aTjdXZWJDb3JlMTVSZXNvdXJjZVJlcXVlc3Qy NHNldEhUVFBQaXBlbGluaW5nRW5hYmxlZEViCi1fX1pON1dlYkNvcmUxNVJlc291cmNlUmVxdWVz dDM5dXBkYXRlRnJvbURlbGVnYXRlUHJlc2VydmluZ09sZEhUVFBCb2R5RVJLUzBfCiBfX1pON1dl YkNvcmUxNVNjcm9sbEFsaWdubWVudDE3YWxpZ25DZW50ZXJBbHdheXNFCiBfX1pON1dlYkNvcmUx NVNjcm9sbEFsaWdubWVudDE5YWxpZ25Ub0VkZ2VJZk5lZWRlZEUKIF9fWk43V2ViQ29yZTE1U3Rv cmFnZVN0cmF0ZWd5MjFsb2NhbFN0b3JhZ2VOYW1lc3BhY2VFUktOM1dURjZTdHJpbmdFagpAQCAt MTcxNSw2ICsxNzE0LDcgQEAgX19aTjdXZWJDb3JlMTJQb3B1cE1lbnVNYWNDMUVQTlNfMTVQb3B1 cE1lbnVDbGllbnRFCiBfX1pON1dlYkNvcmUxM3RvRGV2aWNlU3BhY2VFUktOU185RmxvYXRSZWN0 RVA4TlNXaW5kb3cKIF9fWk43V2ViQ29yZTE1R3JhcGhpY3NDb250ZXh0QzFFUDlDR0NvbnRleHQK IF9fWk43V2ViQ29yZTE1R3JhcGhpY3NDb250ZXh0MTVkcmF3TmF0aXZlSW1hZ2VFUDdDR0ltYWdl UktOU185RmxvYXRTaXplRU5TXzEwQ29sb3JTcGFjZUVSS05TXzlGbG9hdFJlY3RFUzlfTlNfMTdD b21wb3NpdGVPcGVyYXRvckVOU185QmxlbmRNb2RlRU5TXzE2SW1hZ2VPcmllbnRhdGlvbkUKK19f Wk43V2ViQ29yZTE1UmVzb3VyY2VSZXF1ZXN0Mzl1cGRhdGVGcm9tRGVsZWdhdGVQcmVzZXJ2aW5n T2xkSFRUUEJvZHlFUktTMF8KICNpZiBFTkFCTEUoU1BFRUNIX1NZTlRIRVNJUykKIF9fWk43V2Vi Q29yZTE1U3BlZWNoU3ludGhlc2lzMjJzZXRQbGF0Zm9ybVN5bnRoZXNpemVyRU4zV1RGMTBQYXNz T3duUHRySU5TXzI1UGxhdGZvcm1TcGVlY2hTeW50aGVzaXplckVFRQogI2VuZGlmCkBAIC0yMjg4 LDcgKzIyODgsNyBAQCBfX1pON1dlYkNvcmU4U2V0dGluZ3MxNXNldFFUS2l0RW5hYmxlZEViCiAj aWYgVVNFKENGTkVUV09SSykKIF9fWk5LN1dlYkNvcmUxM1Jlc291cmNlRXJyb3JjdlA5X19DRkVy cm9yRXYKIF9fWk43V2ViQ29yZTEyU2NoZWR1bGVQYWlyQzFFUDExX19DRlJ1bkxvb3BQSzEwX19D RlN0cmluZwotX19aTks3V2ViQ29yZTE1UmVzb3VyY2VSZXF1ZXN0MTJjZlVSTFJlcXVlc3RFdgor X19aTks3V2ViQ29yZTE1UmVzb3VyY2VSZXF1ZXN0MTJjZlVSTFJlcXVlc3RFTlNfMjBIVFRQQm9k eVVwZGF0ZVBvbGljeUUKIF9fWk5LN1dlYkNvcmUxNlJlc291cmNlUmVzcG9uc2UxM2NmVVJMUmVz cG9uc2VFdgogX19aTjdXZWJDb3JlMTRSZXNvdXJjZUhhbmRsZTI4cmVsZWFzZUNvbm5lY3Rpb25G b3JEb3dubG9hZEV2CiBfX1pON1dlYkNvcmUxNVJlc291cmNlUmVxdWVzdEMxRVAxMk5TVVJMUmVx dWVzdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNv dXJjZVJlcXVlc3QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3Vy Y2VSZXF1ZXN0LmgKaW5kZXggYTAwYmFlYzY5YzVkMTkwYTE5NDEwMWFjZGE5YjM0ZDk3Nzg4YWUy OS4uNjIxMWNjNmJkZjY4MGUxMGE1NGVmMDJhNDRiNGVmOGY1NzAxMTk0YSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3QuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVxdWVzdC5oCkBA IC04MCw4ICs4MCw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICNlbmRpZgogICAgICAgICB9CiAK LSAgICAgICAgdm9pZCB1cGRhdGVGcm9tRGVsZWdhdGVQcmVzZXJ2aW5nT2xkSFRUUEJvZHkoQ0ZV UkxSZXF1ZXN0UmVmKTsKLQogICAgICAgICBDRlVSTFJlcXVlc3RSZWYgY2ZVUkxSZXF1ZXN0KEhU VFBCb2R5VXBkYXRlUG9saWN5KSBjb25zdDsKICNlbHNlCiAgICAgICAgIFJlc291cmNlUmVxdWVz dChOU1VSTFJlcXVlc3QgKm5zUmVxdWVzdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VSZXF1ZXN0Q0ZOZXQuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHAKaW5kZXggZDY5 YmQ1YWQ2ZjEzMzc0YTkxYWFiNGNjNDkwNjRiZWUxZWM1MzA2MS4uYWMwODFjNzY2ZTk2Mjc2NDVk OWJhMDg4YWFkNDkzNGNjNDliYjc0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHAKQEAgLTE5MCwx MyArMTkwLDEzIEBAIHZvaWQgUmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVBsYXRmb3JtSFRUUEJv ZHkoKQogCiAgICAgUmVmUHRyPEZvcm1EYXRhPiBmb3JtRGF0YSA9IGh0dHBCb2R5KCk7CiAgICAg aWYgKGZvcm1EYXRhICYmICFmb3JtRGF0YS0+aXNFbXB0eSgpKQotICAgICAgICBXZWJDb3JlOjpz ZXRIVFRQQm9keShuc1JlcXVlc3QsIGZvcm1EYXRhKTsKKyAgICAgICAgV2ViQ29yZTo6c2V0SFRU UEJvZHkoY2ZSZXF1ZXN0LCBmb3JtRGF0YSk7CiAKLSAgICBpZiAoUmV0YWluUHRyPENGUmVhZFN0 cmVhbVJlZj4gYm9keVN0cmVhbSA9IGFkb3B0Q0YoQ0ZVUkxSZXF1ZXN0Q29weUhUVFBSZXF1ZXN0 Qm9keVN0cmVhbShyZXF1ZXN0KSkpIHsKKyAgICBpZiAoUmV0YWluUHRyPENGUmVhZFN0cmVhbVJl Zj4gYm9keVN0cmVhbSA9IGFkb3B0Q0YoQ0ZVUkxSZXF1ZXN0Q29weUhUVFBSZXF1ZXN0Qm9keVN0 cmVhbShjZlJlcXVlc3QpKSkgewogICAgICAgICAvLyBGb3Igc3RyZWFtcywgcHJvdmlkZSBhIENv bnRlbnQtTGVuZ3RoIHRvIGF2b2lkIHVzaW5nIGNodW5rZWQgZW5jb2RpbmcsIGFuZCB0byBnZXQg YWNjdXJhdGUgdG90YWwgbGVuZ3RoIGluIGNhbGxiYWNrcy4KLSAgICAgICAgUmV0YWluUHRyPENG U3RyaW5nUmVmPiBsZW5ndGhTdHJpbmcgPSBhZG9wdENGKENGUmVhZFN0cmVhbUNvcHlQcm9wZXJ0 eShib2R5U3RyZWFtLmdldCgpLCBmb3JtRGF0YVN0cmVhbUxlbmd0aFByb3BlcnR5TmFtZSgpKSk7 CisgICAgICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gbGVuZ3RoU3RyaW5nID0gYWRvcHRDRihz dGF0aWNfY2FzdDxDRlN0cmluZ1JlZj4oQ0ZSZWFkU3RyZWFtQ29weVByb3BlcnR5KGJvZHlTdHJl YW0uZ2V0KCksIGZvcm1EYXRhU3RyZWFtTGVuZ3RoUHJvcGVydHlOYW1lKCkpKSk7CiAgICAgICAg IGlmIChsZW5ndGhTdHJpbmcpIHsKLSAgICAgICAgICAgIENGVVJMUmVxdWVzdFNldEhUVFBIZWFk ZXJGaWVsZFZhbHVlKGNmUmVxdWVzdCwgQ0ZTVFIoIkNvbnRlbXQtTGVuZ3RoIiwgbGVuZ3RoU3Ry aW5nLmdldCgpKSk7CisgICAgICAgICAgICBDRlVSTFJlcXVlc3RTZXRIVFRQSGVhZGVyRmllbGRW YWx1ZShjZlJlcXVlc3QsIENGU1RSKCJDb250ZW50LUxlbmd0aCIpLCBsZW5ndGhTdHJpbmcuZ2V0 KCkpOwogICAgICAgICAgICAgLy8gU2luY2UgcmVzb3VyY2UgcmVxdWVzdCBpcyBhbHJlYWR5IG1h cmtlZCB1cGRhdGVkLCB3ZSBuZWVkIHRvIGtlZXAgaXQgdXAgdG8gZGF0ZSB0b28uCiAgICAgICAg ICAgICBBU1NFUlQobV9yZXNvdXJjZVJlcXVlc3RVcGRhdGVkKTsKICAgICAgICAgICAgIG1faHR0 cEhlYWRlckZpZWxkcy5zZXQoIkNvbnRlbnQtTGVuZ3RoIiwgbGVuZ3RoU3RyaW5nLmdldCgpKTsK QEAgLTI2Miw3ICsyNjIsNyBAQCB2b2lkIFJlc291cmNlUmVxdWVzdDo6ZG9VcGRhdGVSZXNvdXJj ZUhUVFBCb2R5KCkKIAogICAgIGlmIChSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBib2R5RGF0YSA9IGFk b3B0Q0YoQ0ZVUkxSZXF1ZXN0Q29weUhUVFBSZXF1ZXN0Qm9keShtX2NmUmVxdWVzdC5nZXQoKSkp KQogICAgICAgICBtX2h0dHBCb2R5ID0gRm9ybURhdGE6OmNyZWF0ZShDRkRhdGFHZXRCeXRlUHRy KGJvZHlEYXRhLmdldCgpKSwgQ0ZEYXRhR2V0TGVuZ3RoKGJvZHlEYXRhLmdldCgpKSk7Ci0gICAg ZWxzZSBpZiAoUmV0YWluUHRyPENGUmVhZFN0cmVhbVJlZj4gYm9keVN0cmVhbSA9IGFkb3B0Q0Yo Q0ZVUkxSZXF1ZXN0Q29weUhUVFBSZXF1ZXN0Qm9keVN0cmVhbShyZXF1ZXN0KSkpIHsKKyAgICBl bHNlIGlmIChSZXRhaW5QdHI8Q0ZSZWFkU3RyZWFtUmVmPiBib2R5U3RyZWFtID0gYWRvcHRDRihD RlVSTFJlcXVlc3RDb3B5SFRUUFJlcXVlc3RCb2R5U3RyZWFtKG1fY2ZSZXF1ZXN0LmdldCgpKSkp IHsKICAgICAgICAgRm9ybURhdGEqIGZvcm1EYXRhID0gaHR0cEJvZHlGcm9tU3RyZWFtKGJvZHlT dHJlYW0uZ2V0KCkpOwogICAgICAgICAvLyBUaGVyZSBpcyBubyBGb3JtRGF0YSBvYmplY3QgaWYg YSBjbGllbnQgcHJvdmlkZWQgYSBjdXN0b20gZGF0YSBzdHJlYW0uCiAgICAgICAgIC8vIFdlIHNo b3VsZG4ndCBiZSBsb29raW5nIGF0IGh0dHAgYm9keSBhZnRlciBjbGllbnQgY2FsbGJhY2tzLgo=