From cliffwoolley@yahoo.com Thu Dec 21 23:03:24 2000 Return-Path: Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Delivered-To: mailing list dev@apr.apache.org Received: (qmail 18027 invoked from network); 21 Dec 2000 23:03:24 -0000 Received: from web3205.mail.yahoo.com (204.71.202.202) by locus.apache.org with SMTP; 21 Dec 2000 23:03:24 -0000 Message-ID: <20001221230323.6385.qmail@web3205.mail.yahoo.com> Received: from [128.143.3.171] by web3205.mail.yahoo.com; Thu, 21 Dec 2000 15:03:23 PST Date: Thu, 21 Dec 2000 15:03:23 -0800 (PST) From: Cliff Woolley Reply-To: cliffwoolley@yahoo.com Subject: [PATCH] resubmit: update ap_brigade_partition patch for APU_DECLARE To: dev@apr.apache.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0-1789376348-977439803=:596" X-Spam-Rating: locus.apache.org 1.6.2 0/1000/N --0-1789376348-977439803=:596 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hey... attached is an update to the patch I posted a while back to make another pass at ap_brigade_partition() in APR-UTIL. I had just noticed that after the APU_DECLARE symbol change, the old patch would no longer apply cleanly, so here's one that will. After this is applied, I'll work on updating the byterange filter to use it. Did anybody ever come up with that list of test cases for byterange requests? --Cliff __________________________________________________ Do You Yahoo!? Yahoo! Shopping - Thousands of Stores. Millions of Products. http://shopping.yahoo.com/ --0-1789376348-977439803=:596 Content-Type: application/x-unknown; name="partition.patch" Content-Transfer-Encoding: base64 Content-Description: partition.patch Content-Disposition: attachment; filename="partition.patch" SW5kZXg6IGluY2x1ZGUvYXBfYnVja2V0cy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KUkNTIGZpbGU6IC9ob21lL2N2c3B1YmxpYy9hcHItdXRpbC9pbmNs dWRlL2FwX2J1Y2tldHMuaCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS42MQpk aWZmIC11IC1yMS42MSBhcF9idWNrZXRzLmgKLS0tIGluY2x1ZGUvYXBfYnVj a2V0cy5oCTIwMDAvMTIvMjEgMTg6MDY6MTMJMS42MQorKysgaW5jbHVkZS9h cF9idWNrZXRzLmgJMjAwMC8xMi8yMSAyMzowMDozNwpAQCAtNTkwLDExICs1 OTAsMTIgQEAKICAqIG9mIGJ5dGVzIGZyb20gdGhlIGJyaWdhZGU7IHRoZSBy YW5nZXMgY2FuIGV2ZW4gb3ZlcmxhcC4KICAqIEBwYXJhbSBiIFRoZSBicmln YWRlIHRvIHBhcnRpdGlvbgogICogQHBhcmFtIHBvaW50IFRoZSBvZmZzZXQg YXQgd2hpY2ggdG8gcGFydGl0aW9uIHRoZSBicmlnYWRlCi0gKiBAcmV0dXJu IEEgcG9pbnRlciB0byB0aGUgZmlyc3QgYnVja2V0IGFmdGVyIHRoZSBwYXJ0 aXRpb247Ci0gKiAgICAgICAgIG9yIE5VTEwgaW4gYW55IGVycm9yIGNvbmRp dGlvbiAoaW5jbHVkaW5nIHBhcnRpdGlvbiBwYXN0IHRoZSBlbmQpCi0gKiBA ZGVmZnVuYyBhcF9idWNrZXQgKmFwX2JyaWdhZGVfcGFydGl0aW9uKGFwX2J1 Y2tldF9icmlnYWRlICpiLCBhcHJfb2ZmX3QgcG9pbnQpCisgKiBAcGFyYW0g YWZ0ZXJfcG9pbnQgUmV0dXJucyBhIHBvaW50ZXIgdG8gdGhlIGZpcnN0IGJ1 Y2tldCBhZnRlciB0aGUgcGFydGl0aW9uCisgKiBAZGVmZnVuYyBhcHJfc3Rh dHVzX3QgYXBfYnJpZ2FkZV9wYXJ0aXRpb24oYXBfYnVja2V0X2JyaWdhZGUg KmIsIGFwcl9vZmZfdCBwb2ludCwgYXBfYnVja2V0ICoqYWZ0ZXJfcG9pbnQp CiAgKi8KLUFQVV9ERUNMQVJFKGFwX2J1Y2tldCAqKSBhcF9icmlnYWRlX3Bh cnRpdGlvbihhcF9idWNrZXRfYnJpZ2FkZSAqYiwgYXByX29mZl90IHBvaW50 KTsKK0FQVV9ERUNMQVJFKGFwcl9zdGF0dXNfdCkgYXBfYnJpZ2FkZV9wYXJ0 aXRpb24oYXBfYnVja2V0X2JyaWdhZGUgKmIsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcl9vZmZfdCBwb2lu dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYXBfYnVja2V0ICoqYWZ0ZXJfcG9pbnQpOwogCiAjaWYgQVBSX05P VF9ET05FX1lFVAogLyoqCkluZGV4OiBzcmMvYnVja2V0cy9hcF9idWNrZXRz LmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUvY3Zz cHVibGljL2Fwci11dGlsL3NyYy9idWNrZXRzL2FwX2J1Y2tldHMuYyx2CnJl dHJpZXZpbmcgcmV2aXNpb24gMS4zOApkaWZmIC11IC1yMS4zOCBhcF9idWNr ZXRzLmMKLS0tIHNyYy9idWNrZXRzL2FwX2J1Y2tldHMuYwkyMDAwLzEyLzIx IDE4OjA2OjE0CTEuMzgKKysrIHNyYy9idWNrZXRzL2FwX2J1Y2tldHMuYwky MDAwLzEyLzIxIDIzOjAwOjM3CkBAIC0xMjIsNDggKzEyMiw0NCBAQAogICAg IHJldHVybiBhOwogfQogCi1BUFVfREVDTEFSRShhcF9idWNrZXQgKikgYXBf YnJpZ2FkZV9wYXJ0aXRpb24oYXBfYnVja2V0X2JyaWdhZGUgKmIsIGFwcl9v ZmZfdCBwb2ludCkKK0FQVV9ERUNMQVJFKGFwcl9zdGF0dXNfdCkgYXBfYnJp Z2FkZV9wYXJ0aXRpb24oYXBfYnVja2V0X2JyaWdhZGUgKmIsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcl9v ZmZfdCBwb2ludCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYXBfYnVja2V0ICoqYWZ0ZXJfcG9pbnQpCiB7CiAg ICAgYXBfYnVja2V0ICplOwogICAgIGNvbnN0IGNoYXIgKnM7CiAgICAgYXBy X3NpemVfdCBsZW47CisgICAgYXByX3N0YXR1c190IHJ2OwogCiAgICAgaWYg KHBvaW50IDwgMCkKLSAgICAgICAgcmV0dXJuIE5VTEw7CisgICAgICAgIHJl dHVybiBBUFJfRUlOVkFMOwogCiAgICAgQVBfQlJJR0FERV9GT1JFQUNIKGUs IGIpIHsKICAgICAgICAgLyogYnVja2V0IGlzIG9mIGEga25vd24gbGVuZ3Ro ICovCi0gICAgICAgIGlmICgocG9pbnQgPiBlLT5sZW5ndGgpICYmIChlLT5s ZW5ndGggIT0gLTEpKSB7Ci0gICAgICAgICAgICBpZiAoQVBfQlVDS0VUX0lT X0VPUyhlKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gTlVMTDsKLSAgICAg ICAgICAgIHBvaW50IC09IGUtPmxlbmd0aDsKLSAgICAgICAgfQotICAgICAg ICBlbHNlIGlmIChwb2ludCA9PSBlLT5sZW5ndGgpIHsKLSAgICAgICAgICAg IHJldHVybiBBUF9CVUNLRVRfTkVYVChlKTsKLSAgICAgICAgfQotICAgICAg ICBlbHNlIHsKKyAgICAgICAgaWYgKHBvaW50IDwgZS0+bGVuZ3RoKSB7CiAg ICAgICAgICAgICAvKiB0cnkgdG8gc3BsaXQgdGhlIGJ1Y2tldCBuYXRpdmVs eSAqLwotICAgICAgICAgICAgaWYgKGFwX2J1Y2tldF9zcGxpdChlLCBwb2lu dCkgIT0gQVBSX0VOT1RJTVBMKQotICAgICAgICAgICAgICAgIHJldHVybiBB UF9CVUNLRVRfTkVYVChlKTsKKyAgICAgICAgICAgIGlmICgocnYgPSBhcF9i dWNrZXRfc3BsaXQoZSwgcG9pbnQpKSAhPSBBUFJfRU5PVElNUEwpIHsKKyAg ICAgICAgICAgICAgICAqYWZ0ZXJfcG9pbnQgPSBBUF9CVUNLRVRfTkVYVChl KTsKKyAgICAgICAgICAgICAgICByZXR1cm4gcnY7CisgICAgICAgICAgICB9 CiAKICAgICAgICAgICAgIC8qIGlmIHRoZSBidWNrZXQgY2Fubm90IGJlIHNw bGl0LCB3ZSBtdXN0IHJlYWQgZnJvbSBpdCwKICAgICAgICAgICAgICAqIGNo YW5naW5nIGl0cyB0eXBlIHRvIG9uZSB0aGF0IGNhbiBiZSBzcGxpdCAqLwot ICAgICAgICAgICAgaWYgKGFwX2J1Y2tldF9yZWFkKGUsICZzLCAmbGVuLCBB UF9CTE9DS19SRUFEKSAhPSBBUFJfU1VDQ0VTUykKLSAgICAgICAgICAgICAg ICByZXR1cm4gTlVMTDsKKyAgICAgICAgICAgIGlmICgocnY9YXBfYnVja2V0 X3JlYWQoZSwgJnMsICZsZW4sIEFQX0JMT0NLX1JFQUQpKSAhPSBBUFJfU1VD Q0VTUykKKyAgICAgICAgICAgICAgICByZXR1cm4gcnY7CiAKICAgICAgICAg ICAgIGlmIChwb2ludCA8IGxlbikgewotICAgICAgICAgICAgICAgIGlmIChh cF9idWNrZXRfc3BsaXQoZSwgcG9pbnQpID09IEFQUl9TVUNDRVNTKQotICAg ICAgICAgICAgICAgICAgICByZXR1cm4gQVBfQlVDS0VUX05FWFQoZSk7Ci0g ICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICByZXR1 cm4gTlVMTDsKKyAgICAgICAgICAgICAgICAqYWZ0ZXJfcG9pbnQgPSBBUF9C VUNLRVRfTkVYVChlKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gYXBfYnVj a2V0X3NwbGl0KGUsIHBvaW50KTsKICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIGVsc2UgaWYgKHBvaW50ID09IGxlbikKLSAgICAgICAgICAgICAgICBy ZXR1cm4gQVBfQlVDS0VUX05FWFQoZSk7Ci0gICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgcG9pbnQgLT0gbGVuOwogICAgICAgICB9CisgICAg ICAgIGlmIChwb2ludCA9PSBlLT5sZW5ndGgpIHsKKyAgICAgICAgICAgICph ZnRlcl9wb2ludCA9IEFQX0JVQ0tFVF9ORVhUKGUpOworICAgICAgICAgICAg cmV0dXJuIEFQUl9TVUNDRVNTOworICAgICAgICB9CisgICAgICAgIHBvaW50 IC09IGUtPmxlbmd0aDsKICAgICB9Ci0gICAgcmV0dXJuIE5VTEw7CisgICAg cmV0dXJuIEFQUl9FSU5WQUw7CiB9CiAKIEFQVV9ERUNMQVJFKGludCkgYXBf YnJpZ2FkZV90b19pb3ZlYyhhcF9idWNrZXRfYnJpZ2FkZSAqYiwgCg== --0-1789376348-977439803=:596--