51563 2010-12-23 14:54:34 -0800 Need WebKit2 API to create a SecurityOrigin from protocol, host, and port 2010-12-23 17:18:09 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 jberlin jberlin beidson jberlin sam oldest_to_newest 326297 0 jberlin 2010-12-23 14:54:34 -0800 Needed for <rdar://problem/8804169> 326325 1 77376 jberlin 2010-12-23 15:26:22 -0800 Created attachment 77376 Patch 326380 2 77376 jberlin 2010-12-23 17:18:02 -0800 Comment on attachment 77376 Patch Committed in r74597 http://trac.webkit.org/changeset/74597 77376 2010-12-23 15:26:22 -0800 2010-12-23 17:18:02 -0800 Patch wk2AddCreateSecurityOriginFromProtocolHostPort.patch text/plain 7566 jberlin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDU4NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMTItMjMgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO ZWVkIFdlYktpdDIgQVBJIHRvIGNyZWF0ZSBhIFNlY3VyaXR5T3JpZ2luIGZyb20gcHJvdG9jb2ws IGhvc3QsIGFuZCBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01MTU2MworCisgICAgICAgIEFkZCBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKGNvbnN0 IFN0cmluZyYgcHJvdG9jb2wsIGNvbnN0IFN0cmluZyYgaG9zdCwgaW50IHBvcnQpLgorCisgICAg ICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAgIEV4cG9ydCB0aGUgc3ltYm9scyBmb3IgV2Vi Q29yZTo6U2VjdXJpdHlPcmlnaW46OmNyZWF0ZShTdHJpbmcsIFN0cmluZywgaW50KS4KKworICAg ICAgICAqIHBhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VjdXJp dHlPcmlnaW46OmNyZWF0ZUZyb21EYXRhYmFzZUlkZW50aWZpZXIpOgorICAgICAgICBVc2UgdGhl IGNvbnN0YW50IE1heEFsbG93ZWRQb3J0LgorICAgICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmln aW46OmNyZWF0ZSk6CisgICAgICAgIFNhbml0aXppbmcgYmFzZWQgb2ZmIG9mIHRoYXQgZG9uZSBp biBjcmVhdGVGcm9tRGF0YWJhc2VJZGVudGlmaWVyLgorICAgICAgICAqIHBhZ2UvU2VjdXJpdHlP cmlnaW4uaDoKKwogMjAxMC0xMi0yMyAgTWloYWkgUGFycGFyaXRhICA8bWloYWlwQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW50IFRhbXVyYS4KSW5kZXg6IFdlYkNvcmUv V2ViQ29yZS5leHAuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkocmV2 aXNpb24gNzQ1NTcpCisrKyBXZWJDb3JlL1dlYkNvcmUuZXhwLmluCSh3b3JraW5nIGNvcHkpCkBA IC0zNDEsNiArMzQxLDcgQEAgX19aTjdXZWJDb3JlMTRTZWN1cml0eU9yaWdpbjI5YWRkT3JpZ2lu QQogX19aTjdXZWJDb3JlMTRTZWN1cml0eU9yaWdpbjMycmVtb3ZlT3JpZ2luQWNjZXNzV2hpdGVs aXN0RW50cnlFUktTMF9SS04zV1RGNlN0cmluZ0VTNl9iCiBfX1pON1dlYkNvcmUxNFNlY3VyaXR5 T3JpZ2luNDBzZXREb21haW5SZWxheGF0aW9uRm9yYmlkZGVuRm9yVVJMU2NoZW1lRWJSS04zV1RG NlN0cmluZ0UKIF9fWk43V2ViQ29yZTE0U2VjdXJpdHlPcmlnaW42Y3JlYXRlRVJLTlNfNEtVUkxF aQorX19aTjdXZWJDb3JlMTRTZWN1cml0eU9yaWdpbjZjcmVhdGVFUktOM1dURjZTdHJpbmdFUzRf aQogX19aTjdXZWJDb3JlMTVBcmNoaXZlUmVzb3VyY2U2Y3JlYXRlRU4zV1RGMTBQYXNzUmVmUHRy SU5TXzEyU2hhcmVkQnVmZmVyRUVFUktOU180S1VSTEVSS05TMV82U3RyaW5nRVNBX1NBX1JLTlNf MTZSZXNvdXJjZVJlc3BvbnNlRQogX19aTjdXZWJDb3JlMTVET01XcmFwcGVyV29ybGQxNXVucmVn aXN0ZXJXb3JsZEV2CiBfX1pON1dlYkNvcmUxNURPTVdyYXBwZXJXb3JsZEQxRXYKSW5kZXg6IFdl YkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdl L1NlY3VyaXR5T3JpZ2luLmNwcAkocmV2aXNpb24gNzQ1NTcpCisrKyBXZWJDb3JlL3BhZ2UvU2Vj dXJpdHlPcmlnaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MCw2ICs0MCw3IEBACiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBTZWN1cml0eU9yaWdpbjo6TG9jYWxMb2FkUG9saWN5IGxv Y2FsTG9hZFBvbGljeSA9IFNlY3VyaXR5T3JpZ2luOjpBbGxvd0xvY2FsTG9hZHNGb3JMb2NhbE9u bHk7Citjb25zdCBpbnQgTWF4QWxsb3dlZFBvcnQgPSA2NTUzNTsKIAogdHlwZWRlZiBWZWN0b3I8 T3JpZ2luQWNjZXNzRW50cnk+IE9yaWdpbkFjY2Vzc1doaXRlTGlzdDsKIHR5cGVkZWYgSGFzaE1h cDxTdHJpbmcsIE9yaWdpbkFjY2Vzc1doaXRlTGlzdCo+IE9yaWdpbkFjY2Vzc01hcDsKQEAgLTQx NSw3ICs0MTYsNyBAQCBQYXNzUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBTZWN1cml0eU9yaWdpCiAg ICAgaWYgKCEocG9ydE9rYXkgfHwgcG9ydEFic2VudCkpCiAgICAgICAgIHJldHVybiBjcmVhdGUo S1VSTCgpKTsKICAgICAKLSAgICBpZiAocG9ydCA8IDAgfHwgcG9ydCA+IDY1NTM1KQorICAgIGlm IChwb3J0IDwgMCB8fCBwb3J0ID4gTWF4QWxsb3dlZFBvcnQpCiAgICAgICAgIHJldHVybiBjcmVh dGUoS1VSTCgpKTsKICAgICAgICAgCiAgICAgLy8gU3BsaXQgb3V0IHRoZSAzIHNlY3Rpb25zIG9m IGRhdGEKQEAgLTQyNiw2ICs0MjcsMTQgQEAgUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4gU2Vj dXJpdHlPcmlnaQogICAgIHJldHVybiBjcmVhdGUoS1VSTChLVVJMKCksIHByb3RvY29sICsgIjov LyIgKyBob3N0ICsgIjoiICsgU3RyaW5nOjpudW1iZXIocG9ydCkpKTsKIH0KIAorUGFzc1JlZlB0 cjxTZWN1cml0eU9yaWdpbj4gU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShjb25zdCBTdHJpbmcmIHBy b3RvY29sLCBjb25zdCBTdHJpbmcmIGhvc3QsIGludCBwb3J0KQoreworICAgIGlmIChwb3J0IDwg MCB8fCBwb3J0ID4gTWF4QWxsb3dlZFBvcnQpCisgICAgICAgIGNyZWF0ZShLVVJMKCkpOworICAg IFN0cmluZyBkZWNvZGVkSG9zdCA9IGRlY29kZVVSTEVzY2FwZVNlcXVlbmNlcyhob3N0KTsKKyAg ICByZXR1cm4gY3JlYXRlKEtVUkwoS1VSTCgpLCBwcm90b2NvbCArICI6Ly8iICsgaG9zdCArICI6 IiArIFN0cmluZzo6bnVtYmVyKHBvcnQpKSk7Cit9CisKIFN0cmluZyBTZWN1cml0eU9yaWdpbjo6 ZGF0YWJhc2VJZGVudGlmaWVyKCkgY29uc3QgCiB7CiAgICAgU3RyaW5nIHNlcGFyYXRvclN0cmlu ZygmU2VwYXJhdG9yQ2hhcmFjdGVyLCAxKTsKSW5kZXg6IFdlYkNvcmUvcGFnZS9TZWN1cml0eU9y aWdpbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCShyZXZp c2lvbiA3NDU1NykKKysrIFdlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCSh3b3JraW5nIGNv cHkpCkBAIC00Miw2ICs0Miw3IEBAIGNsYXNzIFNlY3VyaXR5T3JpZ2luIDogcHVibGljIFRocmVh ZFNhZmUKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4gY3Jl YXRlRnJvbURhdGFiYXNlSWRlbnRpZmllcihjb25zdCBTdHJpbmcmKTsKICAgICBzdGF0aWMgUGFz c1JlZlB0cjxTZWN1cml0eU9yaWdpbj4gY3JlYXRlRnJvbVN0cmluZyhjb25zdCBTdHJpbmcmKTsK KyAgICBzdGF0aWMgUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4gY3JlYXRlKGNvbnN0IFN0cmlu ZyYgcHJvdG9jb2wsIGNvbnN0IFN0cmluZyYgaG9zdCwgaW50IHBvcnQpOwogICAgIHN0YXRpYyBQ YXNzUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBjcmVhdGUoY29uc3QgS1VSTCYsIFNhbmRib3hGbGFn cyA9IFNhbmRib3hOb25lKTsKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4g Y3JlYXRlRW1wdHkoKTsKIApJbmRleDogV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc0NTg0KQorKysgV2ViS2l0Mi9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0xMi0yMyAgSmVzc2llIEJlcmxp biAgPGpiZXJsaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE5lZWQgV2ViS2l0MiBBUEkgdG8gY3JlYXRlIGEgU2VjdXJpdHlPcmln aW4gZnJvbSBwcm90b2NvbCwgaG9zdCwgYW5kIHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxNTYzCisKKyAgICAgICAgQWRkIFdLU2VjdXJpdHlP cmlnaW5DcmVhdGUoV0tTdHJpbmdSZWYgcHJvdG9jb2wsIFdLU3RyaW5nUmVmIGhvc3QsIGludCBw b3J0KS4KKworICAgICAgICAqIFNoYXJlZC9BUEkvYy9XS1NlY3VyaXR5T3JpZ2luLmNwcDoKKyAg ICAgICAgKFdLU2VjdXJpdHlPcmlnaW5DcmVhdGVGcm9tSWRlbnRpZmllcik6CisgICAgICAgIFJl bmFtZWQgc28gYXMgbm90IHRvIGNsYXNoIHdpdGggdGhlIG5ldyBXS1NlY3VyaXR5T3JpZ2luQ3Jl YXRlLgorICAgICAgICAoV0tTZWN1cml0eU9yaWdpbkNyZWF0ZSk6CisgICAgICAgICogU2hhcmVk L0FQSS9jL1dLU2VjdXJpdHlPcmlnaW4uaDoKKyAgICAgICAgKiBTaGFyZWQvV2ViU2VjdXJpdHlP cmlnaW4uaDoKKyAgICAgICAgKFdlYktpdDo6V2ViU2VjdXJpdHlPcmlnaW46OmNyZWF0ZSk6CisK IDIwMTAtMTItMjMgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBGaXgg aW5jb3JyZWN0IGFzc2VydGlvbiBjYXVzaW5nIGFsbCBwYWdlcyB3aXRoIHN1YmZyYW1lcyB0byBj cmFzaC4KSW5kZXg6IFdlYktpdDIvU2hhcmVkL1dlYlNlY3VyaXR5T3JpZ2luLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0Mi9TaGFyZWQvV2ViU2VjdXJpdHlPcmlnaW4uaAkocmV2aXNpb24gNzQ1NTcp CisrKyBXZWJLaXQyL1NoYXJlZC9XZWJTZWN1cml0eU9yaWdpbi5oCSh3b3JraW5nIGNvcHkpCkBA IC00NCw2ICs0NCwxNCBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2Vi U2VjdXJpdHlPcmlnaW4oc2VjdXJpdHlPcmlnaW4ucmVsZWFzZSgpKSk7CiAgICAgfQogCisgICAg c3RhdGljIFBhc3NSZWZQdHI8V2ViU2VjdXJpdHlPcmlnaW4+IGNyZWF0ZShjb25zdCBTdHJpbmcm IHByb3RvY29sLCBjb25zdCBTdHJpbmcmIGhvc3QsIGludCBwb3J0KQorICAgIHsKKyAgICAgICAg UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPiBzZWN1cml0eU9yaWdpbiA9IFdlYkNvcmU6 OlNlY3VyaXR5T3JpZ2luOjpjcmVhdGUocHJvdG9jb2wsIGhvc3QsIHBvcnQpOworICAgICAgICBp ZiAoIXNlY3VyaXR5T3JpZ2luKQorICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVy biBhZG9wdFJlZihuZXcgV2ViU2VjdXJpdHlPcmlnaW4oc2VjdXJpdHlPcmlnaW4ucmVsZWFzZSgp KSk7CisgICAgfQorCiAgICAgY29uc3QgU3RyaW5nIHByb3RvY29sKCkgY29uc3QgeyByZXR1cm4g bV9zZWN1cml0eU9yaWdpbi0+ZG9tYWluKCk7IH0KICAgICBjb25zdCBTdHJpbmcgaG9zdCgpIGNv bnN0IHsgcmV0dXJuIG1fc2VjdXJpdHlPcmlnaW4tPmhvc3QoKTsgfQogICAgIHVuc2lnbmVkIHNo b3J0IHBvcnQoKSBjb25zdCB7IHJldHVybiBtX3NlY3VyaXR5T3JpZ2luLT5wb3J0KCk7IH0KSW5k ZXg6IFdlYktpdDIvU2hhcmVkL0FQSS9jL1dLU2VjdXJpdHlPcmlnaW4uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdDIvU2hhcmVkL0FQSS9jL1dLU2VjdXJpdHlPcmlnaW4uY3BwCShyZXZpc2lvbiA3 NDU1NykKKysrIFdlYktpdDIvU2hhcmVkL0FQSS9jL1dLU2VjdXJpdHlPcmlnaW4uY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNSwxMiArMzUsMTggQEAgV0tUeXBlSUQgV0tTZWN1cml0eU9yaWdpbkdl dFR5cGVJRCgpCiAgICAgcmV0dXJuIHRvQVBJKFdlYlNlY3VyaXR5T3JpZ2luOjpBUElUeXBlKTsK IH0KIAotV0tTZWN1cml0eU9yaWdpblJlZiBXS1NlY3VyaXR5T3JpZ2luQ3JlYXRlKFdLU3RyaW5n UmVmIGlkZW50aWZpZXIpCitXS1NlY3VyaXR5T3JpZ2luUmVmIFdLU2VjdXJpdHlPcmlnaW5DcmVh dGVGcm9tSWRlbnRpZmllcihXS1N0cmluZ1JlZiBpZGVudGlmaWVyKQogewogICAgIFJlZlB0cjxX ZWJTZWN1cml0eU9yaWdpbj4gc2VjdXJpdHlPcmlnaW4gPSBXZWJTZWN1cml0eU9yaWdpbjo6Y3Jl YXRlKHRvSW1wbChpZGVudGlmaWVyKS0+c3RyaW5nKCkpOwogICAgIHJldHVybiB0b0FQSShzZWN1 cml0eU9yaWdpbi5yZWxlYXNlKCkubGVha1JlZigpKTsKIH0KIAorV0tTZWN1cml0eU9yaWdpblJl ZiBXS1NlY3VyaXR5T3JpZ2luQ3JlYXRlKFdLU3RyaW5nUmVmIHByb3RvY29sLCBXS1N0cmluZ1Jl ZiBob3N0LCBpbnQgcG9ydCkKK3sKKyAgICBSZWZQdHI8V2ViU2VjdXJpdHlPcmlnaW4+IHNlY3Vy aXR5T3JpZ2luID0gV2ViU2VjdXJpdHlPcmlnaW46OmNyZWF0ZSh0b0ltcGwocHJvdG9jb2wpLT5z dHJpbmcoKSwgdG9JbXBsKGhvc3QpLT5zdHJpbmcoKSwgcG9ydCk7CisgICAgcmV0dXJuIHRvQVBJ KHNlY3VyaXR5T3JpZ2luLnJlbGVhc2UoKS5sZWFrUmVmKCkpOworfQorCiBXS1N0cmluZ1JlZiBX S1NlY3VyaXR5T3JpZ2luR2V0UHJvdG9jb2woV0tTZWN1cml0eU9yaWdpblJlZiBzZWN1cml0eU9y aWdpbikKIHsKICAgICByZXR1cm4gdG9Db3BpZWRBUEkodG9JbXBsKHNlY3VyaXR5T3JpZ2luKS0+ cHJvdG9jb2woKSk7CkluZGV4OiBXZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1NlY3VyaXR5T3JpZ2lu LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tTZWN1cml0eU9yaWdpbi5o CShyZXZpc2lvbiA3NDU1NykKKysrIFdlYktpdDIvU2hhcmVkL0FQSS9jL1dLU2VjdXJpdHlPcmln aW4uaAkod29ya2luZyBjb3B5KQpAQCAtMzQsNyArMzQsOCBAQCBleHRlcm4gIkMiIHsKIAogV0tf RVhQT1JUIFdLVHlwZUlEIFdLU2VjdXJpdHlPcmlnaW5HZXRUeXBlSUQoKTsKIAotV0tfRVhQT1JU IFdLU2VjdXJpdHlPcmlnaW5SZWYgV0tTZWN1cml0eU9yaWdpbkNyZWF0ZShXS1N0cmluZ1JlZiBp ZGVudGlmaWVyKTsKK1dLX0VYUE9SVCBXS1NlY3VyaXR5T3JpZ2luUmVmIFdLU2VjdXJpdHlPcmln aW5DcmVhdGVGcm9tSWRlbnRpZmllcihXS1N0cmluZ1JlZiBpZGVudGlmaWVyKTsKK1dLX0VYUE9S VCBXS1NlY3VyaXR5T3JpZ2luUmVmIFdLU2VjdXJpdHlPcmlnaW5DcmVhdGUoV0tTdHJpbmdSZWYg cHJvdG9jb2wsIFdLU3RyaW5nUmVmIGhvc3QsIGludCBwb3J0KTsKIAogV0tfRVhQT1JUIFdLU3Ry aW5nUmVmIFdLU2VjdXJpdHlPcmlnaW5HZXRQcm90b2NvbChXS1NlY3VyaXR5T3JpZ2luUmVmIHNl Y3VyaXR5T3JpZ2luKTsKIFdLX0VYUE9SVCBXS1N0cmluZ1JlZiBXS1NlY3VyaXR5T3JpZ2luR2V0 SG9zdChXS1NlY3VyaXR5T3JpZ2luUmVmIHNlY3VyaXR5T3JpZ2luKTsK