148574 2015-08-28 08:40:37 -0700 Use new CFNetwork cookie jar SPI only on El Capitan 2015-09-04 06:26:54 -0700 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Mac All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson commit-queue ddkilzer koivisto oldest_to_newest 1121697 0 beidson 2015-08-28 08:40:37 -0700 Use new CFNetwork cookie jar SPI only on El Capitan <rdar://problem/22460752> 1121703 1 260156 beidson 2015-08-28 09:08:08 -0700 Created attachment 260156 Patch v1 1121708 2 260156 ddkilzer 2015-08-28 09:15:45 -0700 Comment on attachment 260156 Patch v1 r- This won't build on El Capitan without internal headers. You need a change like this to CFNetworkSPI.h: diff --git a/Source/WebCore/platform/spi/cf/CFNetworkSPI.h b/Source/WebCore/platform/spi/cf/CFNetworkSPI.h index ac8f087..34621e1 100644 --- a/Source/WebCore/platform/spi/cf/CFNetworkSPI.h +++ b/Source/WebCore/platform/spi/cf/CFNetworkSPI.h @@ -144,6 +144,14 @@ EXTERN_C CFArrayRef _CFHTTPParsedCookiesWithResponseHeaderFields(CFAllocatorRef + (void)_setSharedHTTPCookieStorage:(NSHTTPCookieStorage *)storage; @end #endif + +#if !USE(APPLE_INTERNAL_SDK) && ((TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)) +@interface NSHTTPCookie () ++ (NSArray *)_parsedCookiesWithResponseHeaderFields:(NSDictionary *)headerFields forURL:(NSURL *)aURL; +@end #endif +#endif + + #endif // CFNetworkSPI_h 1121709 3 260156 ddkilzer 2015-08-28 09:17:03 -0700 Comment on attachment 260156 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=260156&action=review > Source/WebCore/platform/network/mac/CookieJarMac.mm:123 > +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 Also, this needs to include a PLATFORM(MAC) check to fix the build failure on iOS: /Volumes/Data/EWS/WebKit/Source/WebCore/platform/network/mac/CookieJarMac.mm:123:5: error: '__MAC_OS_X_VERSION_MIN_REQUIRED' is not defined, evaluates to 0 [-Werror,-Wundef] #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 ^ 1 error generated. #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 1121710 4 260157 beidson 2015-08-28 09:18:40 -0700 Created attachment 260157 Patch v2 1121712 5 beidson 2015-08-28 09:19:31 -0700 (In reply to comment #2) > Comment on attachment 260156 [details] > Patch v1 > > r- > > This won't build on El Capitan without internal headers. You need a change > like this to CFNetworkSPI.h: > Yup, we already went over this in the radar. Needs the forward declare, but this one isn't quite right. 1121713 6 beidson 2015-08-28 09:20:01 -0700 (In reply to comment #3) > Comment on attachment 260156 [details] > Patch v1 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=260156&action=review > > > Source/WebCore/platform/network/mac/CookieJarMac.mm:123 > > +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 > > Also, this needs to include a PLATFORM(MAC) check to fix the build failure > on iOS: > > /Volumes/Data/EWS/WebKit/Source/WebCore/platform/network/mac/CookieJarMac.mm: > 123:5: error: '__MAC_OS_X_VERSION_MIN_REQUIRED' is not defined, evaluates to > 0 [-Werror,-Wundef] > #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 > ^ > 1 error generated. > > #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 This is sad and always catches me by surprise - iOS uses both cookiejarmac and cookiejarcf :( 1121714 7 beidson 2015-08-28 09:21:30 -0700 (In reply to comment #6) > (In reply to comment #3) > > Comment on attachment 260156 [details] > > Patch v1 > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=260156&action=review > > > > > Source/WebCore/platform/network/mac/CookieJarMac.mm:123 > > > +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 > > > > Also, this needs to include a PLATFORM(MAC) check to fix the build failure > > on iOS: > > > > /Volumes/Data/EWS/WebKit/Source/WebCore/platform/network/mac/CookieJarMac.mm: > > 123:5: error: '__MAC_OS_X_VERSION_MIN_REQUIRED' is not defined, evaluates to > > 0 [-Werror,-Wundef] > > #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 > > ^ > > 1 error generated. > > > > #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 > > This is sad and always catches me by surprise - iOS uses both cookiejarmac > and cookiejarcf :( Actually, this is SUPREMELY surprising. How is this possible? iOS gets this exact same symbol twice - Once from CookieJarMac and once from CookieJarCFNet, yet it uses the CFNet version o_O 1121716 8 260158 beidson 2015-08-28 09:23:33 -0700 Created attachment 260158 Patch v3 This adds the PLATFORM(MAC), but it's weird that it's needed. We need an answer to why that builds on iOS, and how it's possible that iOS gets the same symbol twice and chooses the right one. =/ 1121717 9 260157 ddkilzer 2015-08-28 09:23:45 -0700 Comment on attachment 260157 Patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=260157&action=review r=me with the macro fixes. > Source/WebCore/platform/network/mac/CookieJarMac.mm:123 > +#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 This still needs to be changed to prevent an iOS build failure: #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 Apparently this file is compiled on iOS but not used. > Source/WebCore/platform/spi/cf/CFNetworkSPI.h:132 > +#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 This should really be: #if !USE(APPLE_INTERNAL_SDK) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 1121718 10 260158 ddkilzer 2015-08-28 09:25:43 -0700 Comment on attachment 260158 Patch v3 View in context: https://bugs.webkit.org/attachment.cgi?id=260158&action=review r=me but consider the macro change. > Source/WebCore/platform/spi/cf/CFNetworkSPI.h:132 > +#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 This should probably be: #if !USE(APPLE_INTERNAL_SDK) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 1121721 11 ddkilzer 2015-08-28 09:30:53 -0700 (In reply to comment #8) > Created attachment 260158 [details] > Patch v3 > > This adds the PLATFORM(MAC), but it's weird that it's needed. > > We need an answer to why that builds on iOS, and how it's possible that iOS > gets the same symbol twice and chooses the right one. =/ I know why. It's because the EWS builder has the NSURLConnection path defined (so WTF_USE_CFNETWORK set to 0), while builds against an internal iOS SDK have WTF_USE_CFNETOWRK set to 1. (This needs to be fixed; I'll explain the details in radar.) Otherwise there would be linker errors with duplicate symbols. 1121729 12 260158 ddkilzer 2015-08-28 10:12:35 -0700 Comment on attachment 260158 Patch v3 View in context: https://bugs.webkit.org/attachment.cgi?id=260158&action=review r=me >> Source/WebCore/platform/spi/cf/CFNetworkSPI.h:132 >> +#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 > > This should probably be: > > #if !USE(APPLE_INTERNAL_SDK) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 Comment withdrawn after taking to Brady in person. The !USE(APPLE_INTERNAL_SDK) doesn't matter here. 1121730 13 beidson 2015-08-28 10:15:12 -0700 Since EWS ran and since I was actually back at my computer, landed myself instead of waiting on the CQ. https://trac.webkit.org/changeset/189101 1123419 14 koivisto 2015-09-04 06:26:54 -0700 Why no tests? 260156 2015-08-28 09:08:08 -0700 2015-08-28 09:18:40 -0700 Patch v1 patch text/plain 2151 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NDBlMjk1Li4zOWQ2ZjA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTUtMDgtMjggIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIFVzZSBuZXcgQ0ZOZXR3b3JrIGNvb2tpZSBqYXIgU1BJIG9ubHkgb24gRWwgQ2FwaXRhbi4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODU3NCBh bmQgcmRhcjovL3Byb2JsZW0vMjI0NjA3NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKQorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9tYWMvQ29va2llSmFyTWFjLm1t OgorICAgICAgICAoV2ViQ29yZTo6c2V0Q29va2llc0Zyb21ET00pOiBVc2UgT1MgWCB2ZXJzaW9u IHRvIGRlY2lkZSB3aGljaCBBUEkvU1BJIHRvIHVzZS4KKwogMjAxNS0wOC0yNyAgTXlsZXMgQy4g TWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0gRHJhdyBm b250cyBhdCB0aGVpciBuYXRpdmUgc2l6ZXMgaW5zdGVhZCBvZiBzY2FsaW5nIGEgMXB0IGZvbnQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL0Nvb2tpZUph ck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL0Nvb2tpZUphck1h Yy5tbQppbmRleCA1Y2U0YWYzLi40NzBlNjhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL21hYy9Db29raWVKYXJNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9tYWMvQ29va2llSmFyTWFjLm1tCkBAIC0xMjAsMTQgKzEyMCwxMSBA QCB2b2lkIHNldENvb2tpZXNGcm9tRE9NKGNvbnN0IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgc2Vz c2lvbiwgY29uc3QgVVJMJiBmaXJzdFBhcgogICAgIE5TVVJMICpjb29raWVVUkwgPSB1cmw7CiAg ICAgTlNEaWN0aW9uYXJ5ICpoZWFkZXJGaWVsZHMgPSBbTlNEaWN0aW9uYXJ5IGRpY3Rpb25hcnlX aXRoT2JqZWN0OmNvb2tpZVN0cmluZyBmb3JLZXk6QCJTZXQtQ29va2llIl07CiAKLSAgICBOU0Fy cmF5ICp1bmZpbHRlcmVkQ29va2llczsKLSNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwdXNoCi0j cHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgaWdub3JlZCAiLVd1bmRlY2xhcmVkLXNlbGVjdG9yIgot ICAgIGlmIChbW05TSFRUUENvb2tpZSBjbGFzc10gcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rv cihfcGFyc2VkQ29va2llc1dpdGhSZXNwb25zZUhlYWRlckZpZWxkczpmb3JVUkw6KV0pCi0gICAg ICAgIHVuZmlsdGVyZWRDb29raWVzID0gW05TSFRUUENvb2tpZSBwZXJmb3JtU2VsZWN0b3I6QHNl bGVjdG9yKF9wYXJzZWRDb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzOmZvclVSTDopIHdp dGhPYmplY3Q6aGVhZGVyRmllbGRzIHdpdGhPYmplY3Q6Y29va2llVVJMXTsKLSNwcmFnbWEgY2xh bmcgZGlhZ25vc3RpYyBwb3AKLSAgICBlbHNlCi0gICAgICAgIHVuZmlsdGVyZWRDb29raWVzID0g W05TSFRUUENvb2tpZSBjb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzOmhlYWRlckZpZWxk cyBmb3JVUkw6Y29va2llVVJMXTsKKyNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVE ID49IDEwMTEwMAorICAgIE5TQXJyYXkgKnVuZmlsdGVyZWRDb29raWVzID0gW05TSFRUUENvb2tp ZSBfcGFyc2VkQ29va2llc1dpdGhSZXNwb25zZUhlYWRlckZpZWxkczpoZWFkZXJGaWVsZHMgZm9y VVJMOmNvb2tpZVVSTF07CisjZWxzZQorICAgIE5TQXJyYXkgKnVuZmlsdGVyZWRDb29raWVzID0g W05TSFRUUENvb2tpZSBjb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzOmhlYWRlckZpZWxk cyBmb3JVUkw6Y29va2llVVJMXTsKKyNlbmRpZgogCiAgICAgUmV0YWluUHRyPE5TQXJyYXk+IGZp bHRlcmVkQ29va2llcyA9IGZpbHRlckNvb2tpZXModW5maWx0ZXJlZENvb2tpZXMpOwogICAgIEFT U0VSVChbZmlsdGVyZWRDb29raWVzLmdldCgpIGNvdW50XSA8PSAxKTsK 260157 2015-08-28 09:18:40 -0700 2015-08-28 09:23:57 -0700 Patch v2 patch text/plain 3222 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NDBlMjk1Li45ZGJjNzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTUtMDgtMjggIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIFVzZSBuZXcgQ0ZOZXR3b3JrIGNvb2tpZSBqYXIgU1BJIG9ubHkgb24gRWwgQ2FwaXRhbi4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODU3NCBh bmQgcmRhcjovL3Byb2JsZW0vMjI0NjA3NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKQorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9tYWMvQ29va2llSmFyTWFjLm1t OgorICAgICAgICAoV2ViQ29yZTo6c2V0Q29va2llc0Zyb21ET00pOiBVc2UgT1MgWCB2ZXJzaW9u IHRvIGRlY2lkZSB3aGljaCBBUEkvU1BJIHRvIHVzZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9zcGkv Y2YvQ0ZOZXR3b3JrU1BJLmg6IEZvcndhcmQgZGVjbGFyZSB0aGUgU1BJCisKIDIwMTUtMDgtMjcg IE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29j b2FdIERyYXcgZm9udHMgYXQgdGhlaXIgbmF0aXZlIHNpemVzIGluc3RlYWQgb2Ygc2NhbGluZyBh IDFwdCBmb250CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21h Yy9Db29raWVKYXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9D b29raWVKYXJNYWMubW0KaW5kZXggNWNlNGFmMy4uNDcwZTY4ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvQ29va2llSmFyTWFjLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL0Nvb2tpZUphck1hYy5tbQpAQCAtMTIwLDE0 ICsxMjAsMTEgQEAgdm9pZCBzZXRDb29raWVzRnJvbURPTShjb25zdCBOZXR3b3JrU3RvcmFnZVNl c3Npb24mIHNlc3Npb24sIGNvbnN0IFVSTCYgZmlyc3RQYXIKICAgICBOU1VSTCAqY29va2llVVJM ID0gdXJsOwogICAgIE5TRGljdGlvbmFyeSAqaGVhZGVyRmllbGRzID0gW05TRGljdGlvbmFyeSBk aWN0aW9uYXJ5V2l0aE9iamVjdDpjb29raWVTdHJpbmcgZm9yS2V5OkAiU2V0LUNvb2tpZSJdOwog Ci0gICAgTlNBcnJheSAqdW5maWx0ZXJlZENvb2tpZXM7Ci0jcHJhZ21hIGNsYW5nIGRpYWdub3N0 aWMgcHVzaAotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGlnbm9yZWQgIi1XdW5kZWNsYXJlZC1z ZWxlY3RvciIKLSAgICBpZiAoW1tOU0hUVFBDb29raWUgY2xhc3NdIHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3IoX3BhcnNlZENvb2tpZXNXaXRoUmVzcG9uc2VIZWFkZXJGaWVsZHM6Zm9yVVJM OildKQotICAgICAgICB1bmZpbHRlcmVkQ29va2llcyA9IFtOU0hUVFBDb29raWUgcGVyZm9ybVNl bGVjdG9yOkBzZWxlY3RvcihfcGFyc2VkQ29va2llc1dpdGhSZXNwb25zZUhlYWRlckZpZWxkczpm b3JVUkw6KSB3aXRoT2JqZWN0OmhlYWRlckZpZWxkcyB3aXRoT2JqZWN0OmNvb2tpZVVSTF07Ci0j cHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcG9wCi0gICAgZWxzZQotICAgICAgICB1bmZpbHRlcmVk Q29va2llcyA9IFtOU0hUVFBDb29raWUgY29va2llc1dpdGhSZXNwb25zZUhlYWRlckZpZWxkczpo ZWFkZXJGaWVsZHMgZm9yVVJMOmNvb2tpZVVSTF07CisjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01J Tl9SRVFVSVJFRCA+PSAxMDExMDAKKyAgICBOU0FycmF5ICp1bmZpbHRlcmVkQ29va2llcyA9IFtO U0hUVFBDb29raWUgX3BhcnNlZENvb2tpZXNXaXRoUmVzcG9uc2VIZWFkZXJGaWVsZHM6aGVhZGVy RmllbGRzIGZvclVSTDpjb29raWVVUkxdOworI2Vsc2UKKyAgICBOU0FycmF5ICp1bmZpbHRlcmVk Q29va2llcyA9IFtOU0hUVFBDb29raWUgY29va2llc1dpdGhSZXNwb25zZUhlYWRlckZpZWxkczpo ZWFkZXJGaWVsZHMgZm9yVVJMOmNvb2tpZVVSTF07CisjZW5kaWYKIAogICAgIFJldGFpblB0cjxO U0FycmF5PiBmaWx0ZXJlZENvb2tpZXMgPSBmaWx0ZXJDb29raWVzKHVuZmlsdGVyZWRDb29raWVz KTsKICAgICBBU1NFUlQoW2ZpbHRlcmVkQ29va2llcy5nZXQoKSBjb3VudF0gPD0gMSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvY2YvQ0ZOZXR3b3JrU1BJLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvY2YvQ0ZOZXR3b3JrU1BJLmgKaW5kZXggYWM4ZjA4 Ny4uYWVkMjRjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL2NmL0NG TmV0d29ya1NQSS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jZi9DRk5ldHdv cmtTUEkuaApAQCAtMTI5LDYgKzEyOSwxMiBAQCBFWFRFUk5fQyBDRkFycmF5UmVmIF9DRkhUVFBQ YXJzZWRDb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzKENGQWxsb2NhdG9yUmVmCiAKICNp ZiBkZWZpbmVkKF9fT0JKQ19fKQogCisjaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZF UlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTEwMAorQGludGVyZmFjZSBOU0hUVFBDb29raWUgKCkK KysgKE5TQXJyYXkgKilfcGFyc2VkQ29va2llc1dpdGhSZXNwb25zZUhlYWRlckZpZWxkczooTlNE aWN0aW9uYXJ5ICopaGVhZGVyRmllbGRzIGZvclVSTDooTlNVUkwgKilhVVJMOworQGVuZAorI2Vu ZGlmCisKICNpZiAhVVNFKEFQUExFX0lOVEVSTkFMX1NESykgfHwgKFBMQVRGT1JNKE1BQykgJiYg X19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA9PSAxMDkwKQogQGludGVyZmFjZSBOU0hU VFBDb29raWVTdG9yYWdlICgpCiAtICh2b2lkKXJlbW92ZUNvb2tpZXNTaW5jZURhdGU6KE5TRGF0 ZSAqKWRhdGU7CkBAIC0xNDQsNiArMTUwLDYgQEAgRVhURVJOX0MgQ0ZBcnJheVJlZiBfQ0ZIVFRQ UGFyc2VkQ29va2llc1dpdGhSZXNwb25zZUhlYWRlckZpZWxkcyhDRkFsbG9jYXRvclJlZgogKyAo dm9pZClfc2V0U2hhcmVkSFRUUENvb2tpZVN0b3JhZ2U6KE5TSFRUUENvb2tpZVN0b3JhZ2UgKilz dG9yYWdlOwogQGVuZAogI2VuZGlmCi0jZW5kaWYKKyNlbmRpZiAvLyBkZWZpbmVkKF9fT0JKQ19f KQogCiAjZW5kaWYgLy8gQ0ZOZXR3b3JrU1BJX2gK 260158 2015-08-28 09:23:33 -0700 2015-08-28 10:14:31 -0700 Patch v3 patch text/plain 3239 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NDBlMjk1Li45ZGJjNzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTUtMDgtMjggIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIFVzZSBuZXcgQ0ZOZXR3b3JrIGNvb2tpZSBqYXIgU1BJIG9ubHkgb24gRWwgQ2FwaXRhbi4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODU3NCBh bmQgcmRhcjovL3Byb2JsZW0vMjI0NjA3NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKQorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9tYWMvQ29va2llSmFyTWFjLm1t OgorICAgICAgICAoV2ViQ29yZTo6c2V0Q29va2llc0Zyb21ET00pOiBVc2UgT1MgWCB2ZXJzaW9u IHRvIGRlY2lkZSB3aGljaCBBUEkvU1BJIHRvIHVzZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9zcGkv Y2YvQ0ZOZXR3b3JrU1BJLmg6IEZvcndhcmQgZGVjbGFyZSB0aGUgU1BJCisKIDIwMTUtMDgtMjcg IE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29j b2FdIERyYXcgZm9udHMgYXQgdGhlaXIgbmF0aXZlIHNpemVzIGluc3RlYWQgb2Ygc2NhbGluZyBh IDFwdCBmb250CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21h Yy9Db29raWVKYXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9D b29raWVKYXJNYWMubW0KaW5kZXggNWNlNGFmMy4uMTZkMTBlMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvQ29va2llSmFyTWFjLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL0Nvb2tpZUphck1hYy5tbQpAQCAtMTIwLDE0 ICsxMjAsMTEgQEAgdm9pZCBzZXRDb29raWVzRnJvbURPTShjb25zdCBOZXR3b3JrU3RvcmFnZVNl c3Npb24mIHNlc3Npb24sIGNvbnN0IFVSTCYgZmlyc3RQYXIKICAgICBOU1VSTCAqY29va2llVVJM ID0gdXJsOwogICAgIE5TRGljdGlvbmFyeSAqaGVhZGVyRmllbGRzID0gW05TRGljdGlvbmFyeSBk aWN0aW9uYXJ5V2l0aE9iamVjdDpjb29raWVTdHJpbmcgZm9yS2V5OkAiU2V0LUNvb2tpZSJdOwog Ci0gICAgTlNBcnJheSAqdW5maWx0ZXJlZENvb2tpZXM7Ci0jcHJhZ21hIGNsYW5nIGRpYWdub3N0 aWMgcHVzaAotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGlnbm9yZWQgIi1XdW5kZWNsYXJlZC1z ZWxlY3RvciIKLSAgICBpZiAoW1tOU0hUVFBDb29raWUgY2xhc3NdIHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3IoX3BhcnNlZENvb2tpZXNXaXRoUmVzcG9uc2VIZWFkZXJGaWVsZHM6Zm9yVVJM OildKQotICAgICAgICB1bmZpbHRlcmVkQ29va2llcyA9IFtOU0hUVFBDb29raWUgcGVyZm9ybVNl bGVjdG9yOkBzZWxlY3RvcihfcGFyc2VkQ29va2llc1dpdGhSZXNwb25zZUhlYWRlckZpZWxkczpm b3JVUkw6KSB3aXRoT2JqZWN0OmhlYWRlckZpZWxkcyB3aXRoT2JqZWN0OmNvb2tpZVVSTF07Ci0j cHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcG9wCi0gICAgZWxzZQotICAgICAgICB1bmZpbHRlcmVk Q29va2llcyA9IFtOU0hUVFBDb29raWUgY29va2llc1dpdGhSZXNwb25zZUhlYWRlckZpZWxkczpo ZWFkZXJGaWVsZHMgZm9yVVJMOmNvb2tpZVVSTF07CisjaWYgUExBVEZPUk0oTUFDKSAmJiBfX01B Q19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTEwMAorICAgIE5TQXJyYXkgKnVuZmls dGVyZWRDb29raWVzID0gW05TSFRUUENvb2tpZSBfcGFyc2VkQ29va2llc1dpdGhSZXNwb25zZUhl YWRlckZpZWxkczpoZWFkZXJGaWVsZHMgZm9yVVJMOmNvb2tpZVVSTF07CisjZWxzZQorICAgIE5T QXJyYXkgKnVuZmlsdGVyZWRDb29raWVzID0gW05TSFRUUENvb2tpZSBjb29raWVzV2l0aFJlc3Bv bnNlSGVhZGVyRmllbGRzOmhlYWRlckZpZWxkcyBmb3JVUkw6Y29va2llVVJMXTsKKyNlbmRpZgog CiAgICAgUmV0YWluUHRyPE5TQXJyYXk+IGZpbHRlcmVkQ29va2llcyA9IGZpbHRlckNvb2tpZXMo dW5maWx0ZXJlZENvb2tpZXMpOwogICAgIEFTU0VSVChbZmlsdGVyZWRDb29raWVzLmdldCgpIGNv dW50XSA8PSAxKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jZi9D Rk5ldHdvcmtTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jZi9DRk5ldHdvcmtT UEkuaAppbmRleCBhYzhmMDg3Li5hZWQyNGNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9zcGkvY2YvQ0ZOZXR3b3JrU1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vc3BpL2NmL0NGTmV0d29ya1NQSS5oCkBAIC0xMjksNiArMTI5LDEyIEBAIEVYVEVSTl9DIENG QXJyYXlSZWYgX0NGSFRUUFBhcnNlZENvb2tpZXNXaXRoUmVzcG9uc2VIZWFkZXJGaWVsZHMoQ0ZB bGxvY2F0b3JSZWYKIAogI2lmIGRlZmluZWQoX19PQkpDX18pCiAKKyNpZiBQTEFURk9STShNQUMp ICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMTAwCitAaW50ZXJmYWNl IE5TSFRUUENvb2tpZSAoKQorKyAoTlNBcnJheSAqKV9wYXJzZWRDb29raWVzV2l0aFJlc3BvbnNl SGVhZGVyRmllbGRzOihOU0RpY3Rpb25hcnkgKiloZWFkZXJGaWVsZHMgZm9yVVJMOihOU1VSTCAq KWFVUkw7CitAZW5kCisjZW5kaWYKKwogI2lmICFVU0UoQVBQTEVfSU5URVJOQUxfU0RLKSB8fCAo UExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID09IDEwOTAp CiBAaW50ZXJmYWNlIE5TSFRUUENvb2tpZVN0b3JhZ2UgKCkKIC0gKHZvaWQpcmVtb3ZlQ29va2ll c1NpbmNlRGF0ZTooTlNEYXRlICopZGF0ZTsKQEAgLTE0NCw2ICsxNTAsNiBAQCBFWFRFUk5fQyBD RkFycmF5UmVmIF9DRkhUVFBQYXJzZWRDb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzKENG QWxsb2NhdG9yUmVmCiArICh2b2lkKV9zZXRTaGFyZWRIVFRQQ29va2llU3RvcmFnZTooTlNIVFRQ Q29va2llU3RvcmFnZSAqKXN0b3JhZ2U7CiBAZW5kCiAjZW5kaWYKLSNlbmRpZgorI2VuZGlmIC8v IGRlZmluZWQoX19PQkpDX18pCiAKICNlbmRpZiAvLyBDRk5ldHdvcmtTUElfaAo=