Commit: 112a476b683a634390b23fe7509d5b73632d0829
Author: Gustavo André dos Santos Lopes <cataphr...@php.net> Tue, 10
Apr 2012 19:41:33 +0100
Parents: 9ada49fa1c957645e2bd4a7d58f2fb49a8f834e7
1c8fccdf6d6d04d8e6a5dedd7c9d6b1afda8839f
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=112a476b683a634390b23fe7509d5b73632d0829
Log:
Merge .gitattributes EOL commit from 5.3.
This merge commit includes several changes from the 5.3 commit.
This is because of 1) different tests between the two branches
and 2) the svn:eol-style attributes differing between the two
branches.
Changed paths:
MM .gitattributes
diff --cc .gitattributes
index 5570b4b,d53e569..1f4a719
--- a/.gitattributes
+++ b/.gitattributes
@@@ -22,3 -22,152 +22,153 @@@ sapi/continuity/capi.c iden
Zend/RFCs/002.txt ident
Zend/RFCs/003.txt ident
NEWS merge=NEWS
-/ext/bz2/tests/005.phpt -crlf
-/ext/dom/tests/dom005.phpt -crlf
-/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt -crlf
-/ext/ereg/tests/009.phpt -crlf
-/ext/iconv/tests/eucjp2sjis.phpt -crlf
-/ext/iconv/tests/eucjp2utf8.phpt -crlf
-/ext/iconv/tests/iconv_stream_filter_delimiter.phpt -crlf
-/ext/iconv/tests/iconv_stream_filter.phpt -crlf
-/ext/mbstring/tests/mb_split-compat-01.phpt -crlf
-/ext/phar/tests/005.phpt -crlf
-/ext/phar/tests/phar_commitwrite.phpt -crlf
-/ext/phar/tests/phar_create_in_cwd.phpt -crlf
-/ext/phar/tests/phar_mount.phpt -crlf
-/ext/reflection/tests/009.phpt -crlf
-/ext/reflection/tests/025.phpt -crlf
-/ext/standard/tests/general_functions/highlight_heredoc.phpt -crlf
-/ext/standard/tests/general_functions/parse_ini_file.phpt -crlf
-/ext/standard/tests/general_functions/parse_ini_string_002.phpt -crlf
-/ext/standard/tests/strings/006.phpt -crlf
-/ext/standard/tests/strings/addslashes_variation2.phpt -crlf
-/ext/standard/tests/strings/addslashes_variation3.phpt -crlf
-/ext/standard/tests/strings/bug21453.phpt -crlf
-/ext/standard/tests/strings/chop_variation3.phpt -crlf
-/ext/standard/tests/strings/chunk_split_variation11.phpt -crlf
-/ext/standard/tests/strings/chunk_split_variation12.phpt -crlf
-/ext/standard/tests/strings/chunk_split_variation4.phpt -crlf
-/ext/standard/tests/strings/crc32_variation2.phpt -crlf
-/ext/standard/tests/strings/crc32_variation3.phpt -crlf
-/ext/standard/tests/strings/crc32_variation4.phpt -crlf
++/ext/bz2/tests/with_strings.phpt -crlf
++/ext/dom/tests/bug40836.phpt -crlf
++/ext/dom/tests/domelement.phpt -crlf
++/ext/ereg/tests/eregi_basic_002.phpt -crlf
++/ext/iconv/tests/iconv004.phpt -crlf
++/ext/iconv/tests/iconv_basic.phpt -crlf
++/ext/iconv/tests/iconv_strpos.phpt -crlf
++/ext/iconv/tests/iconv_strpos_variation2.phpt -crlf
++/ext/mbstring/tests/mb_strtoupper_error2.phpt -crlf
++/ext/phar/tests/delete_in_phar_confirm.phpt -crlf
++/ext/phar/tests/frontcontroller12.phpt -crlf
++/ext/phar/tests/security.phpt -crlf
++/ext/phar/tests/test_signaturealgos.phpt -crlf
++/ext/reflection/tests/ReflectionMethod_invokeArgs_basic.phpt -crlf
++/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt -crlf
++/ext/spl/tests/dllist_007.phpt -crlf
++/ext/spl/tests/iterator_012.phpt -crlf
++/ext/spl/tests/SplArray_fromArray.phpt -crlf
++/ext/standard/tests/dir/scandir_variation3.phpt -crlf
++/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt -crlf
++/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt
-crlf
++/ext/standard/tests/strings/bug26817.phpt -crlf
++/ext/standard/tests/strings/bug26973.phpt -crlf
++/ext/standard/tests/strings/bug27457.phpt -crlf
++/ext/standard/tests/strings/bug28386.phpt -crlf
++/ext/standard/tests/strings/bug37262.phpt -crlf
++/ext/standard/tests/strings/bug40637.phpt -crlf
++/ext/standard/tests/strings/bug40915.phpt -crlf
++/ext/standard/tests/strings/bug61374.phpt -crlf
++/ext/standard/tests/strings/chop_error.phpt -crlf
++/ext/standard/tests/strings/chop_variation2.phpt -crlf
++/ext/standard/tests/strings/chunk_split_variation10.phpt -crlf
++/ext/standard/tests/strings/chunk_split_variation8.phpt -crlf
++/ext/standard/tests/strings/count_chars_variation2.phpt -crlf
++/ext/standard/tests/strings/dirname_error.phpt -crlf
++/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt -crlf
+ /ext/standard/tests/strings/highlight_file.phpt -crlf
-/ext/standard/tests/strings/htmlentities_html4.phpt -crlf
-/ext/standard/tests/strings/lcfirst.phpt -crlf
-/ext/standard/tests/strings/ltrim.phpt -crlf
-/ext/standard/tests/strings/nl2br_variation2.phpt -crlf
-/ext/standard/tests/strings/php_strip_whitespace.phpt -crlf
++/ext/standard/tests/strings/htmlentities03.phpt -crlf
++/ext/standard/tests/strings/htmlentities04.phpt -crlf
++/ext/standard/tests/strings/htmlentities08.phpt -crlf
++/ext/standard/tests/strings/htmlentities15.phpt -crlf
++/ext/standard/tests/strings/http_build_query.phpt -crlf
++/ext/standard/tests/strings/metaphone.phpt -crlf
++/ext/standard/tests/strings/ord_error.phpt -crlf
++/ext/standard/tests/strings/printf_basic2.phpt -crlf
++/ext/standard/tests/strings/printf_variation2.phpt -crlf
++/ext/standard/tests/strings/quoted_printable_decode_basic.phpt -crlf
+ /ext/standard/tests/strings/rtrim.phpt -crlf
-/ext/standard/tests/strings/sprintf_f_2.phpt -crlf
-/ext/standard/tests/strings/sprintf_variation15.phpt -crlf
-/ext/standard/tests/strings/strcspn_variation6.phpt -crlf
-/ext/standard/tests/strings/strcspn_variation7.phpt -crlf
-/ext/standard/tests/strings/strcspn_variation8.phpt -crlf
-/ext/standard/tests/strings/stripos_variation1.phpt -crlf
-/ext/standard/tests/strings/stripos_variation3.phpt -crlf
-/ext/standard/tests/strings/stripos_variation4.phpt -crlf
-/ext/standard/tests/strings/stripos_variation5.phpt -crlf
-/ext/standard/tests/strings/stripos_variation6.phpt -crlf
++/ext/standard/tests/strings/setlocale_variation1.phpt -crlf
++/ext/standard/tests/strings/sha1_basic.phpt -crlf
++/ext/standard/tests/strings/similar_text_basic.phpt -crlf
++/ext/standard/tests/strings/soundex.phpt -crlf
++/ext/standard/tests/strings/sprintf_basic1.phpt -crlf
++/ext/standard/tests/strings/sprintf_basic4.phpt -crlf
++/ext/standard/tests/strings/sprintf_basic7.phpt -crlf
++/ext/standard/tests/strings/sprintf_variation12.phpt -crlf
++/ext/standard/tests/strings/sprintf_variation28.phpt -crlf
++/ext/standard/tests/strings/sprintf_variation29.phpt -crlf
++/ext/standard/tests/strings/sprintf_variation30.phpt -crlf
++/ext/standard/tests/strings/sprintf_variation31.phpt -crlf
++/ext/standard/tests/strings/sprintf_variation38.phpt -crlf
++/ext/standard/tests/strings/sprintf_variation42.phpt -crlf
++/ext/standard/tests/strings/sprintf_variation6.phpt -crlf
++/ext/standard/tests/strings/sscanf_basic2.phpt -crlf
++/ext/standard/tests/strings/sscanf_basic3.phpt -crlf
++/ext/standard/tests/strings/str_getcsv_001.phpt -crlf
++/ext/standard/tests/strings/stripcslashes_basic.phpt -crlf
++/ext/standard/tests/strings/stripos_variation11.phpt -crlf
++/ext/standard/tests/strings/stripos_variation13.phpt -crlf
++/ext/standard/tests/strings/stripslashes_variation1.phpt -crlf
+ /ext/standard/tests/strings/stripslashes_variation2.phpt -crlf
-/ext/standard/tests/strings/stripslashes_variation3.phpt -crlf
-/ext/standard/tests/strings/stripslashes_variation4.phpt -crlf
-/ext/standard/tests/strings/stripslashes_variation5.phpt -crlf
-/ext/standard/tests/strings/str_ireplace.phpt -crlf
-/ext/standard/tests/strings/strnatcmp_basic.phpt -crlf
-/ext/standard/tests/strings/strncasecmp_variation9.phpt -crlf
-/ext/standard/tests/strings/strpos.phpt -crlf
-/ext/standard/tests/strings/strrchr_variation1.phpt -crlf
-/ext/standard/tests/strings/strrchr_variation2.phpt -crlf
-/ext/standard/tests/strings/strrchr_variation3.phpt -crlf
-/ext/standard/tests/strings/strrchr_variation4.phpt -crlf
-/ext/standard/tests/strings/strrchr_variation6.phpt -crlf
-/ext/standard/tests/strings/strrchr_variation7.phpt -crlf
-/ext/standard/tests/strings/str_replace.phpt -crlf
-/ext/standard/tests/strings/strrev_variation3.phpt -crlf
-/ext/standard/tests/strings/strrev_variation4.phpt -crlf
-/ext/standard/tests/strings/strripos_variation1.phpt -crlf
-/ext/standard/tests/strings/strripos_variation2.phpt -crlf
-/ext/standard/tests/strings/strripos_variation3.phpt -crlf
-/ext/standard/tests/strings/strripos_variation4.phpt -crlf
-/ext/standard/tests/strings/strripos_variation5.phpt -crlf
-/ext/standard/tests/strings/strrpos_variation1.phpt -crlf
-/ext/standard/tests/strings/strrpos_variation2.phpt -crlf
-/ext/standard/tests/strings/strrpos_variation3.phpt -crlf
++/ext/standard/tests/strings/stristr_error.phpt -crlf
++/ext/standard/tests/strings/strnatcasecmp_basic.phpt -crlf
++/ext/standard/tests/strings/strncasecmp_variation6.phpt -crlf
++/ext/standard/tests/strings/strncasecmp_variation7.phpt -crlf
++/ext/standard/tests/strings/strncasecmp_variation8.phpt -crlf
++/ext/standard/tests/strings/strrchr_error.phpt -crlf
++/ext/standard/tests/strings/strrchr.phpt -crlf
++/ext/standard/tests/strings/strrchr_variation11.phpt -crlf
++/ext/standard/tests/strings/strrpos_error.phpt -crlf
+ /ext/standard/tests/strings/strrpos_variation4.phpt -crlf
-/ext/standard/tests/strings/strrpos_variation5.phpt -crlf
-/ext/standard/tests/strings/strrpos_variation6.phpt -crlf
-/ext/standard/tests/strings/strspn_variation5.phpt -crlf
-/ext/standard/tests/strings/strspn_variation6.phpt -crlf
-/ext/standard/tests/strings/strspn_variation7.phpt -crlf
-/ext/standard/tests/strings/strspn_variation8.phpt -crlf
-/ext/standard/tests/strings/strstr.phpt -crlf
-/ext/standard/tests/strings/strtok_variation1.phpt -crlf
-/ext/standard/tests/strings/strtok_variation3.phpt -crlf
-/ext/standard/tests/strings/strtr_variation1.phpt -crlf
-/ext/standard/tests/strings/strtr_variation2.phpt -crlf
-/ext/standard/tests/strings/str_word_count.phpt -crlf
-/ext/standard/tests/strings/trim1.phpt -crlf
-/ext/standard/tests/strings/ucfirst.phpt -crlf
-/ext/standard/tests/strings/vfprintf_variation10.phpt -crlf
++/ext/standard/tests/strings/strrpos_variation8.phpt -crlf
++/ext/standard/tests/strings/strstr2.phpt -crlf
++/ext/standard/tests/strings/strtok_error.phpt -crlf
++/ext/standard/tests/strings/strtok_variation2.phpt -crlf
++/ext/standard/tests/strings/strtolower-win32.phpt -crlf
++/ext/standard/tests/strings/substr_compare.phpt -crlf
++/ext/standard/tests/strings/ucwords_variation1.phpt -crlf
++/ext/standard/tests/strings/unpack.phpt -crlf
++/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt -crlf
++/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt -crlf
++/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt -crlf
+ /ext/standard/tests/strings/vfprintf_variation12.phpt -crlf
-/ext/standard/tests/strings/vfprintf_variation16.phpt -crlf
-/ext/standard/tests/strings/vfprintf_variation18.phpt -crlf
-/ext/standard/tests/strings/vfprintf_variation4.phpt -crlf
-/ext/standard/tests/strings/vfprintf_variation6.phpt -crlf
++/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt -crlf
+ /ext/standard/tests/strings/vfprintf_variation7.phpt -crlf
-/ext/standard/tests/strings/vfprintf_variation8.phpt -crlf
++/ext/standard/tests/strings/vprintf_basic2.phpt -crlf
++/ext/standard/tests/strings/vprintf_basic7_64bit.phpt -crlf
+ /ext/standard/tests/strings/vprintf_variation10.phpt -crlf
-/ext/standard/tests/strings/vprintf_variation12.phpt -crlf
-/ext/standard/tests/strings/vprintf_variation14.phpt -crlf
-/ext/standard/tests/strings/vprintf_variation18.phpt -crlf
++/ext/standard/tests/strings/vprintf_variation14_64bit.phpt -crlf
++/ext/standard/tests/strings/vprintf_variation17.phpt -crlf
+ /ext/standard/tests/strings/vprintf_variation4.phpt -crlf
-/ext/standard/tests/strings/vprintf_variation6.phpt -crlf
-/ext/standard/tests/strings/vprintf_variation7.phpt -crlf
-/ext/standard/tests/strings/vprintf_variation8.phpt -crlf
-/ext/standard/tests/strings/vsprintf_variation10.phpt -crlf
-/ext/standard/tests/strings/vsprintf_variation12.phpt -crlf
-/ext/standard/tests/strings/vsprintf_variation14.phpt -crlf
-/ext/standard/tests/strings/vsprintf_variation16.phpt -crlf
-/ext/standard/tests/strings/vsprintf_variation4.phpt -crlf
-/ext/standard/tests/strings/vsprintf_variation6.phpt -crlf
++/ext/standard/tests/strings/vsprintf_basic4.phpt -crlf
++/ext/standard/tests/strings/vsprintf_basic8.phpt -crlf
++/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt -crlf
++/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt -crlf
++/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt -crlf
++/ext/standard/tests/strings/vsprintf_variation17.phpt -crlf
++/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt -crlf
+ /ext/standard/tests/strings/vsprintf_variation7.phpt -crlf
-/ext/standard/tests/strings/vsprintf_variation8.phpt -crlf
+ /ext/standard/tests/strings/wordwrap.phpt -crlf
-/ext/tidy/tests/010.phpt -crlf
-/ext/tidy/tests/012.phpt -crlf
-/ext/tidy/tests/025.phpt -crlf
-/ext/tidy/tests/030.phpt -crlf
++/ext/standard/tests/strings/wordwrap_variation5.phpt -crlf
++/ext/standard/tests/url/rawurldecode_variation_001.phpt -crlf
++/ext/tidy/tests/009.phpt -crlf
++/ext/tidy/tests/013.phpt -crlf
++/ext/tidy/tests/021.phpt -crlf
++/ext/tidy/tests/tidy_error.phpt -crlf
++/ext/tokenizer/tests/002.phpt -crlf
+ /ext/tokenizer/tests/bug26463.phpt -crlf
++/ext/tokenizer/tests/token_get_all_error.phpt -crlf
++/ext/tokenizer/tests/token_get_all_variation11.phpt -crlf
+ /ext/tokenizer/tests/token_get_all_variation12.phpt -crlf
+ /ext/tokenizer/tests/token_get_all_variation13.phpt -crlf
+ /ext/tokenizer/tests/token_get_all_variation14.phpt -crlf
+ /ext/tokenizer/tests/token_get_all_variation15.phpt -crlf
-/ext/tokenizer/tests/token_get_all_variation16.phpt -crlf
-/ext/tokenizer/tests/token_get_all_variation17.phpt -crlf
+ /ext/tokenizer/tests/token_get_all_variation18.phpt -crlf
+ /ext/tokenizer/tests/token_get_all_variation19.phpt -crlf
-/ext/tokenizer/tests/token_get_all_variation4.phpt -crlf
++/ext/tokenizer/tests/token_get_all_variation1.phpt -crlf
++/ext/tokenizer/tests/token_get_all_variation2.phpt -crlf
++/ext/tokenizer/tests/token_get_all_variation3.phpt -crlf
+ /ext/tokenizer/tests/token_get_all_variation5.phpt -crlf
-/ext/tokenizer/tests/token_get_all_variation6.phpt -crlf
-/ext/tokenizer/tests/token_get_all_variation7.phpt -crlf
+ /ext/tokenizer/tests/token_get_all_variation8.phpt -crlf
-/ext/tokenizer/tests/token_get_all_variation9.phpt -crlf
-/ext/xml/tests/bug26614_libxml.phpt -crlf
-/ext/xmlwriter/tests/004.phpt -crlf
-/ext/xmlwriter/tests/OO_004.phpt -crlf
-/ext/zlib/tests/005.phpt -crlf
-/ext/zlib/tests/gzfile_basic2.phpt -crlf
-/ext/zlib/tests/gzfile_basic.phpt -crlf
-/ext/zlib/tests/gzfilegzreadfile.phpt -crlf
-/ext/zlib/tests/readgzfile_basic2.phpt -crlf
-/ext/zlib/tests/readgzfile_basic.phpt -crlf
-/sapi/cli/tests/014.phpt -crlf
-/tests/run-test/test010.phpt -crlf
-/Zend/tests/bug35655.phpt -crlf
-/Zend/tests/bug48930.phpt -crlf
-/Zend/tests/bug61095.phpt -crlf
-/Zend/tests/heredoc_017.phpt -crlf
-/Zend/tests/heredoc_018.phpt -crlf
-/Zend/tests/nowdoc_013.phpt -crlf
-/Zend/tests/nowdoc_014.phpt -crlf
-/Zend/tests/nowdoc_015.phpt -crlf
++/ext/xml/tests/bug32001b.phpt -crlf
++/ext/xmlwriter/tests/OO_003.phpt -crlf
++/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt -crlf
++/ext/zlib/tests/008.phpt -crlf
++/ext/zlib/tests/gzopen_variation4.phpt -crlf
++/ext/zlib/tests/gzrewind_error.phpt -crlf
++/ext/zlib/tests/readgzfile_variation7.phpt -crlf
++/ext/zlib/tests/readgzfile_variation8.phpt -crlf
++/ext/zlib/tests/zlib_scheme_stat_basic.phpt -crlf
++/sapi/cli/tests/006.phpt -crlf
++/tests/run-test/test009.phpt -crlf
++/Zend/tests/012.phpt -crlf
++/Zend/tests/bug28072.phpt -crlf
++/Zend/tests/bug38624.phpt -crlf
++/Zend/tests/bug40784.phpt -crlf
++/Zend/tests/bug43053.phpt -crlf
++/Zend/tests/bug51176.phpt -crlf
++/Zend/tests/each_003.phpt -crlf
++/Zend/tests/errmsg_006.phpt -crlf
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
