--- /dev/null
+--- php-4.0b4pl1/ext/imap/imap.c.wiget Mon Feb 21 14:50:40 2000
++++ php-4.0b4pl1/ext/imap/imap.c Thu Mar 16 14:55:05 2000
+@@ -431,23 +431,23 @@
+ unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN |
+ SA_UIDNEXT | SA_UIDVALIDITY;
+
+-#if !(WIN32|WINNT)
++#if 0
+ mail_link(&unixdriver); /* link in the unix driver */
+ #endif
+ mail_link (&imapdriver); /* link in the imap driver */
+ mail_link (&nntpdriver); /* link in the nntp driver */
+ mail_link (&pop3driver); /* link in the pop3 driver */
+-#if !(WIN32|WINNT)
++#if 0
+ mail_link (&mhdriver); /* link in the mh driver */
+ mail_link (&mxdriver); /* link in the mx driver */
+-#endif
+ mail_link (&mbxdriver); /* link in the mbx driver */
+ mail_link (&tenexdriver); /* link in the tenex driver */
+ mail_link (&mtxdriver); /* link in the mtx driver */
+-#if !(WIN32|WINNT)
+ mail_link (&mmdfdriver); /* link in the mmdf driver */
+ mail_link (&newsdriver); /* link in the news driver */
+ mail_link (&philedriver); /* link in the phile driver */
++#endif
++#if !(WIN32|WINNT)
+ auth_link (&auth_log); /* link in the log authenticator */
+ #endif
+ mail_link (&dummydriver); /* link in the dummy driver */
--- /dev/null
+Only in php-4.0RC1/ext/standard/: .libs
+Only in php-4.0RC1/ext/standard/: Makefile
+Only in php-4.0RC1/ext/standard/: array.lo
+Only in php-4.0RC1/ext/standard/: assert.lo
+Only in php-4.0RC1/ext/standard/: base64.lo
+Only in php-4.0RC1/ext/standard/: basic_functions.lo
+Only in php-4.0RC1/ext/standard/: browscap.lo
+Only in php-4.0RC1/ext/standard/: crypt.lo
+Only in php-4.0RC1/ext/standard/: cyr_convert.lo
+Only in php-4.0RC1/ext/standard/: datetime.lo
+Only in php-4.0RC1/ext/standard/: dir.lo
+Only in php-4.0RC1/ext/standard/: dl.lo
+Only in php-4.0RC1/ext/standard/: dns.lo
+Only in php-4.0RC1/ext/standard/: exec.lo
+Only in php-4.0RC1/ext/standard/: file.lo
+Only in php-4.0RC1/ext/standard/: filestat.lo
+Only in php-4.0RC1/ext/standard/: flock_compat.lo
+Only in php-4.0RC1/ext/standard/: formatted_print.lo
+Only in php-4.0RC1/ext/standard/: fsock.lo
+Only in php-4.0RC1/ext/standard/: head.lo
+Only in php-4.0RC1/ext/standard/: html.lo
+Only in php-4.0RC1/ext/standard/: image.lo
+Only in php-4.0RC1/ext/standard/: info.lo
+Only in php-4.0RC1/ext/standard/: iptc.lo
+Only in php-4.0RC1/ext/standard/: lcg.lo
+Only in php-4.0RC1/ext/standard/: libstandard.la
+Only in php-4.0RC1/ext/standard/: link.lo
+diff -ru php-4.0RC1.old/ext/standard/mail.c php-4.0RC1/ext/standard/mail.c
+--- php-4.0RC1.old/ext/standard/mail.c Mon Mar 6 21:37:11 2000
++++ php-4.0RC1/ext/standard/mail.c Tue Apr 4 03:13:33 2000
+@@ -21,6 +21,8 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <stdio.h>
++#include <syslog.h>
++#include <string.h>
+ #include "php.h"
+ #if !defined(PHP_WIN32)
+ #include "build-defs.h"
+@@ -112,8 +114,12 @@
+ sendmail = popen(sendmail_path, "w");
+
+ if (sendmail) {
+- fprintf(sendmail, "To: %s\n", to);
+- fprintf(sendmail, "Subject: %s\n", subject);
++ if ((to != NULL) && (strlen(to)!=0)) {
++ fprintf(sendmail, "To: %s\n", to);
++ }
++ if ((subject != NULL) && (strlen(subject)!=0)) {
++ fprintf(sendmail, "Subject: %s\n", subject);
++ }
+ if (headers != NULL) {
+ fprintf(sendmail, "%s\n", headers);
+ }
+Only in php-4.0RC1/ext/standard/: mail.c~
+Only in php-4.0RC1/ext/standard/: mail.lo
+Only in php-4.0RC1/ext/standard/: math.lo
+Only in php-4.0RC1/ext/standard/: md5.lo
+Only in php-4.0RC1/ext/standard/: metaphone.lo
+Only in php-4.0RC1/ext/standard/: microtime.lo
+Only in php-4.0RC1/ext/standard/: output.lo
+Only in php-4.0RC1/ext/standard/: pack.lo
+Only in php-4.0RC1/ext/standard/: pageinfo.lo
+Only in php-4.0RC1/ext/standard/: parsedate.lo
+Only in php-4.0RC1/ext/standard/: quot_print.lo
+Only in php-4.0RC1/ext/standard/: rand.lo
+Only in php-4.0RC1/ext/standard/: reg.lo
+Only in php-4.0RC1/ext/standard/: soundex.lo
+Only in php-4.0RC1/ext/standard/: string.lo
+Only in php-4.0RC1/ext/standard/: syslog.lo
+Only in php-4.0RC1/ext/standard/: type.lo
+Only in php-4.0RC1/ext/standard/: uniqid.lo
+Only in php-4.0RC1/ext/standard/: url.lo
+Only in php-4.0RC1/ext/standard/: url_scanner.lo
+Only in php-4.0RC1/ext/standard/: var.lo
--- /dev/null
+--- php-4.0RC1/ext/mysql/config.m4.wiget Sun Mar 26 21:51:10 2000
++++ php-4.0RC1/ext/mysql/config.m4 Fri Mar 31 12:23:06 2000
+@@ -4,17 +4,25 @@
+ sinclude(ext/mysql/libmysql/mysql.m4)
+
+ AC_DEFUN(PHP_MYSQL_SOCK,[
+- AC_MSG_CHECKING(for MySQL UNIX socket)
+- MYSQL_SOCK=/tmp/mysql.sock
+- for i in \
+- /var/run/mysqld/mysqld.sock \
+- /var/tmp/mysql.sock \
+- /var/lib/mysql/mysql.sock \
+- ; do
+- if test -r $i; then
+- MYSQL_SOCK=$i
+- fi
+- done
++ AC_ARG_WITH(mysql_sock,
++[ --with-mysql-socket=PATH
++ Specify location of MySQL UNIX socket,
++ defaults search in know locations],[
++ MYSQL_SOCK=$withval
++ ],)
++ if test "$MYSQL_SOCK" = "" -o "$MYSQL_SOCK" = "no" -o "MYSQL_SOCK" = "yes"; then
++ AC_MSG_CHECKING(for MySQL UNIX socket)
++ MYSQL_SOCK=/tmp/mysql.sock
++ for i in \
++ /var/run/mysqld/mysqld.sock \
++ /var/tmp/mysql.sock \
++ /var/lib/mysql/mysql.sock \
++ ; do
++ if test -r $i; then
++ MYSQL_SOCK=$i
++ fi
++ done
++ fi
+ AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, "$MYSQL_SOCK", [ ])
+ AC_MSG_RESULT($MYSQL_SOCK)
+ ])