--- php-4.4.1/ext/standard/mail.c	2005-07-26 12:32:58.000000000 +0300
+++ php-4.4.1-patched/ext/standard/mail.c	2005-11-30 17:18:10.816861032 +0200
@@ -78,6 +78,35 @@
 }
 /* }}} */
 
+int havenl(const char *str, int strln){
+  int i;
+  if (!str)
+    return 0;
+  for (i=0; i<strln; i++)
+    if (str[i]=='\012')
+      return 1;
+  return 0;
+}
+
+int have2nl(const char *str, int strln){
+  int i;
+  if (!str)
+    return 0;
+  strln-=2;
+  if (strln<=0)
+    return 0;
+  for (i=0; i<strln; i++)
+    if (!memcmp(&str[i], "\012\012", 2))
+      return 1;
+  strln--;
+  if (strln<=0)
+    return 0;
+  for (i=0; i<strln; i++)
+    if (!memcmp(&str[i], "\012\015\012", 3))
+      return 1;
+  return 0;
+}
+
 /* {{{ proto int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
    Send an email message */
 PHP_FUNCTION(mail)
@@ -102,7 +131,16 @@
 							  ) == FAILURE) {
 		return;
 	}
-
+        
+        /*
+          Spam protection
+        */
+        if (havenl(subject, subject_len) || havenl(to, to_len) || have2nl(headers, headers_len)){
+                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad parameters to mail() function, mail not sent.");
+                RETURN_FALSE;                
+        }
+        
+        
 	if (to_len > 0) {
 		to_r = estrndup(to, to_len);
 		for (; to_len; to_len--) {