svn commit: rev 6109 - incubator/spamassassin/trunk/spamd

[jm...@apache.org]

Author: jm
Date: Wed Jan  7 18:57:34 2004
New Revision: 6109

Modified:
   incubator/spamassassin/trunk/spamd/spamd.raw
Log:
bug 2842: exiscan spamc passes empty User: on to spamd, fix support for this

Modified: incubator/spamassassin/trunk/spamd/spamd.raw
==============================================================================
--- incubator/spamassassin/trunk/spamd/spamd.raw	(original)
+++ incubator/spamassassin/trunk/spamd/spamd.raw	Wed Jan  7 18:57:34 2004
@@ -623,11 +623,6 @@
 		protocol_error("(header not in 'Name: value' format)");
                 return 1;
             }
-	    if ($value eq '')
-	    {
-		Mail::SpamAssassin::dbg('ignored empty '$header' header');
-		next;
-	    }
 
             # We'll run handle user unless we've been told not
             # to process per-user config files.  Otherwise
@@ -640,7 +635,7 @@
 
             if ($header eq 'User')
             {
-                if ($value !~ /^([\x20-\xFF]+)$/)
+                if ($value !~ /^([\x20-\xFF]*)$/)
                 {
                    protocol_error ("(User header contains control chars)");
                     return 1;
@@ -668,7 +663,7 @@
             }
 	    elsif ($header eq 'Content-length')
             {
-		if ($value !~ /^(\d+)$/)
+		if ($value !~ /^(\d*)$/)
 		{
 		    protocol_error ("(Content-Length contains non-numeric bytes)");
 		    return 1;