Merge branch 'PHP-5.5' into PHP-5.6

laruence · laruence · commit bca005c8d9fa · 2015-06-19T09:35:52.000+08:00
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
@@ -225,7 +225,6 @@ void php_mail_log_to_file(char *filename, char *message, size_t message_size TSR
 
 static int php_mail_detect_multiple_crlf(char *hdr) {
 	/* This function detects multiple/malformed multiple newlines. */
-	size_t len;
 
 	if (!hdr) {
 		return 0;
