johannes Wed Jul 11 17:36:56 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS 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:
- MFH: Always enable mail() function
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.827&r2=1.2027.2.547.2.828&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.827 php-src/NEWS:1.2027.2.547.2.828
--- php-src/NEWS:1.2027.2.547.2.827 Wed Jul 11 12:18:13 2007
+++ php-src/NEWS Wed Jul 11 17:36:55 2007
@@ -16,6 +16,7 @@
- Changed error handler to send HTTP 500 instead of blank page on PHP errors.
(Dmitry, Andrei Nigmatulin)
+- Changed mail() function to be always available. (Johannes)
- Added persistent connection status checker to pdo_pgsql.
(Elvis Pranskevichus, Ilia)
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.19&r2=1.332.2.14.2.20&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.14.2.19
php-src/acinclude.m4:1.332.2.14.2.20
--- php-src/acinclude.m4:1.332.2.14.2.19 Wed Jul 11 15:16:56 2007
+++ php-src/acinclude.m4 Wed Jul 11 17:36:55 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.332.2.14.2.19 2007/07/11 15:16:56 jani Exp $
+dnl $Id: acinclude.m4,v 1.332.2.14.2.20 2007/07/11 17:36:55 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.224.2.22.2.22&r2=1.224.2.22.2.23&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.22
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.23
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.22 Wed Apr 4 15:25:41 2007
+++ php-src/ext/mbstring/mbstring.c Wed Jul 11 17:36:55 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.22 2007/04/04 15:25:41 masugata Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.23 2007/07/11 17:36:55 johannes Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -3297,7 +3297,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')) { \
@@ -3806,16 +3805,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.725.2.31.2.57&r2=1.725.2.31.2.58&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.57
php-src/ext/standard/basic_functions.c:1.725.2.31.2.58
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.57 Mon Jul 9
17:27:24 2007
+++ php-src/ext/standard/basic_functions.c Wed Jul 11 17:36:55 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.57 2007/07/09 17:27:24 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.58 2007/07/11 17:36:55 johannes Exp $
*/
#include "php.h"
#include "php_streams.h"
@@ -1830,7 +1830,6 @@
#endif
/* }}} */
/* {{{ mail.c */
-#ifdef HAVE_SENDMAIL
static
ZEND_BEGIN_ARG_INFO(arginfo_ezmlm_hash, 0)
ZEND_ARG_INFO(0, addr)
@@ -1844,7 +1843,6 @@
ZEND_ARG_INFO(0, additional_headers)
ZEND_ARG_INFO(0, additional_parameters)
ZEND_END_ARG_INFO()
-#endif
/* }}} */
/* {{{ math.c */
static
@@ -3650,10 +3648,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
@@ -4997,14 +4993,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.87.2.1.2.6&r2=1.87.2.1.2.7&diff_format=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.87.2.1.2.6
php-src/ext/standard/mail.c:1.87.2.1.2.7
--- php-src/ext/standard/mail.c:1.87.2.1.2.6 Tue Jul 10 20:21:24 2007
+++ php-src/ext/standard/mail.c Wed Jul 11 17:36:56 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mail.c,v 1.87.2.1.2.6 2007/07/10 20:21:24 stas Exp $ */
+/* $Id: mail.c,v 1.87.2.1.2.7 2007/07/11 17:36:56 johannes Exp $ */
#include <stdlib.h>
#include <ctype.h>
@@ -36,7 +36,6 @@
#include "safe_mode.h"
#include "exec.h"
-#if HAVE_SENDMAIL
#ifdef PHP_WIN32
#include "win32/sendmail.h"
#endif
@@ -295,13 +294,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.18.2.1.2.1&r2=1.18.2.1.2.2&diff_format=u
Index: php-src/ext/standard/php_mail.h
diff -u php-src/ext/standard/php_mail.h:1.18.2.1.2.1
php-src/ext/standard/php_mail.h:1.18.2.1.2.2
--- php-src/ext/standard/php_mail.h:1.18.2.1.2.1 Mon Jan 1 09:36:08 2007
+++ php-src/ext/standard/php_mail.h Wed Jul 11 17:36:56 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mail.h,v 1.18.2.1.2.1 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: php_mail.h,v 1.18.2.1.2.2 2007/07/11 17:36:56 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.85.4.1.2.2&r2=1.85.4.1.2.3&diff_format=u
Index: php-src/main/config.w32.h
diff -u php-src/main/config.w32.h:1.85.4.1.2.2
php-src/main/config.w32.h:1.85.4.1.2.3
--- php-src/main/config.w32.h:1.85.4.1.2.2 Fri Nov 10 09:56:16 2006
+++ php-src/main/config.w32.h Wed Jul 11 17:36:56 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.85.4.1.2.2 2006/11/10 09:56:16 dmitry Exp $
+ $Id: config.w32.h,v 1.85.4.1.2.3 2007/07/11 17:36:56 johannes Exp $
*/
/* Default PHP / PEAR directories */
@@ -118,7 +118,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.640.2.23.2.42&r2=1.640.2.23.2.43&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.42 php-src/main/main.c:1.640.2.23.2.43
--- php-src/main/main.c:1.640.2.23.2.42 Wed Jul 11 10:24:04 2007
+++ php-src/main/main.c Wed Jul 11 17:36:56 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.42 2007/07/11 10:24:04 jani Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.43 2007/07/11 17:36:56 johannes Exp $ */
/* {{{ includes
*/
@@ -231,7 +231,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.7.2.4.2.2&r2=1.7.2.4.2.3&diff_format=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.7.2.4.2.2
php-src/win32/build/config.w32.h.in:1.7.2.4.2.3
--- php-src/win32/build/config.w32.h.in:1.7.2.4.2.2 Tue Apr 10 06:22:28 2007
+++ php-src/win32/build/config.w32.h.in Wed Jul 11 17:36:56 2007
@@ -1,6 +1,6 @@
/*
Build Configuration Template for Win32.
- $Id: config.w32.h.in,v 1.7.2.4.2.2 2007/04/10 06:22:28 dmitry Exp $
+ $Id: config.w32.h.in,v 1.7.2.4.2.3 2007/07/11 17:36:56 johannes Exp $
*/
/* Default PHP / PEAR directories */
@@ -56,7 +56,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
