Merge branch 'PHP-5.3' into PHP-5.4

LawnGnome · LawnGnome · commit b1bf524140f3 · 2013-01-15T17:35:34.000+08:00
* PHP-5.3:
  Revert "Update fputcsv() to escape all characters equally."
diff --git a/NEWS b/NEWS
@@ -9,8 +9,6 @@ PHP                                                                        NEWS
     (Laruence)
   . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence)
   . Fixed bug #63882 (zend_std_compare_objects crash on recursion). (Dmitry)
-  . Fixed bug #43225 (fputcsv incorrectly handles cells ending in \ followed
-    by "). (Adam)
   . Support BITMAPV5HEADER in getimagesize(). (AsamK, Lars)
 
 - Date:
diff --git a/ext/standard/file.c b/ext/standard/file.c
@@ -1871,16 +1871,20 @@ PHPAPI int php_fputcsv(php_stream *stream, zval *fields, char delimiter, char en
 			FPUTCSV_FLD_CHK('\n') ||
 			FPUTCSV_FLD_CHK('\r') ||
 			FPUTCSV_FLD_CHK('\t') ||
-			FPUTCSV_FLD_CHK('\\') ||
 			FPUTCSV_FLD_CHK(' ')
 		) {
 			char *ch = Z_STRVAL(field);
 			char *end = ch + Z_STRLEN(field);
+			int escaped = 0;
 
 			smart_str_appendc(&csvline, enclosure);
 			while (ch < end) {
-				if (*ch == enclosure) {
+				if (*ch == escape_char) {
+					escaped = 1;
+				} else if (!escaped && *ch == enclosure) {
 					smart_str_appendc(&csvline, enclosure);
+				} else {
+					escaped = 0;
 				}
 				smart_str_appendc(&csvline, *ch);
 				ch++;
diff --git a/ext/standard/tests/file/fputcsv.phpt b/ext/standard/tests/file/fputcsv.phpt
@@ -44,7 +44,7 @@ echo '$list = ';var_export($res);echo ";\n";
 
 $fp = fopen($file, "r");
 $res = array();
-while($l=fgetcsv($fp, 0, ',', '"', '"'))
+while($l=fgetcsv($fp))
 {
 	$res[] = join(',',$l);
 }
@@ -75,10 +75,10 @@ $list = array (
   13 => 'aaa,"""bbb   """',
   14 => '"aaa""aaa""","""bbb""bbb"',
   15 => '"aaa""aaa""""""",bbb',
-  16 => 'aaa,"""\\""bbb",ccc',
-  17 => '"aaa""\\""a""","""bbb"""',
-  18 => '"""\\""""","""aaa"""',
-  19 => '"""\\""""""",aaa',
+  16 => 'aaa,"""\\"bbb",ccc',
+  17 => '"aaa""\\"a""","""bbb"""',
+  18 => '"""\\"""","""aaa"""',
+  19 => '"""\\"""""",aaa',
 );
 $list = array (
   0 => 'aaa,bbb',
diff --git a/ext/standard/tests/file/fputcsv_bug43225.phpt b/ext/standard/tests/file/fputcsv_bug43225.phpt
