]> granicus.if.org Git - php/commit
Merge branch 'pull-request/341'
authorStanislav Malyshev <stas@php.net>
Mon, 10 Jun 2013 21:20:18 +0000 (14:20 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 10 Jun 2013 21:20:18 +0000 (14:20 -0700)
commitac40c0b562b0f90652cadef83968d7305626c377
tree450cd9d7b67422adfae2218a69d21fb02f921474
parent04145dc2aa6eea37f7cd27ffa69ad3b2f52a65da
Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
  typofixes
228 files changed:
README.TESTING
Zend/ZEND_CHANGES
Zend/tests/019.phpt
Zend/tests/bug32428.phpt
Zend/tests/gc_007.phpt
Zend/tests/gc_008.phpt
Zend/tests/gc_009.phpt
Zend/zend_API.c
Zend/zend_compile.c
Zend/zend_operators.c
acinclude.m4
build/shtool
ext/bz2/bz2.c
ext/com_dotnet/com_variant.c
ext/date/tests/date_sunrise_and_sunset_basic.phpt
ext/dba/tests/dba_cdb_read.phpt
ext/dom/element.c
ext/dom/tests/DOMNode_removeChild_basic.phpt
ext/enchant/enchant.c
ext/exif/tests/exif_tagname_variation1.phpt
ext/fileinfo/tests/finfo_phpinfo_basic.phpt
ext/fileinfo/tests/magic
ext/gd/tests/imagecopyresampled_basic.phpt
ext/hash/tests/mhash_002.phpt
ext/imap/tests/imap_include.inc
ext/interbase/tests/005.phpt
ext/intl/doc/Tutorial.txt
ext/intl/doc/grapheme_api.php
ext/intl/doc/msgfmt_api.php
ext/libxml/tests/bug61367-read.phpt
ext/mbstring/README_PHP3-i18n-ja
ext/mbstring/libmbfl/filters/unicode_table_jis2004.h
ext/mbstring/oniguruma/HISTORY
ext/mbstring/php_mbregex.c
ext/mysqli/tests/bug34810.phpt
ext/mysqlnd/mysqlnd.c
ext/mysqlnd/mysqlnd_result.c
ext/oci8/package.xml
ext/oci8/tests/conn_attr.inc
ext/oci8/tests/conn_attr_4.phpt
ext/odbc/php_odbc_includes.h
ext/openssl/tests/openssl.cnf
ext/openssl/xp_ssl.c
ext/pcre/pcrelib/ChangeLog
ext/pcre/pcrelib/pcre_compile.c
ext/pcre/tests/preg_replace_basic.phpt
ext/pcre/tests/preg_replace_edit_basic.phpt
ext/pcre/tests/preg_split_basic.phpt
ext/pdo/php_pdo_driver.h
ext/pgsql/README
ext/phar/func_interceptors.c
ext/phar/tests/files/openssl.cnf
ext/posix/config.m4
ext/shmop/README
ext/snmp/snmp.c
ext/soap/TODO
ext/soap/TODO.old
ext/soap/interop/client_round2_params.php
ext/soap/php_http.c
ext/soap/soap.c
ext/soap/tests/bugs/bug27742.wsdl
ext/spl/internal/cachingiterator.inc
ext/spl/tests/iterator_031.phpt
ext/spl/tests/spl_004.phpt
ext/sqlite3/libsqlite/sqlite3.c
ext/standard/filestat.c
ext/standard/ftp_fopen_wrapper.c
ext/standard/image.c
ext/standard/streamsfuncs.c
ext/standard/tests/array/array_combine_variation3.phpt
ext/standard/tests/array/array_fill_basic.phpt
ext/standard/tests/array/array_fill_variation4.phpt
ext/standard/tests/array/array_intersect_assoc_variation3.phpt
ext/standard/tests/array/array_intersect_assoc_variation4.phpt
ext/standard/tests/array/array_intersect_variation3.phpt
ext/standard/tests/array/array_intersect_variation4.phpt
ext/standard/tests/array/array_key_exists.phpt
ext/standard/tests/array/array_merge_recursive_variation3.phpt
ext/standard/tests/array/array_pad_variation6.phpt
ext/standard/tests/array/array_unique_variation2.phpt
ext/standard/tests/array/array_unshift_variation9.phpt
ext/standard/tests/array/array_walk_error2.phpt
ext/standard/tests/array/array_walk_recursive_error2.phpt
ext/standard/tests/array/arsort_variation1.phpt
ext/standard/tests/array/arsort_variation2.phpt
ext/standard/tests/array/asort_variation1.phpt
ext/standard/tests/array/asort_variation2.phpt
ext/standard/tests/array/bug40709.phpt
ext/standard/tests/array/krsort_variation1.phpt
ext/standard/tests/array/krsort_variation2.phpt
ext/standard/tests/array/ksort_variation1.phpt
ext/standard/tests/array/ksort_variation2.phpt
ext/standard/tests/array/sizeof_basic2.phpt
ext/standard/tests/array/sizeof_variation4.phpt
ext/standard/tests/array/sort_variation1.phpt
ext/standard/tests/array/sort_variation2.phpt
ext/standard/tests/array/uasort_error.phpt
ext/standard/tests/array/usort_error2.phpt
ext/standard/tests/file/007_variation10.phpt
ext/standard/tests/file/007_variation11-win32.phpt
ext/standard/tests/file/007_variation11.phpt
ext/standard/tests/file/007_variation12-win32.phpt
ext/standard/tests/file/007_variation12.phpt
ext/standard/tests/file/007_variation13-win32.phpt
ext/standard/tests/file/007_variation13.phpt
ext/standard/tests/file/007_variation14.phpt
ext/standard/tests/file/007_variation15.phpt
ext/standard/tests/file/007_variation16.phpt
ext/standard/tests/file/007_variation18.phpt
ext/standard/tests/file/007_variation19.phpt
ext/standard/tests/file/007_variation2.phpt
ext/standard/tests/file/007_variation20.phpt
ext/standard/tests/file/007_variation21.phpt
ext/standard/tests/file/007_variation22.phpt
ext/standard/tests/file/007_variation23.phpt
ext/standard/tests/file/007_variation24.phpt
ext/standard/tests/file/007_variation3.phpt
ext/standard/tests/file/007_variation4.phpt
ext/standard/tests/file/007_variation5.phpt
ext/standard/tests/file/007_variation6.phpt
ext/standard/tests/file/007_variation7.phpt
ext/standard/tests/file/007_variation8.phpt
ext/standard/tests/file/bug52820.phpt
ext/standard/tests/file/fgetc_variation3.phpt
ext/standard/tests/file/fgetc_variation4.phpt
ext/standard/tests/file/fgetcsv_variation1.phpt
ext/standard/tests/file/fgetcsv_variation10.phpt
ext/standard/tests/file/fgetcsv_variation11.phpt
ext/standard/tests/file/fgetcsv_variation12.phpt
ext/standard/tests/file/fgetcsv_variation13.phpt
ext/standard/tests/file/fgetcsv_variation14.phpt
ext/standard/tests/file/fgetcsv_variation15.phpt
ext/standard/tests/file/fgetcsv_variation16.phpt
ext/standard/tests/file/fgetcsv_variation17.phpt
ext/standard/tests/file/fgetcsv_variation18.phpt
ext/standard/tests/file/fgetcsv_variation19.phpt
ext/standard/tests/file/fgetcsv_variation2.phpt
ext/standard/tests/file/fgetcsv_variation20.phpt
ext/standard/tests/file/fgetcsv_variation21.phpt
ext/standard/tests/file/fgetcsv_variation24.phpt
ext/standard/tests/file/fgetcsv_variation25.phpt
ext/standard/tests/file/fgetcsv_variation27.phpt
ext/standard/tests/file/fgetcsv_variation28.phpt
ext/standard/tests/file/fgetcsv_variation29.phpt
ext/standard/tests/file/fgetcsv_variation3.phpt
ext/standard/tests/file/fgetcsv_variation31.phpt
ext/standard/tests/file/fgetcsv_variation4.phpt
ext/standard/tests/file/fgetcsv_variation5.phpt
ext/standard/tests/file/fgetcsv_variation6.phpt
ext/standard/tests/file/fgetcsv_variation7.phpt
ext/standard/tests/file/fgetcsv_variation8.phpt
ext/standard/tests/file/fgetcsv_variation9.phpt
ext/standard/tests/file/fgets_variation1.phpt
ext/standard/tests/file/fgets_variation3.phpt
ext/standard/tests/file/fgetss_basic2-win32.phpt
ext/standard/tests/file/fgetss_basic2.phpt
ext/standard/tests/file/fgetss_variation1-win32.phpt
ext/standard/tests/file/fgetss_variation1.phpt
ext/standard/tests/file/fgetss_variation2.phpt
ext/standard/tests/file/fgetss_variation3-win32.phpt
ext/standard/tests/file/fgetss_variation3.phpt
ext/standard/tests/file/fgetss_variation4.phpt
ext/standard/tests/file/fgetss_variation5-win32.phpt
ext/standard/tests/file/fgetss_variation5.phpt
ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt
ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt
ext/standard/tests/mail/mail_include.inc
ext/standard/tests/strings/addslashes_variation1.phpt
ext/standard/tests/strings/bug36306.phpt
ext/standard/tests/strings/bug50847.phpt
ext/standard/tests/strings/chop_variation1.phpt
ext/standard/tests/strings/chop_variation2.phpt
ext/standard/tests/strings/get_html_translation_table_variation1.phpt
ext/standard/tests/strings/get_html_translation_table_variation2.phpt
ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt
ext/standard/tests/strings/join_variation1.phpt
ext/standard/tests/strings/join_variation2.phpt
ext/standard/tests/strings/setlocale_basic1.phpt
ext/standard/tests/strings/setlocale_basic2.phpt
ext/standard/tests/strings/setlocale_basic3.phpt
ext/standard/tests/strings/setlocale_error.phpt
ext/standard/tests/strings/setlocale_variation1.phpt
ext/standard/tests/strings/setlocale_variation2.phpt
ext/standard/tests/strings/setlocale_variation3.phpt
ext/standard/tests/strings/setlocale_variation4.phpt
ext/standard/tests/strings/setlocale_variation5.phpt
ext/standard/tests/strings/strcspn_variation2.phpt
ext/standard/tests/strings/strip_tags_variation5.phpt
ext/standard/tests/strings/stripcslashes_variation1.phpt
ext/standard/tests/strings/stripslashes_variation1.phpt
ext/standard/tests/strings/strrchr_basic.phpt
ext/standard/tests/strings/strspn_variation2.phpt
ext/standard/tests/strings/strtok_variation1.phpt
ext/standard/tests/strings/strtok_variation2.phpt
ext/standard/tests/strings/trim1.phpt
ext/standard/tests/strings/trim_error.phpt
ext/standard/tests/strings/trim_variation1.phpt
ext/standard/tests/strings/trim_variation2.phpt
ext/standard/tests/strings/ucwords_variation1.phpt
ext/standard/tests/strings/ucwords_variation2.phpt
ext/standard/tests/strings/wordwrap_variation1.phpt
ext/standard/tests/strings/wordwrap_variation2.phpt
ext/standard/tests/strings/wordwrap_variation3.phpt
ext/standard/tests/strings/wordwrap_variation4.phpt
ext/standard/uuencode.c
ext/sysvmsg/sysvmsg.c
ext/sysvsem/tests/sysv.phpt
ext/xmlreader/php_xmlreader.c
ext/xmlrpc/libxmlrpc/simplestring.c
ext/xmlrpc/libxmlrpc/xmlrpc.c
ext/zip/lib/zip_open.c
ext/zip/tests/bug64342_0.phpt
ext/zip/tests/bug64342_1.phpt
main/rfc1867.c
main/streams/xp_socket.c
run-tests.php
sapi/apache/mod_php5.c
sapi/apache2filter/README
sapi/apache2handler/README
sapi/apache2handler/sapi_apache2.c
sapi/apache_hooks/mod_php5.c
sapi/fpm/fpm/fpm_conf.c
sapi/thttpd/thttpd.c
server-tests-config.php
server-tests.php
win32/install.txt
win32/sendmail.c
win32/signal.h