[PHP-dev 123] mail()関数パッチ

[Rui Hirokawa]

This is a multi-part message in MIME format.

--Multipart_Sat__17_Nov_2001_19:44:47_+0900_08311eb8
Content-Type: text/plain; charset=ISO-2022-JP
Content-Transfer-Encoding: 7bit


廣川です。

mail()関数をmb_send_mail()に差し替える簡単なパッチを作ってみました。
関数オーバーロードに関する変数みたいなのがZendの関数構造体にある
みたいでしたが、使い方が分からなかったので、とりあえず、
関数ポインタだけ差し替えています。
添付したのはphp-4.2.0devに対するパッチです。

-- 
-----------------------------------------------------
Rui Hirokawa <rui_hirokawa@ybb.ne.jp>
             <hirokawa@php.net>

--Multipart_Sat__17_Nov_2001_19:44:47_+0900_08311eb8
Content-Type: application/octet-stream;
 name="mail.patch"
Content-Disposition: attachment;
 filename="mail.patch"
Content-Transfer-Encoding: base64

ZGlmZiAtcmMgbWJzdHJpbmcub3JnL21ic3RyaW5nLmMgbWJzdHJpbmcvbWJzdHJpbmcuYwoqKiog
bWJzdHJpbmcub3JnL21ic3RyaW5nLmMJU2F0IE5vdiAxNyAxOTozODo0OSAyMDAxCi0tLSBtYnN0
cmluZy9tYnN0cmluZy5jCVNhdCBOb3YgMTcgMTc6NTk6MTIgMjAwMQoqKioqKioqKioqKioqKioK
KioqIDQwNyw0MTIgKioqKgotLS0gNDA3LDQxMyAtLS0tCiAgCXBnbG9iYWxzLT5jdXJyZW50X2Zp
bHRlcl9pbGxlZ2FsX21vZGUgPSBNQkZMX09VVFBVVEZJTFRFUl9JTExFR0FMX01PREVfQ0hBUjsK
ICAJcGdsb2JhbHMtPmN1cnJlbnRfZmlsdGVyX2lsbGVnYWxfc3Vic3RjaGFyID0gMHgzZjsJLyog
Jz8nICovCiAgCXBnbG9iYWxzLT5vdXRjb252ID0gTlVMTDsKKyAJcGdsb2JhbHMtPm9yaWdfbWFp
bCA9ICh6ZW5kX2Z1bmN0aW9uICopTlVMTDsKICB9CiAgCiAgUEhQX01JTklUX0ZVTkNUSU9OKG1i
c3RyaW5nKQoqKioqKioqKioqKioqKioKKioqIDQzNCw0MzkgKioqKgotLS0gNDM1LDQ1MiAtLS0t
CiAgCQlmcmVlKE1CU1RSRyhkZXRlY3Rfb3JkZXJfbGlzdCkpOwogIAl9CiAgCisgCWlmIChNQlNU
Ukcob3JpZ19tYWlsKSl7CisgCQlpZih6ZW5kX2hhc2hfZGVsKEVHKGZ1bmN0aW9uX3RhYmxlKSwg
Im1haWwiLHNpemVvZigibWFpbCIpKSA9PSBGQUlMVVJFKXsKKyAJCQl6ZW5kX2Vycm9yKEVfRVJS
T1IsICJmYWlsZWQgdG8gcmVtb3ZlIG1haWwoKSBmcm9tIGZ1bmN0aW9uIHRhYmxlLiIpOworIAkJ
fQorIAkJaWYgKHplbmRfaGFzaF9hZGQoRUcoZnVuY3Rpb25fdGFibGUpLCAibWFpbCIsc2l6ZW9m
KCJtYWlsIiksCisgCQkJCQkJICBNQlNUUkcob3JpZ19tYWlsKSwgc2l6ZW9mKHplbmRfZnVuY3Rp
b24pLCBOVUxMKSA9PSBGQUlMVVJFKXsKKyAJCQl6ZW5kX2Vycm9yKEVfRVJST1IsICJtYnRyaW5n
IGNvdWxkbid0IGFkZCByZWZlcmVuY2UgdG8gbWFpbCgpLiIpOworIAkJfQorIAl9CisgCisgCisg
CiAgCXJldHVybiBTVUNDRVNTOwogIH0KICAKKioqKioqKioqKioqKioqCioqKiA0NDEsNDQ2ICoq
KioKLS0tIDQ1NCw0NjAgLS0tLQogIFBIUF9SSU5JVF9GVU5DVElPTihtYnN0cmluZykKICB7CiAg
CWludCBuLCAqbGlzdCwgKmVudHJ5OworIAl6ZW5kX2Z1bmN0aW9uICpmdW5jOwogIAogIAlNQlNU
UkcoY3VycmVudF9sYW5ndWFnZSkgPSBNQlNUUkcobGFuZ3VhZ2UpOwogIAlNQlNUUkcoY3VycmVu
dF9pbnRlcm5hbF9lbmNvZGluZykgPSBNQlNUUkcoaW50ZXJuYWxfZW5jb2RpbmcpOwoqKioqKioq
KioqKioqKioKKioqIDQ2Nyw0NzIgKioqKgotLS0gNDgxLDUwMyAtLS0tCiAgCQl9CiAgCX0KICAK
KyAJLyogb3ZlcnJpZGUgb3JpZ2luYWwgbWFpbCgpIGZ1bmN0aW9uIHdpdGggbWJfc2VuZF9tYWls
KCkuICovCisgCWlmICghTUJTVFJHKG9yaWdfbWFpbCkpeyAKKyAJCWlmICh6ZW5kX2hhc2hfZmlu
ZChFRyhmdW5jdGlvbl90YWJsZSksICJtYl9zZW5kX21haWwiLCBzaXplb2YoIm1iX3NlbmRfbWFp
bCIpLCAodm9pZCAqKikgJmZ1bmMpID09IEZBSUxVUkUpCXsKKyAJCQl6ZW5kX2Vycm9yKEVfRVJS
T1IsICJtYnRyaW5nIGNvdWxkbid0IGZvdW5kIG1iX3NlbmRfbWFpbCgpLiIpOworIAkJfQorIAkJ
aWYgKHplbmRfaGFzaF9maW5kKEVHKGZ1bmN0aW9uX3RhYmxlKSwgIm1haWwiLCBzaXplb2YoIm1h
aWwiKSwgKHZvaWQgKiopICZNQlNUUkcob3JpZ19tYWlsKSkgPT0gRkFJTFVSRSkJeworIAkJCXpl
bmRfZXJyb3IoRV9FUlJPUiwgIm1idHJpbmcgY291bGRuJ3QgZm91bmQgbWFpbCgpLiIpOworIAkJ
fQorIAkJaWYoemVuZF9oYXNoX2RlbChFRyhmdW5jdGlvbl90YWJsZSksICJtYWlsIixzaXplb2Yo
Im1haWwiKSkgPT0gRkFJTFVSRSl7CisgCQkJemVuZF9lcnJvcihFX0VSUk9SLCAiZmFpbGVkIHRv
IHJlbW92ZSBtYWlsKCkgZnJvbSBmdW5jdGlvbiB0YWJsZS4iKTsKKyAJCX0KKyAJCWlmICh6ZW5k
X2hhc2hfYWRkKEVHKGZ1bmN0aW9uX3RhYmxlKSwgIm1haWwiLHNpemVvZigibWFpbCIpLAorIAkJ
CQkJCSAgZnVuYywgc2l6ZW9mKHplbmRfZnVuY3Rpb24pLCBOVUxMKSA9PSBGQUlMVVJFKXsKKyAJ
CQl6ZW5kX2Vycm9yKEVfRVJST1IsICJtYnRyaW5nIGNvdWxkbid0IGFkZCByZWZlcmVuY2UgdG8g
bWFpbCgpLiIpOworIAkJfQorIAl9CisgCiAgCXJldHVybiBTVUNDRVNTOwogIH0KICAKZGlmZiAt
cmMgbWJzdHJpbmcub3JnL21ic3RyaW5nLmggbWJzdHJpbmcvbWJzdHJpbmcuaAoqKiogbWJzdHJp
bmcub3JnL21ic3RyaW5nLmgJU2F0IE5vdiAxNyAxOTozODo0OSAyMDAxCi0tLSBtYnN0cmluZy9t
YnN0cmluZy5oCVNhdCBOb3YgMTcgMTc6NTU6NTQgMjAwMQoqKioqKioqKioqKioqKioKKioqIDEx
MywxMTggKioqKgotLS0gMTEzLDExOSAtLS0tCiAgCWludCBmaWx0ZXJfaWxsZWdhbF9zdWJzdGNo
YXI7CiAgCWludCBjdXJyZW50X2ZpbHRlcl9pbGxlZ2FsX21vZGU7CiAgCWludCBjdXJyZW50X2Zp
bHRlcl9pbGxlZ2FsX3N1YnN0Y2hhcjsKKyAJemVuZF9mdW5jdGlvbiAqb3JpZ19tYWlsOwogIAlt
YmZsX2J1ZmZlcl9jb252ZXJ0ZXIgKm91dGNvbnY7CiAgWkVORF9FTkRfTU9EVUxFX0dMT0JBTFMo
bWJzdHJpbmcpOwogIAo=

--Multipart_Sat__17_Nov_2001_19:44:47_+0900_08311eb8--