Patch linux-line-endings-message-body-and-utf-8-parsing-fix.patch.txt for Website problem Bug #54077

Patch version 2011-02-23 11:20 UTC

• 2011-02-23 11:20 UTC [diff to current]

Developer: shein@php.net

Index: article.php
===================================================================
--- article.php	(revision 307013)
+++ article.php	(working copy)
@@ -47,7 +47,7 @@
 	if ($inheaders && ($line == "\n" || $line == "\r\n")) {
 		$inheaders = 0;
 		if (isset($headers['content-type'])) {
-			if (preg_match('/charset=(["\']?)(\w+)\1/i', $headers['content-type'], $m)) {
+			if (preg_match('/charset=(["\']?)([\w-]+)\1/i', $headers['content-type'], $m)) {
 				$charset = trim($m[2]);
 			}
 		
@@ -161,7 +161,7 @@
 
 		$line = $linebuf . $line;
 
-		if (substr($line, -2) == "\r\n") {
+		if (in_array(substr($line, -1), array("\n", "\r"))) {
 		   $linebuf = '';
 		} else {
 		   $linebuf = $line;