X-From-Line: fxn@retemail.es Sun Mar 10 05:31:13 2002 Return-Path: Received: from smtp1.ActiveState.com (ns1.ActiveState.com [192.168.2.11]) by smtp3.ActiveState.com (8.11.6/8.11.6) with ESMTP id g2A4SaL02017 for ; Sat, 9 Mar 2002 20:28:36 -0800 Received: from caesar.linpro.no (caesar.linpro.no [194.143.13.38]) by smtp1.ActiveState.com (8.11.6/8.11.6) with ESMTP id g2A4SNb06951 for ; Sat, 9 Mar 2002 20:28:27 -0800 Received: from smtp06.iddeo.es ([62.81.186.16] helo=smtp06.retemail.es) by caesar.linpro.no with esmtp (Exim 3.22 #1 (Debian)) id 16juwT-0000IW-00 for ; Sun, 10 Mar 2002 05:28:17 +0100 Received: from conway.localdomain ([62.174.25.212]) by smtp06.retemail.es (InterMail vM.5.01.03.02 201-253-122-118-102-20010403) with SMTP id <20020310042813.QPLG15175.smtp06.retemail.es@conway.localdomain> for ; Sun, 10 Mar 2002 05:28:13 +0100 Date: Sun, 10 Mar 2002 05:31:13 +0100 From: "F. Xavier Noria" To: gisle@aas.no Subject: better patch for traces in LWP::UserAgent X-Gnus-Mail-Source: pop:gislea@latte.activestate.com Message-Id: <20020310053113.2af050f0.fxn@retemail.es> X-Mailer: Sylpheed version 0.7.3 (GTK+ 1.2.10; i386-portbld-freebsd4.4) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart_Sun__10_Mar_2002_05:31:13_+0100_08174000" X-PerlMx-Spam: Gauge=XXIIIII, Probability=25%, Report="RCVD_IN_BL_SPAMCOP_NET" X-Filtered-By: PerlMx makes it fast and easy. See http://www.ActiveState.com/Products/PerlMx/Header X-UIDL: 0fc"!"\7"!S>X!!h2$!! X-Content-Length: 14137 Xref: caliper.activestate.com lwp:303 Lines: 201 This is a multi-part message in MIME format. --Multipart_Sun__10_Mar_2002_05:31:13_+0100_08174000 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Hello again! I've thought there was no reason for not giving flags to differentiate traces of request headers and content as we gave for responses, so I have added them and the corresponding code. The POD of trace() has been modified accordingly. Attached comes a patch for the original version of LWP::UserAgent which is included in the tarball of libwww-perl-5.64. Best regards, -- fxn --Multipart_Sun__10_Mar_2002_05:31:13_+0100_08174000 Content-Type: application/octet-stream; name="UserAgent.pm.diff" Content-Disposition: attachment; filename="UserAgent.pm.diff" Content-Transfer-Encoding: base64 LS0tIFVzZXJBZ2VudC5wbQlUdWUgRGVjIDExIDIyOjExOjI5IDIwMDEKKysrIFVzZXJBZ2VudC5w bS5uZXcJU3VuIE1hciAxMCAwNToxMDowMiAyMDAyCkBAIC0xMjQsNiArMTI0LDI0IEBACiAgICAg fTsKIH0KIAorIyBDb25zdGFudHMgZm9yIGNvbmZpZ3VyaW5nIHRyYWNlcy4KK3VzZSBjb25zdGFu dCBUUkFDRV9SRVFVRVNUX0hFQURFUlMgID0+IDE7Cit1c2UgY29uc3RhbnQgVFJBQ0VfUkVRVUVT VF9DT05URU5UICA9PiAyOwordXNlIGNvbnN0YW50IFRSQUNFX1JFUVVFU1RTICAgICAgICAgPT4g VFJBQ0VfUkVRVUVTVF9IRUFERVJTIHwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFRSQUNFX1JFUVVFU1RfQ09OVEVOVDsKKwordXNlIGNvbnN0YW50IFRSQUNFX1JFU1BP TlNFX0hFQURFUlMgPT4gNDsKK3VzZSBjb25zdGFudCBUUkFDRV9SRVNQT05TRV9DT05URU5UID0+ IDg7Cit1c2UgY29uc3RhbnQgVFJBQ0VfUkVTUE9OU0VTICAgICAgICA9PiBUUkFDRV9SRVNQT05T RV9IRUFERVJTIHwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRSQUNF X1JFU1BPTlNFX0NPTlRFTlQ7CisKK3VzZSBjb25zdGFudCBUUkFDRV9IRUFERVJTICAgICAgICAg ID0+IFRSQUNFX1JFUVVFU1RfSEVBREVSUyB8CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBUUkFDRV9SRVNQT05TRV9IRUFERVJTOworCit1c2UgY29uc3RhbnQgVFJBQ0Vf QUxMICAgICAgICAgICAgICA9PiBUUkFDRV9SRVFVRVNUUyB8CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBUUkFDRV9SRVNQT05TRVM7CisKKwogPWl0ZW0gJHVhID0gTFdQ OjpVc2VyQWdlbnQtPm5ldyggJW9wdGlvbnMgKTsKIAogVGhpcyBjbGFzcyBtZXRob2QgY29uc3Ry dWN0cyBhIG5ldyBDPExXUDo6VXNlckFnZW50PiBvYmplY3QgYW5kCkBAIC0xNDYsNiArMTY0LDcg QEAKICAgIHByb3RvY29sc19hbGxvd2VkICAgICAgIHVuZGVmCiAgICBwcm90b2NvbHNfZm9yYmlk ZGVuICAgICB1bmRlZgogICAgcmVxdWVzdHNfcmVkaXJlY3RhYmxlICAgWydHRVQnLCAnSEVBRCdd CisgICB0cmFjZSAgICAgICAgICAgICAgICAgICB1bmRlZgogCiBUaGUgZm9sbG93aW5ncyBvcHRp b24gYXJlIGFsc28gYWNjZXB0ZWQ6IElmIHRoZSBDPGVudl9wcm94eT4gb3B0aW9uIGlzCiBwYXNz ZWQgaW4gYW4gaGFzIGEgVFJVRSB2YWx1ZSwgdGhlbiBwcm94eSBzZXR0aW5ncyBhcmUgcmVhZCBm cm9tCkBAIC0xNzksMTQgKzE5OCwxNSBAQAogICAgIG15ICRjb29raWVfamFyID0gZGVsZXRlICRj bmZ7Y29va2llX2phcn07CiAgICAgbXkgJGNvbm5fY2FjaGUgPSBkZWxldGUgJGNuZntjb25uX2Nh Y2hlfTsKICAgICBteSAka2VlcF9hbGl2ZSA9IGRlbGV0ZSAkY25me2tlZXBfYWxpdmV9OwotICAg IAorCiAgICAgQ2FycDo6Y3JvYWsoIkNhbid0IG1peCBjb25uX2NhY2hlIGFuZCBrZWVwX2FsaXZl IikKIAkgIGlmICRjb25uX2NhY2hlICYmICRrZWVwX2FsaXZlOwogCisgICAgbXkgJHRyYWNlID0g ZGVsZXRlICRjbmZ7dHJhY2V9OwogCiAgICAgbXkgJHByb3RvY29sc19hbGxvd2VkICAgPSBkZWxl dGUgJGNuZntwcm90b2NvbHNfYWxsb3dlZH07CiAgICAgbXkgJHByb3RvY29sc19mb3JiaWRkZW4g PSBkZWxldGUgJGNuZntwcm90b2NvbHNfZm9yYmlkZGVufTsKLSAgICAKKwogICAgIG15ICRyZXF1 ZXN0c19yZWRpcmVjdGFibGUgPSBkZWxldGUgJGNuZntyZXF1ZXN0c19yZWRpcmVjdGFibGV9Owog ICAgICRyZXF1ZXN0c19yZWRpcmVjdGFibGUgPSBbJ0dFVCcsICdIRUFEJ10KICAgICAgIHVubGVz cyBkZWZpbmVkICRyZXF1ZXN0c19yZWRpcmVjdGFibGU7CkBAIC0yMTUsNiArMjM1LDcgQEAKICAg ICAgICAgICAgICAgICAgICAgICBwcm90b2NvbHNfYWxsb3dlZCA9PiAkcHJvdG9jb2xzX2FsbG93 ZWQsCiAgICAgICAgICAgICAgICAgICAgICAgcHJvdG9jb2xzX2ZvcmJpZGRlbiA9PiAkcHJvdG9j b2xzX2ZvcmJpZGRlbiwKICAgICAgICAgICAgICAgICAgICAgICByZXF1ZXN0c19yZWRpcmVjdGFi bGUgPT4gJHJlcXVlc3RzX3JlZGlyZWN0YWJsZSwKKyAgICAgICAgICAgICAgICAgICAgICB0cmFj ZSA9PiAkdHJhY2UsCiAJCSAgICAgfSwgJGNsYXNzOwogCiAgICAgJHNlbGYtPmFnZW50KCRhZ2Vu dCkgaWYgJGFnZW50OwpAQCAtMzA1LDYzICszMjYsODIgQEAKICAgICBteSAkcHJvdG9jb2w7CiAK ICAgICB7Ci0gICAgICAjIEhvbm9yIG9iamVjdC1zcGVjaWZpYyByZXN0cmljdGlvbnMgYnkgZm9y Y2luZyBwcm90b2NvbCBvYmplY3RzCi0gICAgICAjICBpbnRvIGNsYXNzIExXUDo6UHJvdG9jb2w6 Om5vZ28uCi0gICAgICBteSAkeDsKLSAgICAgIGlmKCR4ICAgICAgID0gJHNlbGYtPnByb3RvY29s c19hbGxvd2VkKSB7Ci0gICAgICAgIGlmKGdyZXAgJF8gZXEgJHNjaGVtZSwgQCR4KSB7Ci0gICAg ICAgICAgTFdQOjpEZWJ1Zzo6dHJhY2UoIiRzY2hlbWUgVVJMcyBhcmUgYW1vbmcgJHNlbGZcJ3Mg YWxsb3dlZCBwcm90b2NvbHMgKEAkeCkiKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICBM V1A6OkRlYnVnOjp0cmFjZSgiJHNjaGVtZSBVUkxzIGFyZW4ndCBhbW9uZyAkc2VsZlwncyBhbGxv d2VkIHByb3RvY29scyAoQCR4KSIpOwotICAgICAgICAgIHJlcXVpcmUgTFdQOjpQcm90b2NvbDo6 bm9nbzsKLSAgICAgICAgICAkcHJvdG9jb2wgPSBMV1A6OlByb3RvY29sOjpub2dvLT5uZXc7Ci0g ICAgICAgIH0KLSAgICAgIH0gZWxzaWYgKCR4ID0gJHNlbGYtPnByb3RvY29sc19mb3JiaWRkZW4p IHsKLSAgICAgICAgaWYoZ3JlcCAkXyBlcSAkc2NoZW1lLCBAJHgpIHsKLSAgICAgICAgICBMV1A6 OkRlYnVnOjp0cmFjZSgiJHNjaGVtZSBVUkxzIGFyZSBhbW9uZyAkc2VsZlwncyBmb3JiaWRkZW4g cHJvdG9jb2xzIChAJHgpIik7Ci0gICAgICAgICAgcmVxdWlyZSBMV1A6OlByb3RvY29sOjpub2dv OwotICAgICAgICAgICRwcm90b2NvbCA9IExXUDo6UHJvdG9jb2w6Om5vZ28tPm5ldzsKLSAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICBMV1A6OkRlYnVnOjp0cmFjZSgiJHNjaGVtZSBVUkxzIGFy ZW4ndCBhbW9uZyAkc2VsZlwncyBmb3JiaWRkZW4gcHJvdG9jb2xzIChAJHgpIik7CisgICAgICAg ICMgSG9ub3Igb2JqZWN0LXNwZWNpZmljIHJlc3RyaWN0aW9ucyBieSBmb3JjaW5nIHByb3RvY29s IG9iamVjdHMKKyAgICAgICAgIyAgaW50byBjbGFzcyBMV1A6OlByb3RvY29sOjpub2dvLgorICAg ICAgICBteSAkeDsKKyAgICAgICAgaWYgKCR4ICAgICAgID0gJHNlbGYtPnByb3RvY29sc19hbGxv d2VkKSB7CisgICAgICAgICAgICBpZiAoZ3JlcCAkXyBlcSAkc2NoZW1lLCBAJHgpIHsKKyAgICAg ICAgICAgICAgICBMV1A6OkRlYnVnOjp0cmFjZSgiJHNjaGVtZSBVUkxzIGFyZSBhbW9uZyAkc2Vs ZlwncyBhbGxvd2VkIHByb3RvY29scyAoQCR4KSIpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICAgICAgICBMV1A6OkRlYnVnOjp0cmFjZSgiJHNjaGVtZSBVUkxzIGFyZW4ndCBhbW9u ZyAkc2VsZlwncyBhbGxvd2VkIHByb3RvY29scyAoQCR4KSIpOworICAgICAgICAgICAgICAgIHJl cXVpcmUgTFdQOjpQcm90b2NvbDo6bm9nbzsKKyAgICAgICAgICAgICAgICAkcHJvdG9jb2wgPSBM V1A6OlByb3RvY29sOjpub2dvLT5uZXc7CisgICAgICAgICAgICB9CisgICAgICAgIH0gZWxzaWYg KCR4ID0gJHNlbGYtPnByb3RvY29sc19mb3JiaWRkZW4pIHsKKyAgICAgICAgICAgIGlmIChncmVw ICRfIGVxICRzY2hlbWUsIEAkeCkgeworICAgICAgICAgICAgICAgIExXUDo6RGVidWc6OnRyYWNl KCIkc2NoZW1lIFVSTHMgYXJlIGFtb25nICRzZWxmXCdzIGZvcmJpZGRlbiBwcm90b2NvbHMgKEAk eCkiKTsKKyAgICAgICAgICAgICAgICByZXF1aXJlIExXUDo6UHJvdG9jb2w6Om5vZ287CisgICAg ICAgICAgICAgICAgJHByb3RvY29sID0gTFdQOjpQcm90b2NvbDo6bm9nby0+bmV3OworICAgICAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBMV1A6OkRlYnVnOjp0cmFjZSgiJHNjaGVt ZSBVUkxzIGFyZW4ndCBhbW9uZyAkc2VsZlwncyBmb3JiaWRkZW4gcHJvdG9jb2xzIChAJHgpIik7 CisgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgIH0KLSAgICAgICMgZWxzZSBmYWxsIHRo cnUgYW5kIGNyZWF0ZSB0aGUgcHJvdG9jb2wgb2JqZWN0IG5vcm1hbGx5CisgICAgICAgICMgZWxz ZSBmYWxsIHRocnUgYW5kIGNyZWF0ZSB0aGUgcHJvdG9jb2wgb2JqZWN0IG5vcm1hbGx5CiAgICAg fQogCiAgICAgdW5sZXNzKCRwcm90b2NvbCkgewotICAgICAgJHByb3RvY29sID0gZXZhbCB7IExX UDo6UHJvdG9jb2w6OmNyZWF0ZSgkc2NoZW1lLCAkc2VsZikgfTsKLSAgICAgIGlmICgkQCkgewot CSRAID1+IHMvIGF0IC4qIGxpbmUgXGQrLiovL3M7ICAjIHJlbW92ZSBmaWxlL2xpbmUgbnVtYmVy Ci0JcmV0dXJuIF9uZXdfcmVzcG9uc2UoJHJlcXVlc3QsICZIVFRQOjpTdGF0dXM6OlJDX05PVF9J TVBMRU1FTlRFRCwgJEApOwotICAgICAgfQorICAgICAgICAkcHJvdG9jb2wgPSBldmFsIHsgTFdQ OjpQcm90b2NvbDo6Y3JlYXRlKCRzY2hlbWUsICRzZWxmKSB9OworICAgICAgICBpZiAoJEApIHsK KyAgICAgICAgICAgICRAID1+IHMvIGF0IC4qIGxpbmUgXGQrLiovL3M7ICAjIHJlbW92ZSBmaWxl L2xpbmUgbnVtYmVyCisgICAgICAgICAgICAgIHJldHVybiBfbmV3X3Jlc3BvbnNlKCRyZXF1ZXN0 LCAmSFRUUDo6U3RhdHVzOjpSQ19OT1RfSU1QTEVNRU5URUQsICRAKTsKKyAgICAgICAgfQogICAg IH0KIAogICAgICMgRXh0cmFjdCBmaWVsZHMgdGhhdCB3aWxsIGJlIHVzZWQgYmVsb3cKICAgICBt eSAoJHRpbWVvdXQsICRjb29raWVfamFyLCAkdXNlX2V2YWwsICRwYXJzZV9oZWFkLCAkbWF4X3Np emUpID0KICAgICAgIEB7JHNlbGZ9e3F3KHRpbWVvdXQgY29va2llX2phciB1c2VfZXZhbCBwYXJz ZV9oZWFkIG1heF9zaXplKX07CiAKKyAgICBpZiAobXkgJGZsYWdzID0gJHNlbGYtPnRyYWNlICYg VFJBQ0VfUkVRVUVTVFMpIHsKKyAgICAgICAgaWYgKCRmbGFncyAmIFRSQUNFX1JFUVVFU1RfSEVB REVSUykgeworICAgICAgICAgICAgcHJpbnQgJHJlcXVlc3QtPm1ldGhvZCwgJyAnLCAkcmVxdWVz dC0+dXJpLT5hc19zdHJpbmcsICJcbiI7CisgICAgICAgICAgICBwcmludCAkcmVxdWVzdC0+aGVh ZGVyc19hc19zdHJpbmcsICJcbiI7CisgICAgICAgIH0KKyAgICAgICAgcHJpbnQgJHJlcXVlc3Qt PmNvbnRlbnQsICJcbiIKKyAgICAgICAgICBpZiAkZmxhZ3MgJiBUUkFDRV9SRVFVRVNUX0NPTlRF TlQ7CisgICAgfQorCiAgICAgbXkgJHJlc3BvbnNlOwogICAgIGlmICgkdXNlX2V2YWwpIHsKLQkj IHdlIGV2YWwsIGFuZCB0dXJuIGRpZXMgaW50byByZXNwb25zZXMgYmVsb3cKLQlldmFsIHsKLQkg ICAgJHJlc3BvbnNlID0gJHByb3RvY29sLT5yZXF1ZXN0KCRyZXF1ZXN0LCAkcHJveHksCi0JCQkJ CSAgICRhcmcsICRzaXplLCAkdGltZW91dCk7Ci0JfTsKLQlpZiAoJEApIHsKLQkgICAgJEAgPX4g cy8gYXQgLiogbGluZSBcZCsuKi8vczsgICMgcmVtb3ZlIGZpbGUvbGluZSBudW1iZXIKLQkgICAg JHJlc3BvbnNlID0KLQkgICAgICBIVFRQOjpSZXNwb25zZS0+bmV3KCZIVFRQOjpTdGF0dXM6OlJD X0lOVEVSTkFMX1NFUlZFUl9FUlJPUiwKLQkJCQkgICRAKTsKLQl9CisgICAgICAgICMgd2UgZXZh bCwgYW5kIHR1cm4gZGllcyBpbnRvIHJlc3BvbnNlcyBiZWxvdworICAgICAgICBldmFsIHsKKyAg ICAgICAgICAgICRyZXNwb25zZSA9ICRwcm90b2NvbC0+cmVxdWVzdCgkcmVxdWVzdCwgJHByb3h5 LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICRhcmcsICRzaXpl LCAkdGltZW91dCk7CisgICAgICAgIH07CisgICAgICAgIGlmICgkQCkgeworICAgICAgICAgICAg JEAgPX4gcy8gYXQgLiogbGluZSBcZCsuKi8vczsgICMgcmVtb3ZlIGZpbGUvbGluZSBudW1iZXIK KyAgICAgICAgICAgICAgJHJlc3BvbnNlID0KKyAgICAgICAgICAgICAgICBIVFRQOjpSZXNwb25z ZS0+bmV3KCZIVFRQOjpTdGF0dXM6OlJDX0lOVEVSTkFMX1NFUlZFUl9FUlJPUiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICRAKTsKKyAgICAgICAgfQogICAgIH0gZWxzZSB7 Ci0JJHJlc3BvbnNlID0gJHByb3RvY29sLT5yZXF1ZXN0KCRyZXF1ZXN0LCAkcHJveHksCi0JCQkJ ICAgICAgICRhcmcsICRzaXplLCAkdGltZW91dCk7Ci0JIyBYWFg6IFNob3VsZCB3ZSBkaWUgdW5s ZXNzICRyZXNwb25zZS0+aXNfc3VjY2VzcyA/Pz8KKyAgICAgICAgJHJlc3BvbnNlID0gJHByb3Rv Y29sLT5yZXF1ZXN0KCRyZXF1ZXN0LCAkcHJveHksCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAkYXJnLCAkc2l6ZSwgJHRpbWVvdXQpOworICAgICAgICAjIFhYWDogU2hv dWxkIHdlIGRpZSB1bmxlc3MgJHJlc3BvbnNlLT5pc19zdWNjZXNzID8/PwogICAgIH0KIAogICAg ICRyZXNwb25zZS0+cmVxdWVzdCgkcmVxdWVzdCk7ICAjIHJlY29yZCByZXF1ZXN0IGZvciByZWZl cmVuY2UKICAgICAkY29va2llX2phci0+ZXh0cmFjdF9jb29raWVzKCRyZXNwb25zZSkgaWYgJGNv b2tpZV9qYXI7CiAgICAgJHJlc3BvbnNlLT5oZWFkZXIoIkNsaWVudC1EYXRlIiA9PiBIVFRQOjpE YXRlOjp0aW1lMnN0cih0aW1lKSk7CisKKyAgICBpZiAobXkgJGZsYWdzID0gJHNlbGYtPnRyYWNl ICYgVFJBQ0VfUkVTUE9OU0VTKSB7CisgICAgICAgIGlmICgkZmxhZ3MgJiBUUkFDRV9SRVNQT05T RV9IRUFERVJTKSB7CisgICAgICAgICAgICBwcmludCAkcmVzcG9uc2UtPnN0YXR1c19saW5lLCAi XG4iOworICAgICAgICAgICAgcHJpbnQgJHJlc3BvbnNlLT5oZWFkZXJzX2FzX3N0cmluZywgIlxu IjsKKyAgICAgICAgfQorICAgICAgICBwcmludCAkcmVzcG9uc2UtPmNvbnRlbnQsICJcbiIKKyAg ICAgICAgICBpZiAkZmxhZ3MgJiBUUkFDRV9SRVNQT05TRV9DT05URU5UOworICAgIH0KKwogICAg IHJldHVybiAkcmVzcG9uc2U7CiB9CiAKQEAgLTQ4OSw3ICs1MjksNyBAQAogCW15ICRjaF9oZWFk ZXIgPSAkcHJveHkgPyAgIlByb3h5LUF1dGhlbnRpY2F0ZSIgOiAiV1dXLUF1dGhlbnRpY2F0ZSI7 CiAJbXkgQGNoYWxsZW5nZSA9ICRyZXNwb25zZS0+aGVhZGVyKCRjaF9oZWFkZXIpOwogCXVubGVz cyAoQGNoYWxsZW5nZSkgewotCSAgICAkcmVzcG9uc2UtPmhlYWRlcigiQ2xpZW50LVdhcm5pbmci ID0+IAorCSAgICAkcmVzcG9uc2UtPmhlYWRlcigiQ2xpZW50LVdhcm5pbmciID0+CiAJCQkgICAg ICAiTWlzc2luZyBBdXRoZW50aWNhdGUgaGVhZGVyIik7CiAJICAgIHJldHVybiAkcmVzcG9uc2U7 CiAJfQpAQCAtNTA2LDcgKzU0Niw3IEBACiAJICAgIH0KIAogCSAgICB1bmxlc3MgKCRzY2hlbWUg PX4gL14oW2Etel0rKD86LVthLXpdKykqKSQvKSB7Ci0JCSRyZXNwb25zZS0+aGVhZGVyKCJDbGll bnQtV2FybmluZyIgPT4gCisJCSRyZXNwb25zZS0+aGVhZGVyKCJDbGllbnQtV2FybmluZyIgPT4K IAkJCQkgICJCYWQgYXV0aGVudGljYXRpb24gc2NoZW1lICckc2NoZW1lJyIpOwogCQlyZXR1cm4g JHJlc3BvbnNlOwogCSAgICB9CkBAIC02MDYsNyArNjQ2LDcgQEAKIGFuZCBhdHRlbXB0cyB0byB1 c2UgdGhpcyB1c2VyLWFnZW50IHRvIGFjY2VzcyBVUkxzIHdpdGggYW55IG90aGVyCiBzY2hlbWVz IChsaWtlICJmdHA6Ly8uLi4iKSB3aWxsIHJlc3VsdCBpbiBhIDUwMCBlcnJvci4KIAotVG8gZGVs ZXRlIHRoZSBsaXN0LCBjYWxsOiAKK1RvIGRlbGV0ZSB0aGUgbGlzdCwgY2FsbDoKIEM8JHVhLUU8 Z3Q+cHJvdG9jb2xzX2FsbG93ZWQodW5kZWYpPgogCiBCeSBkZWZhdWx0LCBhbiBvYmplY3QgaGFz IG5laXRoZXIgYSBwcm90b2NvbHNfYWxsb3dlZCBsaXN0LCBub3IKQEAgLTYyNyw3ICs2NjcsNyBA QAogYXR0ZW1wdHMgdG8gdXNlIHRoaXMgdXNlci1hZ2VudCB0byBhY2Nlc3MgVVJMcyB3aXRoIHRo b3NlIHNjaGVtZXMKIHdpbGwgcmVzdWx0IGluIGEgNTAwIGVycm9yLgogCi1UbyBkZWxldGUgdGhl IGxpc3QsIGNhbGw6IAorVG8gZGVsZXRlIHRoZSBsaXN0LCBjYWxsOgogQzwkdWEtRTxndD5wcm90 b2NvbHNfZm9yYmlkZGVuKHVuZGVmKT4KIAogPWl0ZW0gJHVhLT5pc19wcm90b2NvbF9zdXBwb3J0 ZWQoJHNjaGVtZSkKQEAgLTY3NCw3ICs3MTQsNyBAQAogCiA9aXRlbSAkdWEtPnJlcXVlc3RzX3Jl ZGlyZWN0YWJsZSggXEByZXF1ZXN0cyApOyAgIyB0byBzZXQKIAotVGhpcyByZWFkcyBvciBzZXRz IHRoZSBvYmplY3QncyBsaXN0IG9mIHJlcXVlc3QgbmFtZXMgdGhhdCAKK1RoaXMgcmVhZHMgb3Ig c2V0cyB0aGUgb2JqZWN0J3MgbGlzdCBvZiByZXF1ZXN0IG5hbWVzIHRoYXQKIEM8JHVhLUU8Z3Q+ cmVkaXJlY3Rfb2soLi4uKT4gd2lsbCBhbGxvdyByZWRpcmVjdGlvbiBmb3IuICBCeQogZGVmYXVs dCwgdGhpcyBpcyBDPFsnR0VUJywgJ0hFQUQnXT4sIGFzIHBlciBSRkMgMjA2OC4gIFRvCiBjaGFu Z2UgdG8gaW5jbHVkZSAnUE9TVCcsIGNvbnNpZGVyOgpAQCAtNzIzLDEyICs3NjMsMTIgQEAKICAg ICBteSAkbWV0aG9kID0gJHJlcXVlc3QtPm1ldGhvZDsKICAgICByZXR1cm4gMCB1bmxlc3MgZ3Jl cCAkXyBlcSAkbWV0aG9kLAogICAgICAgQHsgJHNlbGYtPnJlcXVlc3RzX3JlZGlyZWN0YWJsZSB8 fCBbXSB9OwotICAgIAorCiAgICAgaWYoJHJlcXVlc3QtPnVybC0+c2NoZW1lIGVxICdmaWxlJykg ewogICAgICAgTFdQOjpEZWJ1Zzo6dHJhY2UoIkNhbid0IHJlZGlyZWN0IHRvIGEgZmlsZTovLyBV UkwhIik7CiAgICAgICByZXR1cm4gMDsKICAgICB9Ci0gICAgCisKICAgICAjIE90aGVyd2lzZSBp dCdzIGFwcGFyZW50bHkgb2theS4uLgogICAgIHJldHVybiAxOwogfQpAQCAtMTEzMCw2ICsxMTcw LDQxIEBACiAgICAgJHJlc3BvbnNlLT5yZXF1ZXN0KCRyZXF1ZXN0KTsKICAgICAkcmVzcG9uc2Ut PmhlYWRlcigiQ2xpZW50LURhdGUiID0+IEhUVFA6OkRhdGU6OnRpbWUyc3RyKHRpbWUpKTsKICAg ICByZXR1cm4gJHJlc3BvbnNlOworfQorCisKKz1pdGVtICR1YS0+dHJhY2UoWyRmbGFnc10pOwor CitSZXBvcnQgdGhlIGFjdGl2aXR5IG9mIHRoZSB1c2VyIGFnZW50LiAgVXNlIHRoaXMgY29uc3Rh bnQgZmxhZ3MgdG8KK2N1c3RvbWl6ZSB0aGUgdHJhY2U6CisKKyAgTFdQOjpVc2VyQWdlbnQ6OlRS QUNFX1JFUVVFU1RfSEVBREVSUworICBMV1A6OlVzZXJBZ2VudDo6VFJBQ0VfUkVRVUVTVF9DT05U RU5UCisgIExXUDo6VXNlckFnZW50OjpUUkFDRV9SRVFVRVNUUworCisgIExXUDo6VXNlckFnZW50 OjpUUkFDRV9SRVNQT05TRV9IRUFERVJTCisgIExXUDo6VXNlckFnZW50OjpUUkFDRV9SRVNQT05T RV9DT05URU5UCisgIExXUDo6VXNlckFnZW50OjpUUkFDRV9SRVNQT05TRVMKKworYXMgaW4KKwor ICAkdWEtPnRyYWNlKExXUDo6VXNlckFnZW50OjpUUkFDRV9SRVFVRVNUX0hFQURFUlMgfAorICAg ICAgICAgICAgIExXUDo6VXNlckFnZW50OjpUUkFDRV9SRVNQT05TRV9IRUFERVJTKTsKKworVGhh dCBjb21iaW5hdGlvbiBvZiBmbGFncyBoYXMgYSBzaG9ydGN1dDoKKworICAkdWEtPnRyYWNlKExX UDo6VXNlckFnZW50OjpUUkFDRV9IRUFERVJTKTsKKworSWYgeW91IHdhbnQgJHVhIHRvIHRyYWNl IGFsbCBoaXMgYWN0aXZpdHkganVzdCBzYXkKKworICAkdWEtPnRyYWNlKExXUDo6VXNlckFnZW50 OjpUUkFDRV9BTEwpOworCis9Y3V0CisKK3N1YiB0cmFjZSB7CisgICAgbXkgKCRzZWxmLCAkZmxh Z3MpID0gQF87CisgICAgJHNlbGYtPnt0cmFjZX0gPSAkZmxhZ3MgaWYgZGVmaW5lZCAkZmxhZ3M7 CisgICAgcmV0dXJuICRzZWxmLT57dHJhY2V9OwogfQogCiAxOwo= --Multipart_Sun__10_Mar_2002_05:31:13_+0100_08174000--