[BACK]Return to mail.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / ext / standard

Diff for /embedaddon/php/ext/standard/mail.c between versions 1.1.1.3 and 1.1.1.5

version 1.1.1.3, 2013/07/22 01:32:05 version 1.1.1.5, 2014/06/15 20:03:57
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2013 The PHP Group                                |   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |     | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 276  PHPAPI int php_mail(char *to, char *subject, char *mes Line 276  PHPAPI int php_mail(char *to, char *subject, char *mes
                 if (headers != NULL) {                  if (headers != NULL) {
                         spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n%s", php_getuid(TSRMLS_C), f, headers);                          spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n%s", php_getuid(TSRMLS_C), f, headers);
                 } else {                  } else {
                        spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n", php_getuid(TSRMLS_C), f);                        spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s", php_getuid(TSRMLS_C), f);
                 }                  }
                 efree(f);                  efree(f);
         }          }
Line 318  PHPAPI int php_mail(char *to, char *subject, char *mes Line 318  PHPAPI int php_mail(char *to, char *subject, char *mes
         sendmail = popen_ex(sendmail_cmd, "wb", NULL, NULL TSRMLS_CC);          sendmail = popen_ex(sendmail_cmd, "wb", NULL, NULL TSRMLS_CC);
 #else  #else
         /* Since popen() doesn't indicate if the internal fork() doesn't work          /* Since popen() doesn't indicate if the internal fork() doesn't work
         * (e.g. the shell can't be executed) we explicitely set it to 0 to be         * (e.g. the shell can't be executed) we explicitly set it to 0 to be
          * sure we don't catch any older errno value. */           * sure we don't catch any older errno value. */
         errno = 0;          errno = 0;
         sendmail = popen(sendmail_cmd, "w");          sendmail = popen(sendmail_cmd, "w");
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.5

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>