Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:140 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 97126 invoked from network); 21 Mar 2003 21:52:08 -0000 Received: from unknown (HELO vckyb3.nw.wakwak.com) (211.9.231.144) by pb1.pair.com with SMTP; 21 Mar 2003 21:52:08 -0000 Received: from at.wakwak.com (at.wakwak.com [211.9.230.135:25]) by vckyb3.nw.wakwak.com (Postfix) with ESMTP id B95243FECC; Sat, 22 Mar 2003 06:52:04 +0900 (JST) Received: from at.wakwak.com (z15.219-103-235.ppp.wakwak.ne.jp [219.103.235.15]) by at.wakwak.com (8.12.8/8.12.8/2003-03-04) with SMTP id h2LLq49r054564; Sat, 22 Mar 2003 06:52:04 +0900 (JST) (envelope-from moriyoshi@at.wakwak.com) Date: Sat, 22 Mar 2003 06:54:55 +0900 X-Mailer: EdMax Ver2.85.3F MIME-Version: 1.0 To: internals@lists.php.net Cc: Ian@holsman.net Message-ID: <20030322065455fS4''7@at.wakwak.com> Content-Type: multipart/mixed; boundary="------------Boundary_qx+R2h-+c8K:_lZ" Subject: patch for bug #22805 From: moriyoshi@at.wakwak.com (Moriyoshi Koizumi) --------------Boundary_qx+R2h-+c8K:_lZ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Attached is the patch for bug #22805. The problem is because the total length of buckets obtained in each ap_get_brigade call isn't necessarily as long as expected by SAPI_POST_READER_FUNC if more data are coming in the stream. Moriyoshi --------------Boundary_qx+R2h-+c8K:_lZ Content-Type: text/plain; name="bug22805.patch.diff.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="bug22805.patch.diff.txt" SW5kZXg6IHNhcGkvYXBhY2hlMmhhbmRsZXIvc2FwaV9hcGFjaGUyLmMKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQpSQ1MgZmlsZTogL3JlcG9zaXRvcnkvcGhwNC9zYXBpL2FwYWNoZTJoYW5kbGVyL3NhcGlf YXBhY2hlMi5jLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjEuMi40CmRpZmYgLXUgLXIxLjEu Mi40IHNhcGlfYXBhY2hlMi5jCi0tLSBzYXBpL2FwYWNoZTJoYW5kbGVyL3NhcGlfYXBhY2hl Mi5jCTE4IE1hciAyMDAzIDAxOjI0OjU3IC0wMDAwCTEuMS4yLjQKKysrIHNhcGkvYXBhY2hl MmhhbmRsZXIvc2FwaV9hcGFjaGUyLmMJMjEgTWFyIDIwMDMgMjE6MzI6MzggLTAwMDAKQEAg LTE0OSwzMiArMTQ5LDQxIEBACiBzdGF0aWMgaW50CiBwaHBfYXBhY2hlX3NhcGlfcmVhZF9w b3N0KGNoYXIgKmJ1ZiwgdWludCBjb3VudF9ieXRlcyBUU1JNTFNfREMpCiB7Ci0JYXByX3Np emVfdCBsZW47CisJYXByX3NpemVfdCBuYnl0ZXNfbGVmdDsKIAlwaHBfc3RydWN0ICpjdHgg PSBTRyhzZXJ2ZXJfY29udGV4dCk7CiAJcmVxdWVzdF9yZWMgKnI7CiAJYXByX2J1Y2tldF9i cmlnYWRlICpicmlnYWRlOwogCWFwcl9zdGF0dXNfdCBydjsKKwljaGFyICpwdHI7CiAKIAly ID0gY3R4LT5yOwogCWJyaWdhZGUgPSBjdHgtPmJyaWdhZGU7Ci0JbGVuID0gY291bnRfYnl0 ZXM7CisJcHRyID0gYnVmOwogCi0JcnYgPSBhcF9nZXRfYnJpZ2FkZShyLT5pbnB1dF9maWx0 ZXJzLCBicmlnYWRlLCBBUF9NT0RFX1JFQURCWVRFUywKLQkJCQkJCUFQUl9CTE9DS19SRUFE LCBsZW4pOworCWZvciAobmJ5dGVzX2xlZnQgPSAoYXByX3NpemVfdCkgY291bnRfYnl0ZXM7 IG5ieXRlc19sZWZ0ID4gMDspIHsKKwkJcnYgPSBhcF9nZXRfYnJpZ2FkZShyLT5pbnB1dF9m aWx0ZXJzLCBicmlnYWRlLCBBUF9NT0RFX1JFQURCWVRFUywKKwkJCQkJCQlBUFJfQkxPQ0tf UkVBRCwgKGFwcl9vZmZfdCkgbmJ5dGVzX2xlZnQpOwogCi0JaWYgKHJ2ID09IEFQUl9TVUND RVNTKSB7Ci0JCWFwcl9icmlnYWRlX2ZsYXR0ZW4oYnJpZ2FkZSwgYnVmLCAmbGVuKTsKLQl9 IGVsc2UgewotCQlsZW4gPSAwOworCQlpZiAocnYgPT0gQVBSX1NVQ0NFU1MpIHsKKwkJCWFw cl9zaXplX3QgbmJ5dGVzX3JlYWQgPSBuYnl0ZXNfbGVmdDsKKworCQkJcnYgPSBhcHJfYnJp Z2FkZV9mbGF0dGVuKGJyaWdhZGUsIHB0ciwgJm5ieXRlc19yZWFkKTsKKworCQkJaWYgKHJ2 ID09IEFQUl9TVUNDRVNTKSB7CisJCQkJcHRyICs9IG5ieXRlc19yZWFkOworCQkJCW5ieXRl c19sZWZ0IC09IG5ieXRlc19yZWFkOworCQkJfQorCQkJYXByX2JyaWdhZGVfY2xlYW51cChi cmlnYWRlKTsKKworCQkJaWYgKG5ieXRlc19yZWFkID09IDApIHsKKwkJCQlicmVhazsKKwkJ CX0KKwkJfSBlbHNlIHsKKwkJCWJyZWFrOworCQl9CiAJfQogCi0JYXByX2JyaWdhZGVfY2xl YW51cChicmlnYWRlKTsKLQkKLQkvKiBUaGlzIGlzIGRvd25jYXN0IGlzIG9rYXksIGJlY2F1 c2UgbGVuIGlzIGNvbnN0cmFpbmVkIGJ5Ci0JICogY291bnRfYnl0ZXMgYW5kIHdlIGtub3cg YXBfZ2V0X2JyaWdhZGUgd29uJ3QgcmV0dXJuIG1vcmUKLQkgKiB0aGFuIHRoYXQuCi0JICov Ci0JcmV0dXJuIGxlbjsKKwlyZXR1cm4gKChhcHJfc2l6ZV90KSBjb3VudF9ieXRlcyAtIG5i eXRlc19sZWZ0KTsKIH0KIAogc3RhdGljIHN0cnVjdCBzdGF0Kgp= --------------Boundary_qx+R2h-+c8K:_lZ--