From: Hugh Sasse Date: 2007-11-10T05:28:01+09:00 Subject: [PATCH] http compression, zlib agnostic, for 1.9 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. ---559023410-2022861571-1194640080=:27101 Content-Type: TEXT/PLAIN; charset=US-ASCII I have revised my http compression (gzip, deflate) patch such that if zlib is not available, the patch is effectively switched out. This works on my system, which has zlib. I don't have a system without zlib to check that the behaviour is definitely sensible. I've also been unable to test the deflate variety of compression, since I can still only find servers with gzip as the option. Can anyone help me out with these testing deficiencies, please? Thank you, Hugh ---559023410-2022861571-1194640080=:27101 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=http_compress_zlib_agnostic_patch Content-Transfer-Encoding: BASE64 Content-Description: Content-Disposition: attachment; filename=http_compress_zlib_agnostic_patch LS0tIC4vbGliL25ldC9odHRwLnJiLm9yaWcJMjAwNy0xMS0wNCAxNjowMzoz MC4wMDAwMDAwMDAgKzAwMDANCisrKyAuL2xpYi9uZXQvaHR0cC5yYgkyMDA3 LTExLTA5IDIwOjAwOjEwLjg3MzE4NDAwMCArMDAwMA0KQEAgLTI4Nyw2ICsy ODcsMTMgQEANCiAgICAgUmV2aXNpb24gPSAlcSRSZXZpc2lvbjogMTM4MjAg JC5zcGxpdFsxXQ0KICAgICBIVFRQVmVyc2lvbiA9ICcxLjEnDQogICAgIEBu ZXdpbXBsID0gdHJ1ZQ0KKyAgICBiZWdpbg0KKyAgICAgIHJlcXVpcmUgJ3ps aWInDQorICAgICAgcmVxdWlyZSAnc3RyaW5naW8nICAjZm9yIG91ciBwdXJw b3NlcyAodW5wYWNraW5nIGd6aXApIGx1bXAgdGhlc2UgdG9nZXRoZXINCisg ICAgICBIQVZFX1pMSUI9dHJ1ZQ0KKyAgICByZXNjdWUgTG9hZEVycm9yDQor ICAgICAgSEFWRV9aTElCPWZhbHNlDQorICAgIGVuZA0KICAgICAjIDpzdGFy dGRvYzoNCiANCiAgICAgIyBUdXJucyBvbiBuZXQvaHR0cCAxLjIgKHJ1Ynkg MS44KSBmZWF0dXJlcy4NCkBAIC00NzcsNiArNDg0LDcgQEANCiAgICAgICBA dXNlX3NzbCA9IGZhbHNlDQogICAgICAgQHNzbF9jb250ZXh0ID0gbmlsDQog ICAgICAgQGVuYWJsZV9wb3N0X2Nvbm5lY3Rpb25fY2hlY2sgPSB0cnVlDQor ICAgICAgQGNvbXByZXNzaW9uID0gbmlsDQogICAgIGVuZA0KIA0KICAgICBk ZWYgaW5zcGVjdA0KQEAgLTc0MCw3ICs3NDgsMTggQEANCiAgICAgcHVibGlj DQogDQogICAgICMgR2V0cyBkYXRhIGZyb20gK3BhdGgrIG9uIHRoZSBjb25u ZWN0ZWQtdG8gaG9zdC4NCi0gICAgIyAraGVhZGVyKyBtdXN0IGJlIGEgSGFz aCBsaWtlIHsgJ0FjY2VwdCcgPT4gJyovKicsIC4uLiB9Lg0KKyAgICAjICtp bml0aGVhZGVyKyBtdXN0IGJlIGEgSGFzaCBsaWtlIHsgJ0FjY2VwdCcgPT4g JyovKicsIC4uLiB9LA0KKyAgICAjIGFuZCBpdCBkZWZhdWx0cyB0byBhbiBl bXB0eSBoYXNoLg0KKyAgICAjIElmICtpbml0aGVhZGVyKyBkb2Vzbid0IGhh dmUgdGhlIGtleSAnYWNjZXB0LWVuY29kaW5nJywgdGhlbg0KKyAgICAjIGEg dmFsdWUgb2YgImd6aXA7cT0xLjAsZGVmbGF0ZTtxPTAuNixpZGVudGl0eTtx PTAuMyIgaXMgdXNlZCwNCisgICAgIyBzbyB0aGF0IGd6aXAgY29tcHJlc3Np b24gaXMgdXNlZCBpbiBwcmVmZXJlbmNlIHRvIGRlZmxhdGUgDQorICAgICMg Y29tcHJlc3Npb24sIHdoaWNoIGlzIHVzZWQgaW4gcHJlZmVyZW5jZSB0byBu byBjb21wcmVzc2lvbi4gDQorICAgICMgUnVieSBkb2Vzbid0IGhhdmUgbGli cmFyaWVzIHRvIHN1cHBvcnQgdGhlIGNvbXByZXNzIChMZW1wZWwtWml2KQ0K KyAgICAjIGNvbXByZXNzaW9uLCBzbyB0aGF0IGlzIG5vdCBzdXBwb3J0ZWQu ICBUaGUgaW50ZW50IG9mIHRoaXMgaXMNCisgICAgIyB0byByZWR1Y2UgYmFu ZHdpZHRoIGJ5IGRlZmF1bHQuICAgSWYgdGhpcyByb3V0aW5lIHNldHMgdXAN CisgICAgIyBjb21wcmVzc2lvbiwgdGhlbiBpdCBkb2VzIHRoZSBkZWNvbXBy ZXNzaW9uIGFsc28sIHJlbW92aW5nDQorICAgICMgdGhlIGhlYWRlciBhcyB3 ZWxsIHRvIHByZXZlbnQgY29uZnVzaW9uLiAgT3RoZXJ3aXNlDQorICAgICMg aXQgbGVhdmVzIHRoZSBib2R5IGFzIGl0IGZvdW5kIGl0LiANCiAgICAgIw0K ICAgICAjIEluIHZlcnNpb24gMS4xIChydWJ5IDEuNiksIHRoaXMgbWV0aG9k IHJldHVybnMgYSBwYWlyIG9mIG9iamVjdHMsDQogICAgICMgYSBOZXQ6OkhU VFBSZXNwb25zZSBvYmplY3QgYW5kIHRoZSBlbnRpdHkgYm9keSBzdHJpbmcu DQpAQCAtNzc0LDEwICs3OTMsMzMgQEANCiAgICAgIyAgICAgICBlbmQNCiAg ICAgIyAgICAgfQ0KICAgICAjDQotICAgIGRlZiBnZXQocGF0aCwgaW5pdGhl YWRlciA9IG5pbCwgZGVzdCA9IG5pbCwgJmJsb2NrKSAjIDp5aWVsZDogK2Jv ZHlfc2VnbWVudCsNCisgICAgZGVmIGdldChwYXRoLCBpbml0aGVhZGVyID0g e30sIGRlc3QgPSBuaWwsICZibG9jaykgIyA6eWllbGQ6ICtib2R5X3NlZ21l bnQrDQogICAgICAgcmVzID0gbmlsDQorICAgICAgaWYgSEFWRV9aTElCDQor ICAgICAgICB1bmxlc3MgIGluaXRoZWFkZXIua2V5cy5hbnk/e3xrfCBrLmRv d25jYXNlID09ICJhY2NlcHQtZW5jb2RpbmcifQ0KKyAgICAgICAgICBpbml0 aGVhZGVyWyJhY2NlcHQtZW5jb2RpbmciXSA9ICJnemlwO3E9MS4wLGRlZmxh dGU7cT0wLjYsaWRlbnRpdHk7cT0wLjMiDQorICAgICAgICAgIEBjb21wcmVz c2lvbiA9IHRydWUNCisgICAgICAgIGVuZA0KKyAgICAgIGVuZA0KICAgICAg IHJlcXVlc3QoR2V0Lm5ldyhwYXRoLCBpbml0aGVhZGVyKSkge3xyfA0KLSAg ICAgICAgci5yZWFkX2JvZHkgZGVzdCwgJmJsb2NrDQorICAgICAgICBpZiBy LmtleT8oImNvbnRlbnQtZW5jb2RpbmciKSBhbmQgQGNvbXByZXNzaW9uDQor ICAgICAgICAgIEBjb21wcmVzc2lvbiA9IG5pbCAjIENsZWFyIGl0IHRpbGwg bmV4dCBzZXQuDQorICAgICAgICAgIHRoZV9ib2R5ID0gci5yZWFkX2JvZHkg ZGVzdCwgJmJsb2NrDQorICAgICAgICAgIGNhc2UgclsiY29udGVudC1lbmNv ZGluZyJdDQorICAgICAgICAgIHdoZW4gImd6aXAiDQorICAgICAgICAgICAg ci5ib2R5PSBabGliOjpHemlwUmVhZGVyLm5ldyhTdHJpbmdJTy5uZXcodGhl X2JvZHkpKS5yZWFkDQorICAgICAgICAgICAgci5kZWxldGUoImNvbnRlbnQt ZW5jb2RpbmciKQ0KKyAgICAgICAgICB3aGVuICJkZWZsYXRlIg0KKyAgICAg ICAgICAgIHIuYm9keT0gWmxpYjo6SW5mbGF0ZS5pbmZsYXRlKHRoZV9ib2R5 KTsNCisgICAgICAgICAgICByLmRlbGV0ZSgiY29udGVudC1lbmNvZGluZyIp DQorICAgICAgICAgIHdoZW4gImlkZW50aXR5Ig0KKyAgICAgICAgICAgIDsg IyBub3RoaW5nIG5lZWRlZA0KKyAgICAgICAgICBlbHNlIA0KKyAgICAgICAg ICAgIDsgIyBEb24ndCBkbyBhbnl0aGluZyBkcmFtYXRpYywgdW5sZXNzIHdl IG5lZWQgdG8gbGF0ZXINCisgICAgICAgICAgZW5kDQorICAgICAgICBlbHNl DQorICAgICAgICAgIHIucmVhZF9ib2R5IGRlc3QsICZibG9jaw0KKyAgICAg ICAgZW5kDQogICAgICAgICByZXMgPSByDQogICAgICAgfQ0KICAgICAgIHVu bGVzcyBAbmV3aW1wbA0KQEAgLTIyNjEsNiArMjMwMywxMiBAQA0KICAgICAg IHJlYWRfYm9keSgpDQogICAgIGVuZA0KIA0KKyAgICAjIEJlY2F1c2UgaXQg bWF5IGJlIG5lY2Vzc2FyeSB0byBtb2RpZnkgdGhlIGJvZHksIEVnLCBkZWNv bXByZXNzaW9uDQorICAgICMgdGhpcyBtZXRob2QgZmFjaWxpdGF0ZXMgdGhh dC4NCisgICAgZGVmIGJvZHk9KHZhbHVlKQ0KKyAgICAgIEBib2R5ID0gdmFs dWUNCisgICAgZW5kDQorDQogICAgIGFsaWFzIGVudGl0eSBib2R5ICAgIzpu b2RvYzogb2Jzb2xldGUNCiANCiAgICAgcHJpdmF0ZQ0K ---559023410-2022861571-1194640080=:27101--