Fix for bug 32000 (and refixing bug 4928): extra newlines in comments made

with NS4-Mac

diff --git a/CGI.pl b/CGI.pl
index cde06826c129aba42bcd143d1eb060b536979a11..72fd135bf12d0b16dd33d97a65d9c15265f06701 100644 (file)
--- a/CGI.pl
+++ b/CGI.pl
@@ -262,8 +262,10 @@ sub value_quote {
     # See bug http://bugzilla.mozilla.org/show_bug.cgi?id=4928 for 
     # explanaion of why bugzilla does this linebreak substitution. 
     # This caused form submission problems in mozilla (bug 22983, 32000).
-    $var =~ s/\n/\
/g;
+    $var =~ s/\r\n/\
/g;
+    $var =~ s/\n\r/\
/g;
     $var =~ s/\r/\
/g;
+    $var =~ s/\n/\
/g;
     return $var;
 }