Received: from [152.168.136.238] by web606.mail.yahoo.com; Tue, 02 Nov 1999 13:10:10 PST Date: Tue, 2 Nov 1999 13:10:10 -0800 (PST) From: Christopher Stach II Subject: Re: PHP 3.0.12 Bug id #1951 AND #2626 To: Paul Schreiber Cc: rasmus@lerdorf.on.ca MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0-1957747793-941577010=:22106" Content-Length: 9617 --0-1957747793-941577010=:22106 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline I found a bug in my patch, due to PHP's broken documentation. In the code for one of the php internal functions I use, it says (functions/type.c): /* * 0 - simple variable * 1 - non-index array * 2 - index array */ but in the actual header file it says (functions/type.h): #define GPC_REGULAR 0x1 #define GPC_INDEXED_ARRAY 0x2 #define GPC_NON_INDEXED_ARRAY 0x4 #define GPC_ARRAY (GPC_INDEXED_ARRAY | GPC_NON_INDEXED_ARRAY) Attached is the fixed diff. chris --- Paul Schreiber wrote: > Chris, > > > Here's the patch. I'll attach it here as a > >context diff. Seems to work just fine for me! > Yay!@# > > from a brief glance at the code, in PHP you use > $foo_name[$i] and > $foo_type[$i], right? > > thanks! > > Paul > > shad 96c / 3B CS / mac activist / eda / > fumbler > fan of / jewel / sophie b. / sarah slean / steve > poltz / emm gryner / > / x-files / buffy / dawson's creek / habs / > bills / 49ers / > > t h i n k d i f f e r e n t. > > "I'd rather see the world from another angle." -- > Jewel Kilcher > > __________________________________________________ Do You Yahoo!? Bid and sell for free at http://auctions.yahoo.com --0-1957747793-941577010=:22106 Content-Type: application/x-unknown; name="php-3_0_12-uploadfix2.diff" Content-Transfer-Encoding: base64 Content-Description: php-3_0_12-uploadfix2.diff Content-Disposition: attachment; filename="php-3_0_12-uploadfix2.diff" ZGlmZiAtY3IgcGhwLTMuMC4xMi1vcmlnL2Z1bmN0aW9ucy9taW1lLmMgcGhw LTMuMC4xMi9mdW5jdGlvbnMvbWltZS5jDQoqKiogcGhwLTMuMC4xMi1vcmln L2Z1bmN0aW9ucy9taW1lLmMJVHVlIE5vdiAgMiAxNDo0ODoxMCAxOTk5DQot LS0gcGhwLTMuMC4xMi9mdW5jdGlvbnMvbWltZS5jCVR1ZSBOb3YgIDIgMTU6 MDM6MzIgMTk5OQ0KKioqKioqKioqKioqKioqDQoqKiogMSwzICoqKioNCi0t LSAxLDI3IC0tLS0NCisgLyogMTAvMzEvMTk5OSAtY2dzDQorICAqIFBPU1Qg dXBsb2FkaW5nIGZvciBtdWx0aXBsZSBpbmRleGVkIGFuZCBub24taW5kZXhl ZCBhcnJheXMgc2hvdWxkIGJlDQorICAqIGZpeGVkIG5vdy4gIEkga2VwdCB0 aGUgb3JpZ2luYWwgKHVnbHkpIGNvZGUgc3R5bGUgd2l0aG91dCBzcGFjaW5n IGluDQorICAqIGhvbm9yIG9mIHRoZSBtYWludGFpbmVycy4gIEkgZGlkIGJh cmYgZnJvbSByZWFkaW5nIGl0LCB0aG91Z2guICBJDQorICAqIGFkZGVkIHRo ZSAnY2hhciAqYWluZCcgYW5kICdpbnQgdmFyX3R5cGUnIHZhcmlhYmxlcyB0 byBwaHAzX21pbWVfc3BsaXQNCisgICogdG8ga2VlcCB0cmFjayBvZiB0aGUg dHlwZSBvZiB2YXJpYWJsZSB0aGUgdXNlciBpcyBwYXNzaW5nIHRvIHRoZSBm b3JtDQorICAqIHNvIHdlIGNhbiBwcm9wZXJseSBhZGQgaXQgYmFjayB0byB0 aGUgZm9ybSB2YXJpYWJsZSBoYXNoIHRhYmxlLg0KKyAgKg0KKyAgKiAxMS8w Mi8xOTk5IC1jZ3MNCisgICogRHVlIHRvIGEgbWlzZG9jdW1lbnRhdGlvbiBv ZiByZXR1cm4gdHlwZXMgaW4gZnVuY3Rpb25zL3R5cGUuYyBmb3INCisgICog ZnVuY3Rpb24gcGhwM19jaGVja19pZGVudF90eXBlLCB1cGxvYWRzIGRpZG4n dCB3b3JrIGZvciBub24tYXJyYXkNCisgICogdmFyaWFibGVzIGFmdGVyIGFw cGx5aW5nIHRoaXMgcGF0Y2guICBUaGlzIGlzIGFsbCBmaXhlZCBub3cgYmVj YXVzZSBJDQorICAqIGZvdW5kIHRoZSBSRUFMIHJldHVybiB0eXBlcyBpbiBm dW5jdGlvbnMvdHlwZS5oLiAgQmFkIG1lIGZvciBub3QNCisgICogdXNpbmcg Y29uc3RhbnRzLiAgSSB5YW5rZWQgb3V0ICdpbnQgdmFyX3R5cGUnIGFuZCBu b3cgdXNlICdpbnQgaXR5cGUnDQorICAqIHdoaWNoIGlzIHVzZWQgbGF0ZXIg b24gdGhlIGluIHRoZSBjb2RlIGFuZCBzdWJqZWN0IHRvIHRoZSBzYW1lIGJ1 ZyBJDQorICAqIGp1c3QgZml4ZWQgaW4gbXkgY29kZS4gIEkgZml4ZWQgdGhl IG90aGVyIGluc3RhbmNlIG9mIGl0IGFuZCBvcHRlZA0KKyAgKiBmb3IgdXNp bmcgdGhlIHZhcmlhYmxlIGluIG15IGNvZGUgYWxzby4NCisgICoNCisgICog UHVibGljIGRvbWFpbiwgR1BMLCBldGMuDQorICAqDQorICAqIENocmlzdG9w aGVyIEcuIFN0YWNoIElJDQorICAqIExvY2sgRGF0YSBTeXN0ZW1zL05NTA0K KyAgKiBjZ3NAbGRzeXMubmV0IHwgY19zdGFjaEB5YWhvby5jb20NCisgICov DQogIC8qDQogICAgICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKw0KICAg ICB8IFBIUCBIVE1MIEVtYmVkZGVkIFNjcmlwdGluZyBMYW5ndWFnZSBWZXJz aW9uIDMuMCAgICAgICAgICAgICAgICAgICAgIHwNCioqKioqKioqKioqKioq Kg0KKioqIDQ0LDUwICoqKioNCiAgI2VuZGlmDQogIA0KICAjZGVmaW5lIE5F V19CT1VOREFSWV9DSEVDSyAxDQohICNkZWZpbmUgU0FGRV9SRVRVUk4geyBp ZiAobmFtZWJ1ZikgZWZyZWUobmFtZWJ1Zik7IGlmIChmaWxlbmFtZWJ1Zikg ZWZyZWUoZmlsZW5hbWVidWYpOyBpZiAobGJ1ZikgZWZyZWUobGJ1Zik7IGlm IChhYnVmKSBlZnJlZShhYnVmKTsgcmV0dXJuOyB9DQogIA0KICAvKg0KICAg KiBTcGxpdCByYXcgbWltZSBzdHJlYW0gdXAgaW50byBhcHByb3ByaWF0ZSBj b21wb25lbnRzDQotLS0gNjgsNzQgLS0tLQ0KICAjZW5kaWYNCiAgDQogICNk ZWZpbmUgTkVXX0JPVU5EQVJZX0NIRUNLIDENCiEgI2RlZmluZSBTQUZFX1JF VFVSTiB7IGlmIChuYW1lYnVmKSBlZnJlZShuYW1lYnVmKTsgaWYgKGZpbGVu YW1lYnVmKSBlZnJlZShmaWxlbmFtZWJ1Zik7IGlmIChsYnVmKSBlZnJlZShs YnVmKTsgaWYgKGFidWYpIGVmcmVlKGFidWYpOyBpZiAoYWluZCkgZWZyZWUo YWluZCk7IHJldHVybjsgfQ0KICANCiAgLyoNCiAgICogU3BsaXQgcmF3IG1p bWUgc3RyZWFtIHVwIGludG8gYXBwcm9wcmlhdGUgY29tcG9uZW50cw0KKioq KioqKioqKioqKioqDQoqKiogNTQsNjAgKioqKg0KICAJY2hhciAqcHRyLCAq bG9jLCAqbG9jMiwgKnMsICpuYW1lLCAqZmlsZW5hbWUsICp1LCAqZm47DQog IAlpbnQgbGVuLCBzdGF0ZSA9IDAsIERvbmUgPSAwLCByZW0sIHVyZW07DQog IAlsb25nIGJ5dGVzLCBtYXhfZmlsZV9zaXplID0gMDsNCiEgCWNoYXIgKm5h bWVidWY9TlVMTCwgKmZpbGVuYW1lYnVmPU5VTEwsICpsYnVmPU5VTEwsICph YnVmPU5VTEw7DQogIAljaGFyIHNieXRlc1sxNl07DQogIAlGSUxFICpmcDsN CiAgCWludCBpdHlwZTsNCi0tLSA3OCw4NCAtLS0tDQogIAljaGFyICpwdHIs ICpsb2MsICpsb2MyLCAqcywgKm5hbWUsICpmaWxlbmFtZSwgKnUsICpmbjsN CiAgCWludCBsZW4sIHN0YXRlID0gMCwgRG9uZSA9IDAsIHJlbSwgdXJlbTsN CiAgCWxvbmcgYnl0ZXMsIG1heF9maWxlX3NpemUgPSAwOw0KISAJY2hhciAq bmFtZWJ1Zj1OVUxMLCAqZmlsZW5hbWVidWY9TlVMTCwgKmxidWY9TlVMTCwg KmFidWY9TlVMTCwgKmFpbmQ9TlVMTDsNCiAgCWNoYXIgc2J5dGVzWzE2XTsN CiAgCUZJTEUgKmZwOw0KICAJaW50IGl0eXBlOw0KKioqKioqKioqKioqKioq DQoqKiogMTI2LDEzNyAqKioqDQogIAkJCQkJCWVmcmVlKGZpbGVuYW1lYnVm KTsNCiAgCQkJCQl9DQogIAkJCQkJZmlsZW5hbWVidWYgPSBlc3RybmR1cChm aWxlbmFtZSwgcy1maWxlbmFtZSk7DQohIAkJCQkJaWYgKHN0cnN0cihuYW1l YnVmLCAiW10iKSkgew0KICAJCQkJCQlpZiAoYWJ1Zikgew0KICAJCQkJCQkJ ZWZyZWUoYWJ1Zik7DQogIAkJCQkJCX0NCiEgCQkJCQkJYWJ1ZiA9IGVzdHJu ZHVwKG5hbWVidWYsIHN0cmxlbihuYW1lYnVmKSAtIDIpOw0KISAJCQkJCQlz cHJpbnRmKGxidWYsICIlc19uYW1lW10iLCBhYnVmKTsNCiAgCQkJCQl9IGVs c2Ugew0KICAJCQkJCQlzcHJpbnRmKGxidWYsICIlc19uYW1lIiwgbmFtZWJ1 Zik7DQogIAkJCQkJfQ0KLS0tIDE1MCwxNzYgLS0tLQ0KICAJCQkJCQllZnJl ZShmaWxlbmFtZWJ1Zik7DQogIAkJCQkJfQ0KICAJCQkJCWZpbGVuYW1lYnVm ID0gZXN0cm5kdXAoZmlsZW5hbWUsIHMtZmlsZW5hbWUpOw0KISAJCQkJCWl0 eXBlID0gcGhwM19jaGVja19pZGVudF90eXBlKG5hbWVidWYpOw0KISAJCQkJ CWlmIChpdHlwZSAmIEdQQ19BUlJBWSkgew0KISAJCQkJCQlzID0gc3RyY2hy KG5hbWVidWYsICdbJyk7DQohIAkJCQkJCWlmICghcykgew0KISAJCQkJCQkJ cGhwM19lcnJvcihFX1dBUk5JTkcsICJUaGlzIHNob3VsZG4ndCBldmVyIGhh cHBlbiIpOw0KISAJCQkJCQkJU0FGRV9SRVRVUk47DQohIAkJCQkJCX0NCiAg CQkJCQkJaWYgKGFidWYpIHsNCiAgCQkJCQkJCWVmcmVlKGFidWYpOw0KICAJ CQkJCQl9DQohIAkJCQkJCWlmIChhaW5kKSB7DQohIAkJCQkJCQllZnJlZShh aW5kKTsNCiEgCQkJCQkJfQ0KISAJCQkJCQlhYnVmID0gZXN0cm5kdXAobmFt ZWJ1ZiwgcyAtIG5hbWVidWYpOw0KISAJCQkJCQlpZiAoaXR5cGUgPT0gR1BD X0lOREVYRURfQVJSQVkpIHsNCiEgCQkJCQkJCWFpbmQgPSBwaHAzX2dldF9p ZGVudF9pbmRleChuYW1lYnVmKTsNCiEgCQkJCQkJCXNwcmludGYobGJ1Ziwg IiVzX25hbWVbJXNdIiwgYWJ1ZiwgYWluZCk7DQohIAkJCQkJCX0gZWxzZSB7 DQohIAkJCQkJCQlhaW5kID0gTlVMTDsNCiEgCQkJCQkJCXNwcmludGYobGJ1 ZiwgIiVzX25hbWVbXSIsIGFidWYpOw0KISAJCQkJCQl9DQogIAkJCQkJfSBl bHNlIHsNCiAgCQkJCQkJc3ByaW50ZihsYnVmLCAiJXNfbmFtZSIsIG5hbWVi dWYpOw0KICAJCQkJCX0NCioqKioqKioqKioqKioqKg0KKioqIDE0OCwxNTgg KioqKg0KICAJCQkJCQlpZiAoIXN0cm5jYXNlY21wKGxvYyArIDEsICJDb250 ZW50LVR5cGU6IiwgMTMpKSB7DQogIAkJCQkJCQkqKGxvYzIgLSAxKSA9ICdc MCc7DQogIAkJCQkJCQlpZiAoYWJ1Zikgew0KISAJCQkJCQkJCXNwcmludGYo bGJ1ZiwgIiVzX3R5cGVbXSIsIGFidWYpOw0KICAJCQkJCQkJfSBlbHNlIHsN CiAgCQkJCQkJCQlzcHJpbnRmKGxidWYsICIlc190eXBlIiwgbmFtZWJ1Zik7 DQogIAkJCQkJCQl9DQohIAkJCQkJCQlTRVRfVkFSX1NUUklORyhsYnVmLCBl c3RyZHVwKGxvYyArIDE1KSk7DQogIAkJCQkJCQkqKGxvYzIgLSAxKSA9ICdc bic7DQogIAkJCQkJCX0NCiAgCQkJCQkJcmVtIC09IDI7DQotLS0gMTg3LDIw MiAtLS0tDQogIAkJCQkJCWlmICghc3RybmNhc2VjbXAobG9jICsgMSwgIkNv bnRlbnQtVHlwZToiLCAxMykpIHsNCiAgCQkJCQkJCSoobG9jMiAtIDEpID0g J1wwJzsNCiAgCQkJCQkJCWlmIChhYnVmKSB7DQohIAkJCQkJCQkJaWYgKGFp bmQpIHsNCiEgCQkJCQkJCQkJc3ByaW50ZihsYnVmLCAiJXNfdHlwZVslc10i LCBhYnVmLCBhaW5kKTsNCiEgCQkJCQkJCQl9IGVsc2Ugew0KISAJCQkJCQkJ CQlzcHJpbnRmKGxidWYsICIlc190eXBlW10iLCBhYnVmKTsNCiEgCQkJCQkJ CQl9DQogIAkJCQkJCQl9IGVsc2Ugew0KICAJCQkJCQkJCXNwcmludGYobGJ1 ZiwgIiVzX3R5cGUiLCBuYW1lYnVmKTsNCiAgCQkJCQkJCX0NCiEgCQkJCQkJ CS8qIFNFVF9WQVJfU1RSSU5HKGxidWYsIGVzdHJkdXAobG9jICsgMTUpKTsg Ki8NCiEgCQkJCQkJCV9waHAzX3BhcnNlX2dwY19kYXRhKGVzdHJkdXAobG9j ICsgMTUpLCBsYnVmLCBodHRwX3Bvc3RfdmFycyk7DQogIAkJCQkJCQkqKGxv YzIgLSAxKSA9ICdcbic7DQogIAkJCQkJCX0NCiAgCQkJCQkJcmVtIC09IDI7 DQoqKioqKioqKioqKioqKioNCioqKiAxODIsMTg4ICoqKioNCiAgDQogIAkJ CQkvKiBBbmQgYSBsaXR0bGUga2x1ZGdlIHRvIHBpY2sgb3V0IHNwZWNpYWwg TUFYX0ZJTEVfU0laRSAqLw0KICAJCQkJaXR5cGUgPSBwaHAzX2NoZWNrX2lk ZW50X3R5cGUobmFtZWJ1Zik7DQohIAkJCQlpZiAoaXR5cGUpIHsNCiAgCQkJ CQl1ID0gc3RyY2hyKG5hbWVidWYsICdbJyk7DQogIAkJCQkJaWYgKHUpDQog IAkJCQkJCSp1ID0gJ1wwJzsNCi0tLSAyMjYsMjMyIC0tLS0NCiAgDQogIAkJ CQkvKiBBbmQgYSBsaXR0bGUga2x1ZGdlIHRvIHBpY2sgb3V0IHNwZWNpYWwg TUFYX0ZJTEVfU0laRSAqLw0KICAJCQkJaXR5cGUgPSBwaHAzX2NoZWNrX2lk ZW50X3R5cGUobmFtZWJ1Zik7DQohIAkJCQlpZiAoaXR5cGUgJiBHUENfQVJS QVkpIHsNCiAgCQkJCQl1ID0gc3RyY2hyKG5hbWVidWYsICdbJyk7DQogIAkJ CQkJaWYgKHUpDQogIAkJCQkJCSp1ID0gJ1wwJzsNCioqKioqKioqKioqKioq Kg0KKioqIDI1MywyNTkgKioqKg0KICAJCQkJLyogU0VUX1ZBUl9MT05HKGxi dWYsIGJ5dGVzKTsgKi8NCiAgDQogIAkJCQlpZiAoYWJ1Zikgew0KISAJCQkJ CXNwcmludGYobGJ1ZiwgIiVzX3NpemVbXSIsIGFidWYpOw0KICAJCQkJfSBl bHNlIHsNCiAgCQkJCQlzcHJpbnRmKGxidWYsICIlc19zaXplIiwgbmFtZWJ1 Zik7DQogIAkJCQl9DQotLS0gMjk3LDMwNyAtLS0tDQogIAkJCQkvKiBTRVRf VkFSX0xPTkcobGJ1ZiwgYnl0ZXMpOyAqLw0KICANCiAgCQkJCWlmIChhYnVm KSB7DQohIAkJCQkJaWYgKGFpbmQpIHsNCiEgCQkJCQkJc3ByaW50ZihsYnVm LCAiJXNfc2l6ZVslc10iLCBhYnVmLCBhaW5kKTsNCiEgCQkJCQl9IGVsc2Ug ew0KISAJCQkJCQlzcHJpbnRmKGxidWYsICIlc19zaXplW10iLCBhYnVmKTsN CiEgCQkJCQl9DQogIAkJCQl9IGVsc2Ugew0KICAJCQkJCXNwcmludGYobGJ1 ZiwgIiVzX3NpemUiLCBuYW1lYnVmKTsNCiAgCQkJCX0NCg== --0-1957747793-941577010=:22106--