Re: my patch 1 of 2
Yuuboshi <[email protected]> Sun, 31 May 2015 18:35:04 +0900
| Newsgroups | gmane.comp.web.polipo.user |
|---|---|
| Message-ID | <20150531183504.12406d42%[email protected]> |
This is a MIME multipart message. --Den8_556ad54879b1 Content-Type: text/plain; charset=iso-2022-jp These days, A part that I was supposed to care was those resulting from parse_time.c. It accepts only two formats. Please expand it. I was troubled these formats. Wed May 27 06:42:40 JST 2015 Sun, 24 May 2015 16:22:38 +0000 This function returns -1. Timestamp is NOT set. Then, Polipo wants to unlink cache file. But still in use. "Couldn't unlink <cache file>: Permission denied." For example, I attach my patch for temporarily apply. It does not matter not to commit this. And, Another attachment is minimal part of patch for appropriate behavior. Please commit this. --Den8_556ad54879b1 Content-Type: text/plain; name="bugfix_contribute.txt" Content-Transfer-Encoding: Base64 Content-Disposition: attachment; filename="bugfix_contribute.txt" ZGlmZiAtTnVyIC4vcG9saXBvLW1hc3Rlci9jb25maWcuYyAuL3BvbGlwby0xLjEuMi9jb25maWcu YwotLS0gLi9wb2xpcG8tbWFzdGVyL2NvbmZpZy5jCUZyaSBOb3YgMjEgMDk6MTU6MzYgMjAxNAor KysgLi9wb2xpcG8tMS4xLjIvY29uZmlnLmMJVHVlIEFwciAyOCAxODoyNTozOCAyMDE1CkBAIC04 NTIsNyArODUyLDcgQEAKIGNvbmZpZ0Zsb2F0U2V0dGVyKENvbmZpZ1ZhcmlhYmxlUHRyIHZhciwg dm9pZCogdmFsdWUpCiB7CiAgICAgYXNzZXJ0KHZhci0+dHlwZSA9PSBDT05GSUdfRkxPQVQpOwot ICAgICp2YXItPnZhbHVlLmkgPSAqKGZsb2F0Kil2YWx1ZTsKKyAgICAqdmFyLT52YWx1ZS5mID0g KihmbG9hdCopdmFsdWU7CiAgICAgcmV0dXJuIDE7CiB9CiAKZGlmZiAtTnVyIC4vcG9saXBvLW1h c3Rlci91dGlsLmMgLi9wb2xpcG8tMS4xLjIvdXRpbC5jCi0tLSAuL3BvbGlwby1tYXN0ZXIvdXRp bC5jCUZyaSBOb3YgMjEgMDk6MTU6MzYgMjAxNAorKysgLi9wb2xpcG8tMS4xLjIvdXRpbC5jCVR1 ZSBBcHIgMjggMTg6Mzc6MjMgMjAxNQpAQCAtNzEsOCArNzEsMTAgQEAKICAgICBpZihuIDwgMCkg cmV0dXJuIC0yOwogICAgIHdoaWxlKGkgPCBzbGVuICYmIG4gPCBsZW4pCiAgICAgICAgIGJ1Zltu KytdID0gc1tpKytdOwotICAgIGlmKG4gPCBsZW4pCisgICAgaWYobiA8IGxlbikgeworICAgICAg ICBidWZbbl0gPSAwOwogICAgICAgICByZXR1cm4gbjsKKyAgICB9CiAgICAgZWxzZQogICAgICAg ICByZXR1cm4gLTE7CiB9CmRpZmYgLU51ciAuL3BvbGlwby1tYXN0ZXIvb2JqZWN0LmMgLi9wb2xp cG8tMS4xLjIvb2JqZWN0LmMKLS0tIC4vcG9saXBvLW1hc3Rlci9vYmplY3QuYwlGcmkgTm92IDIx IDA5OjE1OjM2IDIwMTQKKysrIC4vcG9saXBvLTEuMS4yL29iamVjdC5jCVR1ZSBBcHIgMjggMTg6 MjU6MzggMjAxNQpAQCAtOTg1LDggKzk4NSw4IEBACiAgICAgICAgIGlmKG9iamVjdC0+bGFzdF9t b2RpZmllZCA+PSAwKQogICAgICAgICAgICAgLyogQWdhaW4sIHRha2UgY2FyZSBvZiBjbG9jayBz a2V3ICovCiAgICAgICAgICAgICBzdGFsZSA9IE1JTihzdGFsZSwKLSAgICAgICAgICAgICAgICAg ICAgICAgIG9iamVjdC0+YWdlICsKLSAgICAgICAgICAgICAgICAgICAgICAgIChkYXRlIC0gb2Jq ZWN0LT5sYXN0X21vZGlmaWVkKSAqIG1heEFnZUZyYWN0aW9uKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIChpbnQpIChvYmplY3QtPmFnZSArCisgICAgICAgICAgICAgICAgICAgICAgICAoZGF0 ZSAtIG9iamVjdC0+bGFzdF9tb2RpZmllZCkgKiBtYXhBZ2VGcmFjdGlvbikgKTsKICAgICAgICAg ZWxzZQogICAgICAgICAgICAgc3RhbGUgPSBNSU4oc3RhbGUsIG9iamVjdC0+YWdlICsgbWF4Tm9N b2RpZmllZEFnZSk7CiAgICAgfQpkaWZmIC1OdXIgLi9wb2xpcG8tbWFzdGVyL3NlcnZlci5jIC4v cG9saXBvLTEuMS4yL3NlcnZlci5jCi0tLSAuL3BvbGlwby1tYXN0ZXIvc2VydmVyLmMJRnJpIE5v diAyMSAwOToxNTozNiAyMDE0CisrKyAuL3BvbGlwby0xLjEuMi9zZXJ2ZXIuYwlUdWUgQXByIDI4 IDE4OjI1OjM4IDIwMTUKQEAgLTEyMDcsNyArMTIwNyw3IEBACiAgICAgICAgICAgICAgICByZXF1 ZXN0LT50aW1lMC50dl9zZWMgIT0gbnVsbF90aW1lLnR2X3NlYykKICAgICAgICAgICAgICAgICBy dHQgPSB0aW1ldmFsX21pbnVzX3VzZWMoJnJlcXVlc3QtPnRpbWUxLCAmcmVxdWVzdC0+dGltZTAp OwogICAgICAgICAgICAgaWYoc2l6ZSA+PSA4MTkyICYmIGQgPiA1MDAwMCkKLSAgICAgICAgICAg ICAgICByYXRlID0gKChkb3VibGUpc2l6ZSAvIChkb3VibGUpZCkgKiAxMDAwMDAwLjAgKyAwLjU7 CisgICAgICAgICAgICAgICAgcmF0ZSA9IChpbnQpKCAoKGRvdWJsZSlzaXplIC8gKGRvdWJsZSlk KSAqIDEwMDAwMDAuMCArIDAuNSApOwogICAgICAgICB9CiAgICAgICAgIHJlcXVlc3QtPnRpbWUw ID0gbnVsbF90aW1lOwogICAgICAgICByZXF1ZXN0LT50aW1lMSA9IG51bGxfdGltZTsKZGlmZiAt TnVyIC4vcG9saXBvLW1hc3Rlci9taW5ndy5jIC4vcG9saXBvLTEuMS4yL21pbmd3LmMKLS0tIC4v cG9saXBvLW1hc3Rlci9taW5ndy5jCUZyaSBOb3YgMjEgMDk6MTU6MzYgMjAxNAorKysgLi9wb2xp cG8tMS4xLjIvbWluZ3cuYwlUdWUgQXByIDI4IDE4OjI1OjM4IDIwMTUKQEAgLTE4Niw4ICsxODYs OCBAQAogCiAgICAgaWYodHYpIHsKICAgICAgICAgR2V0U3lzdGVtVGltZUFzRmlsZVRpbWUoJmZ0 KTsKLSAgICAgICAgbGkuTG93UGFydCAgPSBmdC5kd0xvd0RhdGVUaW1lOwotICAgICAgICBsaS5I aWdoUGFydCA9IGZ0LmR3SGlnaERhdGVUaW1lOworICAgICAgICBsaS51Lkxvd1BhcnQgID0gZnQu ZHdMb3dEYXRlVGltZTsKKyAgICAgICAgbGkudS5IaWdoUGFydCA9IGZ0LmR3SGlnaERhdGVUaW1l OwogICAgICAgICB0ICA9IGxpLlF1YWRQYXJ0OyAgICAgICAvKiBJbiAxMDAtbmFub3NlY29uZCBp bnRlcnZhbHMgKi8KICAgICAgICAgdCAtPSBFUE9DSEZJTEVUSU1FOyAgICAgLyogT2Zmc2V0IHRv IHRoZSBFcG9jaCB0aW1lICovCiAgICAgICAgIHQgLz0gMTA7ICAgICAgICAgICAgICAgIC8qIElu IG1pY3Jvc2Vjb25kcyAqLwpkaWZmIC1OdXIgLi9wb2xpcG8tbWFzdGVyL2Rpc2tjYWNoZS5jIC4v cG9saXBvLTEuMS4yL2Rpc2tjYWNoZS5jCi0tLSAuL3BvbGlwby1tYXN0ZXIvZGlza2NhY2hlLmMJ RnJpIE5vdiAyMSAwOToxNTozNiAyMDE0CisrKyAuL3BvbGlwby0xLjEuMi9kaXNrY2FjaGUuYwlU dWUgTWF5IDEyIDIwOjQ3OjUyIDIwMTUKQEAgLTEwMDgsOCArMTAwOCwxMCBAQAogICAgICAgICB9 CiAgICAgfQogCi0gICAgaWYobG9jYXRpb24pCisgICAgaWYobG9jYXRpb24pIHsKICAgICAgICAg ZnJlZShsb2NhdGlvbik7CisgICAgICAgIGxvY2F0aW9uID0gTlVMTDsKKyAgICB9CiAKICAgICBp ZihoZWFkZXJzKSB7CiAgICAgICAgIGlmKCFvYmplY3QtPmhlYWRlcnMpCkBAIC0xMDUxLDggKzEw NTMsMTAgQEAKICAgICBpZighb2JqZWN0LT5ldGFnKQogICAgICAgICBvYmplY3QtPmV0YWcgPSBl dGFnOwogICAgIGVsc2UgewotICAgICAgICBpZihldGFnKQorICAgICAgICBpZihldGFnKSB7CiAg ICAgICAgICAgICBmcmVlKGV0YWcpOworICAgICAgICAgICAgZXRhZyA9IE5VTEw7CisgICAgICAg IH0KICAgICB9CiAgICAgcmVsZWFzZUF0b20obWVzc2FnZSk7CiAKQEAgLTE3OTAsNiArMTc5NCw3 IEBACiAgICAgaWYoZHN0LT5sYXN0X21vZGlmaWVkIDwgMCkKICAgICAgICAgZHN0LT5sYXN0X21v ZGlmaWVkID0gc3JjLT5sYXN0X21vZGlmaWVkOwogICAgIGZyZWUoc3JjKTsKKyAgICBzcmMgPSBO VUxMOwogfQogCiBEaXNrT2JqZWN0UHRyCg== --Den8_556ad54879b1 Content-Type: text/plain; name="time_patch_example.txt" Content-Transfer-Encoding: Base64 Content-Disposition: attachment; filename="time_patch_example.txt" LS0tIC4vcG9saXBvLW1hc3Rlci9odHRwX3BhcnNlLmMJRnJpIE5vdiAyMSAwOToxNTozNiAyMDE0 CisrKyAuL3BvbGlwby0xLjEuMi9odHRwX3BhcnNlLmMJRnJpIE1heSAyOSAwNToyNjowMSAyMDE1 CkBAIC03NjcsOCArNzY3LDggQEAKICAgICAgICAgbmFtZV9zdGFydCwgbmFtZV9lbmQsIHZhbHVl X3N0YXJ0LCB2YWx1ZV9lbmQsIAogICAgICAgICB0b2tlbl9zdGFydCwgdG9rZW5fZW5kLCBlbmQ7 CiAgICAgQXRvbVB0ciBuYW1lID0gTlVMTDsKLSAgICB0aW1lX3QgZGF0ZSA9IC0xLCBsYXN0X21v ZGlmaWVkID0gLTEsIGV4cGlyZXMgPSAtMSwgcG9saXBvX2FnZSA9IC0xLAotICAgICAgICBwb2xp cG9fYWNjZXNzID0gLTEsIHBvbGlwb19ib2R5X29mZnNldCA9IC0xOworICAgIHRpbWVfdCBkYXRl ID0gY3VycmVudF90aW1lLnR2X3NlYywgbGFzdF9tb2RpZmllZCA9IC0xLCBleHBpcmVzID0gLTEs IHBvbGlwb19hZ2UgPSAtMSwKKyAgICAgICAgcG9saXBvX2FjY2VzcyA9IGN1cnJlbnRfdGltZS50 dl9zZWMsIHBvbGlwb19ib2R5X29mZnNldCA9IC0xOwogICAgIGludCBsZW4gPSAtMTsKICAgICBD YWNoZUNvbnRyb2xSZWMgY2FjaGVfY29udHJvbDsKICAgICBjaGFyICplbmRwdHI7CkBAIC05ODcs NyArOTg3LDggQEAKICAgICAgICAgICAgIGVsc2UgaWYobmFtZSA9PSBhdG9tWFBvbGlwb0RhdGUp CiAgICAgICAgICAgICAgICAgcG9saXBvX2FnZSA9IHQ7CiAgICAgICAgICAgICBlbHNlIGlmKG5h bWUgPT0gYXRvbVhQb2xpcG9BY2Nlc3MpCi0gICAgICAgICAgICAgICAgcG9saXBvX2FjY2VzcyA9 IHQ7CisgICAgICAgICAgICAgICAgaWYodCA+PSAwKQorICAgICAgICAgICAgICAgICAgICBwb2xp cG9fYWNjZXNzID0gdDsKICAgICAgICAgfSBlbHNlIGlmKG5hbWUgPT0gYXRvbUFnZSkgewogICAg ICAgICAgICAgaiA9IHNraXBXaGl0ZXNwYWNlKGJ1ZiwgdmFsdWVfc3RhcnQpOwogICAgICAgICAg ICAgaWYoaiA8IDApIHsKLS0tIC4vcG9saXBvLW1hc3Rlci9wYXJzZV90aW1lLmMJRnJpIE5vdiAy MSAwOToxNTozNiAyMDE0CisrKyAuL3BvbGlwby0xLjEuMi9wYXJzZV90aW1lLmMJU2F0IE1heSAz MCAyMDoxMDowOSAyMDE1CkBAIC0xMzMsNyArMTMzLDcgQEAKIHsKICAgICBzdHJ1Y3QgdG0gdG07 CiAgICAgdGltZV90IHQ7Ci0gICAgaW50IGkgPSBvZmZzZXQ7CisgICAgaW50IGkgPSBvZmZzZXQs IHNhdmVkX2k7CiAKICAgICBpID0gc2tpcF93b3JkKGJ1ZiwgaSwgbGVuKTsgaWYoaSA8IDApIHJl dHVybiAtMTsKICAgICBpID0gc2tpcF9zZXBhcmF0b3IoYnVmLCBpLCBsZW4pOyBpZihpIDwgMCkg cmV0dXJuIC0xOwpAQCAtMTYxLDcgKzE2MSwxNCBAQAogICAgICAgICBpID0gc2tpcF9zZXBhcmF0 b3IoYnVmLCBpLCBsZW4pOyBpZihpIDwgMCkgcmV0dXJuIC0xOwogICAgICAgICBpID0gcGFyc2Vf aW50KGJ1ZiwgaSwgbGVuLCAmdG0udG1fc2VjKTsgaWYoaSA8IDApIHJldHVybiAtMTsKICAgICAg ICAgaSA9IHNraXBfc2VwYXJhdG9yKGJ1ZiwgaSwgbGVuKTsgaWYoaSA8IDApIHJldHVybiAtMTsK LSAgICAgICAgaSA9IHNraXBfd29yZChidWYsIGksIGxlbik7IGlmKGkgPCAwKSByZXR1cm4gLTE7 CisgICAgICAgIHNhdmVkX2kgPSBpOworICAgICAgICBpID0gc2tpcF93b3JkKGJ1ZiwgaSwgbGVu KTsKKyAgICAgICAgaWYoaSA8IDApIHsKKyAgICAgICAgICAgIGkgPSBzYXZlZF9pOworICAgICAg ICAgICAgaWYoYnVmW2ldICE9ICcrJyAmJiBidWZbaV0gIT0gJy0nKSByZXR1cm4gLTE7CisgICAg ICAgICAgICBpKys7CisgICAgICAgICAgICBpID0gcGFyc2VfaW50KGJ1ZiwgaSwgbGVuLCAmc2F2 ZWRfaSk7IGlmKGkgPCAwKSByZXR1cm4gLTE7CisgICAgICAgIH0KICAgICB9IGVsc2UgeyAgICAg ICAgICAgICAgICAgICAgLyogZnVubnkgQW1lcmljYW4gZm9ybWF0ICovCiAgICAgICAgIGkgPSBw YXJzZV9tb250aChidWYsIGksIGxlbiwgJnRtLnRtX21vbik7IGlmKGkgPCAwKSByZXR1cm4gLTE7 CiAgICAgICAgIGkgPSBza2lwX3NlcGFyYXRvcihidWYsIGksIGxlbik7IGlmKGkgPCAwKSByZXR1 cm4gLTE7CkBAIC0xNzMsNyArMTgwLDE0IEBACiAgICAgICAgIGkgPSBza2lwX3NlcGFyYXRvcihi dWYsIGksIGxlbik7IGlmKGkgPCAwKSByZXR1cm4gLTE7CiAgICAgICAgIGkgPSBwYXJzZV9pbnQo YnVmLCBpLCBsZW4sICZ0bS50bV9zZWMpOyBpZihpIDwgMCkgcmV0dXJuIC0xOwogICAgICAgICBp ID0gc2tpcF9zZXBhcmF0b3IoYnVmLCBpLCBsZW4pOyBpZihpIDwgMCkgcmV0dXJuIC0xOwotICAg ICAgICBpID0gcGFyc2VfaW50KGJ1ZiwgaSwgbGVuLCAmdG0udG1feWVhcik7IGlmKGkgPCAwKSBy ZXR1cm4gLTE7CisgICAgICAgIHNhdmVkX2kgPSBpOworICAgICAgICBpID0gcGFyc2VfaW50KGJ1 ZiwgaSwgbGVuLCAmdG0udG1feWVhcik7CisgICAgICAgIGlmKGkgPCAwKSB7CisgICAgICAgICAg ICBpID0gc2F2ZWRfaTsKKyAgICAgICAgICAgIGkgPSBza2lwX3dvcmQoYnVmLCBpLCBsZW4pOyBp ZihpIDwgMCkgcmV0dXJuIC0xOworICAgICAgICAgICAgaSA9IHNraXBfc2VwYXJhdG9yKGJ1Ziwg aSwgbGVuKTsgaWYoaSA8IDApIHJldHVybiAtMTsKKyAgICAgICAgICAgIGkgPSBwYXJzZV9pbnQo YnVmLCBpLCBsZW4sICZ0bS50bV95ZWFyKTsgaWYoaSA8IDApIHJldHVybiAtMTsKKyAgICAgICAg fQogICAgICAgICBpZih0bS50bV95ZWFyIDwgMTAwKQogICAgICAgICAgICAgdG0udG1feWVhciAr PSAxOTAwOwogICAgICAgICBpZih0bS50bV95ZWFyIDwgMTkzNykK --Den8_556ad54879b1 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------------ --Den8_556ad54879b1 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Polipo-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/polipo-users --Den8_556ad54879b1--