Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 33184 invoked from network); 14 Sep 2006 09:20:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Sep 2006 09:20:19 -0000 Received: (qmail 98747 invoked by uid 500); 14 Sep 2006 09:20:10 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 98726 invoked by uid 500); 14 Sep 2006 09:20:10 -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: List-Id: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 98715 invoked by uid 99); 14 Sep 2006 09:20:10 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Sep 2006 02:20:10 -0700 Authentication-Results: idunn.apache.osuosl.org smtp.mail=nikke@acc.umu.se; spf=permerror X-ASF-Spam-Status: No, hits=0.0 required=5.0 tests= Received-SPF: error (idunn.apache.osuosl.org: domain acc.umu.se from 130.239.18.156 cause and error) Received: from ([130.239.18.156:61293] helo=mail.acc.umu.se) by idunn.apache.osuosl.org (ecelerity 2.1 r(10620)) with ESMTP id 53/F0-03980-34E19054 for ; Thu, 14 Sep 2006 02:19:10 -0700 Received: from localhost (localhost [127.0.0.1]) by amavisd-new (Postfix) with ESMTP id 7DF725B for ; Thu, 14 Sep 2006 11:17:52 +0200 (MEST) Received: by mail.acc.umu.se (Postfix, from userid 12143) id 03AB657; Thu, 14 Sep 2006 11:17:51 +0200 (MEST) Received: from localhost (localhost [127.0.0.1]) by mail.acc.umu.se (Postfix) with ESMTP id F2BC41D for ; Thu, 14 Sep 2006 11:17:50 +0200 (MEST) Date: Thu, 14 Sep 2006 11:17:50 +0200 (MEST) From: Niklas Edmundsson To: dev@httpd.apache.org Subject: [PATCH] (resend) mod_disk_cache LFS-aware config Message-ID: MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="-559023410-33463914-1158225470=:20100" X-Virus-Scanned: amavisd-new at acc.umu.se X-Spam-Rating: minotaur.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. ---559023410-33463914-1158225470=:20100 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed To facilitate the merging of our large mod_disk_cache fixup I will send small patches that fix various bugs so that they can be applied incrementally to trunk with relevant discussion limited to those patches and me not having to respin entire patchsets due to trivial fixes to patches like this one. If you want larger patchsets instead of this "baby steps" approach that's fine by me, but small pieces usually allows for easier review when merging. This patch and the jumbo patch with all fixes are also attached to bug #39380. This patch makes it possible to configure mod_disk_cache to cache files that are larger than the LFS limit. While at it, I implemented error handling so it doesn't accept things like "CacheMinFileSize barf" anymore. Actual LFS support (current code eats all address-space/memory in 32bit boxes) will come in a separate patch once this is commited. /Nikke -- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- Niklas Edmundsson, Admin @ {acc,hpc2n}.umu.se | nikke@acc.umu.se --------------------------------------------------------------------------- "Ensign. How do I get to Ten-Forward?" - Picard =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= ---559023410-33463914-1158225470=:20100 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=mod_disk_cache-lfsconfig.patch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=mod_disk_cache-lfsconfig.patch SW5kZXg6IG1vZF9kaXNrX2NhY2hlLmMNCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0NCi0tLSBtb2RfZGlza19jYWNoZS5jCShyZXZpc2lvbiA0MTYzNjUpDQor KysgbW9kX2Rpc2tfY2FjaGUuYwkod29ya2luZyBjb3B5KQ0KQEAgLTMzNCwx NCArMzM0LDE0IEBAIHN0YXRpYyBpbnQgY3JlYXRlX2VudGl0eShjYWNoZV9o YW5kbGVfdCANCiAgICAgaWYgKGxlbiA+IGNvbmYtPm1heGZzKSB7DQogICAg ICAgICBhcF9sb2dfZXJyb3IoQVBMT0dfTUFSSywgQVBMT0dfREVCVUcsIDAs IHItPnNlcnZlciwNCiAgICAgICAgICAgICAgICAgICAgICAiZGlza19jYWNo ZTogVVJMICVzIGZhaWxlZCB0aGUgc2l6ZSBjaGVjayAiDQotICAgICAgICAg ICAgICAgICAgICAgIiglIiBBUFJfT0ZGX1RfRk1UICIgPiAlIiBBUFJfU0la RV9UX0ZNVCAiKSIsDQorICAgICAgICAgICAgICAgICAgICAgIiglIiBBUFJf T0ZGX1RfRk1UICIgPiAlIiBBUFJfT0ZGX1RfRk1UICIpIiwNCiAgICAgICAg ICAgICAgICAgICAgICBrZXksIGxlbiwgY29uZi0+bWF4ZnMpOw0KICAgICAg ICAgcmV0dXJuIERFQ0xJTkVEOw0KICAgICB9DQogICAgIGlmIChsZW4gPj0g MCAmJiBsZW4gPCBjb25mLT5taW5mcykgew0KICAgICAgICAgYXBfbG9nX2Vy cm9yKEFQTE9HX01BUkssIEFQTE9HX0RFQlVHLCAwLCByLT5zZXJ2ZXIsDQog ICAgICAgICAgICAgICAgICAgICAgImRpc2tfY2FjaGU6IFVSTCAlcyBmYWls ZWQgdGhlIHNpemUgY2hlY2sgIg0KLSAgICAgICAgICAgICAgICAgICAgICIo JSIgQVBSX09GRl9UX0ZNVCAiIDwgJSIgQVBSX1NJWkVfVF9GTVQgIikiLA0K KyAgICAgICAgICAgICAgICAgICAgICIoJSIgQVBSX09GRl9UX0ZNVCAiIDwg JSIgQVBSX09GRl9UX0ZNVCAiKSIsDQogICAgICAgICAgICAgICAgICAgICAg a2V5LCBsZW4sIGNvbmYtPm1pbmZzKTsNCiAgICAgICAgIHJldHVybiBERUNM SU5FRDsNCiAgICAgfQ0KQEAgLTEwMjYsNyArMTAyNiw3IEBAIHN0YXRpYyBh cHJfc3RhdHVzX3Qgc3RvcmVfYm9keShjYWNoZV9oYW4NCiAgICAgICAgIGlm IChkb2JqLT5maWxlX3NpemUgPiBjb25mLT5tYXhmcykgew0KICAgICAgICAg ICAgIGFwX2xvZ19lcnJvcihBUExPR19NQVJLLCBBUExPR19ERUJVRywgMCwg ci0+c2VydmVyLA0KICAgICAgICAgICAgICAgICAgICAgICAgICAiZGlza19j YWNoZTogVVJMICVzIGZhaWxlZCB0aGUgc2l6ZSBjaGVjayAiDQotICAgICAg ICAgICAgICAgICAgICAgICAgICIoJSIgQVBSX09GRl9UX0ZNVCAiPiUiIEFQ Ul9TSVpFX1RfRk1UICIpIiwNCisgICAgICAgICAgICAgICAgICAgICAgICAg IiglIiBBUFJfT0ZGX1RfRk1UICI+JSIgQVBSX09GRl9UX0ZNVCAiKSIsDQog ICAgICAgICAgICAgICAgICAgICAgICAgIGgtPmNhY2hlX29iai0+a2V5LCBk b2JqLT5maWxlX3NpemUsIGNvbmYtPm1heGZzKTsNCiAgICAgICAgICAgICAv KiBSZW1vdmUgdGhlIGludGVybWVkaWF0ZSBjYWNoZSBmaWxlIGFuZCByZXR1 cm4gbm9uLUFQUl9TVUNDRVNTICovDQogICAgICAgICAgICAgZmlsZV9jYWNo ZV9lcnJvcmNsZWFudXAoZG9iaiwgcik7DQpAQCAtMTA1MCw3ICsxMDUwLDcg QEAgc3RhdGljIGFwcl9zdGF0dXNfdCBzdG9yZV9ib2R5KGNhY2hlX2hhbg0K ICAgICAgICAgaWYgKGRvYmotPmZpbGVfc2l6ZSA8IGNvbmYtPm1pbmZzKSB7 DQogICAgICAgICAgICAgYXBfbG9nX2Vycm9yKEFQTE9HX01BUkssIEFQTE9H X0RFQlVHLCAwLCByLT5zZXJ2ZXIsDQogICAgICAgICAgICAgICAgICAgICAg ICAgICJkaXNrX2NhY2hlOiBVUkwgJXMgZmFpbGVkIHRoZSBzaXplIGNoZWNr ICINCi0gICAgICAgICAgICAgICAgICAgICAgICAgIiglIiBBUFJfT0ZGX1Rf Rk1UICI8JSIgQVBSX1NJWkVfVF9GTVQgIikiLA0KKyAgICAgICAgICAgICAg ICAgICAgICAgICAiKCUiIEFQUl9PRkZfVF9GTVQgIjwlIiBBUFJfT0ZGX1Rf Rk1UICIpIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICAgaC0+Y2FjaGVf b2JqLT5rZXksIGRvYmotPmZpbGVfc2l6ZSwgY29uZi0+bWluZnMpOw0KICAg ICAgICAgICAgIC8qIFJlbW92ZSB0aGUgaW50ZXJtZWRpYXRlIGNhY2hlIGZp bGUgYW5kIHJldHVybiBub24tQVBSX1NVQ0NFU1MgKi8NCiAgICAgICAgICAg ICBmaWxlX2NhY2hlX2Vycm9yY2xlYW51cChkb2JqLCByKTsNCkBAIC0xMTM3 LDE1ICsxMTM3LDI1IEBAIHN0YXRpYyBjb25zdCBjaGFyDQogew0KICAgICBk aXNrX2NhY2hlX2NvbmYgKmNvbmYgPSBhcF9nZXRfbW9kdWxlX2NvbmZpZyhw YXJtcy0+c2VydmVyLT5tb2R1bGVfY29uZmlnLA0KICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmZGlza19jYWNo ZV9tb2R1bGUpOw0KLSAgICBjb25mLT5taW5mcyA9IGF0b2koYXJnKTsNCisN CisgICAgaWYgKGFwcl9zdHJ0b2ZmKCZjb25mLT5taW5mcywgYXJnLCBOVUxM LCAwKSAhPSBBUFJfU1VDQ0VTUyB8fA0KKyAgICAgICAgICAgIGNvbmYtPm1p bmZzIDwgMCkgDQorICAgIHsNCisgICAgICAgIHJldHVybiAiQ2FjaGVNaW5G aWxlU2l6ZSBhcmd1bWVudCBtdXN0IGJlIGEgbm9uLW5lZ2F0aXZlIGludGVn ZXIgcmVwcmVzZW50aW5nIHRoZSBtaW4gc2l6ZSBvZiBhIGZpbGUgdG8gY2Fj aGUgaW4gYnl0ZXMuIjsNCisgICAgfQ0KICAgICByZXR1cm4gTlVMTDsNCiB9 DQorDQogc3RhdGljIGNvbnN0IGNoYXINCiAqc2V0X2NhY2hlX21heGZzKGNt ZF9wYXJtcyAqcGFybXMsIHZvaWQgKmluX3N0cnVjdF9wdHIsIGNvbnN0IGNo YXIgKmFyZykNCiB7DQogICAgIGRpc2tfY2FjaGVfY29uZiAqY29uZiA9IGFw X2dldF9tb2R1bGVfY29uZmlnKHBhcm1zLT5zZXJ2ZXItPm1vZHVsZV9jb25m aWcsDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICZkaXNrX2NhY2hlX21vZHVsZSk7DQotICAgIGNvbmYtPm1h eGZzID0gYXRvaShhcmcpOw0KKyAgICBpZiAoYXByX3N0cnRvZmYoJmNvbmYt Pm1heGZzLCBhcmcsIE5VTEwsIDApICE9IEFQUl9TVUNDRVNTIHx8DQorICAg ICAgICAgICAgY29uZi0+bWF4ZnMgPCAwKSANCisgICAgew0KKyAgICAgICAg cmV0dXJuICJDYWNoZU1heEZpbGVTaXplIGFyZ3VtZW50IG11c3QgYmUgYSBu b24tbmVnYXRpdmUgaW50ZWdlciByZXByZXNlbnRpbmcgdGhlIG1heCBzaXpl IG9mIGEgZmlsZSB0byBjYWNoZSBpbiBieXRlcy4iOw0KKyAgICB9DQogICAg IHJldHVybiBOVUxMOw0KIH0NCiANCkluZGV4OiBtb2RfZGlza19jYWNoZS5o DQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gbW9kX2Rpc2tfY2FjaGUu aAkocmV2aXNpb24gNDE2MzY1KQ0KKysrIG1vZF9kaXNrX2NhY2hlLmgJKHdv cmtpbmcgY29weSkNCkBAIC04OCw4ICs4OCw4IEBAIHR5cGVkZWYgc3RydWN0 IHsNCiAgICAgYXByX3NpemVfdCBjYWNoZV9yb290X2xlbjsNCiAgICAgaW50 IGRpcmxldmVsczsgICAgICAgICAgICAgICAvKiBOdW1iZXIgb2YgbGV2ZWxz IG9mIHN1YmRpcmVjdG9yaWVzICovDQogICAgIGludCBkaXJsZW5ndGg7ICAg ICAgICAgICAgICAgLyogTGVuZ3RoIG9mIHN1YmRpcmVjdG9yeSBuYW1lcyAq Lw0KLSAgICBhcHJfc2l6ZV90IG1pbmZzOyAgICAgICAgICAgIC8qIG1pbnVt dW0gZmlsZSBzaXplIGZvciBjYWNoZWQgZmlsZXMgKi8NCi0gICAgYXByX3Np emVfdCBtYXhmczsgICAgICAgICAgICAvKiBtYXhpbXVtIGZpbGUgc2l6ZSBm b3IgY2FjaGVkIGZpbGVzICovDQorICAgIGFwcl9vZmZfdCBtaW5mczsgICAg ICAgICAgICAgLyogbWluaW11bSBmaWxlIHNpemUgZm9yIGNhY2hlZCBmaWxl cyAqLw0KKyAgICBhcHJfb2ZmX3QgbWF4ZnM7ICAgICAgICAgICAgIC8qIG1h eGltdW0gZmlsZSBzaXplIGZvciBjYWNoZWQgZmlsZXMgKi8NCiB9IGRpc2tf Y2FjaGVfY29uZjsNCiANCiAjZW5kaWYgLypNT0RfRElTS19DQUNIRV9IKi8N Cg== ---559023410-33463914-1158225470=:20100--