102436 2012-11-15 14:46:55 -0800 [BlackBerry] Fix assert in NetworkJob::notifyAuthReceived 2012-11-15 16:24:08 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joenotcharles webkit-unassigned mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 768517 0 joenotcharles 2012-11-15 14:46:55 -0800 // The scheme might have changed, but the server type shouldn't have! BLACKBERRY_ASSERT(serverType == oldSpace.serverType()); That comment is wrong - the server type could change if we contact a site taking HTTP auth, through an HTTP proxy taking auth of its own. First we get a 407 from the proxy, and then when get passed the proxy, we get a 401 from the end site - so notifyAuthReceived gets called again with auth type Proxy instead of HTTP. The correct thing to do when that happens is skip the "update the auth type in the credentials" step, since these are actually new credentials and not just credentials being reused for a different auth type on the same server. 768530 1 174524 joenotcharles 2012-11-15 14:51:44 -0800 Created attachment 174524 fix 768534 2 174526 joenotcharles 2012-11-15 14:53:08 -0800 Created attachment 174526 fix first pathc had a typo 768560 3 174526 rwlbuis 2012-11-15 15:24:30 -0800 Comment on attachment 174526 fix LGTM. 768636 4 174526 webkit.review.bot 2012-11-15 16:24:04 -0800 Comment on attachment 174526 fix Clearing flags on attachment: 174526 Committed r134853: <http://trac.webkit.org/changeset/134853> 768637 5 webkit.review.bot 2012-11-15 16:24:08 -0800 All reviewed patches have been landed. Closing bug. 174524 2012-11-15 14:51:44 -0800 2012-11-15 14:53:08 -0800 fix 0001-BlackBerry-Don-t-assert-when-notifyAuthReceived-is-c.patch text/plain 3665 joenotcharles RnJvbSBhM2M2OGU1Nzk1YjQ1ZDc2NTZiYWE5ZGRiZWQyYzgzMGM4ZTgyZjhjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPgpEYXRlOiBUaHUs IDE1IE5vdiAyMDEyIDE3OjQ4OjUzIC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gW0JsYWNrQmVycnld IERvbid0IGFzc2VydCB3aGVuIG5vdGlmeUF1dGhSZWNlaXZlZCBpcyBjYWxsZWQKIHdpdGggYSBk aWZmZXJlbnQgYXV0aCB0eXBlCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTAyNDM2CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRoZSBzZXJ2ZXIgdHlwZSBj b3VsZCBjaGFuZ2UgaWYgd2UgY29udGFjdCBhIHNpdGUgdGFraW5nIEhUVFAgYXV0aCwgdGhyb3Vn aCBhbiBIVFRQIHByb3h5CnRha2luZyBhdXRoIG9mIGl0cyBvd24uIEZpcnN0IHdlIGdldCBhIDQw NyBmcm9tIHRoZSBwcm94eSwgYW5kIHRoZW4gd2hlbiBnZXQgcGFzc2VkIHRoZQpwcm94eSwgd2Ug Z2V0IGEgNDAxIGZyb20gdGhlIGVuZCBzaXRlIC0gc28gbm90aWZ5QXV0aFJlY2VpdmVkIGdldHMg Y2FsbGVkIGFnYWluIHdpdGggYXV0aAp0eXBlIFByb3h5IGluc3RlYWQgb2YgSFRUUC4KClRoZSBj b3JyZWN0IHRoaW5nIHRvIGRvIHdoZW4gdGhhdCBoYXBwZW5zIGlzIHNraXAgdGhlICJ1cGRhdGUg dGhlIGF1dGggdHlwZSBpbiB0aGUKY3JlZGVudGlhbHMiIHN0ZXAsIHNpbmNlIHRoZXNlIGFyZSBh Y3R1YWxseSBuZXcgY3JlZGVudGlhbHMgYW5kIG5vdCBqdXN0IGNyZWRlbnRpYWxzIGJlaW5nCnJl dXNlZCBmb3IgYSBkaWZmZXJlbnQgYXV0aCB0eXBlIG9uIHRoZSBzYW1lIHNlcnZlci4KClBSIDI0 MTYzNwoKKiBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHA6CihXZWJD b3JlOjpOZXR3b3JrSm9iOjpub3RpZnlBdXRoUmVjZWl2ZWQpOgotLS0KIFNvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyMSArKysrKysrKysrKysr KysrKysrKwogLi4uL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcCAg ICAgfCAgICA0ICstLQogMiBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAzIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5YWI3NjJhLi40ZmUzOTg0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjQgQEAKKzIwMTItMTEtMTUgIEpvZSBNYXNvbiAgPGptYXNvbkByaW0uY29tPgorCisg ICAgICAgIFtCbGFja0JlcnJ5XSBEb24ndCBhc3NlcnQgd2hlbiBub3RpZnlBdXRoUmVjZWl2ZWQg aXMgY2FsbGVkIHdpdGggYSBkaWZmZXJlbnQgYXV0aCB0eXBlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI0MzYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgc2VydmVyIHR5cGUgY291bGQgY2hhbmdl IGlmIHdlIGNvbnRhY3QgYSBzaXRlIHRha2luZyBIVFRQIGF1dGgsIHRocm91Z2ggYW4gSFRUUCBw cm94eQorICAgICAgICB0YWtpbmcgYXV0aCBvZiBpdHMgb3duLiBGaXJzdCB3ZSBnZXQgYSA0MDcg ZnJvbSB0aGUgcHJveHksIGFuZCB0aGVuIHdoZW4gZ2V0IHBhc3NlZCB0aGUKKyAgICAgICAgcHJv eHksIHdlIGdldCBhIDQwMSBmcm9tIHRoZSBlbmQgc2l0ZSAtIHNvIG5vdGlmeUF1dGhSZWNlaXZl ZCBnZXRzIGNhbGxlZCBhZ2FpbiB3aXRoIGF1dGgKKyAgICAgICAgdHlwZSBQcm94eSBpbnN0ZWFk IG9mIEhUVFAuCisKKyAgICAgICAgVGhlIGNvcnJlY3QgdGhpbmcgdG8gZG8gd2hlbiB0aGF0IGhh cHBlbnMgaXMgc2tpcCB0aGUgInVwZGF0ZSB0aGUgYXV0aCB0eXBlIGluIHRoZQorICAgICAgICBj cmVkZW50aWFscyIgc3RlcCwgc2luY2UgdGhlc2UgYXJlIGFjdHVhbGx5IG5ldyBjcmVkZW50aWFs cyBhbmQgbm90IGp1c3QgY3JlZGVudGlhbHMgYmVpbmcKKyAgICAgICAgcmV1c2VkIGZvciBhIGRp ZmZlcmVudCBhdXRoIHR5cGUgb24gdGhlIHNhbWUgc2VydmVyLgorCisgICAgICAgIFBSIDI0MTYz NworCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0pvYjo6bm90aWZ5QXV0aFJlY2VpdmVkKToKKwog MjAxMi0xMS0xNCAgVGlhbmNoZW5nIEppYW5nICA8dGlqaWFuZ0ByaW0uY29tPgogCiAgICAgICAg IFtCbGFja0JlcnJ5XSBTdHlsZSBCQjEwIHRpbWUgaW5wdXQgZmllbGQgZm9udC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9i LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3Jr Sm9iLmNwcAppbmRleCAzNjI5ZjcxLi44MjI0YWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCkBAIC0y OTksOSArMjk5LDcgQEAgdm9pZCBOZXR3b3JrSm9iOjpub3RpZnlBdXRoUmVjZWl2ZWQoQmxhY2tC ZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpBdXRoVHkKICAgICAgICAgQXV0aGVudGlj YXRpb25DaGFsbGVuZ2UmIGNoYWxsZW5nZSA9IG1faGFuZGxlLT5nZXRJbnRlcm5hbCgpLT5tX2N1 cnJlbnRXZWJDaGFsbGVuZ2U7CiAgICAgICAgIGlmICghY2hhbGxlbmdlLmlzTnVsbCgpKSB7CiAg ICAgICAgICAgICBjb25zdCBQcm90ZWN0aW9uU3BhY2UmIG9sZFNwYWNlID0gY2hhbGxlbmdlLnBy b3RlY3Rpb25TcGFjZSgpOwotICAgICAgICAgICAgaWYgKG9sZFNwYWNlLmF1dGhlbnRpY2F0aW9u U2NoZW1lKCkgIT0gc2NoZW1lKSB7Ci0gICAgICAgICAgICAgICAgLy8gVGhlIHNjaGVtZSBtaWdo dCBoYXZlIGNoYW5nZWQsIGJ1dCB0aGUgc2VydmVyIHR5cGUgc2hvdWxkbid0IGhhdmUhCi0gICAg ICAgICAgICAgICAgQkxBQ0tCRVJSWV9BU1NFUlQoc2VydmVyVHlwZSA9PSBvbGRTcGFjZS5zZXJ2 ZXJUeXBlKCkpOworICAgICAgICAgICAgaWYgKG9sZFNwYWNlLmF1dGhlbnRpY2F0aW9uU2NoZW1l KCkgIT0gc2NoZW1lICYmIG9sZFNwYWNlLnNlcnZlclR5cGUoKSA9PSBzZXJ2ZXJUeXBlKSB7CiAg ICAgICAgICAgICAgICAgUHJvdGVjdGlvblNwYWNlIG5ld1NwYWNlKG9sZFNwYWNlLmhvc3QoKSwg b2xkU3BhY2UucG9ydCgpLCBvbGRTcGFjZS5zZXJ2ZXJUeXBlKCksIG9sZFNwYWNlLnJlYWxtKCks IHNjaGVtZSk7CiAgICAgICAgICAgICAgICAgbV9oYW5kbGUtPmdldEludGVybmFsKCktPm1fY3Vy cmVudFdlYkNoYWxsZW5nZSA9IEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKG5ld1NwYWNlLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGFsbGVuZ2UucHJvcG9zZWRDcmVkZW50aWFs KCksCi0tIAoxLjcuNS40Cgo= 174526 2012-11-15 14:53:08 -0800 2012-11-15 16:24:04 -0800 fix 0001-BlackBerry-Don-t-assert-when-notifyAuthReceived-is-c.patch text/plain 3661 joenotcharles RnJvbSBmMzE5N2JlYWYzZGVkYjkwODcyMjE3ZDk2ZDM1NDVkYTUyZjY1MWE3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPgpEYXRlOiBUaHUs IDE1IE5vdiAyMDEyIDE3OjQ4OjUzIC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gW0JsYWNrQmVycnld IERvbid0IGFzc2VydCB3aGVuIG5vdGlmeUF1dGhSZWNlaXZlZCBpcyBjYWxsZWQKIHdpdGggYSBk aWZmZXJlbnQgYXV0aCB0eXBlCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTAyNDM2CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRoZSBzZXJ2ZXIgdHlwZSBj b3VsZCBjaGFuZ2UgaWYgd2UgY29udGFjdCBhIHNpdGUgdGFraW5nIEhUVFAgYXV0aCwgdGhyb3Vn aCBhbiBIVFRQIHByb3h5CnRha2luZyBhdXRoIG9mIGl0cyBvd24uIEZpcnN0IHdlIGdldCBhIDQw NyBmcm9tIHRoZSBwcm94eSwgYW5kIHRoZW4gd2hlbiBnZXQgcGFzdCB0aGUKcHJveHksIHdlIGdl dCBhIDQwMSBmcm9tIHRoZSBlbmQgc2l0ZSAtIHNvIG5vdGlmeUF1dGhSZWNlaXZlZCBnZXRzIGNh bGxlZCBhZ2FpbiB3aXRoIGF1dGgKdHlwZSBQcm94eSBpbnN0ZWFkIG9mIEhUVFAuCgpUaGUgY29y cmVjdCB0aGluZyB0byBkbyB3aGVuIHRoYXQgaGFwcGVucyBpcyBza2lwIHRoZSAidXBkYXRlIHRo ZSBhdXRoIHR5cGUgaW4gdGhlCmNyZWRlbnRpYWxzIiBzdGVwLCBzaW5jZSB0aGVzZSBhcmUgYWN0 dWFsbHkgbmV3IGNyZWRlbnRpYWxzIGFuZCBub3QganVzdCBjcmVkZW50aWFscyBiZWluZwpyZXVz ZWQgZm9yIGEgZGlmZmVyZW50IGF1dGggdHlwZSBvbiB0aGUgc2FtZSBzZXJ2ZXIuCgpQUiAyNDE2 MzcKCiogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwOgooV2ViQ29y ZTo6TmV0d29ya0pvYjo6bm90aWZ5QXV0aFJlY2VpdmVkKToKLS0tCiBTb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjEgKysrKysrKysrKysrKysr KysrKysKIC4uLi9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAgICAg IHwgICAgNCArLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggOWFiNzYyYS4uMDdhNTU0ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDI0IEBACisyMDEyLTExLTE1ICBKb2UgTWFzb24gIDxqbWFzb25AcmltLmNvbT4KKworICAg ICAgICBbQmxhY2tCZXJyeV0gRG9uJ3QgYXNzZXJ0IHdoZW4gbm90aWZ5QXV0aFJlY2VpdmVkIGlz IGNhbGxlZCB3aXRoIGEgZGlmZmVyZW50IGF1dGggdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyNDM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHNlcnZlciB0eXBlIGNvdWxkIGNoYW5nZSBp ZiB3ZSBjb250YWN0IGEgc2l0ZSB0YWtpbmcgSFRUUCBhdXRoLCB0aHJvdWdoIGFuIEhUVFAgcHJv eHkKKyAgICAgICAgdGFraW5nIGF1dGggb2YgaXRzIG93bi4gRmlyc3Qgd2UgZ2V0IGEgNDA3IGZy b20gdGhlIHByb3h5LCBhbmQgdGhlbiB3aGVuIGdldCBwYXN0IHRoZQorICAgICAgICBwcm94eSwg d2UgZ2V0IGEgNDAxIGZyb20gdGhlIGVuZCBzaXRlIC0gc28gbm90aWZ5QXV0aFJlY2VpdmVkIGdl dHMgY2FsbGVkIGFnYWluIHdpdGggYXV0aAorICAgICAgICB0eXBlIFByb3h5IGluc3RlYWQgb2Yg SFRUUC4KKworICAgICAgICBUaGUgY29ycmVjdCB0aGluZyB0byBkbyB3aGVuIHRoYXQgaGFwcGVu cyBpcyBza2lwIHRoZSAidXBkYXRlIHRoZSBhdXRoIHR5cGUgaW4gdGhlCisgICAgICAgIGNyZWRl bnRpYWxzIiBzdGVwLCBzaW5jZSB0aGVzZSBhcmUgYWN0dWFsbHkgbmV3IGNyZWRlbnRpYWxzIGFu ZCBub3QganVzdCBjcmVkZW50aWFscyBiZWluZworICAgICAgICByZXVzZWQgZm9yIGEgZGlmZmVy ZW50IGF1dGggdHlwZSBvbiB0aGUgc2FtZSBzZXJ2ZXIuCisKKyAgICAgICAgUFIgMjQxNjM3CisK KyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpOZXR3b3JrSm9iOjpub3RpZnlBdXRoUmVjZWl2ZWQpOgorCiAyMDEy LTExLTE0ICBUaWFuY2hlbmcgSmlhbmcgIDx0aWppYW5nQHJpbS5jb20+CiAKICAgICAgICAgW0Js YWNrQmVycnldIFN0eWxlIEJCMTAgdGltZSBpbnB1dCBmaWVsZCBmb250LgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2Iu Y3BwCmluZGV4IDM2MjlmNzEuLjgyMjRhZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKQEAgLTI5OSw5 ICsyOTksNyBAQCB2b2lkIE5ldHdvcmtKb2I6Om5vdGlmeUF1dGhSZWNlaXZlZChCbGFja0JlcnJ5 OjpQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OkF1dGhUeQogICAgICAgICBBdXRoZW50aWNhdGlv bkNoYWxsZW5nZSYgY2hhbGxlbmdlID0gbV9oYW5kbGUtPmdldEludGVybmFsKCktPm1fY3VycmVu dFdlYkNoYWxsZW5nZTsKICAgICAgICAgaWYgKCFjaGFsbGVuZ2UuaXNOdWxsKCkpIHsKICAgICAg ICAgICAgIGNvbnN0IFByb3RlY3Rpb25TcGFjZSYgb2xkU3BhY2UgPSBjaGFsbGVuZ2UucHJvdGVj dGlvblNwYWNlKCk7Ci0gICAgICAgICAgICBpZiAob2xkU3BhY2UuYXV0aGVudGljYXRpb25TY2hl bWUoKSAhPSBzY2hlbWUpIHsKLSAgICAgICAgICAgICAgICAvLyBUaGUgc2NoZW1lIG1pZ2h0IGhh dmUgY2hhbmdlZCwgYnV0IHRoZSBzZXJ2ZXIgdHlwZSBzaG91bGRuJ3QgaGF2ZSEKLSAgICAgICAg ICAgICAgICBCTEFDS0JFUlJZX0FTU0VSVChzZXJ2ZXJUeXBlID09IG9sZFNwYWNlLnNlcnZlclR5 cGUoKSk7CisgICAgICAgICAgICBpZiAob2xkU3BhY2UuYXV0aGVudGljYXRpb25TY2hlbWUoKSAh PSBzY2hlbWUgJiYgb2xkU3BhY2Uuc2VydmVyVHlwZSgpID09IHNlcnZlclR5cGUpIHsKICAgICAg ICAgICAgICAgICBQcm90ZWN0aW9uU3BhY2UgbmV3U3BhY2Uob2xkU3BhY2UuaG9zdCgpLCBvbGRT cGFjZS5wb3J0KCksIG9sZFNwYWNlLnNlcnZlclR5cGUoKSwgb2xkU3BhY2UucmVhbG0oKSwgc2No ZW1lKTsKICAgICAgICAgICAgICAgICBtX2hhbmRsZS0+Z2V0SW50ZXJuYWwoKS0+bV9jdXJyZW50 V2ViQ2hhbGxlbmdlID0gQXV0aGVudGljYXRpb25DaGFsbGVuZ2UobmV3U3BhY2UsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNoYWxsZW5nZS5wcm9wb3NlZENyZWRlbnRpYWwoKSwK LS0gCjEuNy41LjQKCg==