johannes Wed Jul 11 17:39:04 2007 UTC
Modified files:
/php-src acinclude.m4
/php-src/ext/mbstring mbstring.c
/php-src/ext/standard basic_functions.c mail.c php_mail.h
/php-src/main config.w32.h main.c
/php-src/win32/build config.w32.h.in
Log:
- Always enable mail() function
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.373&r2=1.374&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.373 php-src/acinclude.m4:1.374
--- php-src/acinclude.m4:1.373 Wed Jul 11 10:35:47 2007
+++ php-src/acinclude.m4 Wed Jul 11 17:39:04 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.373 2007/07/11 10:35:47 jani Exp $
+dnl $Id: acinclude.m4,v 1.374 2007/07/11 17:39:04 johannes Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -1991,9 +1991,6 @@
AC_DEFUN([PHP_PROG_SENDMAIL], [
PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
- if test -n "$PROG_SENDMAIL"; then
- AC_DEFINE(HAVE_SENDMAIL,1,[whether you have sendmail])
- fi
PHP_SUBST(PROG_SENDMAIL)
])
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.268&r2=1.269&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.268
php-src/ext/mbstring/mbstring.c:1.269
--- php-src/ext/mbstring/mbstring.c:1.268 Wed Apr 4 15:23:09 2007
+++ php-src/ext/mbstring/mbstring.c Wed Jul 11 17:39:04 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.268 2007/04/04 15:23:09 masugata Exp $ */
+/* $Id: mbstring.c,v 1.269 2007/07/11 17:39:04 johannes Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -3317,7 +3317,6 @@
/* {{{ proto int mb_send_mail(string to, string subject, string message [,
string additional_headers [, string additional_parameters]])
* Sends an email message with MIME scheme
*/
-#if HAVE_SENDMAIL
#define SKIP_LONG_HEADER_SEP_MBSTRING(str, pos)
\
if (str[pos] == '\r' && str[pos + 1] == '\n' && (str[pos + 2] == ' ' ||
str[pos + 2] == '\t')) { \
@@ -3821,16 +3820,6 @@
#undef PHP_MBSTR_MAIL_MIME_HEADER2
#undef PHP_MBSTR_MAIL_MIME_HEADER3
#undef PHP_MBSTR_MAIL_MIME_HEADER4
-
-#else /* HAVE_SENDMAIL */
-
-PHP_FUNCTION(mb_send_mail)
-{
- RETURN_FALSE;
-}
-
-#endif /* HAVE_SENDMAIL */
-
/* }}} */
/* {{{ proto mixed mb_get_info([string type])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.863&r2=1.864&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.863
php-src/ext/standard/basic_functions.c:1.864
--- php-src/ext/standard/basic_functions.c:1.863 Wed Jul 11 15:52:44 2007
+++ php-src/ext/standard/basic_functions.c Wed Jul 11 17:39:04 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.863 2007/07/11 15:52:44 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.864 2007/07/11 17:39:04 johannes Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1816,7 +1816,6 @@
#endif
/* }}} */
/* {{{ mail.c */
-#ifdef HAVE_SENDMAIL
static
ZEND_BEGIN_ARG_INFO(arginfo_ezmlm_hash, 0)
ZEND_ARG_INFO(0, addr)
@@ -1830,7 +1829,6 @@
ZEND_ARG_INFO(0, additional_headers)
ZEND_ARG_INFO(0, additional_parameters)
ZEND_END_ARG_INFO()
-#endif
/* }}} */
/* {{{ math.c */
static
@@ -3693,10 +3691,8 @@
PHP_FALIAS(diskfreespace, disk_free_space,
arginfo_disk_free_space)
/* functions from mail.c */
-#ifdef HAVE_SENDMAIL
PHP_FE(mail,
arginfo_mail)
PHP_FE(ezmlm_hash,
arginfo_ezmlm_hash)
-#endif
/* functions from syslog.c */
#ifdef HAVE_SYSLOG_H
@@ -4944,14 +4940,9 @@
case 1: /*send an email */
{
-#if HAVE_SENDMAIL
if (!php_mail(opt, "PHP error_log message",
message, headers, NULL TSRMLS_CC)) {
return FAILURE;
}
-#else
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Mail option not available!");
- return FAILURE;
-#endif
}
break;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.93&r2=1.94&diff_format=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.93 php-src/ext/standard/mail.c:1.94
--- php-src/ext/standard/mail.c:1.93 Tue Jul 10 20:23:26 2007
+++ php-src/ext/standard/mail.c Wed Jul 11 17:39:04 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mail.c,v 1.93 2007/07/10 20:23:26 stas Exp $ */
+/* $Id: mail.c,v 1.94 2007/07/11 17:39:04 johannes Exp $ */
#include <stdlib.h>
#include <ctype.h>
@@ -35,7 +35,6 @@
#include "php_ini.h"
#include "exec.h"
-#if HAVE_SENDMAIL
#ifdef PHP_WIN32
#include "win32/sendmail.h"
#endif
@@ -271,13 +270,6 @@
}
/* }}} */
-#else
-
-PHP_FUNCTION(mail) {}
-PHP_MINFO_FUNCTION(mail) {}
-
-#endif
-
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_mail.h?r1=1.20&r2=1.21&diff_format=u
Index: php-src/ext/standard/php_mail.h
diff -u php-src/ext/standard/php_mail.h:1.20
php-src/ext/standard/php_mail.h:1.21
--- php-src/ext/standard/php_mail.h:1.20 Mon Jan 1 09:29:32 2007
+++ php-src/ext/standard/php_mail.h Wed Jul 11 17:39:04 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mail.h,v 1.20 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: php_mail.h,v 1.21 2007/07/11 17:39:04 johannes Exp $ */
#ifndef PHP_MAIL_H
#define PHP_MAIL_H
@@ -24,11 +24,7 @@
PHP_FUNCTION(mail);
PHP_MINFO_FUNCTION(mail);
-#if HAVE_SENDMAIL
-
PHP_FUNCTION(ezmlm_hash);
PHPAPI extern int php_mail(char *to, char *subject, char *message, char
*headers, char *extra_cmd TSRMLS_DC);
-#endif
-
#endif /* PHP_MAIL_H */
http://cvs.php.net/viewvc.cgi/php-src/main/config.w32.h?r1=1.89&r2=1.90&diff_format=u
Index: php-src/main/config.w32.h
diff -u php-src/main/config.w32.h:1.89 php-src/main/config.w32.h:1.90
--- php-src/main/config.w32.h:1.89 Mon Jan 1 09:29:35 2007
+++ php-src/main/config.w32.h Wed Jul 11 17:39:04 2007
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
- $Id: config.w32.h,v 1.89 2007/01/01 09:29:35 sebastian Exp $
+ $Id: config.w32.h,v 1.90 2007/07/11 17:39:04 johannes Exp $
*/
/* Default PHP / PEAR directories */
@@ -112,7 +112,6 @@
#undef HAVE_SETITIMER
#undef HAVE_IODBC
#define HAVE_LIBDL 1
-#define HAVE_SENDMAIL 1
#define HAVE_GETTIMEOFDAY 1
#define HAVE_PUTENV 1
#define HAVE_LIMITS_H 1
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.735&r2=1.736&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.735 php-src/main/main.c:1.736
--- php-src/main/main.c:1.735 Wed Jul 11 10:23:47 2007
+++ php-src/main/main.c Wed Jul 11 17:39:04 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.735 2007/07/11 10:23:47 jani Exp $ */
+/* $Id: main.c,v 1.736 2007/07/11 17:39:04 johannes Exp $ */
/* {{{ includes
*/
@@ -341,7 +341,7 @@
#if defined(PHP_PROG_SENDMAIL) && !defined(NETWARE)
# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
#else
-# define DEFAULT_SENDMAIL_PATH NULL
+# define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i"
#endif
/* {{{ PHP_INI
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.13&r2=1.14&diff_format=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.13
php-src/win32/build/config.w32.h.in:1.14
--- php-src/win32/build/config.w32.h.in:1.13 Tue Apr 10 06:22:45 2007
+++ php-src/win32/build/config.w32.h.in Wed Jul 11 17:39:04 2007
@@ -1,6 +1,6 @@
/*
Build Configuration Template for Win32.
- $Id: config.w32.h.in,v 1.13 2007/04/10 06:22:45 dmitry Exp $
+ $Id: config.w32.h.in,v 1.14 2007/07/11 17:39:04 johannes Exp $
*/
/* Default PHP / PEAR directories */
@@ -55,7 +55,6 @@
#undef HAVE_SETITIMER
#undef HAVE_IODBC
#define HAVE_LIBDL 1
-#define HAVE_SENDMAIL 1
#define HAVE_GETTIMEOFDAY 1
#define HAVE_PUTENV 1
#define HAVE_LIMITS_H 1
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
