From test-dev-return-2200-apmail-httpd-test-dev-archive=httpd.apache.org@httpd.apache.org Fri Dec 12 22:50:43 2003 Return-Path: Delivered-To: apmail-httpd-test-dev-archive@www.apache.org Received: (qmail 92929 invoked from network); 12 Dec 2003 22:50:43 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 12 Dec 2003 22:50:43 -0000 Received: (qmail 44600 invoked by uid 500); 12 Dec 2003 22:50:20 -0000 Delivered-To: apmail-httpd-test-dev-archive@httpd.apache.org Received: (qmail 44552 invoked by uid 500); 12 Dec 2003 22:50:20 -0000 Mailing-List: contact test-dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: test-dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list test-dev@httpd.apache.org Received: (qmail 44428 invoked from network); 12 Dec 2003 22:50:19 -0000 Received: from unknown (HELO mail1.astercity.net) (212.76.33.23) by daedalus.apache.org with SMTP; 12 Dec 2003 22:50:19 -0000 Received: from 44-dzi-4 (44-dzi-4.acn.waw.pl [62.121.67.44]) by mail1.astercity.net (sendmail) with SMTP id 135691D72DB for ; Fri, 12 Dec 2003 23:50:24 +0100 (CET) Date: Fri, 12 Dec 2003 23:50:23 +0100 From: Jacek Prucia To: test-dev@httpd.apache.org Subject: Re: Redo for Patch for cookie processing in Flood Message-Id: <20031212235023.5711993e.jacek.prucia@acn.waw.pl> In-Reply-To: References: X-Mailer: Sylpheed version 0.9.4 (GTK+ 1.2.10; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart_Fri__12_Dec_2003_23:50:23_+0100_0827e080" X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N --Multipart_Fri__12_Dec_2003_23:50:23_+0100_0827e080 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Tue, 28 Oct 2003 10:12:19 -0500 (EST) Norman Tuttle wrote: Hello Norman, > As per the suggestions I have received, I am resubmitting the attached > diff for the cookies changes in the proper format. > See the inline comments for what has been fixed by this patch. Please see attached diff. It's basically your patch with some minor corrections: 1. Follow style guide more closely 2. Remove some comments 3. Replace respend with headers end. Do a test for page that has 'Set-Cookie:' string in its body to see why :) If those small changes are OK with you, I'll commit your patch soon. > Note that this patch alone does not provide the most robust solution as it > ignores the possibility of different cookies with the same name going > to different hosts, but for this and observation of expiration dates, etc, > we would have to expand the Flood model of cookies to store that > information as well, which is currently not being done. Yup. Besides that we need to check for Set-Cookie2: header, and allow for custom (specified in configuration) cookies to be sent. Anyway your patch is a step towards right direction. I'll try to review a bunch of your other patches. I'm really sorry, that this takes sooo long, but I'm dead busy with work. Looks like this holds true for other flood dev'ers (because of that we haven't released flood-1.1 to public!). Anyway, your patches have a nice, quiet place on my disk until I get more free time to spent on flood development. regards, -- Jacek Prucia --Multipart_Fri__12_Dec_2003_23:50:23_+0100_0827e080 Content-Type: text/plain; name="multiple_cookies.patch" Content-Disposition: attachment; filename="multiple_cookies.patch" Content-Transfer-Encoding: base64 ZGlmZiAtdXJOIGZsb29kLm9yaWcvZmxvb2Rfcm91bmRfcm9iaW4uYyBmbG9vZC9mbG9vZF9yb3Vu ZF9yb2Jpbi5jCi0tLSBmbG9vZC5vcmlnL2Zsb29kX3JvdW5kX3JvYmluLmMJMjAwMy0xMi0xMiAy MzoxODo0NS4wMDAwMDAwMDAgKzAxMDAKKysrIGZsb29kL2Zsb29kX3JvdW5kX3JvYmluLmMJMjAw My0xMi0xMiAyMzoyNjoyMC4wMDAwMDAwMDAgKzAxMDAKQEAgLTg5Nyw0MiArODk3LDY1IEBACiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzcG9uc2VfdCAqcmVzcCkKIHsK ICAgICByb3VuZF9yb2Jpbl9wcm9maWxlX3QgKnJwOwotICAgIGNoYXIgKmNvb2tpZWhlYWRlciwg KmNvb2tpZXZhbHVlLCAqY29va2llZW5kOworICAgIGNoYXIgKmNvb2tpZWhlYWRlciwgKmNvb2tp ZXZhbHVlLCAqY29va2llZW5kLCAqaGVhZGVyc2VuZDsKKyAgICB1bnNpZ25lZCBzaXplOwogCiAg ICAgcnAgPSAocm91bmRfcm9iaW5fcHJvZmlsZV90Kilwcm9maWxlOwogCi0gICAgLyogRklYTUU6 IFRoaXMgYWxnb3JpdGhtIHN1Y2tzLiAgSSBuZWVkIHRvIGJlIHNob3QgZm9yIHdyaXRpbmcgc3Vj aCAKLSAgICAgKiBhdHJvY2lvdXMgY29kZS4gIEdyci4gICovCi0gICAgY29va2llaGVhZGVyID0g c3Ryc3RyKHJlc3AtPnJidWYsICJTZXQtQ29va2llOiAiKTsKLSAgICBpZiAoY29va2llaGVhZGVy KQotICAgIHsKLSAgICAgICAgLyogUG9pbnQgdG8gdGhlIHZhbHVlICovCisgICAgLyogaGFuZGxl IChwb3NzaWJseSkgbXVsdGlwbGUgY29va2llcyAqLworICAgIGNvb2tpZWVuZCA9IHJlc3AtPnJi dWY7CisgICAgaGVhZGVyc2VuZCA9IHN0cnN0cihyZXNwLT5yYnVmLCAiXHJcblxyXG4iKTsKKwor ICAgIHdoaWxlICgoY29va2llaGVhZGVyID0gc3Ryc3RyKGNvb2tpZWVuZCwgIlNldC1Db29raWU6 ICIpKSAhPSBOVUxMKSB7CisKICAgICAgICAgY29va2llaGVhZGVyICs9IDEyOwotICAgICAgICBj b29raWV2YWx1ZSA9IChjaGFyKikgbWVtY2hyKGNvb2tpZWhlYWRlciwgJz0nLCAKLSAgICAgICAg ICAgICAgICAgICAgICByZXNwLT5yYnVmc2l6ZSAtIChpbnQpKGNvb2tpZWhlYWRlciAtIChpbnQp KHJlc3AtPnJidWYpKSk7Ci0gICAgICAgIGlmIChjb29raWV2YWx1ZSkKLSAgICAgICAgewotICAg ICAgICAgICAgY29va2llX3QgKiBjb29raWUgPSBhcHJfcGNhbGxvYyhycC0+cG9vbCwgc2l6ZW9m KGNvb2tpZV90KSk7Ci0KLSAgICAgICAgICAgICsrY29va2lldmFsdWU7Ci0gICAgICAgICAgICBj b29raWUtPm5hbWUgPSBhcHJfcGFsbG9jKHJwLT5wb29sLCBjb29raWV2YWx1ZSAtIGNvb2tpZWhl YWRlcik7Ci0gICAgICAgICAgICBhcHJfY3B5c3Rybihjb29raWUtPm5hbWUsIGNvb2tpZWhlYWRl ciwgY29va2lldmFsdWUgLSBjb29raWVoZWFkZXIpOwotCi0gICAgICAgICAgICBjb29raWVoZWFk ZXIgPSBjb29raWV2YWx1ZTsKLSAgICAgICAgICAgIGNvb2tpZWVuZCA9IChjaGFyKikgbWVtY2hy KGNvb2tpZWhlYWRlciwgJ1xyJywgCi0gICAgICAgICAgICAgICAgICAgICAgcmVzcC0+cmJ1ZnNp emUgLSAoaW50KShjb29raWVoZWFkZXIgLSAoaW50KShyZXNwLT5yYnVmKSkpOworICAgICAgICBj b29raWV2YWx1ZSA9IChjaGFyKikgbWVtY2hyKGNvb2tpZWhlYWRlciwgJz0nLCBoZWFkZXJzZW5k IC0gY29va2llaGVhZGVyKTsKKworICAgICAgICBpZiAoY29va2lldmFsdWUpIHsKKworICAgICAg ICAgICAgY29va2llX3QgKiBjb29raWUgPSBOVUxMLCAqY29vayA9IHJwLT5jb29raWU7CisgICAg ICAgICAgICBzaXplID0gY29va2lldmFsdWUgLSBjb29raWVoZWFkZXI7CisKKyAgICAgICAgICAg IHdoaWxlIChjb29rKSB7CisgICAgICAgICAgICAgICAgaWYgKChzdHJsZW4oY29vay0+bmFtZSkg PT0gc2l6ZSkKKyAgICAgICAgICAgICAgICAgICAgJiYgKCFzdHJuY2FzZWNtcChjb29raWVoZWFk ZXIsIGNvb2stPm5hbWUsIHNpemUpKSkgeworICAgICAgICAgICAgICAgICAgICBjb29raWUgPSBj b29rOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgY29vayA9IGNvb2sgLT4gbmV4dDsKKyAgICAgICAgICAgIH0KKworICAgICAg ICAgICAgaWYgKCFjb29raWUpIHsKKyAgICAgICAgICAgICAgICBjb29raWUgPSBhcHJfcGNhbGxv YyhycC0+cG9vbCwgc2l6ZW9mKGNvb2tpZV90KSk7CisgICAgICAgICAgICAgICAgY29va2llLT5u YW1lID0gYXByX3BhbGxvYyhycC0+cG9vbCwgKytzaXplKTsKKyAgICAgICAgICAgICAgICBhcHJf Y3B5c3Rybihjb29raWUtPm5hbWUsIGNvb2tpZWhlYWRlciwgc2l6ZSk7CisgICAgICAgICAgICB9 CisKKyAgICAgICAgICAgIGNvb2tpZWhlYWRlciA9IGNvb2tpZXZhbHVlICsgMTsKKyAgICAgICAg ICAgIGNvb2tpZWVuZCA9IChjaGFyKikgbWVtY2hyKGNvb2tpZWhlYWRlciwgJ1xyJywgaGVhZGVy c2VuZCAtIGNvb2tpZWhlYWRlcik7CisKKyAgICAgICAgICAgIC8qIFRoaXMgc2hvdWxkIG5vdCBi ZSBoYXBwZW5pbmcuICovCisgICAgICAgICAgICBpZiAoIWNvb2tpZWVuZCkgeworICAgICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICBjb29raWV2YWx1ZSA9 IChjaGFyKikgbWVtY2hyKGNvb2tpZWhlYWRlciwgJzsnLCAKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjb29raWVlbmQgLSBjb29raWVoZWFkZXIpOwotICAgICAgICAgICAgaWYg KCFjb29raWV2YWx1ZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29va2llZW5kIC0gY29va2llaGVhZGVyKTsKKyAgICAgICAgICAgIGlmICghY29va2lldmFsdWUp IHsKICAgICAgICAgICAgICAgICBjb29raWV2YWx1ZSA9IGNvb2tpZWVuZDsKKyAgICAgICAgICAg IH0KICAgICAgICAgICAgIAotICAgICAgICAgICAgKytjb29raWV2YWx1ZTsKLSAgICAgICAgICAg IAotICAgICAgICAgICAgY29va2llLT52YWx1ZSA9IGFwcl9wYWxsb2MocnAtPnBvb2wsIGNvb2tp ZXZhbHVlIC0gY29va2llaGVhZGVyKTsKLSAgICAgICAgICAgIGFwcl9jcHlzdHJuKGNvb2tpZS0+ dmFsdWUsIGNvb2tpZWhlYWRlciwgCi0gICAgICAgICAgICAgICAgICAgICAgICBjb29raWV2YWx1 ZSAtIGNvb2tpZWhlYWRlcik7Ci0gICAgICAgICAgICBjb29raWUtPm5leHQgPSBycC0+Y29va2ll OwotICAgICAgICAgICAgcnAtPmNvb2tpZSA9IGNvb2tpZTsKKyAgICAgICAgICAgIHNpemUgPSBj b29raWV2YWx1ZSArIDEgLSBjb29raWVoZWFkZXI7CisgICAgICAgICAgICBpZiAoKCFjb29rKSB8 fCAoc2l6ZSA+IHN0cmxlbihjb29raWUtPnZhbHVlKSArIDEpKSB7CisgICAgICAgICAgICAgICAg Y29va2llLT52YWx1ZSA9IGFwcl9wYWxsb2MocnAtPnBvb2wsIHNpemUpOworICAgICAgICAgICAg fQorICAgICAgICAgICAgYXByX2NweXN0cm4oY29va2llLT52YWx1ZSwgY29va2llaGVhZGVyLCBz aXplKTsKKworICAgICAgICAgICAgLyogaWYgY29va2llIHdhc24ndCBpbiBsaW5rZWQgbGlzdCwg cHV0IGl0IGluIG5vdyAqLworICAgICAgICAgICAgaWYgKCFjb29rKSB7CisgICAgICAgICAgICAg ICAgY29va2llLT5uZXh0ID0gcnAtPmNvb2tpZTsKKyAgICAgICAgICAgICAgICBycC0+Y29va2ll ID0gY29va2llOworICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQogICAgIGlmIChycC0+ dXJsW3JwLT5jdXJyZW50X3VybF0ucmVzcG9uc2V0ZW1wbGF0ZSkK --Multipart_Fri__12_Dec_2003_23:50:23_+0100_0827e080--