Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:42125 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 73323 invoked from network); 6 Dec 2008 14:00:14 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 6 Dec 2008 14:00:14 -0000 Authentication-Results: pb1.pair.com header.from=igor.feghali@gmail.com; sender-id=pass; domainkeys=bad Authentication-Results: pb1.pair.com smtp.mail=igor.feghali@gmail.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.221.20 as permitted sender) DomainKey-Status: bad X-DomainKeys: Ecelerity dk_validate implementing draft-delany-domainkeys-base-01 X-PHP-List-Original-Sender: igor.feghali@gmail.com X-Host-Fingerprint: 209.85.221.20 mail-qy0-f20.google.com Received: from [209.85.221.20] ([209.85.221.20:49638] helo=mail-qy0-f20.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 08/72-01047-D658A394 for ; Sat, 06 Dec 2008 09:00:13 -0500 Received: by qyk13 with SMTP id 13so542022qyk.23 for ; Sat, 06 Dec 2008 06:00:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:in-reply-to:mime-version:content-type:references; bh=kqyKkYg1BReI5Hk/12Latr0mwFxoWo3on1lZzlzhQ9M=; b=jdB3YPNl9RdYAXeFWUFQ2TV1+waJp0TEyqCpfHmbrXfOlcojyCqPnhFJiJ3gkYvrrQ GZ8ndK25FhgWnkwGkFWSbQw93xRg2Oz86bcoabyZTk4TdDh+teAz0LQevO2UMfbJI6W1 +QlW6FJtgDw9zMCuI6q66vStlKE5IifqEYHPM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:in-reply-to:mime-version :content-type:references; b=Be3W9SfdUK44+Id1Uthq2BimrFf0gYM4FW3B369/DM4nXt3Xa/ZJa4PkiacfFZEn+J mTPNFWb1Ki8p0f9sxYdhEZYIdcUmP3jfn3TGztPLGGeZ6A0P4l2Rli8gJyML6N0MlR3Z LfJM8j5Hc6LhJqVq/8ipU9XiRKZxS5vjt1410= Received: by 10.214.79.11 with SMTP id c11mr1106936qab.174.1228572009359; Sat, 06 Dec 2008 06:00:09 -0800 (PST) Received: by 10.214.115.21 with HTTP; Sat, 6 Dec 2008 06:00:09 -0800 (PST) Message-ID: Date: Sat, 6 Dec 2008 12:00:09 -0200 To: "PHP Internals List" In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_33281_24320822.1228572009351" References: Subject: Re: Implode() FR and Patch From: igor.feghali@gmail.com ("Igor Feghali") ------=_Part_33281_24320822.1228572009351 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline Please see attached a new patch that fixes the problem with delimiters bigger than one char (that's what happens when you code after midnight). Also, as suggested by Hannes, skip_empty is now being parsed as zend boolean (b) instead of zval (Z). Regards, Igor Feghali. ------=_Part_33281_24320822.1228572009351 Content-Type: text/x-diff; name=implode.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_foebzi9k1 Content-Disposition: attachment; filename=implode.patch SW5kZXg6IGV4dC9zdGFuZGFyZC9waHBfc3RyaW5nLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL3Jl cG9zaXRvcnkvcGhwLXNyYy9leHQvc3RhbmRhcmQvcGhwX3N0cmluZy5oLHYKcmV0cmlldmluZyBy ZXZpc2lvbiAxLjg3LjIuMi4yLjMuMi4zCmRpZmYgLXUgLXIxLjg3LjIuMi4yLjMuMi4zIHBocF9z dHJpbmcuaAotLS0gZXh0L3N0YW5kYXJkL3BocF9zdHJpbmcuaAkyIE5vdiAyMDA4IDE4OjI0OjM0 IC0wMDAwCTEuODcuMi4yLjIuMy4yLjMKKysrIGV4dC9zdGFuZGFyZC9waHBfc3RyaW5nLmgJNiBE ZWMgMjAwOCAxMzo0NjoxOSAtMDAwMApAQCAtMTM3LDcgKzEzNyw3IEBACiBQSFBBUEkgc2l6ZV90 IHBocF9zdHJpcF90YWdzX2V4KGNoYXIgKnJidWYsIGludCBsZW4sIGludCAqc3RhdGVwdHIsIGNo YXIgKmFsbG93LCBpbnQgYWxsb3dfbGVuLCB6ZW5kX2Jvb2wgYWxsb3dfdGFnX3NwYWNlcyk7CiBQ SFBBUEkgaW50IHBocF9jaGFyX3RvX3N0cl9leChjaGFyICpzdHIsIHVpbnQgbGVuLCBjaGFyIGZy b20sIGNoYXIgKnRvLCBpbnQgdG9fbGVuLCB6dmFsICpyZXN1bHQsIGludCBjYXNlX3NlbnNpdGl2 aXR5LCBpbnQgKnJlcGxhY2VfY291bnQpOwogUEhQQVBJIGludCBwaHBfY2hhcl90b19zdHIoY2hh ciAqc3RyLCB1aW50IGxlbiwgY2hhciBmcm9tLCBjaGFyICp0bywgaW50IHRvX2xlbiwgenZhbCAq cmVzdWx0KTsKLVBIUEFQSSB2b2lkIHBocF9pbXBsb2RlKHp2YWwgKmRlbGltLCB6dmFsICphcnIs IHp2YWwgKnJldHVybl92YWx1ZSBUU1JNTFNfREMpOworUEhQQVBJIHZvaWQgcGhwX2ltcGxvZGUo enZhbCAqZGVsaW0sIHp2YWwgKmFyciwgenZhbCAqc2tpcF9lbXB0eSwgenZhbCAqcmV0dXJuX3Zh bHVlIFRTUk1MU19EQyk7CiBQSFBBUEkgdm9pZCBwaHBfZXhwbG9kZSh6dmFsICpkZWxpbSwgenZh bCAqc3RyLCB6dmFsICpyZXR1cm5fdmFsdWUsIGludCBsaW1pdCk7CiAKIFBIUEFQSSBzaXplX3Qg cGhwX3N0cnNwbihjaGFyICpzMSwgY2hhciAqczIsIGNoYXIgKnMxX2VuZCwgY2hhciAqczJfZW5k KTsgCkluZGV4OiBleHQvc3RhbmRhcmQvc3RyaW5nLmMKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL3Jl cG9zaXRvcnkvcGhwLXNyYy9leHQvc3RhbmRhcmQvc3RyaW5nLmMsdgpyZXRyaWV2aW5nIHJldmlz aW9uIDEuNDQ1LjIuMTQuMi42OS4yLjM4CmRpZmYgLXUgLXIxLjQ0NS4yLjE0LjIuNjkuMi4zOCBz dHJpbmcuYwotLS0gZXh0L3N0YW5kYXJkL3N0cmluZy5jCTIxIE5vdiAyMDA4IDE5OjE2OjUwIC0w MDAwCTEuNDQ1LjIuMTQuMi42OS4yLjM4CisrKyBleHQvc3RhbmRhcmQvc3RyaW5nLmMJNiBEZWMg MjAwOCAxMzo0NjoyMSAtMDAwMApAQCAtMTAzMywzMCArMTAzMywyOCBAQAogfQogLyogfX19ICov CiAKLS8qIHt7eyBwcm90byBzdHJpbmcgam9pbihhcnJheSBzcmMsIHN0cmluZyBnbHVlKQorLyog e3t7IHByb3RvIHN0cmluZyBqb2luKGFycmF5IHNyYywgc3RyaW5nIGdsdWVbLCBib29sZWFuIHNr aXBfZW1wdHldKQogICAgQW4gYWxpYXMgZm9yIGltcGxvZGUgKi8KIC8qIH19fSAqLwogCiAvKiB7 e3sgcGhwX2ltcGxvZGUKICAqLwotUEhQQVBJIHZvaWQgcGhwX2ltcGxvZGUoenZhbCAqZGVsaW0s IHp2YWwgKmFyciwgenZhbCAqcmV0dXJuX3ZhbHVlIFRTUk1MU19EQykgCitQSFBBUEkgdm9pZCBw aHBfaW1wbG9kZSh6dmFsICpkZWxpbSwgenZhbCAqYXJyLCB6dmFsICpza2lwX2VtcHR5LCB6dmFs ICpyZXR1cm5fdmFsdWUgVFNSTUxTX0RDKSAKIHsKIAl6dmFsICAgICAgICAgKip0bXA7CiAJSGFz aFBvc2l0aW9uICAgcG9zOwogCXNtYXJ0X3N0ciAgICAgIGltcGxzdHIgPSB7MH07Ci0JaW50ICAg ICAgICAgICAgbnVtZWxlbXMsIGkgPSAwOwotCXp2YWwgdG1wX3ZhbDsKLQlpbnQgc3RyX2xlbjsK LQotCW51bWVsZW1zID0gemVuZF9oYXNoX251bV9lbGVtZW50cyhaX0FSUlZBTF9QKGFycikpOwor CXp2YWwgICAgICAgICAgIHRtcF92YWw7CisJaW50ICAgICAgICAgICAgc3RyX2xlbiwgbGVuOwog Ci0JaWYgKG51bWVsZW1zID09IDApIHsKKwlpZiAoemVuZF9oYXNoX251bV9lbGVtZW50cyhaX0FS UlZBTF9QKGFycikpID09IDApIHsKIAkJUkVUVVJOX0VNUFRZX1NUUklORygpOwogCX0KIAogCXpl bmRfaGFzaF9pbnRlcm5hbF9wb2ludGVyX3Jlc2V0X2V4KFpfQVJSVkFMX1AoYXJyKSwgJnBvcyk7 CiAKIAl3aGlsZSAoemVuZF9oYXNoX2dldF9jdXJyZW50X2RhdGFfZXgoWl9BUlJWQUxfUChhcnIp LCAodm9pZCAqKikgJnRtcCwgJnBvcykgPT0gU1VDQ0VTUykgeworCQlsZW4gPSBpbXBsc3RyLmxl bjsKIAkJc3dpdGNoICgoKnRtcCktPnR5cGUpIHsKIAkJCWNhc2UgSVNfU1RSSU5HOgogCQkJCXNt YXJ0X3N0cl9hcHBlbmRsKCZpbXBsc3RyLCBaX1NUUlZBTF9QUCh0bXApLCBaX1NUUkxFTl9QUCh0 bXApKTsKQEAgLTExMDcsMTAgKzExMDUsMTQgQEAKIAkJCQkKIAkJfQogCi0JCWlmICgrK2kgIT0g bnVtZWxlbXMpIHsKLQkJCXNtYXJ0X3N0cl9hcHBlbmRsKCZpbXBsc3RyLCBaX1NUUlZBTF9QKGRl bGltKSwgWl9TVFJMRU5fUChkZWxpbSkpOwotCQl9CiAJCXplbmRfaGFzaF9tb3ZlX2ZvcndhcmRf ZXgoWl9BUlJWQUxfUChhcnIpLCAmcG9zKTsKKwkJaWYgKFpfQlZBTF9QKHNraXBfZW1wdHkpICYm IChpbXBsc3RyLmxlbiA9PSBsZW4pKSB7CisJCQljb250aW51ZTsKKwkJfQorCQlzbWFydF9zdHJf YXBwZW5kbCgmaW1wbHN0ciwgWl9TVFJWQUxfUChkZWxpbSksIFpfU1RSTEVOX1AoZGVsaW0pKTsK Kwl9CisJaWYgKGltcGxzdHIubGVuKSB7CisJCWltcGxzdHIubGVuIC09IFpfU1RSTEVOX1AoZGVs aW0pOwogCX0KIAlzbWFydF9zdHJfMCgmaW1wbHN0cik7CiAKQEAgLTExMjMsMTQgKzExMjUsMTUg QEAKIH0KIC8qIH19fSAqLwogCi0vKiB7e3sgcHJvdG8gc3RyaW5nIGltcGxvZGUoW3N0cmluZyBn bHVlLF0gYXJyYXkgcGllY2VzKQorLyoge3t7IHByb3RvIHN0cmluZyBpbXBsb2RlKFtzdHJpbmcg Z2x1ZSxdIGFycmF5IHBpZWNlc1ssIGJvb2xlYW4gc2tpcF9lbXB0eV0pCiAgICBKb2lucyBhcnJh eSBlbGVtZW50cyBwbGFjaW5nIGdsdWUgc3RyaW5nIGJldHdlZW4gaXRlbXMgYW5kIHJldHVybiBv bmUgc3RyaW5nICovCiBQSFBfRlVOQ1RJT04oaW1wbG9kZSkKIHsKLQl6dmFsICoqYXJnMSA9IE5V TEwsICoqYXJnMiA9IE5VTEwsICpkZWxpbSwgKmFycjsKKwl6dmFsICoqYXJnMSA9IE5VTEwsICoq YXJnMiA9IE5VTEwsICpkZWxpbSwgKmFyciwgKnNraXBfZW1wdHk7CisJemVuZF9ib29sIGFyZzM7 CiAJSGFzaFBvc2l0aW9uIHBvczsKIAotCWlmICh6ZW5kX3BhcnNlX3BhcmFtZXRlcnMoWkVORF9O VU1fQVJHUygpIFRTUk1MU19DQywgIlp8WiIsICZhcmcxLCAmYXJnMikgPT0gRkFJTFVSRSkgewor CWlmICh6ZW5kX3BhcnNlX3BhcmFtZXRlcnMoWkVORF9OVU1fQVJHUygpIFRTUk1MU19DQywgIlp8 WmIiLCAmYXJnMSwgJmFyZzIsICZhcmczKSA9PSBGQUlMVVJFKSB7CiAJCXJldHVybjsKIAl9CiAJ CkBAIC0xMTYxLDkgKzExNjQsMTYgQEAKIAkJfQogCX0KIAorCQlNQUtFX1NURF9aVkFMKHNraXBf ZW1wdHkpOworCWlmIChhcmczKSB7CisJCVpWQUxfQk9PTChza2lwX2VtcHR5LCAxKTsKKwl9IGVs c2UgeworCQlaVkFMX0JPT0woc2tpcF9lbXB0eSwgMCk7CisJfQorCiAJcG9zID0gWl9BUlJWQUxf UChhcnIpLT5wSW50ZXJuYWxQb2ludGVyOwogCQotCXBocF9pbXBsb2RlKGRlbGltLCBhcnIsIHJl dHVybl92YWx1ZSBUU1JNTFNfQ0MpOworCXBocF9pbXBsb2RlKGRlbGltLCBhcnIsIHNraXBfZW1w dHksIHJldHVybl92YWx1ZSBUU1JNTFNfQ0MpOwogCiAJWl9BUlJWQUxfUChhcnIpLT5wSW50ZXJu YWxQb2ludGVyID0gcG9zOwogCkluZGV4OiB0ZXN0cy9zdHJpbmdzLzAwMS5waHB0Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KUkNTIGZpbGU6IC9yZXBvc2l0b3J5L3BocC1zcmMvdGVzdHMvc3RyaW5ncy8wMDEucGhwdCx2 CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zLjQuMS40LjEKZGlmZiAtdSAtcjEuMy40LjEuNC4xIDAw MS5waHB0Ci0tLSB0ZXN0cy9zdHJpbmdzLzAwMS5waHB0CTUgSnVuIDIwMDggMDg6Mjk6MjkgLTAw MDAJMS4zLjQuMS40LjEKKysrIHRlc3RzL3N0cmluZ3MvMDAxLnBocHQJNiBEZWMgMjAwOCAxMzo0 NjoyNyAtMDAwMApAQCAtMTkwLDYgKzE5MCwxOCBAQAogCWVjaG8oImZhaWxlZCFcbiIpOwogfQog CitlY2hvICdUZXN0aW5nIGltcGxvZGU6ICc7CiskZm9vID0gJ2Jhcic7CiskYXJyID0gYXJyYXko MSwnJywyLG51bGwsMywwLDQsdHJ1ZSw1LGZhbHNlLGZhbHNlKTsKKworJHN0cjEgPSBpbXBsb2Rl KCcsfCcsICRhcnIpOworJHN0cjIgPSBpbXBsb2RlKCcsfCcsICRhcnIsICRmb28pOworCitpZiAo JHN0cjEgPT0gJzEsfCx8Mix8LHwzLHwwLHw0LHwxLHw1LHwsfCcgJiYgJHN0cjIgPT0gJzEsfDIs fDMsfDAsfDQsfDEsfDUnICYmICRmb28gPT0gJ2JhcicpIHsKKwllY2hvKCJwYXNzZWRcbiIpOwor fSBlbHNlIHsKKwllY2hvKCJmYWlsZWQhXG4iKTsKK30KID8+CiAtLUVYUEVDVC0tCiBUZXN0aW5n IHN0cnRvazogcGFzc2VkCkBAIC0yMDgsMyArMjIwLDUgQEAKIFRlc3RpbmcgYWRkc2xhc2hlczog cGFzc2VkCiBUZXN0aW5nIHN0cmlwc2xhc2hlczogcGFzc2VkCiBUZXN0aW5nIHVuaXFpZDogcGFz c2VkCitUZXN0aW5nIGltcGxvZGU6IHBhc3NlZAorCg== ------=_Part_33281_24320822.1228572009351--