summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-06-19 09:36:27 +0800
committerXinchen Hui <laruence@php.net>2015-06-19 09:36:27 +0800
commit29087f00f6be121a46135ac7f2b014cc5c082c66 (patch)
treeba69f4df663123c4a052d93e9d05ddeda489eaef
parentcdde1be056b21ae6bee51a9c22711c22cede568b (diff)
parentbca005c8d9fa047e2d4b0f2496f771f4a74f458d (diff)
downloadphp-git-29087f00f6be121a46135ac7f2b014cc5c082c66.tar.gz
Merge branch 'PHP-5.6'
-rw-r--r--ext/standard/mail.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index a9046cea69..77ad1fe0e8 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -226,7 +226,6 @@ void php_mail_log_to_file(char *filename, char *message, size_t message_size) {
static int php_mail_detect_multiple_crlf(char *hdr) {
/* This function detects multiple/malformed multiple newlines. */
- size_t len;
if (!hdr) {
return 0;