Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()

diff --cc ext/standard/mail.c
index 09e0a5546bb238f3b36c357ee1264f2f15d5309c,75bd423f8dcde03206f5aeefccab21d1508a550a..17c09dbcaaaefb9632077b488efaecab50c6b3fc
--- 1/ext/standard/mail.c
--- 2/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@@ -225,8 -223,9 +225,8 @@@ void php_mail_log_to_file(char *filenam
  
  static int php_mail_detect_multiple_crlf(char *hdr) {
        /* This function detects multiple/malformed multiple newlines. */
 -      size_t len;
  
-       if (!hdr) {
+       if (!hdr || !strlen(hdr)) {
                return 0;
        }