diff options
| author | Johannes Schlüter <johannes@php.net> | 2007-07-11 17:39:04 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2007-07-11 17:39:04 +0000 |
| commit | c91907a51583ba1c1fb0fe00e1a6400a2da8881d (patch) | |
| tree | 7a4e2fcebc0017a8eda84d6adff2e626503f8df9 /ext/standard/basic_functions.c | |
| parent | d3a6deb076d96c6622732f5582727059cb659818 (diff) | |
| download | php-git-c91907a51583ba1c1fb0fe00e1a6400a2da8881d.tar.gz | |
- Always enable mail() function
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index cc01619e7e..fd83b8d1b2 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1816,7 +1816,6 @@ ZEND_END_ARG_INFO() #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_BEGIN_ARG_INFO_EX(arginfo_mail, 0, 0, 3) ZEND_ARG_INFO(0, additional_headers) ZEND_ARG_INFO(0, additional_parameters) ZEND_END_ARG_INFO() -#endif /* }}} */ /* {{{ math.c */ static @@ -3693,10 +3691,8 @@ zend_function_entry basic_functions[] = { /* {{{ */ 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 @@ PHPAPI int _php_error_log(int opt_err, char *message, char *opt, char *headers T 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; |