57092 2011-03-25 01:39:53 -0700 [Qt] QNetworkReplyHandler refactoring: some adjustments 2011-05-03 11:01:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED Qt P3 Normal --- 1 luiz luiz benjamin cmarcelo hausmann jturcotte kenneth kling menard oldest_to_newest 373399 0 luiz 2011-03-25 01:39:53 -0700 further simplification is possible due to the invariants created by previous patches. 373401 1 86910 luiz 2011-03-25 01:44:06 -0700 Created attachment 86910 patch please review 374478 2 jturcotte 2011-03-28 07:37:43 -0700 I'm no official reviewer but this looks good to me. 385489 3 89525 luiz 2011-04-13 21:03:11 -0700 Created attachment 89525 patch 385817 4 89525 kling 2011-04-14 09:37:28 -0700 Comment on attachment 89525 patch View in context: https://bugs.webkit.org/attachment.cgi?id=89525&action=review > Source/WebCore/ChangeLog:12 > + - Ignoring status code 404 because application cache depends on it. This should be in a separate patch with a test. :) 385818 5 89525 kling 2011-04-14 09:37:43 -0700 Comment on attachment 89525 patch View in context: https://bugs.webkit.org/attachment.cgi?id=89525&action=review > Source/WebCore/ChangeLog:12 > + - Ignoring status code 404 because application cache depends on it. This should be in a separate patch with a test. :) 386787 6 89822 luiz 2011-04-15 11:52:53 -0700 Created attachment 89822 patch 386808 7 89822 kling 2011-04-15 12:11:07 -0700 Comment on attachment 89822 patch View in context: https://bugs.webkit.org/attachment.cgi?id=89822&action=review Another nice cleanup. :) r=me with some minor fixes before landing: > Source/WebCore/platform/network/qt/QNetworkReplyHandler.h:78 > + bool redirected() const { return m_redirectionTargetUrl.isValid(); } wasRedirected() would read nicer IMO. > Source/WebCore/platform/network/qt/QNetworkReplyHandler.h:97 > + int m_statusCode; This is not used anywhere, should be removed. 397194 8 luiz 2011-05-03 11:01:03 -0700 landed. http://trac.webkit.org/changeset/84018 86910 2011-03-25 01:44:06 -0700 2011-04-13 21:03:11 -0700 patch 0001-Qt-QNetworkReplyHandler-refactoring-removing-redunda.patch text/plain 8410 luiz RnJvbSAzNTRhMDE5N2I0YjNhYTMyN2Q2ODQ1ZDA4Y2U5Mjg0ZDRmNzhlNzc5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IEZyaSwgMjUgTWFyIDIwMTEgMDU6NDM6MTEgLTAzMDAKU3ViamVjdDogW1BB VENIXSBbUXRdIFFOZXR3b3JrUmVwbHlIYW5kbGVyIHJlZmFjdG9yaW5nOiByZW1vdmluZyByZWR1 bmRhbnQgY29kZQogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MDky CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCmZ1cnRoZXIgc2ltcGxpZmljYXRpb24gaXMg cG9zc2libGUgZHVlIHRvIHRoZSBpbnZhcmlhbnRzIGNyZWF0ZWQgYnkgcHJldmlvdXMgcGF0Y2hl cy4KCiogcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5jcHA6CihXZWJD b3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6UU5ldHdvcmtSZXBseUhhbmRsZXIpOgooV2ViQ29y ZTo6UU5ldHdvcmtSZXBseUhhbmRsZXI6OnJlc2V0U3RhdGUpOgooV2ViQ29yZTo6UU5ldHdvcmtS ZXBseUhhbmRsZXI6OnJlbGVhc2UpOgooV2ViQ29yZTo6c2hvdWxkSWdub3JlSHR0cEVycm9yKToK KFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpmaW5pc2gpOgooV2ViQ29yZTo6UU5ldHdv cmtSZXBseUhhbmRsZXI6OnNlbmRSZXNwb25zZSk6CihXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFu ZGxlcjo6cmVkaXJlY3RlZCk6CihXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6Zm9yd2Fy ZERhdGEpOgooV2ViQ29yZTo6UU5ldHdvcmtSZXBseUhhbmRsZXI6OnN0YXJ0KToKKiBwbGF0Zm9y bS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmg6CihXZWJDb3JlOjpRTmV0d29ya1Jl cGx5SGFuZGxlclNpZ25hbFF1ZXVlOjptZXRhRGF0YUNoYW5nZWQpOgotLS0KIFNvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyMiArKysrKysrCiAu Li4vcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5jcHAgICB8ICAgNjIg KysrKy0tLS0tLS0tLS0tLS0tLS0KIC4uLi9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVw bHlIYW5kbGVyLmggICAgIHwgICAgNyArLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9u cygrKSwgNTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDM3Y2IxYjEuLmI4NTYzYWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMS0wMy0yNSAgTHVpeiBBZ29zdGluaSAgPGx1 aXouYWdvc3RpbmlAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbUXRdIFFOZXR3b3JrUmVwbHlIYW5kbGVyIHJlZmFjdG9yaW5n OiByZW1vdmluZyByZWR1bmRhbnQgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTcwOTIKKworICAgICAgICBmdXJ0aGVyIHNpbXBsaWZpY2F0aW9u IGlzIHBvc3NpYmxlIGR1ZSB0byB0aGUgaW52YXJpYW50cyBjcmVhdGVkIGJ5IHByZXZpb3VzIHBh dGNoZXMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5k bGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpRTmV0d29y a1JlcGx5SGFuZGxlcik6CisgICAgICAgIChXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6 cmVzZXRTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6cmVs ZWFzZSk6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRJZ25vcmVIdHRwRXJyb3IpOgorICAgICAg ICAoV2ViQ29yZTo6UU5ldHdvcmtSZXBseUhhbmRsZXI6OmZpbmlzaCk6CisgICAgICAgIChXZWJD b3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6c2VuZFJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNv cmU6OlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpyZWRpcmVjdGVkKToKKyAgICAgICAgKFdlYkNvcmU6 OlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpmb3J3YXJkRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpR TmV0d29ya1JlcGx5SGFuZGxlcjo6c3RhcnQpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv cXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlFOZXR3b3JrUmVw bHlIYW5kbGVyU2lnbmFsUXVldWU6Om1ldGFEYXRhQ2hhbmdlZCk6CisKIDIwMTEtMDMtMjQgIEx1 aXogQWdvc3RpbmkgIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwCmluZGV4IGZlYTI3 MmYuLjc3MmUxYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv cXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwCkBAIC0yODMsMTIgKzI4MywxMSBA QCBRTmV0d29ya1JlcGx5SGFuZGxlcjo6UU5ldHdvcmtSZXBseUhhbmRsZXIoUmVzb3VyY2VIYW5k bGUqIGhhbmRsZSwgTG9hZFR5cGUgbG9hZAogICAgIDogUU9iamVjdCgwKQogICAgICwgbV9yZXBs eVdyYXBwZXIoMCkKICAgICAsIG1fcmVzb3VyY2VIYW5kbGUoaGFuZGxlKQorICAgICwgbV9yZXNw b25zZUNvbnRhaW5zRGF0YShmYWxzZSkKICAgICAsIG1fbG9hZFR5cGUobG9hZFR5cGUpCiAgICAg LCBtX3NpZ25hbFF1ZXVlKHRoaXMsIGRlZmVycmVkKQogICAgICwgbV9yZWRpcmVjdGlvblRyaWVz KGdNYXhSZWRpcmVjdGlvbnMpCiB7Ci0gICAgcmVzZXRTdGF0ZSgpOwotCiAgICAgY29uc3QgUmVz b3VyY2VSZXF1ZXN0ICZyID0gbV9yZXNvdXJjZUhhbmRsZS0+Zmlyc3RSZXF1ZXN0KCk7CiAKICAg ICBpZiAoci5odHRwTWV0aG9kKCkgPT0gIkdFVCIpCkBAIC0zMTUsOSArMzE0LDcgQEAgUU5ldHdv cmtSZXBseUhhbmRsZXI6OlFOZXR3b3JrUmVwbHlIYW5kbGVyKFJlc291cmNlSGFuZGxlKiBoYW5k bGUsIExvYWRUeXBlIGxvYWQKIAogdm9pZCBRTmV0d29ya1JlcGx5SGFuZGxlcjo6cmVzZXRTdGF0 ZSgpCiB7Ci0gICAgbV9yZXNwb25zZVNlbnQgPSBmYWxzZTsKICAgICBtX3Jlc3BvbnNlQ29udGFp bnNEYXRhID0gZmFsc2U7Ci0gICAgbV9oYXNTdGFydGVkID0gZmFsc2U7CiAKICAgICBpZiAobV9y ZXBseVdyYXBwZXIpIHsKICAgICAgICAgZGVsZXRlIG1fcmVwbHlXcmFwcGVyOwpAQCAtMzQxLDgg KzMzOCw3IEBAIFFOZXR3b3JrUmVwbHkqIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpyZWxlYXNlKCkK ICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBRTmV0d29ya1JlcGx5KiByZXBseSA9IG1fcmVwbHlX cmFwcGVyLT5yZWxlYXNlKCk7Ci0gICAgZGVsZXRlIG1fcmVwbHlXcmFwcGVyOwotICAgIG1fcmVw bHlXcmFwcGVyID0gMDsKKyAgICByZXNldFN0YXRlKCk7CiAgICAgcmV0dXJuIHJlcGx5OwogfQog CkBAIC0zNTAsOSArMzQ2LDEzIEBAIHN0YXRpYyBib29sIHNob3VsZElnbm9yZUh0dHBFcnJvcihR TmV0d29ya1JlcGx5KiByZXBseSwgYm9vbCByZWNlaXZlZERhdGEpCiB7CiAgICAgaW50IGh0dHBT dGF0dXNDb2RlID0gcmVwbHktPmF0dHJpYnV0ZShRTmV0d29ya1JlcXVlc3Q6Okh0dHBTdGF0dXND b2RlQXR0cmlidXRlKS50b0ludCgpOwogCisgICAgLy8gNDAxIFVuYXV0aG9yaXplZAorICAgIC8v IDQwNyBQcm94eSBBdXRoZW50aWNhdGlvbiBSZXF1aXJlZAogICAgIGlmIChodHRwU3RhdHVzQ29k ZSA9PSA0MDEgfHwgaHR0cFN0YXR1c0NvZGUgPT0gNDA3KQogICAgICAgICByZXR1cm4gdHJ1ZTsK IAorICAgIC8vIDR4eCBDbGllbnQgRXJyb3IKKyAgICAvLyA1eHggU2VydmVyIEVycm9yCiAgICAg aWYgKHJlY2VpdmVkRGF0YSAmJiAoaHR0cFN0YXR1c0NvZGUgPj0gNDAwICYmIGh0dHBTdGF0dXND b2RlIDwgNjAwKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKQEAgLTM3OSwyMCArMzc5LDEyIEBA IHZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OnJlYWRIdHRwSGVhZGVycyhjb25zdCBLVVJMJiB1 cmwsIFJlc291cmNlUmVzcG9uc2UmIHJlCiAKIHZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OmZp bmlzaCgpCiB7Ci0gICAgQVNTRVJUKG1faGFzU3RhcnRlZCk7Ci0KICAgICBpZiAoIW1fcmVwbHlX cmFwcGVyIHx8ICFtX3JlcGx5V3JhcHBlci0+cmVwbHkoKSkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgc2VuZFJlc3BvbnNlSWZOZWVkZWQoKTsKLQotICAgIGlmICh3YXNBYm9ydGVkKCkpCi0gICAg ICAgIHJldHVybjsKLQogICAgIFJlc291cmNlSGFuZGxlQ2xpZW50KiBjbGllbnQgPSBtX3Jlc291 cmNlSGFuZGxlLT5jbGllbnQoKTsKICAgICBpZiAoIWNsaWVudCkgewotICAgICAgICBkZWxldGUg bV9yZXBseVdyYXBwZXI7Ci0gICAgICAgIG1fcmVwbHlXcmFwcGVyID0gMDsKKyAgICAgICAgcmVz ZXRTdGF0ZSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC00MTEsMjkgKzQwMywxNyBA QCB2b2lkIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpmaW5pc2goKQogICAgICAgICB9CiAgICAgfQog Ci0gICAgaWYgKG1fcmVwbHlXcmFwcGVyKSB7Ci0gICAgICAgIGRlbGV0ZSBtX3JlcGx5V3JhcHBl cjsKLSAgICAgICAgbV9yZXBseVdyYXBwZXIgPSAwOwotICAgIH0KKyAgICByZXNldFN0YXRlKCk7 CiB9CiAKLXZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OnNlbmRSZXNwb25zZUlmTmVlZGVkKCkK K3ZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OnNlbmRSZXNwb25zZSgpCiB7Ci0gICAgQVNTRVJU KG1faGFzU3RhcnRlZCk7Ci0KICAgICBpZiAoIW1fcmVwbHlXcmFwcGVyIHx8ICFtX3JlcGx5V3Jh cHBlci0+cmVwbHkoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKG1fcmVwbHlXcmFwcGVy LT5yZXBseSgpLT5lcnJvcigpICYmICFzaG91bGRJZ25vcmVIdHRwRXJyb3IobV9yZXBseVdyYXBw ZXItPnJlcGx5KCksIG1fcmVzcG9uc2VDb250YWluc0RhdGEpKQogICAgICAgICByZXR1cm47CiAK LSAgICBpZiAod2FzQWJvcnRlZCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAobV9yZXNw b25zZVNlbnQpCi0gICAgICAgIHJldHVybjsKLSAgICBtX3Jlc3BvbnNlU2VudCA9IHRydWU7Ci0K ICAgICBSZXNvdXJjZUhhbmRsZUNsaWVudCogY2xpZW50ID0gbV9yZXNvdXJjZUhhbmRsZS0+Y2xp ZW50KCk7CiAgICAgaWYgKCFjbGllbnQpCiAgICAgICAgIHJldHVybjsKQEAgLTUwOCwxOSArNDg4 LDkgQEAgYm9vbCBRTmV0d29ya1JlcGx5SGFuZGxlcjo6cmVkaXJlY3QoUmVzb3VyY2VSZXNwb25z ZSYgcmVzcG9uc2UsIGNvbnN0IFFVcmwmIHJlZGkKIAogdm9pZCBRTmV0d29ya1JlcGx5SGFuZGxl cjo6cmVkaXJlY3RlZCgpCiB7Ci0gICAgcURlYnVnKCkgPDwgInJlZGlyZWN0ZWQ6ICIgPDwgbV9y ZWRpcmVjdGlvblRyaWVzOwotCi0gICAgQVNTRVJUKG1faGFzU3RhcnRlZCk7Ci0KICAgICBpZiAo IW1fcmVwbHlXcmFwcGVyIHx8ICFtX3JlcGx5V3JhcHBlci0+cmVwbHkoKSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgaWYgKG1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLT5lcnJvcigpICYmICFzaG91 bGRJZ25vcmVIdHRwRXJyb3IobV9yZXBseVdyYXBwZXItPnJlcGx5KCksIG1fcmVzcG9uc2VDb250 YWluc0RhdGEpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAod2FzQWJvcnRlZCgpKQotICAg ICAgICByZXR1cm47Ci0KICAgICBSZXNvdXJjZUhhbmRsZUNsaWVudCogY2xpZW50ID0gbV9yZXNv dXJjZUhhbmRsZS0+Y2xpZW50KCk7CiAgICAgaWYgKCFjbGllbnQpCiAgICAgICAgIHJldHVybjsK QEAgLTU0MSwxNiArNTExLDEyIEBAIHZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OnJlZGlyZWN0 ZWQoKQogCiB2b2lkIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpmb3J3YXJkRGF0YSgpCiB7Ci0gICAg QVNTRVJUKG1faGFzU3RhcnRlZCk7CisgICAgaWYgKCFtX3JlcGx5V3JhcHBlciB8fCAhbV9yZXBs eVdyYXBwZXItPnJlcGx5KCkpCisgICAgICAgIHJldHVybjsKIAogICAgIGlmIChtX3JlcGx5V3Jh cHBlci0+cmVwbHkoKS0+Ynl0ZXNBdmFpbGFibGUoKSkKICAgICAgICAgbV9yZXNwb25zZUNvbnRh aW5zRGF0YSA9IHRydWU7CiAKLSAgICBzZW5kUmVzcG9uc2VJZk5lZWRlZCgpOwotCi0gICAgaWYg KHdhc0Fib3J0ZWQoKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgUUJ5dGVBcnJheSBkYXRhID0g bV9yZXBseVdyYXBwZXItPnJlcGx5KCktPnJlYWQobV9yZXBseVdyYXBwZXItPnJlcGx5KCktPmJ5 dGVzQXZhaWxhYmxlKCkpOwogCiAgICAgUmVzb3VyY2VIYW5kbGVDbGllbnQqIGNsaWVudCA9IG1f cmVzb3VyY2VIYW5kbGUtPmNsaWVudCgpOwpAQCAtNjM2LDE2ICs2MDIsMTIgQEAgUU5ldHdvcmtS ZXBseSogUU5ldHdvcmtSZXBseUhhbmRsZXI6OnNlbmROZXR3b3JrUmVxdWVzdCgpCiAKIHZvaWQg UU5ldHdvcmtSZXBseUhhbmRsZXI6OnN0YXJ0KCkKIHsKLSAgICBBU1NFUlQoIW1faGFzU3RhcnRl ZCk7Ci0gICAgbV9oYXNTdGFydGVkID0gdHJ1ZTsKKyAgICByZXNldFN0YXRlKCk7CiAKICAgICBR TmV0d29ya1JlcGx5KiByZXBseSA9IHNlbmROZXR3b3JrUmVxdWVzdCgpOwogICAgIGlmICghcmVw bHkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX3JlcGx5V3JhcHBlcikKLSAgICAgICAg ZGVsZXRlIG1fcmVwbHlXcmFwcGVyOwotCiAgICAgbV9yZXBseVdyYXBwZXIgPSBuZXcgUU5ldHdv cmtSZXBseVdyYXBwZXIocmVwbHksICZtX3NpZ25hbFF1ZXVlLCB0aGlzKTsKIAogICAgIGlmICht X2xvYWRUeXBlID09IFN5bmNocm9ub3VzTG9hZCAmJiBtX3JlcGx5V3JhcHBlci0+cmVwbHkoKS0+ aXNGaW5pc2hlZCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmgKaW5kZXggOWI0NzU2Zi4uNmJlMDA2MiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1Jl cGx5SGFuZGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5l dHdvcmtSZXBseUhhbmRsZXIuaApAQCAtMTI2LDcgKzEyNiw3IEBAIHB1YmxpYzoKIAogcHVibGlj IHNsb3RzOgogICAgIHZvaWQgZmluaXNoKCk7Ci0gICAgdm9pZCBzZW5kUmVzcG9uc2VJZk5lZWRl ZCgpOworICAgIHZvaWQgc2VuZFJlc3BvbnNlKCk7CiAgICAgdm9pZCBmb3J3YXJkRGF0YSgpOwog ICAgIHZvaWQgdXBsb2FkUHJvZ3Jlc3MocWludDY0IGJ5dGVzU2VudCwgcWludDY0IGJ5dGVzVG90 YWwpOwogICAgIHZvaWQgcmVkaXJlY3RlZCgpOwpAQCAtMTQyLDcgKzE0Miw2IEBAIHByaXZhdGU6 CiAKICAgICBRTmV0d29ya1JlcGx5V3JhcHBlciogbV9yZXBseVdyYXBwZXI7CiAgICAgUmVzb3Vy Y2VIYW5kbGUqIG1fcmVzb3VyY2VIYW5kbGU7Ci0gICAgYm9vbCBtX3Jlc3BvbnNlU2VudDsKICAg ICBib29sIG1fcmVzcG9uc2VDb250YWluc0RhdGE7CiAgICAgTG9hZFR5cGUgbV9sb2FkVHlwZTsK ICAgICBRTmV0d29ya0FjY2Vzc01hbmFnZXI6Ok9wZXJhdGlvbiBtX21ldGhvZDsKQEAgLTE1MCw4 ICsxNDksNiBAQCBwcml2YXRlOgogCiAgICAgUU5ldHdvcmtSZXBseUhhbmRsZXJTaWduYWxRdWV1 ZSBtX3NpZ25hbFF1ZXVlOwogCi0gICAgLy8gZGVmZXIgc3RhdGUgaG9sZGluZwotICAgIGJvb2wg bV9oYXNTdGFydGVkOwogICAgIGludCBtX3JlZGlyZWN0aW9uVHJpZXM7CiB9OwogCkBAIC0xOTgs NyArMTk1LDcgQEAgaW5saW5lIHZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXJTaWduYWxRdWV1ZTo6 ZmluaXNoZWQoKQogCiBpbmxpbmUgdm9pZCBRTmV0d29ya1JlcGx5SGFuZGxlclNpZ25hbFF1ZXVl OjptZXRhRGF0YUNoYW5nZWQoKQogewotICAgIHB1c2goJlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpz ZW5kUmVzcG9uc2VJZk5lZWRlZCk7CisgICAgcHVzaCgmUU5ldHdvcmtSZXBseUhhbmRsZXI6OnNl bmRSZXNwb25zZSk7CiB9CiAKIGlubGluZSB2b2lkIFFOZXR3b3JrUmVwbHlIYW5kbGVyU2lnbmFs UXVldWU6OnJlZGlyZWN0ZWQoKQotLSAKMS43LjEKCg== 89525 2011-04-13 21:03:11 -0700 2011-04-15 11:52:53 -0700 patch 0001-Qt-QNetworkReplyHandler-refactoring-some-adjustments.patch text/plain 10335 luiz RnJvbSA5ZWYzYjU1NTQyMWFlNTA2NTkxY2Y4NzM0ZWI4YjY4YzI1OGU1YTI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IFRodSwgMTQgQXByIDIwMTEgMDE6MDE6MzggLTAzMDAKU3ViamVjdDogW1BB VENIXSBbUXRdIFFOZXR3b3JrUmVwbHlIYW5kbGVyIHJlZmFjdG9yaW5nOiBzb21lIGFkanVzdG1l bnRzCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcwOTIKClJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKLSBSZW1vdmluZyBmbGFnIG1fcmVkaXJlY3RlZCBmcm9t IFFOZXR3b3JrUmVwbHlIYW5kbGVyIGFuZCB1c2luZyBtX3JlZGlyZWN0aW9uVGFyZ2V0VXJsLmlz VmFsaWQoKSBpbnN0ZWFkLgotIE1vdmluZyBmbGFnIG1fcmVzcG9uc2VDb250YWluc0RhdGEgZnJv bSBRTmV0d29ya1JlcGx5SGFuZGxlciB0byB0aGUgcmVwbHkgd3JhcHBlciBhbmQgcmVtb3Zpbmcg dGhlIGNvbm5lY3Rpb24gb2YKc2lnbmFsIG1ldGFEYXRhQ2hhbmdlZCBmb3IgbV9yZXNwb25zZUNv bnRhaW5zRGF0YSB0byBiZSBjb25zaXN0ZW50LgotIFVzaW5nIGFuIE93blB0ciB0byBrZWVwIHRo ZSByZWZlcmVuY2UgdG8gdGhlIFFOZXR3b3JrUmVwbHlXcmFwcGVyLgotIElnbm9yaW5nIHN0YXR1 cyBjb2RlIDQwNCBiZWNhdXNlIGFwcGxpY2F0aW9uIGNhY2hlIGRlcGVuZHMgb24gaXQuCgoqIHBs YXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwOgooV2ViQ29yZTo6UU5l dHdvcmtSZXBseVdyYXBwZXI6OlFOZXR3b3JrUmVwbHlXcmFwcGVyKToKKFdlYkNvcmU6OlFOZXR3 b3JrUmVwbHlXcmFwcGVyOjpyZWNlaXZlTWV0YURhdGEpOgooV2ViQ29yZTo6UU5ldHdvcmtSZXBs eVdyYXBwZXI6OmRpZFJlY2VpdmVSZWFkeVJlYWQpOgooV2ViQ29yZTo6UU5ldHdvcmtSZXBseUhh bmRsZXI6OlFOZXR3b3JrUmVwbHlIYW5kbGVyKToKKFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlIYW5k bGVyOjpyZWxlYXNlKToKKFdlYkNvcmU6OnNob3VsZElnbm9yZUh0dHBFcnJvcik6CihXZWJDb3Jl OjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6ZmluaXNoKToKKFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlI YW5kbGVyOjpzZW5kUmVzcG9uc2VJZk5lZWRlZCk6CihXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFu ZGxlcjo6cmVkaXJlY3QpOgooV2ViQ29yZTo6UU5ldHdvcmtSZXBseUhhbmRsZXI6OmZvcndhcmRE YXRhKToKKiBwbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmg6CihXZWJD b3JlOjpRTmV0d29ya1JlcGx5V3JhcHBlcjo6cmVzcG9uc2VDb250YWluc0RhdGEpOgooV2ViQ29y ZTo6UU5ldHdvcmtSZXBseVdyYXBwZXI6OnJlZGlyZWN0ZWQpOgotLS0KIFNvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyOCArKysrKysrKysrKwog Li4uL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwICAgfCAgIDQ4 ICsrKysrKy0tLS0tLS0tLS0tLS0KIC4uLi9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVw bHlIYW5kbGVyLmggICAgIHwgICAgOSArKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDQ4IGluc2VydGlv bnMoKyksIDM3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlZWNmNWU5Li4wMjFjMzNhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDQtMTMgIEx1aXogQWdvc3RpbmkgIDxs dWl6LmFnb3N0aW5pQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW1F0XSBRTmV0d29ya1JlcGx5SGFuZGxlciByZWZhY3Rvcmlu Zzogc29tZSBhZGp1c3RtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTcwOTIKKworICAgICAgICAtIFJlbW92aW5nIGZsYWcgbV9yZWRpcmVjdGVk IGZyb20gUU5ldHdvcmtSZXBseUhhbmRsZXIgYW5kIHVzaW5nIG1fcmVkaXJlY3Rpb25UYXJnZXRV cmwuaXNWYWxpZCgpIGluc3RlYWQuCisgICAgICAgIC0gTW92aW5nIGZsYWcgbV9yZXNwb25zZUNv bnRhaW5zRGF0YSBmcm9tIFFOZXR3b3JrUmVwbHlIYW5kbGVyIHRvIHRoZSByZXBseSB3cmFwcGVy IGFuZCByZW1vdmluZyB0aGUgY29ubmVjdGlvbiBvZgorICAgICAgICBzaWduYWwgbWV0YURhdGFD aGFuZ2VkIGZvciBtX3Jlc3BvbnNlQ29udGFpbnNEYXRhIHRvIGJlIGNvbnNpc3RlbnQuCisgICAg ICAgIC0gVXNpbmcgYW4gT3duUHRyIHRvIGtlZXAgdGhlIHJlZmVyZW5jZSB0byB0aGUgUU5ldHdv cmtSZXBseVdyYXBwZXIuCisgICAgICAgIC0gSWdub3Jpbmcgc3RhdHVzIGNvZGUgNDA0IGJlY2F1 c2UgYXBwbGljYXRpb24gY2FjaGUgZGVwZW5kcyBvbiBpdC4KKworICAgICAgICAqIHBsYXRmb3Jt L25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UU5ldHdvcmtSZXBseVdyYXBwZXI6OlFOZXR3b3JrUmVwbHlXcmFwcGVyKToKKyAgICAgICAgKFdl YkNvcmU6OlFOZXR3b3JrUmVwbHlXcmFwcGVyOjpyZWNlaXZlTWV0YURhdGEpOgorICAgICAgICAo V2ViQ29yZTo6UU5ldHdvcmtSZXBseVdyYXBwZXI6OmRpZFJlY2VpdmVSZWFkeVJlYWQpOgorICAg ICAgICAoV2ViQ29yZTo6UU5ldHdvcmtSZXBseUhhbmRsZXI6OlFOZXR3b3JrUmVwbHlIYW5kbGVy KToKKyAgICAgICAgKFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpyZWxlYXNlKToKKyAg ICAgICAgKFdlYkNvcmU6OnNob3VsZElnbm9yZUh0dHBFcnJvcik6CisgICAgICAgIChXZWJDb3Jl OjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6ZmluaXNoKToKKyAgICAgICAgKFdlYkNvcmU6OlFOZXR3 b3JrUmVwbHlIYW5kbGVyOjpzZW5kUmVzcG9uc2VJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3Jl OjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6cmVkaXJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6UU5l dHdvcmtSZXBseUhhbmRsZXI6OmZvcndhcmREYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpRTmV0d29y a1JlcGx5V3JhcHBlcjo6cmVzcG9uc2VDb250YWluc0RhdGEpOgorICAgICAgICAoV2ViQ29yZTo6 UU5ldHdvcmtSZXBseVdyYXBwZXI6OnJlZGlyZWN0ZWQpOgorCiAyMDExLTA0LTEzICBPbGl2ZXIg SHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmYgR2Fy ZW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3 b3JrUmVwbHlIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQv UU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwCmluZGV4IGZlYjM2MjkuLjBiOWU2YWEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRs ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtS ZXBseUhhbmRsZXIuY3BwCkBAIC0yMDksMTAgKzIwOSwxMCBAQCBRTmV0d29ya1JlcGx5V3JhcHBl cjo6UU5ldHdvcmtSZXBseVdyYXBwZXIoUU5ldHdvcmtSZXBseUhhbmRsZXJDYWxsUXVldWUqIHF1 ZXVlLAogICAgIDogUU9iamVjdChwYXJlbnQpCiAgICAgLCBtX3JlcGx5KHJlcGx5KQogICAgICwg bV9xdWV1ZShxdWV1ZSkKKyAgICAsIG1fcmVzcG9uc2VDb250YWluc0RhdGEoZmFsc2UpCiB7CiAg ICAgUV9BU1NFUlQobV9yZXBseSk7CiAKLSAgICBjb25uZWN0KG1fcmVwbHksIFNJR05BTChtZXRh RGF0YUNoYW5nZWQoKSksIHRoaXMsIFNMT1QocmVjZWl2ZU1ldGFEYXRhKCkpKTsKICAgICBjb25u ZWN0KG1fcmVwbHksIFNJR05BTChyZWFkeVJlYWQoKSksIHRoaXMsIFNMT1QocmVjZWl2ZU1ldGFE YXRhKCkpKTsKICAgICBjb25uZWN0KG1fcmVwbHksIFNJR05BTChmaW5pc2hlZCgpKSwgdGhpcywg U0xPVChyZWNlaXZlTWV0YURhdGEoKSkpOwogfQpAQCAtMjYzLDggKzI2MywxMCBAQCB2b2lkIFFO ZXR3b3JrUmVwbHlXcmFwcGVyOjpyZWNlaXZlTWV0YURhdGEoKQogCiAgICAgbV9xdWV1ZS0+cHVz aCgmUU5ldHdvcmtSZXBseUhhbmRsZXI6OnNlbmRSZXNwb25zZUlmTmVlZGVkKTsKIAotICAgIGlm IChtX3JlcGx5LT5ieXRlc0F2YWlsYWJsZSgpKQorICAgIGlmIChtX3JlcGx5LT5ieXRlc0F2YWls YWJsZSgpKSB7CisgICAgICAgIG1fcmVzcG9uc2VDb250YWluc0RhdGEgPSB0cnVlOwogICAgICAg ICBtX3F1ZXVlLT5wdXNoKCZRTmV0d29ya1JlcGx5SGFuZGxlcjo6Zm9yd2FyZERhdGEpOworICAg IH0KIAogICAgIGlmIChtX3JlcGx5LT5pc0ZpbmlzaGVkKCkpIHsKICAgICAgICAgbV9xdWV1ZS0+ cHVzaCgmUU5ldHdvcmtSZXBseUhhbmRsZXI6OmZpbmlzaCk7CkBAIC0yNzgsNiArMjgwLDggQEAg dm9pZCBRTmV0d29ya1JlcGx5V3JhcHBlcjo6cmVjZWl2ZU1ldGFEYXRhKCkKIAogdm9pZCBRTmV0 d29ya1JlcGx5V3JhcHBlcjo6ZGlkUmVjZWl2ZVJlYWR5UmVhZCgpCiB7CisgICAgaWYgKG1fcmVw bHktPmJ5dGVzQXZhaWxhYmxlKCkpCisgICAgICAgIG1fcmVzcG9uc2VDb250YWluc0RhdGEgPSB0 cnVlOwogICAgIG1fcXVldWUtPnB1c2goJlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpmb3J3YXJkRGF0 YSk7CiB9CiAKQEAgLTMxNyw4ICszMjEsNiBAQCBRTmV0d29ya1JlcGx5SGFuZGxlcjo6UU5ldHdv cmtSZXBseUhhbmRsZXIoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSwgTG9hZFR5cGUgbG9hZAogICAg ICwgbV9yZWRpcmVjdGlvblRyaWVzKGdNYXhSZWRpcmVjdGlvbnMpCiAgICAgLCBtX3F1ZXVlKHRo aXMsIGRlZmVycmVkKQogewotICAgIHJlc2V0U3RhdGUoKTsKLQogICAgIGNvbnN0IFJlc291cmNl UmVxdWVzdCAmciA9IG1fcmVzb3VyY2VIYW5kbGUtPmZpcnN0UmVxdWVzdCgpOwogCiAgICAgaWYg KHIuaHR0cE1ldGhvZCgpID09ICJHRVQiKQpAQCAtMzQzLDE3ICszNDUsNiBAQCBRTmV0d29ya1Jl cGx5SGFuZGxlcjo6UU5ldHdvcmtSZXBseUhhbmRsZXIoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSwg TG9hZFR5cGUgbG9hZAogICAgIG1fcXVldWUucHVzaCgmUU5ldHdvcmtSZXBseUhhbmRsZXI6OnN0 YXJ0KTsKIH0KIAotdm9pZCBRTmV0d29ya1JlcGx5SGFuZGxlcjo6cmVzZXRTdGF0ZSgpCi17Ci0g ICAgbV9yZWRpcmVjdGVkID0gZmFsc2U7Ci0gICAgbV9yZXNwb25zZUNvbnRhaW5zRGF0YSA9IGZh bHNlOwotCi0gICAgaWYgKG1fcmVwbHlXcmFwcGVyKSB7Ci0gICAgICAgIGRlbGV0ZSBtX3JlcGx5 V3JhcHBlcjsKLSAgICAgICAgbV9yZXBseVdyYXBwZXIgPSAwOwotICAgIH0KLX0KLQogdm9pZCBR TmV0d29ya1JlcGx5SGFuZGxlcjo6YWJvcnQoKQogewogICAgIG1fcmVzb3VyY2VIYW5kbGUgPSAw OwpAQCAtMzcwLDcgKzM2MSw2IEBAIFFOZXR3b3JrUmVwbHkqIFFOZXR3b3JrUmVwbHlIYW5kbGVy OjpyZWxlYXNlKCkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBRTmV0d29ya1JlcGx5KiByZXBs eSA9IG1fcmVwbHlXcmFwcGVyLT5yZWxlYXNlKCk7Ci0gICAgZGVsZXRlIG1fcmVwbHlXcmFwcGVy OwogICAgIG1fcmVwbHlXcmFwcGVyID0gMDsKICAgICByZXR1cm4gcmVwbHk7CiB9CkBAIC0zNzks NyArMzY5LDggQEAgc3RhdGljIGJvb2wgc2hvdWxkSWdub3JlSHR0cEVycm9yKFFOZXR3b3JrUmVw bHkqIHJlcGx5LCBib29sIHJlY2VpdmVkRGF0YSkKIHsKICAgICBpbnQgaHR0cFN0YXR1c0NvZGUg PSByZXBseS0+YXR0cmlidXRlKFFOZXR3b3JrUmVxdWVzdDo6SHR0cFN0YXR1c0NvZGVBdHRyaWJ1 dGUpLnRvSW50KCk7CiAKLSAgICBpZiAoaHR0cFN0YXR1c0NvZGUgPT0gNDAxIHx8IGh0dHBTdGF0 dXNDb2RlID09IDQwNykKKyAgICAvLyA0MDQgZXJyb3IgbXVzdCBiZSBpZ25vcmVkIGJlY2F1c2Ug YXBwbGljYXRpb24gY2FjaGUgZGVwZW5kcyBvbiBpdC4KKyAgICBpZiAoaHR0cFN0YXR1c0NvZGUg PT0gNDAxIHx8IGh0dHBTdGF0dXNDb2RlID09IDQwNyB8fCBodHRwU3RhdHVzQ29kZSA9PSA0MDQp CiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgaWYgKHJlY2VpdmVkRGF0YSAmJiAoaHR0cFN0 YXR1c0NvZGUgPj0gNDAwICYmIGh0dHBTdGF0dXNDb2RlIDwgNjAwKSkKQEAgLTM5NCwxOCArMzg1 LDE3IEBAIHZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OmZpbmlzaCgpCiAKICAgICBSZXNvdXJj ZUhhbmRsZUNsaWVudCogY2xpZW50ID0gbV9yZXNvdXJjZUhhbmRsZS0+Y2xpZW50KCk7CiAgICAg aWYgKCFjbGllbnQpIHsKLSAgICAgICAgZGVsZXRlIG1fcmVwbHlXcmFwcGVyOwogICAgICAgICBt X3JlcGx5V3JhcHBlciA9IDA7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAobV9y ZWRpcmVjdGVkKSB7Ci0gICAgICAgIHJlc2V0U3RhdGUoKTsKKyAgICBpZiAobV9yZXBseVdyYXBw ZXItPnJlZGlyZWN0ZWQoKSkgeworICAgICAgICBtX3JlcGx5V3JhcHBlciA9IDA7CiAgICAgICAg IG1fcXVldWUucHVzaCgmUU5ldHdvcmtSZXBseUhhbmRsZXI6OnN0YXJ0KTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIAotICAgIGlmICghbV9yZXBseVdyYXBwZXItPnJlcGx5KCktPmVycm9yKCkg fHwgc2hvdWxkSWdub3JlSHR0cEVycm9yKG1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLCBtX3Jlc3Bv bnNlQ29udGFpbnNEYXRhKSkKKyAgICBpZiAoIW1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLT5lcnJv cigpIHx8IHNob3VsZElnbm9yZUh0dHBFcnJvcihtX3JlcGx5V3JhcHBlci0+cmVwbHkoKSwgbV9y ZXBseVdyYXBwZXItPnJlc3BvbnNlQ29udGFpbnNEYXRhKCkpKQogICAgICAgICBjbGllbnQtPmRp ZEZpbmlzaExvYWRpbmcobV9yZXNvdXJjZUhhbmRsZSwgMCk7CiAgICAgZWxzZSB7CiAgICAgICAg IFFVcmwgdXJsID0gbV9yZXBseVdyYXBwZXItPnJlcGx5KCktPnVybCgpOwpAQCAtNDIwLDE3ICs0 MTAsMTQgQEAgdm9pZCBRTmV0d29ya1JlcGx5SGFuZGxlcjo6ZmluaXNoKCkKICAgICAgICAgfQog ICAgIH0KIAotICAgIGlmIChtX3JlcGx5V3JhcHBlcikgewotICAgICAgICBkZWxldGUgbV9yZXBs eVdyYXBwZXI7Ci0gICAgICAgIG1fcmVwbHlXcmFwcGVyID0gMDsKLSAgICB9CisgICAgbV9yZXBs eVdyYXBwZXIgPSAwOwogfQogCiB2b2lkIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpzZW5kUmVzcG9u c2VJZk5lZWRlZCgpCiB7CiAgICAgQVNTRVJUKG1fcmVwbHlXcmFwcGVyICYmIG1fcmVwbHlXcmFw cGVyLT5yZXBseSgpICYmICF3YXNBYm9ydGVkKCkpOwogCi0gICAgaWYgKG1fcmVwbHlXcmFwcGVy LT5yZXBseSgpLT5lcnJvcigpICYmICFzaG91bGRJZ25vcmVIdHRwRXJyb3IobV9yZXBseVdyYXBw ZXItPnJlcGx5KCksIG1fcmVzcG9uc2VDb250YWluc0RhdGEpKQorICAgIGlmIChtX3JlcGx5V3Jh cHBlci0+cmVwbHkoKS0+ZXJyb3IoKSAmJiAhc2hvdWxkSWdub3JlSHR0cEVycm9yKG1fcmVwbHlX cmFwcGVyLT5yZXBseSgpLCBtX3JlcGx5V3JhcHBlci0+cmVzcG9uc2VDb250YWluc0RhdGEoKSkp CiAgICAgICAgIHJldHVybjsKIAogICAgIFJlc291cmNlSGFuZGxlQ2xpZW50KiBjbGllbnQgPSBt X3Jlc291cmNlSGFuZGxlLT5jbGllbnQoKTsKQEAgLTQ5OSw5ICs0ODYsOSBAQCB2b2lkIFFOZXR3 b3JrUmVwbHlIYW5kbGVyOjpyZWRpcmVjdChSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgY29u c3QgUVVybCYgcmVkaQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ld1VybC50b1N0cmlu ZygpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIFFDb3JlQXBwbGljYXRpb246OnRyYW5z bGF0ZSgiUVdlYlBhZ2UiLCAiUmVkaXJlY3Rpb24gbGltaXQgcmVhY2hlZCIpKTsKICAgICAgICAg Y2xpZW50LT5kaWRGYWlsKG1fcmVzb3VyY2VIYW5kbGUsIGVycm9yKTsKKyAgICAgICAgbV9yZXBs eVdyYXBwZXIgPSAwOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIG1fcmVkaXJlY3RlZCA9 IHRydWU7CiAKICAgICAvLyAgU3RhdHVzIENvZGUgMzAxIChNb3ZlZCBQZXJtYW5lbnRseSksIDMw MiAoTW92ZWQgVGVtcG9yYXJpbHkpLCAzMDMgKFNlZSBPdGhlcik6CiAgICAgLy8gICAgLSBJZiBv cmlnaW5hbCByZXF1ZXN0IGlzIFBPU1QgY29udmVydCB0byBHRVQgYW5kIHJlZGlyZWN0IGF1dG9t YXRpY2FsbHkKQEAgLTUzMSwxMiArNTE4LDcgQEAgdm9pZCBRTmV0d29ya1JlcGx5SGFuZGxlcjo6 cmVkaXJlY3QoUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIGNvbnN0IFFVcmwmIHJlZGkKIAog dm9pZCBRTmV0d29ya1JlcGx5SGFuZGxlcjo6Zm9yd2FyZERhdGEoKQogewotICAgIEFTU0VSVCht X3JlcGx5V3JhcHBlciAmJiBtX3JlcGx5V3JhcHBlci0+cmVwbHkoKSAmJiAhd2FzQWJvcnRlZCgp KTsKLQotICAgIEFTU0VSVCghbV9yZWRpcmVjdGVkKTsKLQotICAgIGlmIChtX3JlcGx5V3JhcHBl ci0+cmVwbHkoKS0+Ynl0ZXNBdmFpbGFibGUoKSkKLSAgICAgICAgbV9yZXNwb25zZUNvbnRhaW5z RGF0YSA9IHRydWU7CisgICAgQVNTRVJUKG1fcmVwbHlXcmFwcGVyICYmIG1fcmVwbHlXcmFwcGVy LT5yZXBseSgpICYmICF3YXNBYm9ydGVkKCkgJiYgIW1fcmVwbHlXcmFwcGVyLT5yZWRpcmVjdGVk KCkpOwogCiAgICAgUUJ5dGVBcnJheSBkYXRhID0gbV9yZXBseVdyYXBwZXItPnJlcGx5KCktPnJl YWQobV9yZXBseVdyYXBwZXItPnJlcGx5KCktPmJ5dGVzQXZhaWxhYmxlKCkpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5k bGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlI YW5kbGVyLmgKaW5kZXggZmNlZDJkZi4uYThjZDUzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuaApAQCAt NzQsNiArNzQsOSBAQCBwdWJsaWM6CiAgICAgUVN0cmluZyBlbmNvZGluZygpIGNvbnN0IHsgcmV0 dXJuIG1fZW5jb2Rpbmc7IH0KICAgICBRU3RyaW5nIGFkdmVydGlzZWRNaW1lVHlwZSgpIGNvbnN0 IHsgcmV0dXJuIG1fYWR2ZXJ0aXNlZE1pbWVUeXBlOyB9CiAKKyAgICBib29sIHJlc3BvbnNlQ29u dGFpbnNEYXRhKCkgY29uc3QgeyByZXR1cm4gbV9yZXNwb25zZUNvbnRhaW5zRGF0YTsgfQorICAg IGJvb2wgcmVkaXJlY3RlZCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVkaXJlY3Rpb25UYXJnZXRVcmwu aXNWYWxpZCgpOyB9CisKIHByaXZhdGUgUV9TTE9UUzoKICAgICB2b2lkIHJlY2VpdmVNZXRhRGF0 YSgpOwogICAgIHZvaWQgZGlkUmVjZWl2ZUZpbmlzaGVkKCk7CkBAIC04OSw2ICs5Miw3IEBAIHBy aXZhdGU6CiAgICAgUVN0cmluZyBtX2FkdmVydGlzZWRNaW1lVHlwZTsKIAogICAgIFFOZXR3b3Jr UmVwbHlIYW5kbGVyQ2FsbFF1ZXVlKiBtX3F1ZXVlOworICAgIGJvb2wgbV9yZXNwb25zZUNvbnRh aW5zRGF0YTsKIH07CiAKIGNsYXNzIFFOZXR3b3JrUmVwbHlIYW5kbGVyIDogcHVibGljIFFPYmpl Y3QKQEAgLTExNywxNiArMTIxLDEzIEBAIHB1YmxpYyBzbG90czoKIAogcHJpdmF0ZToKICAgICB2 b2lkIHN0YXJ0KCk7Ci0gICAgdm9pZCByZXNldFN0YXRlKCk7CiAgICAgU3RyaW5nIGh0dHBNZXRo b2QoKSBjb25zdDsKICAgICB2b2lkIHJlZGlyZWN0KFJlc291cmNlUmVzcG9uc2UmLCBjb25zdCBR VXJsJik7CiAgICAgYm9vbCB3YXNBYm9ydGVkKCkgY29uc3QgeyByZXR1cm4gIW1fcmVzb3VyY2VI YW5kbGU7IH0KICAgICBRTmV0d29ya1JlcGx5KiBzZW5kTmV0d29ya1JlcXVlc3QoKTsKIAotICAg IFFOZXR3b3JrUmVwbHlXcmFwcGVyKiBtX3JlcGx5V3JhcHBlcjsKKyAgICBPd25QdHI8UU5ldHdv cmtSZXBseVdyYXBwZXI+IG1fcmVwbHlXcmFwcGVyOwogICAgIFJlc291cmNlSGFuZGxlKiBtX3Jl c291cmNlSGFuZGxlOwotICAgIGJvb2wgbV9yZWRpcmVjdGVkOwotICAgIGJvb2wgbV9yZXNwb25z ZUNvbnRhaW5zRGF0YTsKICAgICBMb2FkVHlwZSBtX2xvYWRUeXBlOwogICAgIFFOZXR3b3JrQWNj ZXNzTWFuYWdlcjo6T3BlcmF0aW9uIG1fbWV0aG9kOwogICAgIFFOZXR3b3JrUmVxdWVzdCBtX3Jl cXVlc3Q7Ci0tIAoxLjcuMQoK 89822 2011-04-15 11:52:53 -0700 2011-04-15 12:11:07 -0700 patch 0001-Qt-QNetworkReplyHandler-refactoring-some-adjustments.patch text/plain 10090 luiz RnJvbSAzYTM0MWI4MmQyOWU1ODU5YzEyYWVhMzhjMDFiNDFlMjZhZGRlMDBmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IEZyaSwgMTUgQXByIDIwMTEgMTU6NTA6MjQgLTAzMDAKU3ViamVjdDogW1BB VENIXSBbUXRdIFFOZXR3b3JrUmVwbHlIYW5kbGVyIHJlZmFjdG9yaW5nOiBzb21lIGFkanVzdG1l bnRzCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcwOTIKClJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKLSBSZW1vdmluZyBmbGFnIG1fcmVkaXJlY3RlZCBmcm9t IFFOZXR3b3JrUmVwbHlIYW5kbGVyIGFuZCB1c2luZyBtX3JlZGlyZWN0aW9uVGFyZ2V0VXJsLmlz VmFsaWQoKSBpbnN0ZWFkLgotIE1vdmluZyBmbGFnIG1fcmVzcG9uc2VDb250YWluc0RhdGEgZnJv bSBRTmV0d29ya1JlcGx5SGFuZGxlciB0byB0aGUgcmVwbHkgd3JhcHBlciBhbmQgcmVtb3Zpbmcg dGhlIGNvbm5lY3Rpb24gb2YKc2lnbmFsIG1ldGFEYXRhQ2hhbmdlZCBmb3IgbV9yZXNwb25zZUNv bnRhaW5zRGF0YSB0byBiZSBjb25zaXN0ZW50LgotIFVzaW5nIGFuIE93blB0ciB0byBrZWVwIHRo ZSByZWZlcmVuY2UgdG8gdGhlIFFOZXR3b3JrUmVwbHlXcmFwcGVyLgoKKiBwbGF0Zm9ybS9uZXR3 b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmNwcDoKKFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlX cmFwcGVyOjpRTmV0d29ya1JlcGx5V3JhcHBlcik6CihXZWJDb3JlOjpRTmV0d29ya1JlcGx5V3Jh cHBlcjo6cmVjZWl2ZU1ldGFEYXRhKToKKFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlXcmFwcGVyOjpk aWRSZWNlaXZlUmVhZHlSZWFkKToKKFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpRTmV0 d29ya1JlcGx5SGFuZGxlcik6CihXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6cmVsZWFz ZSk6CihXZWJDb3JlOjpzaG91bGRJZ25vcmVIdHRwRXJyb3IpOgooV2ViQ29yZTo6UU5ldHdvcmtS ZXBseUhhbmRsZXI6OmZpbmlzaCk6CihXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6c2Vu ZFJlc3BvbnNlSWZOZWVkZWQpOgooV2ViQ29yZTo6UU5ldHdvcmtSZXBseUhhbmRsZXI6OnJlZGly ZWN0KToKKFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpmb3J3YXJkRGF0YSk6CiogcGxh dGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5oOgooV2ViQ29yZTo6UU5ldHdv cmtSZXBseVdyYXBwZXI6OnJlc3BvbnNlQ29udGFpbnNEYXRhKToKKFdlYkNvcmU6OlFOZXR3b3Jr UmVwbHlXcmFwcGVyOjpyZWRpcmVjdGVkKToKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg ICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjcgKysrKysrKysrKysKIC4uLi9wbGF0Zm9y bS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmNwcCAgIHwgICA0OCArKysrKystLS0t LS0tLS0tLS0tCiAuLi4vcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5o ICAgICB8ICAgMTEgKysrLS0KIDMgZmlsZXMgY2hhbmdlZCwgNDkgaW5zZXJ0aW9ucygrKSwgMzcg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDVkMjY4OWYuLjczNWEyODcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwzMCBAQAorMjAxMS0wNC0xMyAgTHVpeiBBZ29zdGluaSAgPGx1aXouYWdvc3Rp bmlAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbUXRdIFFOZXR3b3JrUmVwbHlIYW5kbGVyIHJlZmFjdG9yaW5nOiBzb21lIGFk anVzdG1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01NzA5MgorCisgICAgICAgIC0gUmVtb3ZpbmcgZmxhZyBtX3JlZGlyZWN0ZWQgZnJvbSBRTmV0 d29ya1JlcGx5SGFuZGxlciBhbmQgdXNpbmcgbV9yZWRpcmVjdGlvblRhcmdldFVybC5pc1ZhbGlk KCkgaW5zdGVhZC4KKyAgICAgICAgLSBNb3ZpbmcgZmxhZyBtX3Jlc3BvbnNlQ29udGFpbnNEYXRh IGZyb20gUU5ldHdvcmtSZXBseUhhbmRsZXIgdG8gdGhlIHJlcGx5IHdyYXBwZXIgYW5kIHJlbW92 aW5nIHRoZSBjb25uZWN0aW9uIG9mCisgICAgICAgIHNpZ25hbCBtZXRhRGF0YUNoYW5nZWQgZm9y IG1fcmVzcG9uc2VDb250YWluc0RhdGEgdG8gYmUgY29uc2lzdGVudC4KKyAgICAgICAgLSBVc2lu ZyBhbiBPd25QdHIgdG8ga2VlcCB0aGUgcmVmZXJlbmNlIHRvIHRoZSBRTmV0d29ya1JlcGx5V3Jh cHBlci4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRs ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UU5ldHdvcmtSZXBseVdyYXBwZXI6OlFOZXR3b3Jr UmVwbHlXcmFwcGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlXcmFwcGVyOjpy ZWNlaXZlTWV0YURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UU5ldHdvcmtSZXBseVdyYXBwZXI6 OmRpZFJlY2VpdmVSZWFkeVJlYWQpOgorICAgICAgICAoV2ViQ29yZTo6UU5ldHdvcmtSZXBseUhh bmRsZXI6OlFOZXR3b3JrUmVwbHlIYW5kbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlFOZXR3b3Jr UmVwbHlIYW5kbGVyOjpyZWxlYXNlKToKKyAgICAgICAgKFdlYkNvcmU6OnNob3VsZElnbm9yZUh0 dHBFcnJvcik6CisgICAgICAgIChXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6ZmluaXNo KToKKyAgICAgICAgKFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpzZW5kUmVzcG9uc2VJ Zk5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6cmVkaXJl Y3QpOgorICAgICAgICAoV2ViQ29yZTo6UU5ldHdvcmtSZXBseUhhbmRsZXI6OmZvcndhcmREYXRh KToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmg6 CisgICAgICAgIChXZWJDb3JlOjpRTmV0d29ya1JlcGx5V3JhcHBlcjo6cmVzcG9uc2VDb250YWlu c0RhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UU5ldHdvcmtSZXBseVdyYXBwZXI6OnJlZGlyZWN0 ZWQpOgorCiAyMDExLTA0LTE1ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgTWFjaWVqIFN0YWNob3dpYWsuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwCmlu ZGV4IGZlYjM2MjkuLjhkYTFlYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwCkBAIC0yMDksMTAg KzIwOSwxMSBAQCBRTmV0d29ya1JlcGx5V3JhcHBlcjo6UU5ldHdvcmtSZXBseVdyYXBwZXIoUU5l dHdvcmtSZXBseUhhbmRsZXJDYWxsUXVldWUqIHF1ZXVlLAogICAgIDogUU9iamVjdChwYXJlbnQp CiAgICAgLCBtX3JlcGx5KHJlcGx5KQogICAgICwgbV9xdWV1ZShxdWV1ZSkKKyAgICAsIG1fcmVz cG9uc2VDb250YWluc0RhdGEoZmFsc2UpCisgICAgLCBtX3N0YXR1c0NvZGUoMCkKIHsKICAgICBR X0FTU0VSVChtX3JlcGx5KTsKIAotICAgIGNvbm5lY3QobV9yZXBseSwgU0lHTkFMKG1ldGFEYXRh Q2hhbmdlZCgpKSwgdGhpcywgU0xPVChyZWNlaXZlTWV0YURhdGEoKSkpOwogICAgIGNvbm5lY3Qo bV9yZXBseSwgU0lHTkFMKHJlYWR5UmVhZCgpKSwgdGhpcywgU0xPVChyZWNlaXZlTWV0YURhdGEo KSkpOwogICAgIGNvbm5lY3QobV9yZXBseSwgU0lHTkFMKGZpbmlzaGVkKCkpLCB0aGlzLCBTTE9U KHJlY2VpdmVNZXRhRGF0YSgpKSk7CiB9CkBAIC0yNjMsOCArMjY0LDEwIEBAIHZvaWQgUU5ldHdv cmtSZXBseVdyYXBwZXI6OnJlY2VpdmVNZXRhRGF0YSgpCiAKICAgICBtX3F1ZXVlLT5wdXNoKCZR TmV0d29ya1JlcGx5SGFuZGxlcjo6c2VuZFJlc3BvbnNlSWZOZWVkZWQpOwogCi0gICAgaWYgKG1f cmVwbHktPmJ5dGVzQXZhaWxhYmxlKCkpCisgICAgaWYgKG1fcmVwbHktPmJ5dGVzQXZhaWxhYmxl KCkpIHsKKyAgICAgICAgbV9yZXNwb25zZUNvbnRhaW5zRGF0YSA9IHRydWU7CiAgICAgICAgIG1f cXVldWUtPnB1c2goJlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpmb3J3YXJkRGF0YSk7CisgICAgfQog CiAgICAgaWYgKG1fcmVwbHktPmlzRmluaXNoZWQoKSkgewogICAgICAgICBtX3F1ZXVlLT5wdXNo KCZRTmV0d29ya1JlcGx5SGFuZGxlcjo6ZmluaXNoKTsKQEAgLTI3OCw2ICsyODEsOCBAQCB2b2lk IFFOZXR3b3JrUmVwbHlXcmFwcGVyOjpyZWNlaXZlTWV0YURhdGEoKQogCiB2b2lkIFFOZXR3b3Jr UmVwbHlXcmFwcGVyOjpkaWRSZWNlaXZlUmVhZHlSZWFkKCkKIHsKKyAgICBpZiAobV9yZXBseS0+ Ynl0ZXNBdmFpbGFibGUoKSkKKyAgICAgICAgbV9yZXNwb25zZUNvbnRhaW5zRGF0YSA9IHRydWU7 CiAgICAgbV9xdWV1ZS0+cHVzaCgmUU5ldHdvcmtSZXBseUhhbmRsZXI6OmZvcndhcmREYXRhKTsK IH0KIApAQCAtMzE3LDggKzMyMiw2IEBAIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpRTmV0d29ya1Jl cGx5SGFuZGxlcihSZXNvdXJjZUhhbmRsZSogaGFuZGxlLCBMb2FkVHlwZSBsb2FkCiAgICAgLCBt X3JlZGlyZWN0aW9uVHJpZXMoZ01heFJlZGlyZWN0aW9ucykKICAgICAsIG1fcXVldWUodGhpcywg ZGVmZXJyZWQpCiB7Ci0gICAgcmVzZXRTdGF0ZSgpOwotCiAgICAgY29uc3QgUmVzb3VyY2VSZXF1 ZXN0ICZyID0gbV9yZXNvdXJjZUhhbmRsZS0+Zmlyc3RSZXF1ZXN0KCk7CiAKICAgICBpZiAoci5o dHRwTWV0aG9kKCkgPT0gIkdFVCIpCkBAIC0zNDMsMTcgKzM0Niw2IEBAIFFOZXR3b3JrUmVwbHlI YW5kbGVyOjpRTmV0d29ya1JlcGx5SGFuZGxlcihSZXNvdXJjZUhhbmRsZSogaGFuZGxlLCBMb2Fk VHlwZSBsb2FkCiAgICAgbV9xdWV1ZS5wdXNoKCZRTmV0d29ya1JlcGx5SGFuZGxlcjo6c3RhcnQp OwogfQogCi12b2lkIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpyZXNldFN0YXRlKCkKLXsKLSAgICBt X3JlZGlyZWN0ZWQgPSBmYWxzZTsKLSAgICBtX3Jlc3BvbnNlQ29udGFpbnNEYXRhID0gZmFsc2U7 Ci0KLSAgICBpZiAobV9yZXBseVdyYXBwZXIpIHsKLSAgICAgICAgZGVsZXRlIG1fcmVwbHlXcmFw cGVyOwotICAgICAgICBtX3JlcGx5V3JhcHBlciA9IDA7Ci0gICAgfQotfQotCiB2b2lkIFFOZXR3 b3JrUmVwbHlIYW5kbGVyOjphYm9ydCgpCiB7CiAgICAgbV9yZXNvdXJjZUhhbmRsZSA9IDA7CkBA IC0zNzAsNyArMzYyLDYgQEAgUU5ldHdvcmtSZXBseSogUU5ldHdvcmtSZXBseUhhbmRsZXI6OnJl bGVhc2UoKQogICAgICAgICByZXR1cm4gMDsKIAogICAgIFFOZXR3b3JrUmVwbHkqIHJlcGx5ID0g bV9yZXBseVdyYXBwZXItPnJlbGVhc2UoKTsKLSAgICBkZWxldGUgbV9yZXBseVdyYXBwZXI7CiAg ICAgbV9yZXBseVdyYXBwZXIgPSAwOwogICAgIHJldHVybiByZXBseTsKIH0KQEAgLTM5NCwxOCAr Mzg1LDE3IEBAIHZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OmZpbmlzaCgpCiAKICAgICBSZXNv dXJjZUhhbmRsZUNsaWVudCogY2xpZW50ID0gbV9yZXNvdXJjZUhhbmRsZS0+Y2xpZW50KCk7CiAg ICAgaWYgKCFjbGllbnQpIHsKLSAgICAgICAgZGVsZXRlIG1fcmVwbHlXcmFwcGVyOwogICAgICAg ICBtX3JlcGx5V3JhcHBlciA9IDA7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAo bV9yZWRpcmVjdGVkKSB7Ci0gICAgICAgIHJlc2V0U3RhdGUoKTsKKyAgICBpZiAobV9yZXBseVdy YXBwZXItPnJlZGlyZWN0ZWQoKSkgeworICAgICAgICBtX3JlcGx5V3JhcHBlciA9IDA7CiAgICAg ICAgIG1fcXVldWUucHVzaCgmUU5ldHdvcmtSZXBseUhhbmRsZXI6OnN0YXJ0KTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KIAotICAgIGlmICghbV9yZXBseVdyYXBwZXItPnJlcGx5KCktPmVycm9y KCkgfHwgc2hvdWxkSWdub3JlSHR0cEVycm9yKG1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLCBtX3Jl c3BvbnNlQ29udGFpbnNEYXRhKSkKKyAgICBpZiAoIW1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLT5l cnJvcigpIHx8IHNob3VsZElnbm9yZUh0dHBFcnJvcihtX3JlcGx5V3JhcHBlci0+cmVwbHkoKSwg bV9yZXBseVdyYXBwZXItPnJlc3BvbnNlQ29udGFpbnNEYXRhKCkpKQogICAgICAgICBjbGllbnQt PmRpZEZpbmlzaExvYWRpbmcobV9yZXNvdXJjZUhhbmRsZSwgMCk7CiAgICAgZWxzZSB7CiAgICAg ICAgIFFVcmwgdXJsID0gbV9yZXBseVdyYXBwZXItPnJlcGx5KCktPnVybCgpOwpAQCAtNDIwLDE3 ICs0MTAsMTQgQEAgdm9pZCBRTmV0d29ya1JlcGx5SGFuZGxlcjo6ZmluaXNoKCkKICAgICAgICAg fQogICAgIH0KIAotICAgIGlmIChtX3JlcGx5V3JhcHBlcikgewotICAgICAgICBkZWxldGUgbV9y ZXBseVdyYXBwZXI7Ci0gICAgICAgIG1fcmVwbHlXcmFwcGVyID0gMDsKLSAgICB9CisgICAgbV9y ZXBseVdyYXBwZXIgPSAwOwogfQogCiB2b2lkIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpzZW5kUmVz cG9uc2VJZk5lZWRlZCgpCiB7CiAgICAgQVNTRVJUKG1fcmVwbHlXcmFwcGVyICYmIG1fcmVwbHlX cmFwcGVyLT5yZXBseSgpICYmICF3YXNBYm9ydGVkKCkpOwogCi0gICAgaWYgKG1fcmVwbHlXcmFw cGVyLT5yZXBseSgpLT5lcnJvcigpICYmICFzaG91bGRJZ25vcmVIdHRwRXJyb3IobV9yZXBseVdy YXBwZXItPnJlcGx5KCksIG1fcmVzcG9uc2VDb250YWluc0RhdGEpKQorICAgIGlmIChtX3JlcGx5 V3JhcHBlci0+cmVwbHkoKS0+ZXJyb3IoKSAmJiBtX3JlcGx5V3JhcHBlci0+cmVwbHkoKS0+YXR0 cmlidXRlKFFOZXR3b3JrUmVxdWVzdDo6SHR0cFN0YXR1c0NvZGVBdHRyaWJ1dGUpLmlzTnVsbCgp KQogICAgICAgICByZXR1cm47CiAKICAgICBSZXNvdXJjZUhhbmRsZUNsaWVudCogY2xpZW50ID0g bV9yZXNvdXJjZUhhbmRsZS0+Y2xpZW50KCk7CkBAIC00OTksOSArNDg2LDkgQEAgdm9pZCBRTmV0 d29ya1JlcGx5SGFuZGxlcjo6cmVkaXJlY3QoUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIGNv bnN0IFFVcmwmIHJlZGkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuZXdVcmwudG9TdHJp bmcoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBRQ29yZUFwcGxpY2F0aW9uOjp0cmFu c2xhdGUoIlFXZWJQYWdlIiwgIlJlZGlyZWN0aW9uIGxpbWl0IHJlYWNoZWQiKSk7CiAgICAgICAg IGNsaWVudC0+ZGlkRmFpbChtX3Jlc291cmNlSGFuZGxlLCBlcnJvcik7CisgICAgICAgIG1fcmVw bHlXcmFwcGVyID0gMDsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBtX3JlZGlyZWN0ZWQg PSB0cnVlOwogCiAgICAgLy8gIFN0YXR1cyBDb2RlIDMwMSAoTW92ZWQgUGVybWFuZW50bHkpLCAz MDIgKE1vdmVkIFRlbXBvcmFyaWx5KSwgMzAzIChTZWUgT3RoZXIpOgogICAgIC8vICAgIC0gSWYg b3JpZ2luYWwgcmVxdWVzdCBpcyBQT1NUIGNvbnZlcnQgdG8gR0VUIGFuZCByZWRpcmVjdCBhdXRv bWF0aWNhbGx5CkBAIC01MzEsMTIgKzUxOCw3IEBAIHZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6 OnJlZGlyZWN0KFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBjb25zdCBRVXJsJiByZWRpCiAK IHZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OmZvcndhcmREYXRhKCkKIHsKLSAgICBBU1NFUlQo bV9yZXBseVdyYXBwZXIgJiYgbV9yZXBseVdyYXBwZXItPnJlcGx5KCkgJiYgIXdhc0Fib3J0ZWQo KSk7Ci0KLSAgICBBU1NFUlQoIW1fcmVkaXJlY3RlZCk7Ci0KLSAgICBpZiAobV9yZXBseVdyYXBw ZXItPnJlcGx5KCktPmJ5dGVzQXZhaWxhYmxlKCkpCi0gICAgICAgIG1fcmVzcG9uc2VDb250YWlu c0RhdGEgPSB0cnVlOworICAgIEFTU0VSVChtX3JlcGx5V3JhcHBlciAmJiBtX3JlcGx5V3JhcHBl ci0+cmVwbHkoKSAmJiAhd2FzQWJvcnRlZCgpICYmICFtX3JlcGx5V3JhcHBlci0+cmVkaXJlY3Rl ZCgpKTsKIAogICAgIFFCeXRlQXJyYXkgZGF0YSA9IG1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLT5y ZWFkKG1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLT5ieXRlc0F2YWlsYWJsZSgpKTsKIApAQCAtNjI3 LDcgKzYwOSw3IEBAIHZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OnN0YXJ0KCkKICAgICBpZiAo IXJlcGx5KQogICAgICAgICByZXR1cm47CiAKLSAgICBtX3JlcGx5V3JhcHBlciA9IG5ldyBRTmV0 d29ya1JlcGx5V3JhcHBlcigmbV9xdWV1ZSwgcmVwbHksIHRoaXMpOworICAgIG1fcmVwbHlXcmFw cGVyID0gbmV3IFFOZXR3b3JrUmVwbHlXcmFwcGVyKCZtX3F1ZXVlLCByZXBseSk7CiAKICAgICBp ZiAobV9sb2FkVHlwZSA9PSBTeW5jaHJvbm91c0xvYWQgJiYgbV9yZXBseVdyYXBwZXItPnJlcGx5 KCktPmlzRmluaXNoZWQoKSkgewogICAgICAgICBtX3JlcGx5V3JhcHBlci0+c3luY2hyb25vdXNM b2FkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FO ZXR3b3JrUmVwbHlIYW5kbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0 L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmgKaW5kZXggZmNlZDJkZi4uNmYwMWVmNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxl ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBs eUhhbmRsZXIuaApAQCAtNzQsNiArNzQsOSBAQCBwdWJsaWM6CiAgICAgUVN0cmluZyBlbmNvZGlu ZygpIGNvbnN0IHsgcmV0dXJuIG1fZW5jb2Rpbmc7IH0KICAgICBRU3RyaW5nIGFkdmVydGlzZWRN aW1lVHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fYWR2ZXJ0aXNlZE1pbWVUeXBlOyB9CiAKKyAgICBi b29sIHJlc3BvbnNlQ29udGFpbnNEYXRhKCkgY29uc3QgeyByZXR1cm4gbV9yZXNwb25zZUNvbnRh aW5zRGF0YTsgfQorICAgIGJvb2wgcmVkaXJlY3RlZCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVkaXJl Y3Rpb25UYXJnZXRVcmwuaXNWYWxpZCgpOyB9CisKIHByaXZhdGUgUV9TTE9UUzoKICAgICB2b2lk IHJlY2VpdmVNZXRhRGF0YSgpOwogICAgIHZvaWQgZGlkUmVjZWl2ZUZpbmlzaGVkKCk7CkBAIC04 OSw2ICs5Miw5IEBAIHByaXZhdGU6CiAgICAgUVN0cmluZyBtX2FkdmVydGlzZWRNaW1lVHlwZTsK IAogICAgIFFOZXR3b3JrUmVwbHlIYW5kbGVyQ2FsbFF1ZXVlKiBtX3F1ZXVlOworICAgIGJvb2wg bV9yZXNwb25zZUNvbnRhaW5zRGF0YTsKKworICAgIGludCBtX3N0YXR1c0NvZGU7CiB9OwogCiBj bGFzcyBRTmV0d29ya1JlcGx5SGFuZGxlciA6IHB1YmxpYyBRT2JqZWN0CkBAIC0xMTcsMTYgKzEy MywxMyBAQCBwdWJsaWMgc2xvdHM6CiAKIHByaXZhdGU6CiAgICAgdm9pZCBzdGFydCgpOwotICAg IHZvaWQgcmVzZXRTdGF0ZSgpOwogICAgIFN0cmluZyBodHRwTWV0aG9kKCkgY29uc3Q7CiAgICAg dm9pZCByZWRpcmVjdChSZXNvdXJjZVJlc3BvbnNlJiwgY29uc3QgUVVybCYpOwogICAgIGJvb2wg d2FzQWJvcnRlZCgpIGNvbnN0IHsgcmV0dXJuICFtX3Jlc291cmNlSGFuZGxlOyB9CiAgICAgUU5l dHdvcmtSZXBseSogc2VuZE5ldHdvcmtSZXF1ZXN0KCk7CiAKLSAgICBRTmV0d29ya1JlcGx5V3Jh cHBlciogbV9yZXBseVdyYXBwZXI7CisgICAgT3duUHRyPFFOZXR3b3JrUmVwbHlXcmFwcGVyPiBt X3JlcGx5V3JhcHBlcjsKICAgICBSZXNvdXJjZUhhbmRsZSogbV9yZXNvdXJjZUhhbmRsZTsKLSAg ICBib29sIG1fcmVkaXJlY3RlZDsKLSAgICBib29sIG1fcmVzcG9uc2VDb250YWluc0RhdGE7CiAg ICAgTG9hZFR5cGUgbV9sb2FkVHlwZTsKICAgICBRTmV0d29ya0FjY2Vzc01hbmFnZXI6Ok9wZXJh dGlvbiBtX21ldGhvZDsKICAgICBRTmV0d29ya1JlcXVlc3QgbV9yZXF1ZXN0OwotLSAKMS43LjEK Cg==