Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 58929 invoked from network); 22 Jul 2004 11:21:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 22 Jul 2004 11:21:14 -0000 Received: (qmail 38692 invoked by uid 500); 22 Jul 2004 11:20:40 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 38629 invoked by uid 500); 22 Jul 2004 11:20:40 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 38600 invoked by uid 99); 22 Jul 2004 11:20:39 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received: from [80.229.52.226] (HELO hugin.webthing.com) (80.229.52.226) by apache.org (qpsmtpd/0.27.1) with ESMTP; Thu, 22 Jul 2004 04:20:38 -0700 Received: by hugin.webthing.com (Postfix, from userid 500) id 8672F400D2; Thu, 22 Jul 2004 12:20:34 +0100 (BST) Received: from localhost (localhost [127.0.0.1]) by hugin.webthing.com (Postfix) with ESMTP id 7C1593FF9A for ; Thu, 22 Jul 2004 12:20:34 +0100 (BST) Date: Thu, 22 Jul 2004 12:20:33 +0100 (BST) From: Nick Kew To: dev@httpd.apache.org Subject: Re: cvs commit: httpd-2.0/modules/filters mod_deflate.c In-Reply-To: Message-ID: References: <20040717152235.62897.qmail@minotaur.apache.org> <20040719110655.GA22910@redhat.com> <20040719154152.GD22422@redhat.com> MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="-1463810294-1984130195-1090495233=:3478" X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. ---1463810294-1984130195-1090495233=:3478 Content-Type: TEXT/PLAIN; charset=US-ASCII On Thu, 22 Jul 2004, Nick Kew wrote: > On Mon, 19 Jul 2004, Joe Orton wrote: > > > Nothing like that was posted to the list, at least. Patch below is > > still sufficient to fix the proxy+304 case; does it work for you too? > > Yes, mostly (it fixes the important bug that was previously a > showstopper). I attach a new patch based on yours. it fixes my testcases including headers for HEAD requests. Look OK to you? -- Nick Kew ---1463810294-1984130195-1090495233=:3478 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=newpatch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: patch to mod_deflate.c Content-Disposition: attachment; filename=newpatch LS0tIG1vZF9kZWZsYXRlLmMuYmFrCTIwMDQtMDctMjIgMTE6MTI6NTMuMDAw MDAwMDAwICswMTAwDQorKysgbW9kX2RlZmxhdGUuYwkyMDA0LTA3LTIyIDEy OjE3OjEzLjAwMDAwMDAwMCArMDEwMA0KQEAgLTI0Nyw3ICsyNDcsNiBAQA0K ICAgICBhcHJfYnVja2V0X2JyaWdhZGUgKmJiLCAqcHJvY19iYjsNCiB9IGRl ZmxhdGVfY3R4Ow0KIA0KLXN0YXRpYyB2b2lkKiBjb25zdCBkZWZsYXRlX3ll cyA9ICh2b2lkKikiWUVTIjsNCiBzdGF0aWMgYXByX3N0YXR1c190IGRlZmxh dGVfb3V0X2ZpbHRlcihhcF9maWx0ZXJfdCAqZiwNCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBhcHJfYnVja2V0X2JyaWdhZGUg KmJiKQ0KIHsNCkBAIC0yNTUsMTQgKzI1NCwxNCBAQA0KICAgICByZXF1ZXN0 X3JlYyAqciA9IGYtPnI7DQogICAgIGRlZmxhdGVfY3R4ICpjdHggPSBmLT5j dHg7DQogICAgIGludCB6UkM7DQotICAgIGNoYXIqIGJ1ZjsNCi0gICAgaW50 IGVvc19vbmx5ID0gMTsNCi0gICAgYXByX2J1Y2tldCAqYmt0Ow0KLSAgICBj aGFyICp0b2tlbjsNCi0gICAgY29uc3QgY2hhciAqZW5jb2RpbmcgPSBOVUxM Ow0KICAgICBkZWZsYXRlX2ZpbHRlcl9jb25maWcgKmMgPSBhcF9nZXRfbW9k dWxlX2NvbmZpZyhyLT5zZXJ2ZXItPm1vZHVsZV9jb25maWcsDQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICZkZWZsYXRlX21vZHVsZSk7DQogDQorICAgIC8qIERvIG5vdGhpbmcgaWYg YXNrZWQgdG8gZmlsdGVyIG5vdGhpbmcuICovDQorICAgIGlmIChBUFJfQlJJ R0FERV9FTVBUWShiYikpIHsNCisgICAgICAgIHJldHVybiBBUFJfU1VDQ0VT UzsNCisgICAgfQ0KKw0KICAgICAvKiBJZiB3ZSBkb24ndCBoYXZlIGEgY29u dGV4dCwgd2UgbmVlZCB0byBlbnN1cmUgdGhhdCBpdCBpcyBva2F5IHRvIHNl bmQNCiAgICAgICogdGhlIGRlZmxhdGVkIGNvbnRlbnQuICBJZiB3ZSBoYXZl IGEgY29udGV4dCwgdGhhdCBtZWFucyB3ZSd2ZSBkb25lDQogICAgICAqIHRo aXMgYmVmb3JlIGFuZCB3ZSBsaWtlZCBpdC4NCkBAIC0yNzAsNiArMjY5LDgg QEANCiAgICAgICogd2UncmUgaW4gYmV0dGVyIHNoYXBlLg0KICAgICAgKi8N CiAgICAgaWYgKCFjdHgpIHsNCisgICAgICAgIGNoYXIgKmJ1ZiwgKnRva2Vu Ow0KKyAgICAgICAgY29uc3QgY2hhciAqZW5jb2Rpbmc7DQogDQogICAgICAg ICAvKiBvbmx5IHdvcmsgb24gbWFpbiByZXF1ZXN0L25vIHN1YnJlcXVlc3Rz ICovDQogICAgICAgICBpZiAoci0+bWFpbikgew0KQEAgLTM0OSw3ICszNTAs NiBAQA0KICAgICAgICAgICovDQogICAgICAgICBhcHJfdGFibGVfc2V0bihy LT5oZWFkZXJzX291dCwgIlZhcnkiLCAiQWNjZXB0LUVuY29kaW5nIik7DQog DQotDQogICAgICAgICAvKiBmb3JjZS1nemlwIHdpbGwganVzdCBmb3JjZSBp dCBvdXQgcmVnYXJkbGVzcyBpZiB0aGUgYnJvd3Nlcg0KICAgICAgICAgICog Y2FuIGFjdHVhbGx5IGRvIGFueXRoaW5nIHdpdGggaXQuDQogICAgICAgICAg Ki8NCkBAIC0zODQsMzkgKzM4NCwyMiBAQA0KICAgICAgICAgICAgIH0NCiAg ICAgICAgIH0NCiANCi0gICAgICAgIC8qIGRvbid0IGRlZmxhdGUgcmVzcG9u c2VzIHdpdGggemVybyBsZW5ndGggZS5nLiBwcm94aWVkIDMwNCdzIGJ1dA0K LSAgICAgICAgICogd2UgZG8gc2V0IHRoZSBoZWFkZXIgb24gZW9zX29ubHkg YXQgdGhpcyBwb2ludCBmb3IgaGVhZGVyc19maWx0ZXINCi0gICAgICAgICAq DQotICAgICAgICAgKiBpZiB3ZSBnZXQgZW9zX29ubHkgYW5kIGNvbWUgcm91 bmQgYWdhaW4sIHdlIHdhbnQgdG8gYXZvaWQgcmVkb2luZw0KLSAgICAgICAg ICogd2hhdCB3ZSd2ZSBhbHJlYWR5IGRvbmUsIHNvIHNldCBmLT5jdHggdG8g YSBmbGFnIGhlcmUNCisgICAgICAgIC8qIERlZmxhdGluZyBhIHplcm8tbGVu Z3RoIHJlc3BvbnNlIHdvdWxkIG1ha2UgaXQgbG9uZ2VyOyB0aGUNCisgICAg ICAgICAqIHByb3h5IG1heSBwYXNzIHRocm91Z2ggYW4gZW1wdHkgcmVzcG9u c2UgZm9yIGEgMzA0IHRvby4NCisgICAgICAgICAqIFNvIHdlIGp1c3QgbmVl ZCB0byBmaXggdXAgdGhlIGhlYWRlcnMgYXMgaWYgd2UgaGFkIGEgYm9keS4N CiAgICAgICAgICAqLw0KLSAgICAgICAgZi0+Y3R4ID0gY3R4ID0gZGVmbGF0 ZV95ZXM7DQotICAgIH0NCi0gICAgaWYgKGN0eCA9PSBkZWZsYXRlX3llcykg ew0KLSAgICAgICAgLyogZGVhbCB3aXRoIHRoZSBwYXRob2xvZ2ljYWwgY2Fz ZSBvZiBsb3RzIG9mIGVtcHR5IGJyaWdhZGVzIGFuZA0KLSAgICAgICAgICog bm8ga25vd2xlZGdlIG9mIHdoZXRoZXIgY29udGVudCB3aWxsIGZvbGxvdw0K LSAgICAgICAgICovDQotICAgICAgICBmb3IgKGJrdCA9IEFQUl9CUklHQURF X0ZJUlNUKGJiKTsNCi0gICAgICAgICAgICAgYmt0ICE9IEFQUl9CUklHQURF X1NFTlRJTkVMKGJiKTsNCi0gICAgICAgICAgICAgYmt0ID0gQVBSX0JVQ0tF VF9ORVhUKGJrdCkpDQotICAgICAgICB7DQotICAgICAgICAgICAgaWYgKCFB UFJfQlVDS0VUX0lTX0VPUyhia3QpKSB7DQotICAgICAgICAgICAgICAgICBl b3Nfb25seSA9IDA7ICAgICAgICAgICAgICAgICANCi0gICAgICAgICAgICAg ICAgIGJyZWFrOw0KLSAgICAgICAgICAgIH0NCi0gICAgICAgIH0NCi0gICAg ICAgIGlmIChlb3Nfb25seSkgew0KLSAgICAgICAgICAgIGlmICghZW5jb2Rp bmcgfHwgIXN0cmNhc2VjbXAoZW5jb2RpbmcsICJpZGVudGl0eSIpKSB7DQor ICAgICAgICBpZiAoQVBSX0JVQ0tFVF9JU19FT1MoQVBSX0JSSUdBREVfRklS U1QoYmIpKSkgew0KKwkgICAgaWYgKCFlbmNvZGluZyB8fCAhc3RyY2FzZWNt cChlbmNvZGluZywgImlkZW50aXR5IikpIHsNCiAgICAgICAgICAgICAgICAg YXByX3RhYmxlX3NldChyLT5oZWFkZXJzX291dCwgIkNvbnRlbnQtRW5jb2Rp bmciLCAiZ3ppcCIpOw0KICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICBl bHNlIHsNCiAgICAgICAgICAgICAgICAgYXByX3RhYmxlX21lcmdlKHItPmhl YWRlcnNfb3V0LCAiQ29udGVudC1FbmNvZGluZyIsICJnemlwIik7DQogICAg ICAgICAgICAgfQ0KICAgICAgICAgICAgIGFwcl90YWJsZV91bnNldChyLT5o ZWFkZXJzX291dCwgIkNvbnRlbnQtTGVuZ3RoIik7DQorDQorICAgICAgICAg ICAgYXBfcmVtb3ZlX291dHB1dF9maWx0ZXIoZik7DQogICAgICAgICAgICAg cmV0dXJuIGFwX3Bhc3NfYnJpZ2FkZShmLT5uZXh0LCBiYik7DQogICAgICAg ICB9DQotICAgIH0NCi0gICAgaWYgKCFjdHggfHwgKGN0eD09ZGVmbGF0ZV95 ZXMpKSB7DQogDQogICAgICAgICAvKiBXZSdyZSBjb29sIHdpdGggZmlsdGVy aW5nIHRoaXMuICovDQogICAgICAgICBjdHggPSBmLT5jdHggPSBhcHJfcGNh bGxvYyhyLT5wb29sLCBzaXplb2YoKmN0eCkpOw0KQEAgLTkxMiw2ICs4OTUs MTEgQEANCiAgICAgYXByX3N0YXR1c190IHJ2Ow0KICAgICBkZWZsYXRlX2Zp bHRlcl9jb25maWcgKmM7DQogDQorICAgIC8qIERvIG5vdGhpbmcgaWYgYXNr ZWQgdG8gZmlsdGVyIG5vdGhpbmcuICovDQorICAgIGlmIChBUFJfQlJJR0FE RV9FTVBUWShiYikpIHsNCisgICAgICAgIHJldHVybiBBUFJfU1VDQ0VTUzsN CisgICAgfQ0KKw0KICAgICBjID0gYXBfZ2V0X21vZHVsZV9jb25maWcoci0+ c2VydmVyLT5tb2R1bGVfY29uZmlnLCAmZGVmbGF0ZV9tb2R1bGUpOw0KIA0K ICAgICBpZiAoIWN0eCkgew0KQEAgLTk1MCw2ICs5MzgsMTMgQEANCiAgICAg ICAgIH0NCiAgICAgICAgIGFwcl90YWJsZV91bnNldChyLT5oZWFkZXJzX291 dCwgIkNvbnRlbnQtRW5jb2RpbmciKTsNCiANCisgICAgICAgIC8qIE5vIG5l ZWQgdG8gaW5mbGF0ZSBIRUFEIG9yIDIwNC8zMDQgKi8NCisgICAgICAgIGlm IChBUFJfQlVDS0VUX0lTX0VPUyhBUFJfQlJJR0FERV9GSVJTVChiYikpKSB7 DQorICAgICAgICAgICAgYXBfcmVtb3ZlX291dHB1dF9maWx0ZXIoZik7DQor ICAgICAgICAgICAgcmV0dXJuIGFwX3Bhc3NfYnJpZ2FkZShmLT5uZXh0LCBi Yik7DQorICAgICAgICB9DQorDQorDQogICAgICAgICBmLT5jdHggPSBjdHgg PSBhcHJfcGNhbGxvYyhmLT5yLT5wb29sLCBzaXplb2YoKmN0eCkpOw0KICAg ICAgICAgY3R4LT5wcm9jX2JiID0gYXByX2JyaWdhZGVfY3JlYXRlKHItPnBv b2wsIGYtPmMtPmJ1Y2tldF9hbGxvYyk7DQogICAgICAgICBjdHgtPmJ1ZmZl ciA9IGFwcl9wYWxsb2Moci0+cG9vbCwgYy0+YnVmZmVyU2l6ZSk7DQpAQCAt OTgzLDkgKzk3OCwxMCBAQA0KICAgICAgICAgYXByX3NpemVfdCBsZW47DQog DQogICAgICAgICAvKiBJZiB3ZSBhY3R1YWxseSBzZWUgdGhlIEVPUywgdGhh dCBtZWFucyB3ZSBzY3Jld2VkIHVwISAqLw0KKyAgICAgICAgLyogbm8gaXQg ZG9lc24ndCAtIG5vdCBpbiBhIEhFQUQgb3IgMjA0LzMwNCAqLw0KICAgICAg ICAgaWYgKEFQUl9CVUNLRVRfSVNfRU9TKGJrdCkpIHsNCiAgICAgICAgICAg ICBpbmZsYXRlRW5kKCZjdHgtPnN0cmVhbSk7DQotICAgICAgICAgICAgcmV0 dXJuIEFQUl9FR0VORVJBTDsNCisgICAgICAgICAgICByZXR1cm4gYXBfcGFz c19icmlnYWRlKGYtPm5leHQsIGJiKTsNCiAgICAgICAgIH0NCiANCiAgICAg ICAgIGlmIChBUFJfQlVDS0VUX0lTX0ZMVVNIKGJrdCkpIHsNCg== ---1463810294-1984130195-1090495233=:3478--