diff options
137 files changed, 2749 insertions, 2751 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 7dd1ef5bb1..6d04b51f60 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,7 +14,7 @@ cache: - c:\build-cache environment: - PHP_BUILD_CACHE_BASE_DIR: c:\build-cache + PHP_BUILD_CACHE_BASE_DIR: c:\build-cache PHP_BUILD_OBJ_DIR: c:\obj PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk PHP_BUILD_SDK_BRANCH: php-sdk-2.1.9beta1 @@ -5,7 +5,7 @@ end document set_ts set the ts resource, it is impossible for gdb to call ts_resource_ex while no process is running, - but we could get the resource from the argument + but we could get the resource from the argument of frame info. end @@ -153,7 +153,7 @@ end define printzv set $ind = 1 - ____printzv $arg0 0 + ____printzv $arg0 0 end document printzv @@ -190,7 +190,7 @@ define ____printzv_contents if $type == 6 printf "string: %s", $zvalue->value.str->val end - if $type == 7 + if $type == 7 printf "array: " if ! $arg1 set $ind = $ind + 1 @@ -287,7 +287,7 @@ define ____printzv if $arg1 ____printzv_contents $zcontents $arg1 else - ____printzv_contents $zcontents 0 + ____printzv_contents $zcontents 0 end end @@ -340,7 +340,7 @@ define ____print_ht set $n = $n - 1 end printf "[%d] ", $i - if $p->key + if $p->key printf "%s => ", $p->key->val else printf "%d => ", $p->h @@ -389,7 +389,7 @@ document print_htptr end define print_htstr - set $ind = 0 + set $ind = 0 ____print_ht $arg0 2 end @@ -543,10 +543,10 @@ define printzn if $znode->op_type == 1 set $optype = "IS_CONST" end - if $znode->op_type == 2 + if $znode->op_type == 2 set $optype = "IS_TMP_VAR" end - if $znode->op_type == 4 + if $znode->op_type == 4 set $optype = "IS_VAR" end if $znode->op_type == 8 @@ -576,11 +576,11 @@ end document printzn print type and content of znode. - usage: printzn &opline->op1 + usage: printzn &opline->op1 end define printzops - printf "op1 => " + printf "op1 => " printzn &execute_data->opline.op1 printf "op2 => " printzn &execute_data->opline.op2 diff --git a/.travis.yml b/.travis.yml index 6aca11ee16..702802ecf5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ addons: - libzip-dev notifications: - email: + email: on_failure: change irc: template: @@ -62,7 +62,7 @@ before_script: - . ./travis/ext/pgsql/setup.sh - . ./travis/ext/pdo_pgsql/setup.sh -# Run PHPs run-tests.php +# Run PHPs run-tests.php script: - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120 diff --git a/CODING_STANDARDS b/CODING_STANDARDS index 1e72328e9a..7e0131e9c8 100644 --- a/CODING_STANDARDS +++ b/CODING_STANDARDS @@ -112,7 +112,7 @@ User Functions/Methods Naming Conventions of ``parent_*``:: A family of 'foo' functions, for example: - + Good: 'foo_select_bar' 'foo_insert_baz' @@ -1,7 +1,7 @@ --------------------------------------------------------------------- +-------------------------------------------------------------------- The PHP License, version 3.01 Copyright (c) 1999 - 2018 The PHP Group. All rights reserved. --------------------------------------------------------------------- +-------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions @@ -9,22 +9,22 @@ are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + 3. The name "PHP" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact group@php.net. - + 4. Products derived from this software may not be called "PHP", nor may "PHP" appear in their name, without prior written permission from group@php.net. You may indicate that your software works in conjunction with PHP by saying "Foo for PHP" instead of calling it "PHP Foo" or "phpfoo" - + 5. The PHP Group may publish revised and/or new versions of the license from time to time. Each version will be given a distinguishing version number. @@ -41,27 +41,27 @@ are met: "This product includes PHP software, freely available from <http://www.php.net/software/>". -THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND +THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP -DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------- +-------------------------------------------------------------------- This software consists of voluntary contributions made by many individuals on behalf of the PHP Group. The PHP Group can be contacted via Email at group@php.net. -For more information on the PHP Group and the PHP project, +For more information on the PHP Group and the PHP project, please see <http://www.php.net>. PHP includes the Zend Engine, freely available at diff --git a/Makefile.gcov b/Makefile.gcov index e7c9c7054a..b290d777d8 100644 --- a/Makefile.gcov +++ b/Makefile.gcov @@ -62,7 +62,7 @@ php_lcov.info: lcov-test rm -rf lcov_data/$$dir ; \ fi; \ done - @echo + @echo @echo "Generating $@" @$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data --output-file $@ @@ -148,7 +148,7 @@ PHP NEWS (Andrew Nester, Laruence, Anatol) - iconv: - . Fixed bug #68180 (iconv_mime_decode can return extra characters in a + . Fixed bug #68180 (iconv_mime_decode can return extra characters in a header). (cmb) . Fixed bug #63839 (iconv_mime_decode_headers function is skipping headers). (cmb) @@ -267,7 +267,7 @@ PHP NEWS (cmb) - Filter: - . Added the 'add_slashes' sanitization mode (FILTER_SANITIZE_ADD_SLASHES). + . Added the 'add_slashes' sanitization mode (FILTER_SANITIZE_ADD_SLASHES). (Kalle) . Fixed bug #76366 (References in sub-array for filtering breaks the filter). (ZiHang Gao) @@ -277,7 +277,7 @@ PHP NEWS . Added fpm_get_status function. (Till Backhaus) . Fixed bug #69031 (Long messages into stdout/stderr are truncated incorrectly) - added new log related FPM configuration options: - log_limit, log_buffering and decorate_workers_output. (Jakub Zelenka) + log_limit, log_buffering and decorate_workers_output. (Jakub Zelenka) - mbstring: . Fixed bug #76574 (use of undeclared identifiers INT_MAX and LONG_MAX). (cmb) @@ -411,7 +411,7 @@ PHP NEWS - Core: . Improved PHP GC. (Dmitry, Nikita) - . Redesigned the old ext_skel program written in PHP, run: + . Redesigned the old ext_skel program written in PHP, run: 'php ext_skel.php' for all options. This means there are no dependencies, thus making it work on Windows out of the box. (Kalle) . Removed support for BeOS. (Kalle) @@ -428,13 +428,13 @@ PHP NEWS . Fixed bug #75031 (support append mode in temp/memory streams). (adsr) . Fixed bug #74860 (Uncaught exceptions not being formatted properly when error_log set to "syslog"). (Philip Prindeville) - . Fixed bug #75220 (Segfault when calling is_callable on parent). + . Fixed bug #75220 (Segfault when calling is_callable on parent). (andrewnester) . Fixed bug #69954 (broken links and unused config items in distributed ini files). (petk) . Fixed bug #74922 (Composed class has fatal error with duplicate, equal const properties). (pmmaga) - . Fixed bug #63911 (identical trait methods raise errors during composition). + . Fixed bug #63911 (identical trait methods raise errors during composition). (pmmaga) . Fixed bug #75677 (Clang ignores fastcall calling convention on variadic function). (Li-Wen Hsu) @@ -487,14 +487,14 @@ PHP NEWS . Fixed bug #75453 (Incorrect reflection for ibase_[p]connect). (villfa) - intl: - . Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead + . Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead of destination). (andrewnester) - JSON: . Added JSON_THROW_ON_ERROR flag. (Andrea) - LDAP: - . Added ldap_exop_refresh helper for EXOP REFRESH operation with dds overlay. + . Added ldap_exop_refresh helper for EXOP REFRESH operation with dds overlay. (Come) . Added full support for sending and parsing ldap controls (Come) . Fixed bug #49876 (Fix LDAP path lookup on 64-bit distros). (dzuelke) @@ -503,7 +503,7 @@ PHP NEWS . Fixed bug #75871 (use pkg-config where available). (pmmaga) - litespeed: - . Fixed bug #75248 (Binary directory doesn't get created when building + . Fixed bug #75248 (Binary directory doesn't get created when building only litespeed SAPI). (petk) . Fixed bug #75251 (Missing program prefix and suffix). (petk) @@ -568,7 +568,7 @@ PHP NEWS to readline_info() if linked against libreadline. (krageon) - Session: - . Fixed bug #74941 (session fails to start after having headers sent). + . Fixed bug #74941 (session fails to start after having headers sent). (morozov) - SimpleXML: @@ -580,7 +580,7 @@ PHP NEWS used). (Anton Artamonov) - SPL: - . Fixed bug #74977 (Appending AppendIterator leads to segfault). + . Fixed bug #74977 (Appending AppendIterator leads to segfault). (Andrew Nester) . Fixed bug #75173 (incorrect behavior of AppendIterator::append in foreach loop). (jhdxr) @@ -589,7 +589,7 @@ PHP NEWS . Fixed bug #75878 (RecursiveTreeIterator::setPostfix has wrong signature). (cmb) . Fixed bug #74519 (strange behavior of AppendIterator). (jhdxr) - . Fixed bug #76131 (mismatch arginfo for splarray constructor). + . Fixed bug #76131 (mismatch arginfo for splarray constructor). (carusogabriel) - SQLite3: @@ -597,11 +597,11 @@ PHP NEWS - Standard: . Added is_countable() function. (Gabriel Caruso) - . Fixed bug #75916 (DNS_CAA record results contain garbage). (Mike, + . Fixed bug #75916 (DNS_CAA record results contain garbage). (Mike, Philip Sharp) . Fixed unserialize(), to disable creation of unsupported data structures through manually crafted strings. (Dmitry) - . Fixed bug #75409 (accept EFAULT in addition to ENOSYS as indicator + . Fixed bug #75409 (accept EFAULT in addition to ENOSYS as indicator that getrandom() is missing). (sarciszewski) . Fixed bug #74719 (fopen() should accept NULL as context). (Alexander Holman) . Fixed bug #69948 (path/domain are not sanitized in setcookie). (cmb) diff --git a/README.EXT_SKEL b/README.EXT_SKEL index 2d093694d1..1b4dc12ba3 100644 --- a/README.EXT_SKEL +++ b/README.EXT_SKEL @@ -11,8 +11,8 @@ HOW TO USE IT and everything you need will be placed in directory ext/extension_name. - If you don't need to test the existence of any external header files, - libraries or functions in them, the extension is ready to be compiled in + If you don't need to test the existence of any external header files, + libraries or functions in them, the extension is ready to be compiled in PHP. To compile the extension, run the following: ./buildconf; ./configure --enable-extension_name; make @@ -24,7 +24,7 @@ HOW TO USE IT SOURCE AND HEADER FILE NAME - The ext_skel.php script generates 'extension_name.c' and 'php_extension_name.h' + The ext_skel.php script generates 'extension_name.c' and 'php_extension_name.h' as the main source and header files. Keep these names. extension functions (User functions) must be named diff --git a/README.NEW-OUTPUT-API b/README.NEW-OUTPUT-API index fa15fdc732..3c23c8e8de 100644 --- a/README.NEW-OUTPUT-API +++ b/README.NEW-OUTPUT-API @@ -1,6 +1,6 @@ API adjustment to the old output control code: - Everything now resides beneath the php_output namespace, + Everything now resides beneath the php_output namespace, and there's an API call for every output handler op. Checking output control layers status: @@ -131,7 +131,7 @@ Output handler hooks Open questions Should the userland API be adjusted and unified? - + Many bits of the manual (and very first implementation) do not comply with the behaviour of the current (to be obsoleted) code, thus should the manual or the behaviour be adjusted? diff --git a/README.PARAMETER_PARSING_API b/README.PARAMETER_PARSING_API index 1f00c33572..c725879fc4 100644 --- a/README.PARAMETER_PARSING_API +++ b/README.PARAMETER_PARSING_API @@ -49,11 +49,11 @@ See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse Type specifiers --------------- - The following list shows the type specifier, its meaning and the parameter + The following list shows the type specifier, its meaning and the parameter types that need to be passed by address. All passed parameters are set - if the PHP parameter is non optional and untouched if optional and the + if the PHP parameter is non optional and untouched if optional and the parameter is not present. The only exception is O where the zend_class_entry* - has to be provided on input and is used to verify the PHP parameter is an + has to be provided on input and is used to verify the PHP parameter is an instance of that class. a - array (zval*) @@ -61,7 +61,7 @@ Type specifiers b - boolean (zend_bool) C - class (zend_class_entry*) d - double (double) - f - function or array containing php method call info (returned as + f - function or array containing php method call info (returned as zend_fcall_info and zend_fcall_info_cache) h - array (returned as HashTable*) H - array or HASH_OF(object) (returned as HashTable*) @@ -95,9 +95,9 @@ Type specifiers Note on 64bit compatibility --------------------------- -Please note that since version 7 PHP uses zend_long as integer type and -zend_string with size_t as length, so make sure you pass zend_longs to "l" -and size_t to strings length (i.e. for "s" you need to pass char * and size_t), +Please note that since version 7 PHP uses zend_long as integer type and +zend_string with size_t as length, so make sure you pass zend_longs to "l" +and size_t to strings length (i.e. for "s" you need to pass char * and size_t), not the other way round! Both mistakes might cause memory corruptions and segfaults: @@ -110,7 +110,7 @@ Both mistakes might cause memory corruptions and segfaults: int num; /* XXX THIS IS WRONG!! Use zend_long instead. */ zend_parse_parameters(ZEND_NUM_ARGS(), "l", &num) -If you're in doubt, use check_parameters.php script to the parameters +If you're in doubt, use check_parameters.php script to the parameters and their types (it can be found in ./scripts/dev/ directory of PHP sources): # php ./scripts/dev/check_parameters.php /path/to/your/sources/ @@ -159,7 +159,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/!", /* Get either a set of 3 longs or a string. */ zend_long l1, l2, l3; char *s; -/* +/* * The function expects a pointer to a size_t in this case, not a long * or any other type. If you specify a type which is larger * than a 'size_t', the upper bits might not be initialized diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS index c5c59c546a..dda28b156f 100644 --- a/README.RELEASE_PROCESS +++ b/README.RELEASE_PROCESS @@ -32,7 +32,7 @@ team (Bjori) on hand. 6. Verify the tags to be extra sure everything was tagged properly. 7. Moving extensions from/to PECL requires write access to the destination. -Most developers should have this. +Most developers should have this. Moving extensions from php-src to PECL - Checkout the pecl directory, most likely you want a sparse-root checkout @@ -125,7 +125,7 @@ Getting the non stable release (alpha/beta/RC) announced b. ``$PHP_x_RC_DATE`` = "06 September 2007" -3. Add a short notice to phpweb stating that there is a new release, and +3. Add a short notice to phpweb stating that there is a new release, and highlight the major important things (security fixes) and when it is important to upgrade. @@ -140,7 +140,7 @@ to upgrade. *Wait for web and qa sites to update with new information before sending announce* -5. Send **separate** emails **To** ``internals@lists.php.net`` and ``php-general@lists.php.net`` +5. Send **separate** emails **To** ``internals@lists.php.net`` and ``php-general@lists.php.net`` lists pointing out "the location of the release" and "the possible release date of either the next RC, or the final release". Include in this information the verification information output by ``gen_verify_stub``. @@ -194,7 +194,7 @@ can be influenced by defining the environment variable TAR_OPTIONS='--format=gnu ``gpg -u YOUREMAIL --armor --detach-sign php-X.Y.Z.tar.xxx`` 11. Commit and push all the tarballs and signature files to web/php-distributions.git, - then update the git submodule reference in web/php.git: + then update the git submodule reference in web/php.git: ``git submodule init; git submodule update; cd distributions; @@ -265,7 +265,7 @@ f.e. ``ChangeLog-5.php`` from the NEWS file IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/`` V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/`` - + e. You may want to try php-web/bin/news2html to automate this task 6. Add a short notice to phpweb stating that there is a new release, and @@ -362,7 +362,7 @@ New Release Manager Checklist one or more of the previous RMs sign your key. Publish your public key to pgp.mit.edu with: `gpg --keyserver pgp.mit.edu --send-keys $KEYID` -3. Request karma to edit main/php_version.h. Possibly karma for other restricted parts of +3. Request karma to edit main/php_version.h. Possibly karma for other restricted parts of php-src might come in question. 4. Request karma for web/qa.git and web/php.git for publishing release announcements. diff --git a/README.SELF-CONTAINED-EXTENSIONS b/README.SELF-CONTAINED-EXTENSIONS index 1e917797c1..6fb89746b3 100644 --- a/README.SELF-CONTAINED-EXTENSIONS +++ b/README.SELF-CONTAINED-EXTENSIONS @@ -20,7 +20,7 @@ PREPARING YOUR SYSTEM GNU libtool GNU m4 - All of these are available from + All of these are available from ftp://ftp.gnu.org/pub/gnu/ @@ -30,7 +30,7 @@ CONVERTING AN EXISTING EXTENSION extension, we will convert an embedded extension into a self-contained one. Install PHP and execute the following commands. - + $ mkdir /tmp/newext $ cd /tmp/newext @@ -53,7 +53,7 @@ CONVERTING AN EXISTING EXTENSION [--with-mysql=MYSQL-DIR] $ make install - The MySQL module will either use the embedded MySQL client + The MySQL module will either use the embedded MySQL client library or the MySQL installation in MYSQL-DIR. @@ -64,8 +64,8 @@ DEFINING THE NEW EXTENSION It consists of two source files "foo.c" and "bar.c" (and any arbitrary amount of header files, but that is not important here). - - The demo extension does not reference any external + + The demo extension does not reference any external libraries (that is important, because the user does not need to specify anything). @@ -75,7 +75,7 @@ DEFINING THE NEW EXTENSION CREATING THE M4 CONFIGURATION FILE - The m4 configuration can perform additional checks. For a + The m4 configuration can perform additional checks. For a self-contained extension, you do not need more than a few macro calls. @@ -94,7 +94,7 @@ fi The first argument of PHP_NEW_EXTENSION describes the name of the extension. The second names the source-code files. The third passes $ext_shared which is set by PHP_ARG_ENABLE/WITH to PHP_NEW_EXTENSION. - + Please use always PHP_ARG_ENABLE or PHP_ARG_WITH. Even if you do not plan to distribute your module with PHP, these facilities allow you to integrate your module easily into the main PHP module framework. @@ -135,7 +135,7 @@ INSTALLING A SELF-CONTAINED EXTENSION ADDING SHARED MODULE SUPPORT TO A MODULE In order to be useful, a self-contained extension must be loadable - as a shared module. I will explain now how you can add shared module + as a shared module. I will explain now how you can add shared module support to an existing module called foo. 1. In config.m4, use PHP_ARG_WITH/PHP_ARG_ENABLE. Then you will diff --git a/README.STREAMS b/README.STREAMS index f22cab5d71..b3d0c7a826 100644 --- a/README.STREAMS +++ b/README.STREAMS @@ -27,7 +27,7 @@ The main functions are: PHPAPI size_t php_stream_read(php_stream * stream, char * buf, size_t count); PHPAPI size_t php_stream_write(php_stream * stream, const char * buf, size_t count); -PHPAPI size_t php_stream_printf(php_stream * stream, +PHPAPI size_t php_stream_printf(php_stream * stream, const char * fmt, ...); PHPAPI int php_stream_eof(php_stream * stream); PHPAPI int php_stream_getc(php_stream * stream); @@ -62,7 +62,7 @@ Where: file/URL, use this option to arrange for the stream to be copied (if needed) into a stream that can be seek()ed. - + opened_path is used to return the path of the actual file opened, but if you used STREAM_MUST_SEEK, may not be valid. You are responsible for efree()ing opened_path. opened_path may be (and usually @@ -94,7 +94,7 @@ PHPAPI php_stream *php_stream_sock_open_host(const char *host, unsigned short po PHPAPI php_stream *php_stream_sock_open_unix(const char *path, int persistent, struct timeval *timeout); Open a UNIX domain socket. - + Stream Utilities ================ @@ -245,7 +245,7 @@ PHPAPI php_stream * php_stream_fopen(const char * filename, const char * mode) { FILE * fp = fopen(filename, mode); php_stream * ret; - + if (fp) { ret = php_stream_alloc(&php_stream_stdio_ops, fp, 0, 0, mode); if (ret) @@ -346,7 +346,7 @@ static size_t php_mysqlop_read(php_stream * stream, char * buf, size_t count) else return 0; } - + /* pull out some data from the stream and put it in buf */ ... mysql_fetch_row(state->result) ... /* we could do something strange, like format the data as XML here, diff --git a/README.SUBMITTING_PATCH b/README.SUBMITTING_PATCH index bdd46a22f8..be14a97bc3 100644 --- a/README.SUBMITTING_PATCH +++ b/README.SUBMITTING_PATCH @@ -128,7 +128,7 @@ How to create your PHP, PHP Documentation or PECL patch ------------------------------------------------------- PHP and most PECL packages use Git for revision control. Some PECL packages use Subversion (SVN) Read http://www.php.net/git.php for help -on using Git to get and build PHP source code. We recommend to look +on using Git to get and build PHP source code. We recommend to look at our workflow on https://wiki.php.net/vcs/gitworkflow and our FAQ https://wiki.php.net/vcs/gitfaq. diff --git a/README.input_filter b/README.input_filter index 697d6e763b..bca7f29ad2 100644 --- a/README.input_filter +++ b/README.input_filter @@ -12,7 +12,7 @@ enforced. It is implemented as a SAPI hook and is called from the treat_data and post handler functions. To implement your own security policy you will need to write a standard PHP extension. There is also a powerful standard implementation in ext/filter that should suit most -peoples' needs. However, if you want to implement your own security +peoples' needs. However, if you want to implement your own security policy, read on. A simple implementation might look like the following. This stores the diff --git a/TSRM/build.mk b/TSRM/build.mk index a608c55583..e5e46b7eaa 100644 --- a/TSRM/build.mk +++ b/TSRM/build.mk @@ -31,7 +31,7 @@ aclocal.m4: configure.ac acinclude.m4 aclocal $(config_h_in): configure.ac -# explicitly remove target since autoheader does not seem to work +# explicitly remove target since autoheader does not seem to work # correctly otherwise (timestamps are not updated) @rm -f $@ autoheader diff --git a/TSRM/threads.m4 b/TSRM/threads.m4 index efd8ee4e64..55864c8982 100644 --- a/TSRM/threads.m4 +++ b/TSRM/threads.m4 @@ -1,17 +1,17 @@ dnl Copyright (c) 1999, 2000 Sascha Schumann. All rights reserved. -dnl +dnl dnl Redistribution and use in source and binary forms, with or without dnl modification, are permitted provided that the following conditions dnl are met: -dnl +dnl dnl 1. Redistributions of source code must retain the above copyright dnl notice, this list of conditions and the following disclaimer. -dnl +dnl dnl 2. Redistributions in binary form must reproduce the above copyright dnl notice, this list of conditions and the following disclaimer in dnl the documentation and/or other materials provided with the dnl distribution. -dnl +dnl dnl THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY dnl EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE dnl IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -97,7 +97,7 @@ dnl -Kthread UDK cc (UnixWare) dnl -mt WorkShop cc (Solaris) dnl -mthreads gcc (AIX) dnl -pthread gcc (Linux, FreeBSD, NetBSD, OpenBSD) -dnl -pthreads gcc (Solaris) +dnl -pthreads gcc (Solaris) dnl -qthreaded AIX cc V5 dnl -threads gcc (HP-UX) dnl @@ -113,7 +113,7 @@ CFLAGS=$save_CFLAGS AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[ ac_cv_pthreads_cflags= if test "$pthreads_working" != "yes"; then - for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do + for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do ac_save=$CFLAGS CFLAGS="$CFLAGS $flag" PTHREADS_CHECK_COMPILE @@ -237,13 +237,13 @@ readline: if PHP is linked against libreadline (rather than libedit). Standard: - . The --with-password-argon2[=dir] configure argument now provides support for - both Argon2i and Argon2id hashes in the password_hash(), password_verify(), + . The --with-password-argon2[=dir] configure argument now provides support for + both Argon2i and Argon2id hashes in the password_hash(), password_verify(), password_get_info(), and password_needs_rehash() functions. Passwords may be hashed and verified using the PASSWORD_ARGON2ID constant. Support for both Argon2i and Argon2id in the password_* functions now requires PHP be linked against libargon2 reference library >= 20161029. - (RFC: https://wiki.php.net/rfc/argon2_password_hash_enhancements). + (RFC: https://wiki.php.net/rfc/argon2_password_hash_enhancements). ======================================== 3. Changes in SAPI modules @@ -447,8 +447,8 @@ JSON: . FILTER_VALIDATE_FLOAT now also supports a `thousand` option, which defines the set of allowed thousand separator chars. The default (`"',."`) is fully backward compatible with former PHP versions. - . FILTER_SANITIZE_ADD_SLASHES has been added as an alias of the 'magic_quotes' - filter (FILTER_SANITIZE_MAGIC_QUOTES). The 'magic_quotes' filter is subject + . FILTER_SANITIZE_ADD_SLASHES has been added as an alias of the 'magic_quotes' + filter (FILTER_SANITIZE_MAGIC_QUOTES). The 'magic_quotes' filter is subject to removal in future versions of PHP. FTP: diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 905eb3738d..2f229dfd9d 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -175,7 +175,7 @@ PHP 7.3 INTERNALS UPGRADE NOTES aa. RETSIGTYPE has been removed from the generated php_config.h and should be replaced with void. - bb. php_setcookie() now expects an additional samesite argument, and the + bb. php_setcookie() now expects an additional samesite argument, and the url_encode parameter has been moved to the end. The signature is now: int php_setcookie(zend_string *name, zend_string *value, time_t expires, zend_string *path, zend_string *domain, int secure, diff --git a/Zend/LICENSE b/Zend/LICENSE index 8acb9af4f8..51f5cccde9 100644 --- a/Zend/LICENSE +++ b/Zend/LICENSE @@ -1,25 +1,25 @@ --------------------------------------------------------------------- +-------------------------------------------------------------------- The Zend Engine License, Version 2.00 Copyright (c) 1999-2006 Zend Technologies Ltd. All rights reserved. --------------------------------------------------------------------- +-------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + 3. The names "Zend" and "Zend Engine" must not be used to endorse or promote products derived from this software without prior permission from Zend Technologies Ltd. For written permission, - please contact license@zend.com. - + please contact license@zend.com. + 4. Zend Technologies Ltd. may publish revised and/or new versions of the license from time to time. Each version will be given a distinguishing version number. @@ -40,9 +40,9 @@ are met: software must display the following acknowledgment: "The Zend Engine is freely available at http://www.zend.com" -THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``AS IS'' AND +THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ZEND TECHNOLOGIES LTD. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT @@ -53,4 +53,4 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------- +-------------------------------------------------------------------- diff --git a/Zend/README.ZEND_VM b/Zend/README.ZEND_VM index 2cd5dfc520..b05b7ccc9a 100644 --- a/Zend/README.ZEND_VM +++ b/Zend/README.ZEND_VM @@ -21,7 +21,7 @@ ZEND_VM_HANDLER(<OPCODE-NUMBER>, <OPCODE>, <OP1_TYPES>, <OP2_TYPES>) <OPCODE-NUMBER> is a opcode number (0, 1, ...) <OPCODE> is an opcode name (ZEN_NOP, ZEND_ADD, :) <OP1_TYPES> & <OP2_TYPES> are masks for allowed operand op_types. Specializer -will generate code only for defined combination of types. You can use any +will generate code only for defined combination of types. You can use any combination of the following op_types UNUSED, CONST, VAR, TMP and CV also you can use ANY mask to disable specialization according operand's op_type. <HANDLER'S CODE> is a handler's code itself. For most handlers it stills the @@ -34,9 +34,9 @@ EXECUTE_DATA execute_data ZEND_VM_DISPATCH_TO_HANDLER(<OP>) return <OP>_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) -ZEND_VM_DISPATCH_TO_HELPER(<NAME>) +ZEND_VM_DISPATCH_TO_HELPER(<NAME>) return <NAME>(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) -ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>) +ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>) return <NAME>(<VAL>, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) ZEND_VM_CONTINUE() return 0 @@ -72,7 +72,7 @@ FREE_OP<X>_VAR_PTR() FREE_VAR_PTR(free_op<X>) -Executor's helpers can be defined without parameters or with one parameter. +Executor's helpers can be defined without parameters or with one parameter. This is done with the following constructs: ZEND_VM_HELPER(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>) @@ -86,13 +86,13 @@ ZEND_VM_HELPER_EX(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>, <PARAM_SPEC>) } Executor's code is generated by PHP script zend_vm_gen.php it uses zend_vm_def.h -and zend_vm_execute.skl as input and produces zend_vm_opcodes.h and -zend_vm_execute.h. The first file is a list of opcode definitions. It is +and zend_vm_execute.skl as input and produces zend_vm_opcodes.h and +zend_vm_execute.h. The first file is a list of opcode definitions. It is included from zend_compile.h. The second one is an executor code itself. It is included from zend_execute.c. -zend_vm_gen.php can produce different kind of executors. You can select -different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can +zend_vm_gen.php can produce different kind of executors. You can select +different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can disable opcode specialization using --without-specializer. You can include or exclude old executor together with specialized one using --without-old-executor. At last you can debug executor using original zend_vm_def.h or generated file diff --git a/Zend/bench.php b/Zend/bench.php index f76bb3f2bd..a6c0c6daed 100644 --- a/Zend/bench.php +++ b/Zend/bench.php @@ -5,18 +5,18 @@ if (function_exists("date_default_timezone_set")) { function simple() { $a = 0; - for ($i = 0; $i < 1000000; $i++) + for ($i = 0; $i < 1000000; $i++) $a++; $thisisanotherlongname = 0; - for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++) + for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++) $thisisanotherlongname++; } /****/ function simplecall() { - for ($i = 0; $i < 1000000; $i++) + for ($i = 0; $i < 1000000; $i++) strlen("hallo"); } @@ -26,14 +26,14 @@ function hallo($a) { } function simpleucall() { - for ($i = 0; $i < 1000000; $i++) + for ($i = 0; $i < 1000000; $i++) hallo("hallo"); } /****/ function simpleudcall() { - for ($i = 0; $i < 1000000; $i++) + for ($i = 0; $i < 1000000; $i++) hallo2("hallo"); } diff --git a/Zend/build.mk b/Zend/build.mk index 53e7849cf9..ef14b65e65 100644 --- a/Zend/build.mk +++ b/Zend/build.mk @@ -32,7 +32,7 @@ aclocal.m4: configure.ac acinclude.m4 aclocal $(config_h_in): configure.ac -# explicitly remove target since autoheader does not seem to work +# explicitly remove target since autoheader does not seem to work # correctly otherwise (timestamps are not updated) @rm -f $@ autoheader diff --git a/Zend/micro_bench.php b/Zend/micro_bench.php index c9ea19e263..42f1110c88 100644 --- a/Zend/micro_bench.php +++ b/Zend/micro_bench.php @@ -4,12 +4,12 @@ function hallo() { } function simpleucall($n) { - for ($i = 0; $i < $n; $i++) + for ($i = 0; $i < $n; $i++) hallo(); } function simpleudcall($n) { - for ($i = 0; $i < $n; $i++) + for ($i = 0; $i < $n; $i++) hallo2(); } @@ -17,7 +17,7 @@ function hallo2() { } function simpleicall($n) { - for ($i = 0; $i < $n; $i++) + for ($i = 0; $i < $n; $i++) func_num_args(); } diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index 10dda5f836..15fd742d4f 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -128,7 +128,7 @@ static void zend_ini_add_string(zval *result, zval *op1, zval *op2) } } op1_len = (int)Z_STRLEN_P(op1); - + if (Z_TYPE_P(op2) != IS_STRING) { convert_to_string(op2); } diff --git a/Zend/zend_vm_trace_map.h b/Zend/zend_vm_trace_map.h index a5da487611..70b00556f4 100644 --- a/Zend/zend_vm_trace_map.h +++ b/Zend/zend_vm_trace_map.h @@ -79,4 +79,3 @@ static void zend_vm_trace_init(void) } zend_hash_destroy(&vm_trace_ht); } -
\ No newline at end of file diff --git a/appveyor/build.bat b/appveyor/build.bat index dfef616164..36e8fbdd4e 100644 --- a/appveyor/build.bat +++ b/appveyor/build.bat @@ -20,7 +20,7 @@ if not exist "%SDK_RUNNER%" ( if not exist "%PHP_BUILD_CACHE_SDK_DIR%" ( echo Cloning remote SDK repository - git clone --branch %SDK_BRANCH% %SDK_REMOTE% "%PHP_BUILD_CACHE_SDK_DIR%" 2>&1 + git clone --branch %SDK_BRANCH% %SDK_REMOTE% "%PHP_BUILD_CACHE_SDK_DIR%" 2>&1 ) for /f "tokens=*" %%a in ('type %PHP_BUILD_CACHE_SDK_DIR%\VERSION') do set GOT_SDK_VER=%%a @@ -30,7 +30,7 @@ if NOT "%GOT_SDK_VER%" == "%PHP_BUILD_SDK_BRANCH:~8%" ( echo Fetching remote SDK repository git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" fetch --prune origin 2>&1 echo Checkout SDK repository branch - git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" checkout --force %SDK_BRANCH% + git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" checkout --force %SDK_BRANCH% ) if not exist "%SDK_RUNNER%" ( diff --git a/build/mkdep.awk b/build/mkdep.awk index 752602b339..4bd4f3a07f 100644 --- a/build/mkdep.awk +++ b/build/mkdep.awk @@ -33,16 +33,16 @@ } dif=i-1 - + for (; i <= NF; i++) filenames[i-dif]=$i - + no_files=NF-dif - + for(i = 1; i <= no_files; i++) { if (system("test -r " filenames[i]) != 0) continue - + target=filenames[i] sub(srcdir "/", "", target) target2=target @@ -51,7 +51,7 @@ for (e in used) delete used[e] - + cmdx=cmd " " filenames[i] done=0 while ((cmdx | getline) > 0) { @@ -64,10 +64,10 @@ done=1 printf(" \\\n\t" substr($3,2,length($3)-2)) used[$3] = 1; - } + } } } if (done == 1) print "\n" } -} +} diff --git a/build/order_by_dep.awk b/build/order_by_dep.awk index 281898ecee..ad3781101b 100644 --- a/build/order_by_dep.awk +++ b/build/order_by_dep.awk @@ -77,7 +77,7 @@ function count(arr, n, i) END { # order it correctly out_count = 0; - + while (count(mods)) { for (i = 0; i <= mod_count - 1; i++) { if (i in mods) { diff --git a/build/scan_makefile_in.awk b/build/scan_makefile_in.awk index 0c6d20398f..c7ba9a8c52 100644 --- a/build/scan_makefile_in.awk +++ b/build/scan_makefile_in.awk @@ -2,7 +2,7 @@ BEGIN { mode=0 sources="" } - + mode == 0 && /^LTLIBRARY_SOURCES.*\\$/ { if (match($0, "[^=]*$")) { sources=substr($0, RSTART, RLENGTH-1) diff --git a/ext/bcmath/libbcmath/FAQ b/ext/bcmath/libbcmath/FAQ index 6499b1cffb..1b06b301ba 100644 --- a/ext/bcmath/libbcmath/FAQ +++ b/ext/bcmath/libbcmath/FAQ @@ -1,4 +1,4 @@ -BCMATH FAQ: +BCMATH FAQ: 1) Why BCMATH? diff --git a/ext/ctype/ctype.xml b/ext/ctype/ctype.xml index 0e7c714b70..312c195e05 100644 --- a/ext/ctype/ctype.xml +++ b/ext/ctype/ctype.xml @@ -9,7 +9,7 @@ current locale. </para> <para> - When called with an integer argument these functions + When called with an integer argument these functions behave exactly like their C counterparts. </para> <para> @@ -19,7 +19,7 @@ requested criteria. </para> <para> - Passing anything else but a string or integer will + Passing anything else but a string or integer will return false immediately. </para> </partintro> diff --git a/ext/curl/config.w32 b/ext/curl/config.w32 index b2376a4623..b37964ea8a 100644 --- a/ext/curl/config.w32 +++ b/ext/curl/config.w32 @@ -18,7 +18,7 @@ if (PHP_CURL != "no") { SETUP_OPENSSL("curl", PHP_CURL) > 0 && CHECK_LIB("winmm.lib", "curl", PHP_CURL) && CHECK_LIB("wldap32.lib", "curl", PHP_CURL) && - (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) || + (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) || (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) && !isNaN(ver_num) && (ver_num <= parseInt("0x073b00") || ver_num > parseInt("0x073b00") && diff --git a/ext/curl/tests/responder/get.php b/ext/curl/tests/responder/get.php index 60aafc03d4..f9269745f6 100644 --- a/ext/curl/tests/responder/get.php +++ b/ext/curl/tests/responder/get.php @@ -21,7 +21,7 @@ echo $_COOKIE['foo']; break; case 'encoding': - echo $_SERVER['HTTP_ACCEPT_ENCODING']; + echo $_SERVER['HTTP_ACCEPT_ENCODING']; break; case 'contenttype': header('Content-Type: text/plain;charset=utf-8'); diff --git a/ext/dba/README b/ext/dba/README index a79413f100..3d23fb914c 100755 --- a/ext/dba/README +++ b/ext/dba/README @@ -1,54 +1,54 @@ -These functions build the foundation for accessing Berkeley DB style -databases. +These functions build the foundation for accessing Berkeley DB style +databases. This is a general abstraction layer for several file-based databases. As -such, functionality is limited to a common subset of features supported -by modern databases such as Sleepycat Software's DB2. (This is not to be -confused with IBM's DB2 software, which is supported through the ODBC -functions.) +such, functionality is limited to a common subset of features supported +by modern databases such as Sleepycat Software's DB2. (This is not to be +confused with IBM's DB2 software, which is supported through the ODBC +functions.) This extensions allows to work with the following databases: dbm DBM is the oldest (original) type of Berkeley DB style databases. - You should avoid it, if possible. We do not support the - compatibility functions built into DB2 and gdbm, because they are - only compatible on the source code level, but cannot handle the - original dbm format. -ndbm NDBM is a newer type and more flexible than dbm. It still has - most of the arbitrary limits of dbm (therefore it is deprecated). -gdbm GDBM is the GNU database manager. + You should avoid it, if possible. We do not support the + compatibility functions built into DB2 and gdbm, because they are + only compatible on the source code level, but cannot handle the + original dbm format. +ndbm NDBM is a newer type and more flexible than dbm. It still has + most of the arbitrary limits of dbm (therefore it is deprecated). +gdbm GDBM is the GNU database manager. db2 DB2 is Sleepycat Software's DB2. It's described as "a programmatic - toolkit that provides high-performance built-in database support - for both standalone and client/server applications. -db3 DB3 is Sleepycat Software's DB3. + toolkit that provides high-performance built-in database support + for both standalone and client/server applications. +db3 DB3 is Sleepycat Software's DB3. db4 DB4 is Sleepycat Software's DB4. This is available since PHP 5.0. -cdb CDB is "a fast, reliable, lightweight package for creating and - reading constant databases." It is from the author of qmail and - can be found at http://cr.yp.to/cdb.html. Since it is constant, - we support only reading operations. And since PHP 4.3.0 we support - writing (not updating) through the internal cdb library. -cdb_make Since PHP 4.3.0 we support creation (not updating) of cdb files - when the bundled cdb library is used. -flatfile This is available since PHP 4.3.0 for compatibility with the - deprecated dbm extension only and should be avoided. However you - may use this where files were created in this format. That happens - when configure could not find any external library. -inifile This is available since PHP 4.3.3 to be able to modify php.ini - files from within PHP scripts. When working with ini files you - can pass arrays of the form array(0=>group,1=>value_name) or - strings of the form "[group]value_name" where group is optional. - As the functions dba_firstkey() and dba_nextkey() return string - representations of the key there is a new function dba_key_split() - available since PHP 5 which allows to convert the string keys into - array keys without losing FALSE. -qdbm This is available since PHP 5.0.0. The qdbm library can be loaded - from http://qdbm.sourceforge.net. +cdb CDB is "a fast, reliable, lightweight package for creating and + reading constant databases." It is from the author of qmail and + can be found at http://cr.yp.to/cdb.html. Since it is constant, + we support only reading operations. And since PHP 4.3.0 we support + writing (not updating) through the internal cdb library. +cdb_make Since PHP 4.3.0 we support creation (not updating) of cdb files + when the bundled cdb library is used. +flatfile This is available since PHP 4.3.0 for compatibility with the + deprecated dbm extension only and should be avoided. However you + may use this where files were created in this format. That happens + when configure could not find any external library. +inifile This is available since PHP 4.3.3 to be able to modify php.ini + files from within PHP scripts. When working with ini files you + can pass arrays of the form array(0=>group,1=>value_name) or + strings of the form "[group]value_name" where group is optional. + As the functions dba_firstkey() and dba_nextkey() return string + representations of the key there is a new function dba_key_split() + available since PHP 5 which allows to convert the string keys into + array keys without losing FALSE. +qdbm This is available since PHP 5.0.0. The qdbm library can be loaded + from http://qdbm.sourceforge.net. After configuring and compiling PHP you must execute the following test -from commandline: - php run-tests.php ext/dba. -This shows whether your combination of handlers works. Most problematic -are dbm and ndbm which conflict with many installations. The reason for +from commandline: + php run-tests.php ext/dba. +This shows whether your combination of handlers works. Most problematic +are dbm and ndbm which conflict with many installations. The reason for this is that on several systems these libraries are part of more than one -other library. The configuration test only prevents you from configuring +other library. The configuration test only prevents you from configuring malfaunctioning single handlers but not combinations.
\ No newline at end of file diff --git a/ext/dba/install_cdb.sh b/ext/dba/install_cdb.sh index 782d3a6f8d..975c39b89b 100755 --- a/ext/dba/install_cdb.sh +++ b/ext/dba/install_cdb.sh @@ -1,10 +1,10 @@ #! /bin/sh # You can use this script if you want to use an external cdb lib. If you -# compile php using --with-cdb the internal functions will be used and no +# compile php using --with-cdb the internal functions will be used and no # external library is used so that this script is not necessary. # -# cdb-0.75 lacks support for installing header files and creating a +# cdb-0.75 lacks support for installing header files and creating a # library which programs can link against. This shell script fills # the gap. diff --git a/ext/dom/tests/domdocumentload_utilities.php b/ext/dom/tests/domdocumentload_utilities.php index efd1e5a1a5..d40f7639ff 100644 --- a/ext/dom/tests/domdocumentload_utilities.php +++ b/ext/dom/tests/domdocumentload_utilities.php @@ -1,13 +1,13 @@ <?php function libxml_options_to_int($libxmlOptions) { - + $defined_constants = get_defined_constants(true); $env_array = explode('|', $libxmlOptions); $libxml_constants = array_intersect_key($defined_constants['libxml'], array_flip($env_array)); $sum = 0; - foreach($libxml_constants as $value) { + foreach($libxml_constants as $value) { $sum = $sum|$value; } diff --git a/ext/dom/tests/domdocumentloadxml_test_method.php b/ext/dom/tests/domdocumentloadxml_test_method.php index ed2f38b6c6..9b97e2badd 100644 --- a/ext/dom/tests/domdocumentloadxml_test_method.php +++ b/ext/dom/tests/domdocumentloadxml_test_method.php @@ -4,7 +4,7 @@ include(dirname(__FILE__) . '/domdocumentload_utilities.php'); $doc = new DOMDocument(); $libxml_options = libxml_options_to_int(getenv('LOAD_OPTIONS')); -$result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')), +$result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')), $libxml_options); $expectedResult = (bool) getenv('EXPECTED_RESULT'); diff --git a/ext/dom/tests/domdocumentloadxml_test_method_savexml.php b/ext/dom/tests/domdocumentloadxml_test_method_savexml.php index 1ef72d58d7..1bcf8a8e33 100644 --- a/ext/dom/tests/domdocumentloadxml_test_method_savexml.php +++ b/ext/dom/tests/domdocumentloadxml_test_method_savexml.php @@ -4,7 +4,7 @@ include(dirname(__FILE__) . '/domdocumentload_utilities.php'); $doc = new DOMDocument(); $libxml_options = libxml_options_to_int(getenv('LOAD_OPTIONS')); -$result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')), +$result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')), $libxml_options); $expectedResult = (bool) getenv('EXPECTED_RESULT'); diff --git a/ext/dom/tests/note.xml b/ext/dom/tests/note.xml index 49614a1b52..f580ef1c25 100644 --- a/ext/dom/tests/note.xml +++ b/ext/dom/tests/note.xml @@ -5,4 +5,4 @@ <from>Shane</from> <heading>Reminder</heading> <body>Don't forget the meeting tonight!</body> -</note> +</note> diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 42f87f1998..bd73f572d3 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -14,8 +14,8 @@ if (PHP_GD != "no") { CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng15") || CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng12")) && (CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) && - CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && - (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD) )) || + CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && + (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD) )) || (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) && CHECK_LIB("libXpm_a.lib", "gd", PHP_GD) && CHECK_HEADER_ADD_INCLUDE("xpm.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\X11") @@ -77,7 +77,7 @@ if (PHP_GD != "no") { if (ICC_TOOLSET) { ADD_FLAG("LDFLAGS_GD", "/nodefaultlib:libcmt"); } - + PHP_INSTALL_HEADERS("", "ext/gd ext/gd/libgd" ); } else { WARNING("gd not enabled; libraries and headers not found"); diff --git a/ext/hash/README b/ext/hash/README index 97eb206d02..8c01afa6b1 100644 --- a/ext/hash/README +++ b/ext/hash/README @@ -15,5 +15,5 @@ $context = hash_init($algoname); hash_update($context, $message); $digest = hash_final($context); -hash(), hash_file(), and hash_final() each support an optional boolean parameter $raw_output which behaves in the same +hash(), hash_file(), and hash_final() each support an optional boolean parameter $raw_output which behaves in the same manner as sha1()'s optional parameter. diff --git a/ext/hash/bench.php b/ext/hash/bench.php index eb94cd07f7..98af373ac3 100644 --- a/ext/hash/bench.php +++ b/ext/hash/bench.php @@ -2,7 +2,7 @@ /* This gives rather interesting results :) - + Measures on a Notebook P4M-1.7 256MB Windows 2000: sha1 0.556691 tiger160,3 0.774469 diff --git a/ext/hash/config.w32 b/ext/hash/config.w32 index 545c8673ff..85ade5f30d 100644 --- a/ext/hash/config.w32 +++ b/ext/hash/config.w32 @@ -1,7 +1,7 @@ // vim:ft=javascript ARG_ENABLE("hash", "enable hash support", "yes"); -ARG_WITH("mhash", "mhash support", "no"); +ARG_WITH("mhash", "mhash support", "no"); if (PHP_MHASH != "no") { if (PHP_HASH == "no") { @@ -25,7 +25,7 @@ if (PHP_HASH != "no") { PHP_INSTALL_HEADERS("ext/hash/", "php_hash.h php_hash_md.h php_hash_sha.h php_hash_ripemd.h " + - "php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h " + + "php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h " + "php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h php_hash_sha3.h "); } else { WARNING("hash not enabled; libraries and headers not found"); diff --git a/ext/iconv/CREDITS b/ext/iconv/CREDITS index 70d3825ac3..990abde45a 100644 --- a/ext/iconv/CREDITS +++ b/ext/iconv/CREDITS @@ -1,2 +1,2 @@ Iconv -Rui Hirokawa, Stig Bakken, Moriyoshi Koizumi +Rui Hirokawa, Stig Bakken, Moriyoshi Koizumi diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32 index d719ddbb0e..9161ca91ad 100644 --- a/ext/iconv/config.w32 +++ b/ext/iconv/config.w32 @@ -8,7 +8,7 @@ if (PHP_ICONV != "no") { CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV)) { EXTENSION("iconv", "iconv.c", PHP_ICONV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - + AC_DEFINE("HAVE_ICONV", 1, "Define if iconv extension is enabled"); AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is available"); AC_DEFINE("ICONV_ALIASED_LIBICONV", 1, "The iconv function is called iconv() in libiconv"); diff --git a/ext/imap/tests/README b/ext/imap/tests/README index 0d222ad0b8..0e554e94c0 100644 --- a/ext/imap/tests/README +++ b/ext/imap/tests/README @@ -1,7 +1,7 @@ Many of the tests in this directory require a mail server to be running, if there is no mail server the test will skip and warn, see skipif.inc for details. -To make the tests run parameters in the skipif.inc and imap_include.inc file will need to be changed to match the local mailserver configuration. +To make the tests run parameters in the skipif.inc and imap_include.inc file will need to be changed to match the local mailserver configuration. The tests have been checked using dovecot (on Linux 32 and 64 bit systems) and hMailServer on Windows. The tests are intended to be mailserver agnostic. diff --git a/ext/interbase/config.w32 b/ext/interbase/config.w32 index 9891fae442..c1f5a91f41 100644 --- a/ext/interbase/config.w32 +++ b/ext/interbase/config.w32 @@ -4,7 +4,7 @@ ARG_WITH("interbase", "InterBase support", "no"); if (PHP_INTERBASE != "no") { - if (CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE", + if (CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE", PHP_PHP_BUILD + "\\include\\interbase;" + PHP_PHP_BUILD + "\\interbase\\include;" + PHP_INTERBASE) && (CHECK_LIB("fbclient_ms.lib", "interbase", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_INTERBASE) || CHECK_LIB("gds32_ms.lib", "interbase", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_INTERBASE))) { diff --git a/ext/intl/ERROR.CONVENTIONS b/ext/intl/ERROR.CONVENTIONS index a7ef53665e..7b0bbe7286 100644 --- a/ext/intl/ERROR.CONVENTIONS +++ b/ext/intl/ERROR.CONVENTIONS @@ -28,7 +28,7 @@ void intl_error_set(intl_error* err, UErrorCode code, char* msg, int copyMsg); and by passing NULL as the first parameter. The last function is a combination of the first two. If the message is not a static buffer, copyMsg should be 1. This makes the message string be copied and freed when no longer needed. There's -no way to pass ownership of the string without it being copied. +no way to pass ownership of the string without it being copied. :: The last is ALSO stored in the object whose method call triggered the error, diff --git a/ext/intl/config.w32 b/ext/intl/config.w32 index 23673232b2..ce6478f99f 100644 --- a/ext/intl/config.w32 +++ b/ext/intl/config.w32 @@ -97,18 +97,18 @@ if (PHP_INTL != "no") { transliterator_class.c \ transliterator_methods.c", "intl"); - + ADD_SOURCES(configure_module_dirname + "/timezone", "\ timezone_class.cpp \ timezone_methods.cpp", "intl"); - + ADD_SOURCES(configure_module_dirname + "/calendar", "\ calendar_methods.cpp \ gregoriancalendar_methods.cpp \ calendar_class.cpp", "intl"); - + ADD_SOURCES(configure_module_dirname + "/breakiterator", "\ breakiterator_class.cpp \ breakiterator_methods.cpp \ @@ -117,7 +117,7 @@ if (PHP_INTL != "no") { codepointiterator_internal.cpp \ codepointiterator_methods.cpp ", "intl"); - + ADD_FLAG("LIBS_INTL", "icudt.lib icuin.lib icuio.lib"); /* Compat for ICU before 58.1.*/ diff --git a/ext/intl/normalizer/normalizer_normalize.c b/ext/intl/normalizer/normalizer_normalize.c index d5ec912848..72b848e487 100644 --- a/ext/intl/normalizer/normalizer_normalize.c +++ b/ext/intl/normalizer/normalizer_normalize.c @@ -380,7 +380,7 @@ PHP_FUNCTION( normalizer_get_raw_decomposition ) intl_error_set_custom_msg(NULL, "Code point out of range", 0); return; } - + decomposition_length = unorm2_getRawDecomposition(norm, codepoint, decomposition, 32, &status); if (decomposition_length == -1) { RETURN_NULL(); diff --git a/ext/json/json_scanner.re b/ext/json/json_scanner.re index 8348981deb..3fda1df5ad 100644 --- a/ext/json/json_scanner.re +++ b/ext/json/json_scanner.re @@ -104,7 +104,7 @@ void php_json_scanner_init(php_json_scanner *s, char *str, size_t str_len, int o int php_json_scan(php_json_scanner *s) { ZVAL_NULL(&s->value); - + std: s->token = s->cursor; diff --git a/ext/ldap/tests/README b/ext/ldap/tests/README index edc44eb4b0..8dfa12d2f9 100644 --- a/ext/ldap/tests/README +++ b/ext/ldap/tests/README @@ -63,7 +63,7 @@ export LDAP_TEST_HOST=192.168.33.10 Now you can run the test-suite by calling "make test". To test only the LDAP-Tests, run "make test TESTS=ext/ldap" -CAVEAT: The current setup does not (yet) test secure connections. +CAVEAT: The current setup does not (yet) test secure connections. ======== diff --git a/ext/mbstring/libmbfl/LICENSE b/ext/mbstring/libmbfl/LICENSE index 3b204400cf..9a749e6855 100644 --- a/ext/mbstring/libmbfl/LICENSE +++ b/ext/mbstring/libmbfl/LICENSE @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an diff --git a/ext/mbstring/libmbfl/NEWS b/ext/mbstring/libmbfl/NEWS index 8217e4158f..82a763b695 100644 --- a/ext/mbstring/libmbfl/NEWS +++ b/ext/mbstring/libmbfl/NEWS @@ -10,12 +10,12 @@ version 1.3.2 August 20, 2011 version 1.3.1 August 5, 2011 - added check for invalid/obsolete utf-8 encoding (rui). - + version 1.3.0 August 1, 2011 -- added encoding conversion between Shift_JIS and Unicode (6.0 or PUA) +- added encoding conversion between Shift_JIS and Unicode (6.0 or PUA) for pictogram characters defined by mobile phone carrier in Japan (rui). - + Detailed info:https://github.com/hirokawa/libmbfl/wiki/Introduction-to-libmbflhttps:--github.com-hirokawa-libmbfl-wiki-Introduction-to-libmbfl-_edit%23 - fixed encoding conversion of cp5022x for user defined area (rui). diff --git a/ext/mbstring/libmbfl/filters/mk_emoji_tbl.pl b/ext/mbstring/libmbfl/filters/mk_emoji_tbl.pl index 5b5c3d63ff..5bab0c602e 100755 --- a/ext/mbstring/libmbfl/filters/mk_emoji_tbl.pl +++ b/ext/mbstring/libmbfl/filters/mk_emoji_tbl.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# script to generate Shift_JIS encoded Emoji to/from Unicode conversion table. +# script to generate Shift_JIS encoded Emoji to/from Unicode conversion table. # Rui Hirokawa <hirokawa@php.net> # # usage: mktbl.pl EmojiSources.txt @@ -22,7 +22,7 @@ sub sjis2code { # Shift_JIS -> JIS $c[0] = (($c[0]-($c[0]<160?112:176))<<1)-($c[1]<159?1:0); - $c[1] -= ($c[1]<159?($c[1]>127?32:31):126); + $c[1] -= ($c[1]<159?($c[1]>127?32:31):126); $s = ($c[0] - 0x21)*94 + $c[1]-0x21; @@ -131,19 +131,19 @@ push(@r_docomo2_val, 0x00); push(@r_docomo3_key, 0x00); push(@r_docomo3_val, 0x00); -print OUT "int mb_tbl_code2uni_docomo_min = $docomo_min;\n"; -print OUT "int mb_tbl_code2uni_docomo_max = $docomo_max;\n\n"; +print OUT "int mb_tbl_code2uni_docomo_min = $docomo_min;\n"; +print OUT "int mb_tbl_code2uni_docomo_max = $docomo_max;\n\n"; print OUT "int mb_tbl_code2uni_docomo[] = {\n"; print OUT &show_code(@docomo_v); print OUT "};\n\n"; -print OUT "int mb_tbl_uni_docomo2code_min1 = $to_docomo_min1;\n"; -print OUT "int mb_tbl_uni_docomo2code_max1 = $to_docomo_max1;\n"; -print OUT "int mb_tbl_uni_docomo2code_min2 = $to_docomo_min2;\n"; -print OUT "int mb_tbl_uni_docomo2code_max2 = $to_docomo_max2;\n"; -print OUT "int mb_tbl_uni_docomo2code_min3 = $to_docomo_min3;\n"; -print OUT "int mb_tbl_uni_docomo2code_max3 = $to_docomo_max3;\n\n"; +print OUT "int mb_tbl_uni_docomo2code_min1 = $to_docomo_min1;\n"; +print OUT "int mb_tbl_uni_docomo2code_max1 = $to_docomo_max1;\n"; +print OUT "int mb_tbl_uni_docomo2code_min2 = $to_docomo_min2;\n"; +print OUT "int mb_tbl_uni_docomo2code_max2 = $to_docomo_max2;\n"; +print OUT "int mb_tbl_uni_docomo2code_min3 = $to_docomo_min3;\n"; +print OUT "int mb_tbl_uni_docomo2code_max3 = $to_docomo_max3;\n\n"; #print "DOCOMO reverse 1\n"; @@ -238,10 +238,10 @@ push(@r_kddi2_val, 0x00); push(@r_kddi3_key, 0x00); push(@r_kddi3_val, 0x00); -print OUT "int mb_tbl_code2uni_kddi1_min = $kddi_min1;\n"; -print OUT "int mb_tbl_code2uni_kddi1_max = $kddi_max1;\n"; -print OUT "int mb_tbl_code2uni_kddi2_min = $kddi_min2;\n"; -print OUT "int mb_tbl_code2uni_kddi2_max = $kddi_max2;\n\n"; +print OUT "int mb_tbl_code2uni_kddi1_min = $kddi_min1;\n"; +print OUT "int mb_tbl_code2uni_kddi1_max = $kddi_max1;\n"; +print OUT "int mb_tbl_code2uni_kddi2_min = $kddi_min2;\n"; +print OUT "int mb_tbl_code2uni_kddi2_max = $kddi_max2;\n\n"; #print "KDDI 1\n"; @@ -255,12 +255,12 @@ print OUT "int mb_tbl_code2uni_kddi2[] = {\n"; print OUT &show_code(@kddi_v2); print OUT "};\n\n"; -print OUT "int mb_tbl_uni_kddi2code_min1 = $to_kddi_min1;\n"; -print OUT "int mb_tbl_uni_kddi2code_max1 = $to_kddi_max1;\n"; -print OUT "int mb_tbl_uni_kddi2code_min2 = $to_kddi_min2;\n"; -print OUT "int mb_tbl_uni_kddi2code_max2 = $to_kddi_max2;\n"; -print OUT "int mb_tbl_uni_kddi2code_min3 = $to_kddi_min3;\n"; -print OUT "int mb_tbl_uni_kddi2code_max3 = $to_kddi_max3;\n\n"; +print OUT "int mb_tbl_uni_kddi2code_min1 = $to_kddi_min1;\n"; +print OUT "int mb_tbl_uni_kddi2code_max1 = $to_kddi_max1;\n"; +print OUT "int mb_tbl_uni_kddi2code_min2 = $to_kddi_min2;\n"; +print OUT "int mb_tbl_uni_kddi2code_max2 = $to_kddi_max2;\n"; +print OUT "int mb_tbl_uni_kddi2code_min3 = $to_kddi_min3;\n"; +print OUT "int mb_tbl_uni_kddi2code_max3 = $to_kddi_max3;\n\n"; #print "KDDI reverse 1\n"; @@ -303,7 +303,7 @@ $sb_max3 = 10153+901; if (1) { print "SoftBank\n"; - + foreach $key (sort {hex($a) <=> hex($b)} keys(%softbank)) { $s = $key; $pos = $s % 94; @@ -319,7 +319,7 @@ if (1) { $sb_v3[$key-$sb_min3] = $softbank{$key}; } } - + } $to_sb_min = 10263; @@ -362,12 +362,12 @@ push(@r_sb3_key, 0x00); push(@r_sb3_val, 0x00); -print OUT "int mb_tbl_code2uni_sb1_min = $sb_min1;\n"; -print OUT "int mb_tbl_code2uni_sb1_max = $sb_max1;\n"; -print OUT "int mb_tbl_code2uni_sb2_min = $sb_min2;\n"; -print OUT "int mb_tbl_code2uni_sb2_max = $sb_max2;\n"; -print OUT "int mb_tbl_code2uni_sb3_min = $sb_min3;\n"; -print OUT "int mb_tbl_code2uni_sb3_max = $sb_max3;\n\n"; +print OUT "int mb_tbl_code2uni_sb1_min = $sb_min1;\n"; +print OUT "int mb_tbl_code2uni_sb1_max = $sb_max1;\n"; +print OUT "int mb_tbl_code2uni_sb2_min = $sb_min2;\n"; +print OUT "int mb_tbl_code2uni_sb2_max = $sb_max2;\n"; +print OUT "int mb_tbl_code2uni_sb3_min = $sb_min3;\n"; +print OUT "int mb_tbl_code2uni_sb3_max = $sb_max3;\n\n"; #print "SoftBank 1\n"; @@ -387,12 +387,12 @@ print OUT "int mb_tbl_code2uni_sb3[] = {\n"; print OUT &show_code(@sb_v3); print OUT "};\n\n"; -print OUT "int mb_tbl_uni_sb2code_min1 = $to_sb_min1;\n"; -print OUT "int mb_tbl_uni_sb2code_max1 = $to_sb_max1;\n"; -print OUT "int mb_tbl_uni_sb2code_min2 = $to_sb_min2;\n"; -print OUT "int mb_tbl_uni_sb2code_max2 = $to_sb_max2;\n"; -print OUT "int mb_tbl_uni_sb2code_min3 = $to_sb_min3;\n"; -print OUT "int mb_tbl_uni_sb2code_max3 = $to_sb_max3;\n\n"; +print OUT "int mb_tbl_uni_sb2code_min1 = $to_sb_min1;\n"; +print OUT "int mb_tbl_uni_sb2code_max1 = $to_sb_max1;\n"; +print OUT "int mb_tbl_uni_sb2code_min2 = $to_sb_min2;\n"; +print OUT "int mb_tbl_uni_sb2code_max2 = $to_sb_max2;\n"; +print OUT "int mb_tbl_uni_sb2code_min3 = $to_sb_min3;\n"; +print OUT "int mb_tbl_uni_sb2code_max3 = $to_sb_max3;\n\n"; #print "SB reverse 1\n"; diff --git a/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk b/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk index b496e6f1d1..31c5449d96 100755 --- a/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk +++ b/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk @@ -54,7 +54,7 @@ END { print "" break; } - } + } print "};" if (IFNDEF_NAME) { diff --git a/ext/mbstring/libmbfl/mbfl/mk_eaw_tbl.awk b/ext/mbstring/libmbfl/mbfl/mk_eaw_tbl.awk index 5813fbd7e7..e5223a432a 100644 --- a/ext/mbstring/libmbfl/mbfl/mk_eaw_tbl.awk +++ b/ext/mbstring/libmbfl/mbfl/mk_eaw_tbl.awk @@ -76,4 +76,4 @@ END { printf("{ 0x%04x, 0x%04x }", first, prev) } print "\n};\n" -} +} diff --git a/ext/mbstring/libmbfl/tests/conv_kana.tests/conv_kana.exp b/ext/mbstring/libmbfl/tests/conv_kana.tests/conv_kana.exp index a6459fe5ac..c9b87ea961 100644 --- a/ext/mbstring/libmbfl/tests/conv_kana.tests/conv_kana.exp +++ b/ext/mbstring/libmbfl/tests/conv_kana.tests/conv_kana.exp @@ -867,7 +867,7 @@ expect { } close -set test "full-width katakanas to full-width hiragana" +set test "full-width katakanas to full-width hiragana" spawn tests/conv_kana EUC-JP "c" expect_after { "\[^\r\n\]*\r\n" { fail $test } diff --git a/ext/mbstring/ucgendat/ucgendat.php b/ext/mbstring/ucgendat/ucgendat.php index 556a8cf98f..4bb5b9b698 100644 --- a/ext/mbstring/ucgendat/ucgendat.php +++ b/ext/mbstring/ucgendat/ucgendat.php @@ -505,7 +505,7 @@ function generateData(UnicodeData $data) { /* This file was generated from a modified version UCData's ucgendat. * * DO NOT EDIT THIS FILE! - * + * * Instead, compile ucgendat.c (bundled with PHP in ext/mbstring), download * the appropriate UnicodeData-x.x.x.txt and CompositionExclusions-x.x.x.txt * files from http://www.unicode.org/Public/ and run this program. diff --git a/ext/mysqli/config.w32 b/ext/mysqli/config.w32 index 5c32db2c40..4d8630c27d 100644 --- a/ext/mysqli/config.w32 +++ b/ext/mysqli/config.w32 @@ -30,7 +30,7 @@ if (PHP_MYSQLI != "no") { PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h"); } else { if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) && - CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + + CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQLI)) { EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); diff --git a/ext/mysqlnd/config.w32 b/ext/mysqlnd/config.w32 index 24c1415246..1dac93578a 100644 --- a/ext/mysqlnd/config.w32 +++ b/ext/mysqlnd/config.w32 @@ -4,7 +4,7 @@ ARG_WITH("mysqlnd", "Mysql Native Client Driver", "yes"); if (PHP_MYSQLND != "no") { if (CHECK_LIB("ws2_32.lib", "mysqlnd")) { - mysqlnd_source = + mysqlnd_source = "mysqlnd_alloc.c " + "mysqlnd_auth.c " + "mysqlnd_block_alloc.c " + diff --git a/ext/opcache/config.w32 b/ext/opcache/config.w32 index a54569485c..14cb7ca593 100644 --- a/ext/opcache/config.w32 +++ b/ext/opcache/config.w32 @@ -25,7 +25,7 @@ if (PHP_OPCACHE != "no") { ADD_SOURCES(configure_module_dirname + "/Optimizer", "zend_optimizer.c pass1_5.c pass2.c pass3.c optimize_func_calls.c block_pass.c optimize_temp_vars_5.c nop_removal.c compact_literals.c zend_cfg.c zend_dfg.c dfa_pass.c zend_ssa.c zend_inference.c zend_func_info.c zend_call_graph.c sccp.c scdf.c dce.c escape_analysis.c compact_vars.c zend_dump.c", "opcache", "OptimizerObj"); - + ADD_FLAG('CFLAGS_OPCACHE', "/I " + configure_module_dirname); } diff --git a/ext/openssl/README b/ext/openssl/README index 1070d3ee9f..6241675658 100644 --- a/ext/openssl/README +++ b/ext/openssl/README @@ -272,7 +272,7 @@ Seal and open // now we try to decrypt data for one of the recipients $fp = fopen("/src/openssl-0.9.6/demos/sign/key.pem", "r"); - // Get PEM coded key into $pkey + // Get PEM coded key into $pkey $pkey = fread($fp, 8192); fclose($fp); // $key will be resource id for unpacked $pkey diff --git a/ext/pcntl/README b/ext/pcntl/README index 7b80924e49..34313b2040 100644 --- a/ext/pcntl/README +++ b/ext/pcntl/README @@ -1,8 +1,8 @@ Process Control Module for PHP (pcntl) This module will attempt to implement all features related to process spawning and -control (fork(), waitpid(), signal(), WIF's, etc). This is extremely experimental, -with hope to become stable on most UNIX's. I greatly apreciate any feedback, fixes, +control (fork(), waitpid(), signal(), WIF's, etc). This is extremely experimental, +with hope to become stable on most UNIX's. I greatly apreciate any feedback, fixes, and or suggestions on how to improve/better implement this functionality. diff --git a/ext/pdo_firebird/config.w32 b/ext/pdo_firebird/config.w32 index dc3ea0d17e..634ac4c8e9 100644 --- a/ext/pdo_firebird/config.w32 +++ b/ext/pdo_firebird/config.w32 @@ -6,7 +6,7 @@ if (PHP_PDO_FIREBIRD != "no") { if ((CHECK_LIB("fbclient_ms.lib", "pdo_firebird", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_PDO_FIREBIRD) || CHECK_LIB("gds32_ms.lib", "pdo_firebird", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_PDO_FIREBIRD) - ) && CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_PDO_FIREBIRD", + ) && CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_PDO_FIREBIRD", PHP_PHP_BUILD + "\\include\\interbase;" + PHP_PHP_BUILD + "\\interbase\\include;" + PHP_PDO_FIREBIRD) ) { diff --git a/ext/pdo_mysql/get_error_codes.php b/ext/pdo_mysql/get_error_codes.php index a1ed85016c..4605df564a 100644 --- a/ext/pdo_mysql/get_error_codes.php +++ b/ext/pdo_mysql/get_error_codes.php @@ -15,7 +15,7 @@ fputs(STDERR, "input doesn't look like a MySQL sql_state.h file\n"); exit(3); } - + echo "/* DO NOT EDIT THIS FILE!!! It is auto generated by get_error_codes.php */\n"; foreach ($codes as $code => $state) { echo "#ifdef $code\n"; @@ -23,5 +23,5 @@ echo "#endif\n"; } - + ?> diff --git a/ext/pdo_oci/config.w32 b/ext/pdo_oci/config.w32 index b1ec04f13b..39936578a3 100755 --- a/ext/pdo_oci/config.w32 +++ b/ext/pdo_oci/config.w32 @@ -20,7 +20,7 @@ if (PHP_PDO_OCI != "no") { pdo_oci_lib_paths += pdo_oci_dirs[i] + "\\lib\\msvc;"; pdo_oci_inc_paths += pdo_oci_dirs[i] + "\\include;"; } - + pdo_oci_inc_paths += PHP_PHP_BUILD + "\\include\\instantclient;" pdo_oci_lib_paths += PHP_PHP_BUILD + "\\lib\\instantclient;"; diff --git a/ext/pdo_oci/package2.xml b/ext/pdo_oci/package2.xml index 1f828d1f12..3fc931140c 100644 --- a/ext/pdo_oci/package2.xml +++ b/ext/pdo_oci/package2.xml @@ -35,7 +35,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> You require Oracle OCI 8 or higher client libraries (instantclient is also supported) installed on the machine where you intend to build and/or use this package. - + If you are running on windows, you can download the binary from here: http://pecl4win.php.net/ext.php/php_pdo_oci.dll </notes> diff --git a/ext/pdo_sqlite/config.w32 b/ext/pdo_sqlite/config.w32 index 79079dc18b..2a2d0787c0 100644 --- a/ext/pdo_sqlite/config.w32 +++ b/ext/pdo_sqlite/config.w32 @@ -4,7 +4,7 @@ ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no"); if (PHP_PDO_SQLITE != "no") { EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c sqlite_statement.c", null, "/DSQLITE_THREADSAFE=" + (PHP_ZTS == "yes" ? "1" : "0") + " /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_FTS4=1 /D SQLITE_ENABLE_FTS5=1 /D SQLITE_ENABLE_JSON1=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D SQLITE_CORE=1 /I" + configure_module_dirname + "/../sqlite3/libsqlite /I" + configure_module_dirname); - + ADD_EXTENSION_DEP('pdo_sqlite', 'pdo'); // If pdo_sqlite is static, and sqlite3 is also static, then we don't add a second copy of the sqlite3 libs if (PHP_PDO_SQLITE_SHARED || PHP_SQLITE3_SHARED || PHP_SQLITE3 == 'no') { diff --git a/ext/pgsql/README b/ext/pgsql/README index 86df804fbd..26f7aad02d 100644 --- a/ext/pgsql/README +++ b/ext/pgsql/README @@ -1,27 +1,27 @@ ==== About This Module === -PostgreSQL module provides access to PostgreSQL server from +PostgreSQL module provides access to PostgreSQL server from PHP script. This module uses PostgreSQL C client lib called libpq. -It is important that you use libpq that is later than backend -(PostgreSQL Server) version. Otherwise, you may experience -strange problems. +It is important that you use libpq that is later than backend +(PostgreSQL Server) version. Otherwise, you may experience +strange problems. -Please send e-mail to yohgaki@php.net if you have comments for +Please send e-mail to yohgaki@php.net if you have comments for pgsql module. I appreciate your feedback. ==== API Change === -Older PHP than 4.2.0, pg_loimport()/pg_loexport() connection +Older PHP than 4.2.0, pg_loimport()/pg_loexport() connection parameter as last parameter, not like other functions. From 4.2.0, -connection parameter became 1st parameter. Old syntax is preserved, +connection parameter became 1st parameter. Old syntax is preserved, but it will raise NOTICE error message. pg_connect()/pg_pconnect() has obsolete multi parameter syntax. This syntax will be deleted in 4.3.0 or later. -Omitting connectin parameter is NOT recommended. Connection +Omitting connectin parameter is NOT recommended. Connection parameter may be required for future PHP version. Specify connection always if you don't want to rewrite code when it is changed. -==== Function Name Change ==== +==== Function Name Change ==== Function names are going to be changed to confirm coding standard. MySQL module has been done this already. Function names will be changed as follows. @@ -29,8 +29,8 @@ be changed as follows. pg_errormessage -> pg_error_message pg_cmdtuples -> pg_affected_rows pg_fieldnum -> pg_field_num -and so on. Except pg_cmdtuples, under scores '_' will be added to -names. +and so on. Except pg_cmdtuples, under scores '_' will be added to +names. Older names will become aliases of new functions for backward compatibility. @@ -39,14 +39,14 @@ Manual will be updated when this change is committed to CVS source. ==== Configure Option Notes ==== You cannot specify PostgreSQL source directly to build PostgreSQL -module with specific version. You need to install PostgreSQL +module with specific version. You need to install PostgreSQL somewhere in your system to build PHP with PostgreSQL support. ==== Note For PostgreSQL 7.2 ==== I've tested up to 7.2.2. ==== TODO List === -Make pg_convert() smater. +Make pg_convert() smater. - Better regex - User defiend type support Support async connection. @@ -57,7 +57,7 @@ WARNING: API/behavior may be changed without notice. Async query can improve application performance *significantly*. Please test and report any failure to -yohgaki@php.net +yohgaki@php.net There are some cases that async functions blocks process. Even if process was blocked, functions work as expected. (except it blocks @@ -65,13 +65,13 @@ process) These are cases that process is blocked. Refer to libpq manual for details. Followings are common cases that async functions are blocked. - - If libpq is compile with USE_SSL, some async functions are + - If libpq is compile with USE_SSL, some async functions are blocked. - - If libpq under Win32 is *NOT* compiled with - WIN32_NON_BLOCKING_CONNECTIONS, non-blocking connection will block. + - If libpq under Win32 is *NOT* compiled with + WIN32_NON_BLOCKING_CONNECTIONS, non-blocking connection will block. -Async function may also block if you have not retrive result and -send or execute query. If there is result left on connection, +Async function may also block if you have not retrive result and +send or execute query. If there is result left on connection, pg_send_query() will block until last query is completed. Garbages are cleaned when resource is cleaned up. There is no need to @@ -84,7 +84,7 @@ API may be changed. NOTE: These functions are added in PHP 4.2.0 unless they are mentioned. ------------------------------------------------------------------- -bool pg_send_query(resource connection, string query) +bool pg_send_query(resource connection, string query) Sends async query to backend. Result may be retrieved with pg_get_result(). It does not accept multiple query, but it accepts @@ -92,7 +92,7 @@ multiple queries at once. Each result may be retrieved separately by pg_get_result(). -------------------------------------------------------------------- -bool pg_cancel_query(resource connection) +bool pg_cancel_query(resource connection) Cancels currently executing async query already sent to PostgreSQL server. This function is useful when user request time consuming query @@ -100,7 +100,7 @@ to server. It cannot cancel query executed by pg_exec(), since pg_exec() is a blocking function. -------------------------------------------------------------------- -resource pg_get_result(resource conn) +resource pg_get_result(resource conn) Gets pgsql query result resource. Returned value can be fed to pg_result()/pg_fetch_*(). pg_get_result() may block if result is not @@ -112,7 +112,7 @@ in connection, it returns false. -------------------------------------------------------------------- bool pg_connection_busy(resource connection) -Returns connections is executing query or not. +Returns connections is executing query or not. -------------------------------------------------------------------- int pg_connection_status(resource connection) @@ -129,7 +129,7 @@ connection parameter. It's useful for error recovery. -------------------------------------------------------------------- string pg_result_error(resource result) -Get error message associated with result +Get error message associated with result -------------------------------------------------------------------- int pg_result_status(resource result) @@ -166,7 +166,7 @@ Large Object Functions -------------------------------------------------------------------- int pg_lo_tell(resource large_object) -Returns current position of large object +Returns current position of large object -------------------------------------------------------------------- bool pg_lo_lseek(resource large_object, int offset[, int whence]) @@ -179,7 +179,7 @@ Notice message function -------------------------------------------------------------------- string pg_last_notice(resource connection) -Returns the last notice set by the backend +Returns the last notice set by the backend This function is fully implemed in only in current CVS version. PHP 4.3.0 supposed to included fully implemented version. @@ -201,35 +201,35 @@ array pg_convert(resource db, string table, array values) -------------------------------------------------------------------- bool pg_insert(resource db, string table, array values[, bool convert[, bool async]]) - Insert values (filed=>value) to table + Insert values (filed=>value) to table -------------------------------------------------------------------- bool pg_update(resource db, string table, array fields, array ids[, bool convert[, bool async]]) - Update table using values (field=>value) and ids (id=>value) + Update table using values (field=>value) and ids (id=>value) -------------------------------------------------------------------- bool pg_delete(resource db, string table, array ids[, bool convert[, bool async]]) - Delete records has ids (id=>value) + Delete records has ids (id=>value) -------------------------------------------------------------------- array pg_select(resource db, string table, array ids[, bool convert]) - Select records that has ids (id=>value) + Select records that has ids (id=>value) -------------------------------------------------------------------- array pg_get_notify([resource db[, notify]]) - Get notify message on the connection + Get notify message on the connection -------------------------------------------------------------------- string pg_unescape_bytea(string bytea_data) - Unescape bytea field data + Unescape bytea field data -------------------------------------------------------------------- bool pg_ping(resource db) ping database connection and try to reset connection if it's - broken + broken ------------------------------------------------------------------- -Again, experimental functions are subject to be changed without +Again, experimental functions are subject to be changed without notice. diff --git a/ext/pgsql/mysql_users.php b/ext/pgsql/mysql_users.php index edfaa1cddc..44d4f1b66d 100644 --- a/ext/pgsql/mysql_users.php +++ b/ext/pgsql/mysql_users.php @@ -2,7 +2,7 @@ /* * File: mysql_users.php * Author: Yasuo Ohgaki <yohgaki@php.net> - * + * * This file contains example user defined functions that does * similar to MySQL functions. They can be implemented as module * functions, but there won't be many users need them. @@ -12,11 +12,11 @@ /* * mysql_list_dbs() - * - * This function should be needed, since PostgreSQL connection + * + * This function should be needed, since PostgreSQL connection * binds database. */ -function pg_list_dbs($db) +function pg_list_dbs($db) { assert(is_resource($db)); $query = ' @@ -24,7 +24,7 @@ SELECT d.datname as "Name", u.usename as "Owner", pg_encoding_to_char(d.encoding) as "Encoding" -FROM +FROM pg_database d LEFT JOIN pg_user u ON d.datdba = u.usesysid ORDER BY 1; '; @@ -35,7 +35,7 @@ ORDER BY 1; /* * mysql_list_tables() */ -function pg_list_tables($db) +function pg_list_tables($db) { assert(is_resource($db)); $query = " @@ -58,7 +58,7 @@ ORDER BY 1; * * See also pg_meta_data(). It returns field definition as array. */ -function pg_list_fields($db, $table) +function pg_list_fields($db, $table) { assert(is_resource($db)); $query = " diff --git a/ext/pgsql/tests/README b/ext/pgsql/tests/README index 1a29a34e64..5321d1f48d 100644 --- a/ext/pgsql/tests/README +++ b/ext/pgsql/tests/README @@ -1,15 +1,15 @@ -Test scripts assumes: +Test scripts assumes: - PostgreSQL server is installed locally - there is a PostgreSQL account for the users running the test scripts - there is database named "test" -For instance, if your login name is 'testuser', you should have PostgreSQL -user account named 'testuser' and grant that user access to the database +For instance, if your login name is 'testuser', you should have PostgreSQL +user account named 'testuser' and grant that user access to the database 'test'. -If you have account and database, type "createdb test" from command prompt -to create the database to execute the test scripts. By executing the above -command as the same user running the tests you ensure that the user is +If you have account and database, type "createdb test" from command prompt +to create the database to execute the test scripts. By executing the above +command as the same user running the tests you ensure that the user is granted access to the database. If you find problems in PostgreSQL module, please mail to diff --git a/ext/phar/gdbhelp b/ext/phar/gdbhelp index 5411858671..14ff89c56b 100644 --- a/ext/phar/gdbhelp +++ b/ext/phar/gdbhelp @@ -21,9 +21,9 @@ define ____print_pharht set $temp = *(phar_archive_data*)$p->pDataPtr ____print_str $temp.fname $temp.fname_len printf " => " - + if $arg1 == 0 - + printf "%i (alias ", $temp.refcount ____print_str $temp.alias $temp.alias_len printf ")\n" diff --git a/ext/phar/phar.1.in b/ext/phar/phar.1.in index 26451508fc..36a8cc503e 100644 --- a/ext/phar/phar.1.in +++ b/ext/phar/phar.1.in @@ -11,7 +11,7 @@ file called a "phar" (PHP Archive) for easy distribution and installation. .P With the \fBphar\fP command you can create, update or extract PHP archives. .P -Commands: +Commands: add compress delete extract help help-list info list meta-del meta-get meta-set pack sign stub-get stub-set tree version @@ -39,7 +39,7 @@ Provide an \fIalias\fP name for the phar file. .TP .PD .B \-c \fIalgo\fP -Compression algorithm (see +Compression algorithm (see .SM .B COMPRESSION ) @@ -63,7 +63,7 @@ Required arguments: .TP 15 .PD .B \-c \fIalgo\fP -Compression algorithm (see +Compression algorithm (see .SM .B COMPRESSION ) @@ -280,14 +280,14 @@ The hash mark itself '#!' and the newline character are optional. .TP .PD .B \-c \fIalgo\fP -Compression algorithm (see +Compression algorithm (see .SM .B COMPRESSION ) .TP .PD .B \-h \fIhash\fP -Selects the \fIhash\fP algorithm (see +Selects the \fIhash\fP algorithm (see .SM .B HASH ) @@ -336,7 +336,7 @@ Specifies the phar \fIfile\fP to work on. .TP .PD .B \-h \fIhash\fP -Selects the \fIhash\fP algorithm (see +Selects the \fIhash\fP algorithm (see .SM .B HASH ) @@ -502,7 +502,7 @@ A List of active developers can be found here: .B http://www.php.net/credits.php .PD 1 .P -And last but not least PHP was developed with the help of a huge amount of +And last but not least PHP was developed with the help of a huge amount of contributors all around the world. .SH VERSION INFORMATION This manpage describes \fBphar\fP, version @PHP_VERSION@. diff --git a/ext/phar/shortarc.php b/ext/phar/shortarc.php index e5ac8bab6d..2c1f40dfe4 100644 --- a/ext/phar/shortarc.php +++ b/ext/phar/shortarc.php @@ -127,7 +127,7 @@ class Extract_Phar } while (strlen($last) && strlen($m) < $L[1]); if (strlen($m) < $L[1]) { - die('ERROR: manifest length read was "' . + die('ERROR: manifest length read was "' . strlen($m) .'" should be "' . $L[1] . '"'); } diff --git a/ext/pspell/README b/ext/pspell/README index 2e68a2cb9d..58806289db 100644 --- a/ext/pspell/README +++ b/ext/pspell/README @@ -43,9 +43,9 @@ pspell_new() and specifying the custom dictionary as the first parameter. The parameter probably should begin with '/' because otherwise it will be relative to $HOME, which is probably set to "/root". This is probably not what you want because you need write access for nobody to be able to write -to a dictionary. Once the dictionary is open, you can use -pspell_add_to_personal() to add words to the wordlist and finally -pspell_save_wordlist() to save it. +to a dictionary. Once the dictionary is open, you can use +pspell_add_to_personal() to add words to the wordlist and finally +pspell_save_wordlist() to save it. Note that at this moment pspell_save_wordlist() will return TRUE, even if there was an error. This will be changed once pspell library is fixed.
\ No newline at end of file diff --git a/ext/session/mod_files.bat b/ext/session/mod_files.bat index b6a8babae8..83f85eb66b 100644 --- a/ext/session/mod_files.bat +++ b/ext/session/mod_files.bat @@ -8,7 +8,7 @@ IF _%1_==_AUTO_ ( IF _%2_==__ ( ECHO Usage %0 ^<basedir^> ^<depth^> ^[^hash_bits^] ECHO. - ECHO Where ^<basedir^> is the session directory + ECHO Where ^<basedir^> is the session directory ECHO ^<depth^> is the number of levels defined in session.save_path ECHO ^[hash_bits^] is the number of bits defined in session.hash_bits_per_character EXIT /B 1 diff --git a/ext/shmop/README b/ext/shmop/README index 2553f3fe18..cb7b502f92 100644 --- a/ext/shmop/README +++ b/ext/shmop/README @@ -9,32 +9,32 @@ Shared Memory Operations Extension to PHP offers high level features which are extremely bothersome for basic SHM we had in mind. After spending a day trying to reverse engineer and figure out the format of sysvshm we decided that it would be much easier to - add our own extension to php for simple SHM operations, we were right :)). + add our own extension to php for simple SHM operations, we were right :)). the functions are: - + int shmop_open(int key, string flags, int mode, int size) - + key - the key of/for the shared memory block - flags - 4 flags are avalible + flags - 4 flags are avalible a for read only access (sets SHM_RDONLY) w for read & write access c create or open an existing segment (sets IPC_CREATE) n create a new segment and fail if one already exists under same name (sets IPC_CREATE|IPC_EXCL) - (the n flag is mostly useful for security perpouses, so that you don't end up opening a faked segment + (the n flag is mostly useful for security perpouses, so that you don't end up opening a faked segment if someone guesses your key) mode - acsess mode same as for a file (0644) for example size - size of the block in bytes - + returns an identifier - + char shmop_read(int shmid, int start, int count) shmid - shmid from which to read start - offset from which to start reading count - how many bytes to read - + returns the data read int shmop_write(int shmid, string data, int offset) @@ -42,28 +42,28 @@ int shmop_write(int shmid, string data, int offset) shmid - shmid from which to read data - string to put into shared memory offset - offset in shm to write from - + returns bytes written - + int shmop_size(int shmid) shmid - shmid for which to return the size - + returns the size in bytes of the shm segment - - + + int shmop_delete(int shmid) marks the segment for deletion, the segment will be deleted when all processes mapping it will detach shmid - shmid which to mark for deletion - + returns 1 if all ok, zero on failure - + int shmop_close(int shmid) shmid - shmid which to close - + returns zero - + diff --git a/ext/simplexml/README b/ext/simplexml/README index bb9240d103..406b312002 100755 --- a/ext/simplexml/README +++ b/ext/simplexml/README @@ -8,12 +8,12 @@ SimpleXML objects follow four basic rules: 4) string conversion allows to access TEXT data When iterating properties then the extension always iterates over -all nodes with that element name. Thus method children() must be +all nodes with that element name. Thus method children() must be called to iterate over subnodes. But also doing the following: foreach ($obj->node_name as $elem) { // do something with $elem } -always results in iteration of 'node_name' elements. So no further +always results in iteration of 'node_name' elements. So no further check is needed to distinguish the number of nodes of that type. When an elements TEXT data is being accessed through a property @@ -29,6 +29,6 @@ TODO ==== At the moment property access to multiple elements of the same -name returns an array of SimpleXML objects. This should be an +name returns an array of SimpleXML objects. This should be an object of a new type instead so that all kinds of linkage, assignment and deleting would work. diff --git a/ext/simplexml/tests/sxe.xml b/ext/simplexml/tests/sxe.xml index 909b4e652c..413be72087 100755 --- a/ext/simplexml/tests/sxe.xml +++ b/ext/simplexml/tests/sxe.xml @@ -14,4 +14,4 @@ </elem3> </elem2> </elem1> -</sxe>
\ No newline at end of file +</sxe>
\ No newline at end of file diff --git a/ext/simplexml/tests/sxe私はガラスを食べられます.xml b/ext/simplexml/tests/sxe私はガラスを食べられます.xml index 909b4e652c..413be72087 100644 --- a/ext/simplexml/tests/sxe私はガラスを食べられます.xml +++ b/ext/simplexml/tests/sxe私はガラスを食べられます.xml @@ -14,4 +14,4 @@ </elem3> </elem2> </elem1> -</sxe>
\ No newline at end of file +</sxe>
\ No newline at end of file diff --git a/ext/skeleton/config.m4.in b/ext/skeleton/config.m4.in index dab0d31a70..e6b34a8eeb 100644 --- a/ext/skeleton/config.m4.in +++ b/ext/skeleton/config.m4.in @@ -61,7 +61,7 @@ if test "$PHP_%EXTNAMECAPS%" != "no"; then dnl # --with-%EXTNAME% -> check for lib and symbol presence dnl LIBNAME=%EXTNAMECAPS% # you may want to change this - dnl LIBSYMBOL=%EXTNAMECAPS% # you most likely want to change this + dnl LIBSYMBOL=%EXTNAMECAPS% # you most likely want to change this dnl PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, dnl [ diff --git a/ext/snmp/tests/README b/ext/snmp/tests/README index 0db1a4f82b..6b4e8d9705 100644 --- a/ext/snmp/tests/README +++ b/ext/snmp/tests/README @@ -31,7 +31,7 @@ On Linux/FreeBSD - Install package net-snmpd (name may differ based on your distribution). - Replace config file (by default this is /etc/snmp/snmpd.conf on Linux and /usr/local/etc/snmp/snmpd.conf on FreeBSD) with snmpd.conf supplied. - + Before launching daemon make sure that there is no file /var/net-snmp/snmpd.conf Delete it if exists. Ingoring to to so will fail SNMPv3 tests. diff --git a/ext/soap/interop/client_round2_interop.php b/ext/soap/interop/client_round2_interop.php index 0066667449..7e48f83e40 100644 --- a/ext/soap/interop/client_round2_interop.php +++ b/ext/soap/interop/client_round2_interop.php @@ -198,7 +198,7 @@ class Interop_Client } else if (!$all) $sql .= "where status=1"; $sql .= " order by endpointName"; - + $db_ep = $this->dbc->getAll($sql,NULL, DB_FETCHMODE_ASSOC ); if (DB::isError($db_ep)) { @@ -261,7 +261,7 @@ class Interop_Client $success = $result['fault']->faultcode; $pos = strpos($success,':'); if ($pos !== false) { - $success = substr($success,$pos+1); + $success = substr($success,$pos+1); } $error = $result['fault']->faultstring; if (!$wire) $wire= $result['fault']->detail; @@ -450,7 +450,7 @@ try { // compare header results $headers_ok = TRUE; if ($soap_test->headers || $soap_test->headers_expect) { - $headers_ok = $this->compareResult($soap_test->headers_expect, $result_headers); + $headers_ok = $this->compareResult($soap_test->headers_expect, $result_headers); } # we need to decode what we sent so we can compare! @@ -512,7 +512,7 @@ try { $res =$fault->faultcode; $pos = strpos($res,':'); if ($pos !== false) { - $res = substr($res,$pos+1); + $res = substr($res,$pos+1); } } // save the wire diff --git a/ext/soap/interop/client_round2_params.php b/ext/soap/interop/client_round2_params.php index 504c4cc024..3979e72497 100644 --- a/ext/soap/interop/client_round2_params.php +++ b/ext/soap/interop/client_round2_params.php @@ -106,7 +106,7 @@ class SOAP_Test { $res = $fault->faultcode; $pos = strpos($res,':'); if ($pos !== false) { - $res = substr($res,$pos+1); + $res = substr($res,$pos+1); } if ($html) { print "<font color=\"#ff0000\">FAILED: [$res] {$fault->faultstring}</font>\n"; diff --git a/ext/spl/README b/ext/spl/README index 28373a3eda..0f0e1e31b0 100755 --- a/ext/spl/README +++ b/ext/spl/README @@ -1,7 +1,7 @@ -This is an extension that aims to implement some efficient data access +This is an extension that aims to implement some efficient data access interfaces and classes. You'll find the classes documented using php code in the file spl.php or in the corresponding .inc file in the examples -subdirectory. Based on the internal implementations or the files in the +subdirectory. Based on the internal implementations or the files in the examples subdirectory there are also some .php files to experiment with. For more information look at: http://php.net/manual/en/book.spl.php diff --git a/ext/spl/examples/dba_array.php b/ext/spl/examples/dba_array.php index 346ac1f2f7..f217c34546 100755 --- a/ext/spl/examples/dba_array.php +++ b/ext/spl/examples/dba_array.php @@ -11,7 +11,7 @@ * If \<value\> is specified then \<key\> is set to \<value\> in \<file\>. * Else the value of \<key\> is printed only. * - * Note: configure with --enable-dba + * Note: configure with --enable-dba */ if ($argc < 4) { diff --git a/ext/spl/examples/dba_dump.php b/ext/spl/examples/dba_dump.php index 2c698d427a..7ea8e76255 100755 --- a/ext/spl/examples/dba_dump.php +++ b/ext/spl/examples/dba_dump.php @@ -11,7 +11,7 @@ * Show all groups in the ini file specified by \<file\>. * The regular expression \<regex\> is used to filter the by setting name. * - * Note: configure with --enable-dba + * Note: configure with --enable-dba */ if ($argc < 3) { diff --git a/ext/spl/examples/findregex.php b/ext/spl/examples/findregex.php index b43ee0cbbc..288c0924b1 100755 --- a/ext/spl/examples/findregex.php +++ b/ext/spl/examples/findregex.php @@ -1,5 +1,5 @@ <?php - + /** @file findregex.php * @brief Program Find a specific file by name. * @ingroup Examples @@ -33,4 +33,4 @@ foreach(new RegexFindFile($argv[1], $argv[2]) as $file) echo $file->getPathname()."\n"; } -?>
\ No newline at end of file +?>
\ No newline at end of file diff --git a/ext/spl/examples/ini_groups.php b/ext/spl/examples/ini_groups.php index 5136911096..4c6c89bd70 100755 --- a/ext/spl/examples/ini_groups.php +++ b/ext/spl/examples/ini_groups.php @@ -11,7 +11,7 @@ * Show all groups in the ini file specified by \<file\>. * The regular expression \<regex\> is used to filter the result. * - * Note: configure with --enable-dba + * Note: configure with --enable-dba */ if ($argc < 2) { diff --git a/ext/spl/examples/phar_from_dir.php b/ext/spl/examples/phar_from_dir.php index 2ee15ca1e6..d75788e840 100755 --- a/ext/spl/examples/phar_from_dir.php +++ b/ext/spl/examples/phar_from_dir.php @@ -9,7 +9,7 @@ * * Usage: php phar_create_from_dir.php \<archive\> \<directory\> [\<regex\>] * - * Create phar archive \<archive\> using entries from \<directory\> that + * Create phar archive \<archive\> using entries from \<directory\> that * optionally match \<regex\>. */ diff --git a/ext/standard/html_tables/ents_html5.txt b/ext/standard/html_tables/ents_html5.txt index 18defb29b4..005bebbe20 100644 --- a/ext/standard/html_tables/ents_html5.txt +++ b/ext/standard/html_tables/ents_html5.txt @@ -1,2125 +1,2125 @@ -AElig 000C6 -AMP 00026 -Aacute 000C1 -Abreve 00102 -Acirc 000C2 -Acy 00410 -Afr 1D504 -Agrave 000C0 -Alpha 00391 -Amacr 00100 -And 02A53 -Aogon 00104 -Aopf 1D538 -ApplyFunction 02061 -Aring 000C5 -Ascr 1D49C -Assign 02254 -Atilde 000C3 -Auml 000C4 -Backslash 02216 -Barv 02AE7 -Barwed 02306 -Bcy 00411 -Because 02235 -Bernoullis 0212C -Beta 00392 -Bfr 1D505 -Bopf 1D539 -Breve 002D8 -Bscr 0212C -Bumpeq 0224E -CHcy 00427 -COPY 000A9 -Cacute 00106 -Cap 022D2 -CapitalDifferentialD 02145 -Cayleys 0212D -Ccaron 0010C -Ccedil 000C7 -Ccirc 00108 -Cconint 02230 -Cdot 0010A -Cedilla 000B8 -CenterDot 000B7 -Cfr 0212D -Chi 003A7 -CircleDot 02299 -CircleMinus 02296 -CirclePlus 02295 -CircleTimes 02297 -ClockwiseContourIntegral 02232 -CloseCurlyDoubleQuote 0201D -CloseCurlyQuote 02019 -Colon 02237 -Colone 02A74 -Congruent 02261 -Conint 0222F -ContourIntegral 0222E -Copf 02102 -Coproduct 02210 -CounterClockwiseContourIntegral 02233 -Cross 02A2F -Cscr 1D49E -Cup 022D3 -CupCap 0224D -DD 02145 -DDotrahd 02911 -DJcy 00402 -DScy 00405 -DZcy 0040F -Dagger 02021 -Darr 021A1 -Dashv 02AE4 -Dcaron 0010E -Dcy 00414 -Del 02207 -Delta 00394 -Dfr 1D507 -DiacriticalAcute 000B4 -DiacriticalDot 002D9 -DiacriticalDoubleAcute 002DD -DiacriticalGrave 00060 -DiacriticalTilde 002DC -Diamond 022C4 -DifferentialD 02146 -Dopf 1D53B -Dot 000A8 -DotDot 020DC -DotEqual 02250 -DoubleContourIntegral 0222F -DoubleDot 000A8 -DoubleDownArrow 021D3 -DoubleLeftArrow 021D0 -DoubleLeftRightArrow 021D4 -DoubleLeftTee 02AE4 -DoubleLongLeftArrow 027F8 -DoubleLongLeftRightArrow 027FA -DoubleLongRightArrow 027F9 -DoubleRightArrow 021D2 -DoubleRightTee 022A8 -DoubleUpArrow 021D1 -DoubleUpDownArrow 021D5 -DoubleVerticalBar 02225 -DownArrow 02193 -DownArrowBar 02913 -DownArrowUpArrow 021F5 -DownBreve 00311 -DownLeftRightVector 02950 -DownLeftTeeVector 0295E -DownLeftVector 021BD -DownLeftVectorBar 02956 -DownRightTeeVector 0295F -DownRightVector 021C1 -DownRightVectorBar 02957 -DownTee 022A4 -DownTeeArrow 021A7 -Downarrow 021D3 -Dscr 1D49F -Dstrok 00110 -ENG 0014A -ETH 000D0 -Eacute 000C9 -Ecaron 0011A -Ecirc 000CA -Ecy 0042D -Edot 00116 -Efr 1D508 -Egrave 000C8 -Element 02208 -Emacr 00112 -EmptySmallSquare 025FB -EmptyVerySmallSquare 025AB -Eogon 00118 -Eopf 1D53C -Epsilon 00395 -Equal 02A75 -EqualTilde 02242 -Equilibrium 021CC -Escr 02130 -Esim 02A73 -Eta 00397 -Euml 000CB -Exists 02203 -ExponentialE 02147 -Fcy 00424 -Ffr 1D509 -FilledSmallSquare 025FC -FilledVerySmallSquare 025AA -Fopf 1D53D -ForAll 02200 -Fouriertrf 02131 -Fscr 02131 -GJcy 00403 -GT 0003E -Gamma 00393 -Gammad 003DC -Gbreve 0011E -Gcedil 00122 -Gcirc 0011C -Gcy 00413 -Gdot 00120 -Gfr 1D50A -Gg 022D9 -Gopf 1D53E -GreaterEqual 02265 -GreaterEqualLess 022DB -GreaterFullEqual 02267 -GreaterGreater 02AA2 -GreaterLess 02277 -GreaterSlantEqual 02A7E -GreaterTilde 02273 -Gscr 1D4A2 -Gt 0226B -HARDcy 0042A -Hacek 002C7 -Hat 0005E -Hcirc 00124 -Hfr 0210C -HilbertSpace 0210B -Hopf 0210D -HorizontalLine 02500 -Hscr 0210B -Hstrok 00126 -HumpDownHump 0224E -HumpEqual 0224F -IEcy 00415 -IJlig 00132 -IOcy 00401 -Iacute 000CD -Icirc 000CE -Icy 00418 -Idot 00130 -Ifr 02111 -Igrave 000CC -Im 02111 -Imacr 0012A -ImaginaryI 02148 -Implies 021D2 -Int 0222C -Integral 0222B -Intersection 022C2 -InvisibleComma 02063 -InvisibleTimes 02062 -Iogon 0012E -Iopf 1D540 -Iota 00399 -Iscr 02110 -Itilde 00128 -Iukcy 00406 -Iuml 000CF -Jcirc 00134 -Jcy 00419 -Jfr 1D50D -Jopf 1D541 -Jscr 1D4A5 -Jsercy 00408 -Jukcy 00404 -KHcy 00425 -KJcy 0040C -Kappa 0039A -Kcedil 00136 -Kcy 0041A -Kfr 1D50E -Kopf 1D542 -Kscr 1D4A6 -LJcy 00409 -LT 0003C -Lacute 00139 -Lambda 0039B -Lang 027EA -Laplacetrf 02112 -Larr 0219E -Lcaron 0013D -Lcedil 0013B -Lcy 0041B -LeftAngleBracket 027E8 -LeftArrow 02190 -LeftArrowBar 021E4 -LeftArrowRightArrow 021C6 -LeftCeiling 02308 -LeftDoubleBracket 027E6 -LeftDownTeeVector 02961 -LeftDownVector 021C3 -LeftDownVectorBar 02959 -LeftFloor 0230A -LeftRightArrow 02194 -LeftRightVector 0294E -LeftTee 022A3 -LeftTeeArrow 021A4 -LeftTeeVector 0295A -LeftTriangle 022B2 -LeftTriangleBar 029CF -LeftTriangleEqual 022B4 -LeftUpDownVector 02951 -LeftUpTeeVector 02960 -LeftUpVector 021BF -LeftUpVectorBar 02958 -LeftVector 021BC -LeftVectorBar 02952 -Leftarrow 021D0 -Leftrightarrow 021D4 -LessEqualGreater 022DA -LessFullEqual 02266 -LessGreater 02276 -LessLess 02AA1 -LessSlantEqual 02A7D -LessTilde 02272 -Lfr 1D50F -Ll 022D8 -Lleftarrow 021DA -Lmidot 0013F -LongLeftArrow 027F5 -LongLeftRightArrow 027F7 -LongRightArrow 027F6 -Longleftarrow 027F8 -Longleftrightarrow 027FA -Longrightarrow 027F9 -Lopf 1D543 -LowerLeftArrow 02199 -LowerRightArrow 02198 -Lscr 02112 -Lsh 021B0 -Lstrok 00141 -Lt 0226A -Map 02905 -Mcy 0041C -MediumSpace 0205F -Mellintrf 02133 -Mfr 1D510 -MinusPlus 02213 -Mopf 1D544 -Mscr 02133 -Mu 0039C -NJcy 0040A -Nacute 00143 -Ncaron 00147 -Ncedil 00145 -Ncy 0041D -NegativeMediumSpace 0200B -NegativeThickSpace 0200B -NegativeThinSpace 0200B -NegativeVeryThinSpace 0200B -NestedGreaterGreater 0226B -NestedLessLess 0226A -NewLine 0000A -Nfr 1D511 -NoBreak 02060 -NonBreakingSpace 000A0 -Nopf 02115 -Not 02AEC -NotCongruent 02262 -NotCupCap 0226D -NotDoubleVerticalBar 02226 -NotElement 02209 -NotEqual 02260 +AElig 000C6 +AMP 00026 +Aacute 000C1 +Abreve 00102 +Acirc 000C2 +Acy 00410 +Afr 1D504 +Agrave 000C0 +Alpha 00391 +Amacr 00100 +And 02A53 +Aogon 00104 +Aopf 1D538 +ApplyFunction 02061 +Aring 000C5 +Ascr 1D49C +Assign 02254 +Atilde 000C3 +Auml 000C4 +Backslash 02216 +Barv 02AE7 +Barwed 02306 +Bcy 00411 +Because 02235 +Bernoullis 0212C +Beta 00392 +Bfr 1D505 +Bopf 1D539 +Breve 002D8 +Bscr 0212C +Bumpeq 0224E +CHcy 00427 +COPY 000A9 +Cacute 00106 +Cap 022D2 +CapitalDifferentialD 02145 +Cayleys 0212D +Ccaron 0010C +Ccedil 000C7 +Ccirc 00108 +Cconint 02230 +Cdot 0010A +Cedilla 000B8 +CenterDot 000B7 +Cfr 0212D +Chi 003A7 +CircleDot 02299 +CircleMinus 02296 +CirclePlus 02295 +CircleTimes 02297 +ClockwiseContourIntegral 02232 +CloseCurlyDoubleQuote 0201D +CloseCurlyQuote 02019 +Colon 02237 +Colone 02A74 +Congruent 02261 +Conint 0222F +ContourIntegral 0222E +Copf 02102 +Coproduct 02210 +CounterClockwiseContourIntegral 02233 +Cross 02A2F +Cscr 1D49E +Cup 022D3 +CupCap 0224D +DD 02145 +DDotrahd 02911 +DJcy 00402 +DScy 00405 +DZcy 0040F +Dagger 02021 +Darr 021A1 +Dashv 02AE4 +Dcaron 0010E +Dcy 00414 +Del 02207 +Delta 00394 +Dfr 1D507 +DiacriticalAcute 000B4 +DiacriticalDot 002D9 +DiacriticalDoubleAcute 002DD +DiacriticalGrave 00060 +DiacriticalTilde 002DC +Diamond 022C4 +DifferentialD 02146 +Dopf 1D53B +Dot 000A8 +DotDot 020DC +DotEqual 02250 +DoubleContourIntegral 0222F +DoubleDot 000A8 +DoubleDownArrow 021D3 +DoubleLeftArrow 021D0 +DoubleLeftRightArrow 021D4 +DoubleLeftTee 02AE4 +DoubleLongLeftArrow 027F8 +DoubleLongLeftRightArrow 027FA +DoubleLongRightArrow 027F9 +DoubleRightArrow 021D2 +DoubleRightTee 022A8 +DoubleUpArrow 021D1 +DoubleUpDownArrow 021D5 +DoubleVerticalBar 02225 +DownArrow 02193 +DownArrowBar 02913 +DownArrowUpArrow 021F5 +DownBreve 00311 +DownLeftRightVector 02950 +DownLeftTeeVector 0295E +DownLeftVector 021BD +DownLeftVectorBar 02956 +DownRightTeeVector 0295F +DownRightVector 021C1 +DownRightVectorBar 02957 +DownTee 022A4 +DownTeeArrow 021A7 +Downarrow 021D3 +Dscr 1D49F +Dstrok 00110 +ENG 0014A +ETH 000D0 +Eacute 000C9 +Ecaron 0011A +Ecirc 000CA +Ecy 0042D +Edot 00116 +Efr 1D508 +Egrave 000C8 +Element 02208 +Emacr 00112 +EmptySmallSquare 025FB +EmptyVerySmallSquare 025AB +Eogon 00118 +Eopf 1D53C +Epsilon 00395 +Equal 02A75 +EqualTilde 02242 +Equilibrium 021CC +Escr 02130 +Esim 02A73 +Eta 00397 +Euml 000CB +Exists 02203 +ExponentialE 02147 +Fcy 00424 +Ffr 1D509 +FilledSmallSquare 025FC +FilledVerySmallSquare 025AA +Fopf 1D53D +ForAll 02200 +Fouriertrf 02131 +Fscr 02131 +GJcy 00403 +GT 0003E +Gamma 00393 +Gammad 003DC +Gbreve 0011E +Gcedil 00122 +Gcirc 0011C +Gcy 00413 +Gdot 00120 +Gfr 1D50A +Gg 022D9 +Gopf 1D53E +GreaterEqual 02265 +GreaterEqualLess 022DB +GreaterFullEqual 02267 +GreaterGreater 02AA2 +GreaterLess 02277 +GreaterSlantEqual 02A7E +GreaterTilde 02273 +Gscr 1D4A2 +Gt 0226B +HARDcy 0042A +Hacek 002C7 +Hat 0005E +Hcirc 00124 +Hfr 0210C +HilbertSpace 0210B +Hopf 0210D +HorizontalLine 02500 +Hscr 0210B +Hstrok 00126 +HumpDownHump 0224E +HumpEqual 0224F +IEcy 00415 +IJlig 00132 +IOcy 00401 +Iacute 000CD +Icirc 000CE +Icy 00418 +Idot 00130 +Ifr 02111 +Igrave 000CC +Im 02111 +Imacr 0012A +ImaginaryI 02148 +Implies 021D2 +Int 0222C +Integral 0222B +Intersection 022C2 +InvisibleComma 02063 +InvisibleTimes 02062 +Iogon 0012E +Iopf 1D540 +Iota 00399 +Iscr 02110 +Itilde 00128 +Iukcy 00406 +Iuml 000CF +Jcirc 00134 +Jcy 00419 +Jfr 1D50D +Jopf 1D541 +Jscr 1D4A5 +Jsercy 00408 +Jukcy 00404 +KHcy 00425 +KJcy 0040C +Kappa 0039A +Kcedil 00136 +Kcy 0041A +Kfr 1D50E +Kopf 1D542 +Kscr 1D4A6 +LJcy 00409 +LT 0003C +Lacute 00139 +Lambda 0039B +Lang 027EA +Laplacetrf 02112 +Larr 0219E +Lcaron 0013D +Lcedil 0013B +Lcy 0041B +LeftAngleBracket 027E8 +LeftArrow 02190 +LeftArrowBar 021E4 +LeftArrowRightArrow 021C6 +LeftCeiling 02308 +LeftDoubleBracket 027E6 +LeftDownTeeVector 02961 +LeftDownVector 021C3 +LeftDownVectorBar 02959 +LeftFloor 0230A +LeftRightArrow 02194 +LeftRightVector 0294E +LeftTee 022A3 +LeftTeeArrow 021A4 +LeftTeeVector 0295A +LeftTriangle 022B2 +LeftTriangleBar 029CF +LeftTriangleEqual 022B4 +LeftUpDownVector 02951 +LeftUpTeeVector 02960 +LeftUpVector 021BF +LeftUpVectorBar 02958 +LeftVector 021BC +LeftVectorBar 02952 +Leftarrow 021D0 +Leftrightarrow 021D4 +LessEqualGreater 022DA +LessFullEqual 02266 +LessGreater 02276 +LessLess 02AA1 +LessSlantEqual 02A7D +LessTilde 02272 +Lfr 1D50F +Ll 022D8 +Lleftarrow 021DA +Lmidot 0013F +LongLeftArrow 027F5 +LongLeftRightArrow 027F7 +LongRightArrow 027F6 +Longleftarrow 027F8 +Longleftrightarrow 027FA +Longrightarrow 027F9 +Lopf 1D543 +LowerLeftArrow 02199 +LowerRightArrow 02198 +Lscr 02112 +Lsh 021B0 +Lstrok 00141 +Lt 0226A +Map 02905 +Mcy 0041C +MediumSpace 0205F +Mellintrf 02133 +Mfr 1D510 +MinusPlus 02213 +Mopf 1D544 +Mscr 02133 +Mu 0039C +NJcy 0040A +Nacute 00143 +Ncaron 00147 +Ncedil 00145 +Ncy 0041D +NegativeMediumSpace 0200B +NegativeThickSpace 0200B +NegativeThinSpace 0200B +NegativeVeryThinSpace 0200B +NestedGreaterGreater 0226B +NestedLessLess 0226A +NewLine 0000A +Nfr 1D511 +NoBreak 02060 +NonBreakingSpace 000A0 +Nopf 02115 +Not 02AEC +NotCongruent 02262 +NotCupCap 0226D +NotDoubleVerticalBar 02226 +NotElement 02209 +NotEqual 02260 NotEqualTilde 02242 00338 -NotExists 02204 -NotGreater 0226F -NotGreaterEqual 02271 +NotExists 02204 +NotGreater 0226F +NotGreaterEqual 02271 NotGreaterFullEqual 02267 00338 NotGreaterGreater 0226B 00338 -NotGreaterLess 02279 +NotGreaterLess 02279 NotGreaterSlantEqual 02A7E 00338 -NotGreaterTilde 02275 +NotGreaterTilde 02275 NotHumpDownHump 0224E 00338 NotHumpEqual 0224F 00338 -NotLeftTriangle 022EA +NotLeftTriangle 022EA NotLeftTriangleBar 029CF 00338 -NotLeftTriangleEqual 022EC -NotLess 0226E -NotLessEqual 02270 -NotLessGreater 02278 +NotLeftTriangleEqual 022EC +NotLess 0226E +NotLessEqual 02270 +NotLessGreater 02278 NotLessLess 0226A 00338 NotLessSlantEqual 02A7D 00338 -NotLessTilde 02274 +NotLessTilde 02274 NotNestedGreaterGreater 02AA2 00338 NotNestedLessLess 02AA1 00338 -NotPrecedes 02280 +NotPrecedes 02280 NotPrecedesEqual 02AAF 00338 -NotPrecedesSlantEqual 022E0 -NotReverseElement 0220C -NotRightTriangle 022EB +NotPrecedesSlantEqual 022E0 +NotReverseElement 0220C +NotRightTriangle 022EB NotRightTriangleBar 029D0 00338 -NotRightTriangleEqual 022ED +NotRightTriangleEqual 022ED NotSquareSubset 0228F 00338 -NotSquareSubsetEqual 022E2 +NotSquareSubsetEqual 022E2 NotSquareSuperset 02290 00338 -NotSquareSupersetEqual 022E3 +NotSquareSupersetEqual 022E3 NotSubset 02282 020D2 -NotSubsetEqual 02288 -NotSucceeds 02281 +NotSubsetEqual 02288 +NotSucceeds 02281 NotSucceedsEqual 02AB0 00338 -NotSucceedsSlantEqual 022E1 +NotSucceedsSlantEqual 022E1 NotSucceedsTilde 0227F 00338 NotSuperset 02283 020D2 -NotSupersetEqual 02289 -NotTilde 02241 -NotTildeEqual 02244 -NotTildeFullEqual 02247 -NotTildeTilde 02249 -NotVerticalBar 02224 -Nscr 1D4A9 -Ntilde 000D1 -Nu 0039D -OElig 00152 -Oacute 000D3 -Ocirc 000D4 -Ocy 0041E -Odblac 00150 -Ofr 1D512 -Ograve 000D2 -Omacr 0014C -Omega 003A9 -Omicron 0039F -Oopf 1D546 -OpenCurlyDoubleQuote 0201C -OpenCurlyQuote 02018 -Or 02A54 -Oscr 1D4AA -Oslash 000D8 -Otilde 000D5 -Otimes 02A37 -Ouml 000D6 -OverBar 0203E -OverBrace 023DE -OverBracket 023B4 -OverParenthesis 023DC -PartialD 02202 -Pcy 0041F -Pfr 1D513 -Phi 003A6 -Pi 003A0 -PlusMinus 000B1 -Poincareplane 0210C -Popf 02119 -Pr 02ABB -Precedes 0227A -PrecedesEqual 02AAF -PrecedesSlantEqual 0227C -PrecedesTilde 0227E -Prime 02033 -Product 0220F -Proportion 02237 -Proportional 0221D -Pscr 1D4AB -Psi 003A8 -QUOT 00022 -Qfr 1D514 -Qopf 0211A -Qscr 1D4AC -RBarr 02910 -REG 000AE -Racute 00154 -Rang 027EB -Rarr 021A0 -Rarrtl 02916 -Rcaron 00158 -Rcedil 00156 -Rcy 00420 -Re 0211C -ReverseElement 0220B -ReverseEquilibrium 021CB -ReverseUpEquilibrium 0296F -Rfr 0211C -Rho 003A1 -RightAngleBracket 027E9 -RightArrow 02192 -RightArrowBar 021E5 -RightArrowLeftArrow 021C4 -RightCeiling 02309 -RightDoubleBracket 027E7 -RightDownTeeVector 0295D -RightDownVector 021C2 -RightDownVectorBar 02955 -RightFloor 0230B -RightTee 022A2 -RightTeeArrow 021A6 -RightTeeVector 0295B -RightTriangle 022B3 -RightTriangleBar 029D0 -RightTriangleEqual 022B5 -RightUpDownVector 0294F -RightUpTeeVector 0295C -RightUpVector 021BE -RightUpVectorBar 02954 -RightVector 021C0 -RightVectorBar 02953 -Rightarrow 021D2 -Ropf 0211D -RoundImplies 02970 -Rrightarrow 021DB -Rscr 0211B -Rsh 021B1 -RuleDelayed 029F4 -SHCHcy 00429 -SHcy 00428 -SOFTcy 0042C -Sacute 0015A -Sc 02ABC -Scaron 00160 -Scedil 0015E -Scirc 0015C -Scy 00421 -Sfr 1D516 -ShortDownArrow 02193 -ShortLeftArrow 02190 -ShortRightArrow 02192 -ShortUpArrow 02191 -Sigma 003A3 -SmallCircle 02218 -Sopf 1D54A -Sqrt 0221A -Square 025A1 -SquareIntersection 02293 -SquareSubset 0228F -SquareSubsetEqual 02291 -SquareSuperset 02290 -SquareSupersetEqual 02292 -SquareUnion 02294 -Sscr 1D4AE -Star 022C6 -Sub 022D0 -Subset 022D0 -SubsetEqual 02286 -Succeeds 0227B -SucceedsEqual 02AB0 -SucceedsSlantEqual 0227D -SucceedsTilde 0227F -SuchThat 0220B -Sum 02211 -Sup 022D1 -Superset 02283 -SupersetEqual 02287 -Supset 022D1 -THORN 000DE -TRADE 02122 -TSHcy 0040B -TScy 00426 -Tab 00009 -Tau 003A4 -Tcaron 00164 -Tcedil 00162 -Tcy 00422 -Tfr 1D517 -Therefore 02234 -Theta 00398 +NotSupersetEqual 02289 +NotTilde 02241 +NotTildeEqual 02244 +NotTildeFullEqual 02247 +NotTildeTilde 02249 +NotVerticalBar 02224 +Nscr 1D4A9 +Ntilde 000D1 +Nu 0039D +OElig 00152 +Oacute 000D3 +Ocirc 000D4 +Ocy 0041E +Odblac 00150 +Ofr 1D512 +Ograve 000D2 +Omacr 0014C +Omega 003A9 +Omicron 0039F +Oopf 1D546 +OpenCurlyDoubleQuote 0201C +OpenCurlyQuote 02018 +Or 02A54 +Oscr 1D4AA +Oslash 000D8 +Otilde 000D5 +Otimes 02A37 +Ouml 000D6 +OverBar 0203E +OverBrace 023DE +OverBracket 023B4 +OverParenthesis 023DC +PartialD 02202 +Pcy 0041F +Pfr 1D513 +Phi 003A6 +Pi 003A0 +PlusMinus 000B1 +Poincareplane 0210C +Popf 02119 +Pr 02ABB +Precedes 0227A +PrecedesEqual 02AAF +PrecedesSlantEqual 0227C +PrecedesTilde 0227E +Prime 02033 +Product 0220F +Proportion 02237 +Proportional 0221D +Pscr 1D4AB +Psi 003A8 +QUOT 00022 +Qfr 1D514 +Qopf 0211A +Qscr 1D4AC +RBarr 02910 +REG 000AE +Racute 00154 +Rang 027EB +Rarr 021A0 +Rarrtl 02916 +Rcaron 00158 +Rcedil 00156 +Rcy 00420 +Re 0211C +ReverseElement 0220B +ReverseEquilibrium 021CB +ReverseUpEquilibrium 0296F +Rfr 0211C +Rho 003A1 +RightAngleBracket 027E9 +RightArrow 02192 +RightArrowBar 021E5 +RightArrowLeftArrow 021C4 +RightCeiling 02309 +RightDoubleBracket 027E7 +RightDownTeeVector 0295D +RightDownVector 021C2 +RightDownVectorBar 02955 +RightFloor 0230B +RightTee 022A2 +RightTeeArrow 021A6 +RightTeeVector 0295B +RightTriangle 022B3 +RightTriangleBar 029D0 +RightTriangleEqual 022B5 +RightUpDownVector 0294F +RightUpTeeVector 0295C +RightUpVector 021BE +RightUpVectorBar 02954 +RightVector 021C0 +RightVectorBar 02953 +Rightarrow 021D2 +Ropf 0211D +RoundImplies 02970 +Rrightarrow 021DB +Rscr 0211B +Rsh 021B1 +RuleDelayed 029F4 +SHCHcy 00429 +SHcy 00428 +SOFTcy 0042C +Sacute 0015A +Sc 02ABC +Scaron 00160 +Scedil 0015E +Scirc 0015C +Scy 00421 +Sfr 1D516 +ShortDownArrow 02193 +ShortLeftArrow 02190 +ShortRightArrow 02192 +ShortUpArrow 02191 +Sigma 003A3 +SmallCircle 02218 +Sopf 1D54A +Sqrt 0221A +Square 025A1 +SquareIntersection 02293 +SquareSubset 0228F +SquareSubsetEqual 02291 +SquareSuperset 02290 +SquareSupersetEqual 02292 +SquareUnion 02294 +Sscr 1D4AE +Star 022C6 +Sub 022D0 +Subset 022D0 +SubsetEqual 02286 +Succeeds 0227B +SucceedsEqual 02AB0 +SucceedsSlantEqual 0227D +SucceedsTilde 0227F +SuchThat 0220B +Sum 02211 +Sup 022D1 +Superset 02283 +SupersetEqual 02287 +Supset 022D1 +THORN 000DE +TRADE 02122 +TSHcy 0040B +TScy 00426 +Tab 00009 +Tau 003A4 +Tcaron 00164 +Tcedil 00162 +Tcy 00422 +Tfr 1D517 +Therefore 02234 +Theta 00398 ThickSpace 0205F 0200A -ThinSpace 02009 -Tilde 0223C -TildeEqual 02243 -TildeFullEqual 02245 -TildeTilde 02248 -Topf 1D54B -TripleDot 020DB -Tscr 1D4AF -Tstrok 00166 -Uacute 000DA -Uarr 0219F -Uarrocir 02949 -Ubrcy 0040E -Ubreve 0016C -Ucirc 000DB -Ucy 00423 -Udblac 00170 -Ufr 1D518 -Ugrave 000D9 -Umacr 0016A -UnderBar 0005F -UnderBrace 023DF -UnderBracket 023B5 -UnderParenthesis 023DD -Union 022C3 -UnionPlus 0228E -Uogon 00172 -Uopf 1D54C -UpArrow 02191 -UpArrowBar 02912 -UpArrowDownArrow 021C5 -UpDownArrow 02195 -UpEquilibrium 0296E -UpTee 022A5 -UpTeeArrow 021A5 -Uparrow 021D1 -Updownarrow 021D5 -UpperLeftArrow 02196 -UpperRightArrow 02197 -Upsi 003D2 -Upsilon 003A5 -Uring 0016E -Uscr 1D4B0 -Utilde 00168 -Uuml 000DC -VDash 022AB -Vbar 02AEB -Vcy 00412 -Vdash 022A9 -Vdashl 02AE6 -Vee 022C1 -Verbar 02016 -Vert 02016 -VerticalBar 02223 -VerticalLine 0007C -VerticalSeparator 02758 -VerticalTilde 02240 -VeryThinSpace 0200A -Vfr 1D519 -Vopf 1D54D -Vscr 1D4B1 -Vvdash 022AA -Wcirc 00174 -Wedge 022C0 -Wfr 1D51A -Wopf 1D54E -Wscr 1D4B2 -Xfr 1D51B -Xi 0039E -Xopf 1D54F -Xscr 1D4B3 -YAcy 0042F -YIcy 00407 -YUcy 0042E -Yacute 000DD -Ycirc 00176 -Ycy 0042B -Yfr 1D51C -Yopf 1D550 -Yscr 1D4B4 -Yuml 00178 -ZHcy 00416 -Zacute 00179 -Zcaron 0017D -Zcy 00417 -Zdot 0017B -ZeroWidthSpace 0200B -Zeta 00396 -Zfr 02128 -Zopf 02124 -Zscr 1D4B5 -aacute 000E1 -abreve 00103 -ac 0223E +ThinSpace 02009 +Tilde 0223C +TildeEqual 02243 +TildeFullEqual 02245 +TildeTilde 02248 +Topf 1D54B +TripleDot 020DB +Tscr 1D4AF +Tstrok 00166 +Uacute 000DA +Uarr 0219F +Uarrocir 02949 +Ubrcy 0040E +Ubreve 0016C +Ucirc 000DB +Ucy 00423 +Udblac 00170 +Ufr 1D518 +Ugrave 000D9 +Umacr 0016A +UnderBar 0005F +UnderBrace 023DF +UnderBracket 023B5 +UnderParenthesis 023DD +Union 022C3 +UnionPlus 0228E +Uogon 00172 +Uopf 1D54C +UpArrow 02191 +UpArrowBar 02912 +UpArrowDownArrow 021C5 +UpDownArrow 02195 +UpEquilibrium 0296E +UpTee 022A5 +UpTeeArrow 021A5 +Uparrow 021D1 +Updownarrow 021D5 +UpperLeftArrow 02196 +UpperRightArrow 02197 +Upsi 003D2 +Upsilon 003A5 +Uring 0016E +Uscr 1D4B0 +Utilde 00168 +Uuml 000DC +VDash 022AB +Vbar 02AEB +Vcy 00412 +Vdash 022A9 +Vdashl 02AE6 +Vee 022C1 +Verbar 02016 +Vert 02016 +VerticalBar 02223 +VerticalLine 0007C +VerticalSeparator 02758 +VerticalTilde 02240 +VeryThinSpace 0200A +Vfr 1D519 +Vopf 1D54D +Vscr 1D4B1 +Vvdash 022AA +Wcirc 00174 +Wedge 022C0 +Wfr 1D51A +Wopf 1D54E +Wscr 1D4B2 +Xfr 1D51B +Xi 0039E +Xopf 1D54F +Xscr 1D4B3 +YAcy 0042F +YIcy 00407 +YUcy 0042E +Yacute 000DD +Ycirc 00176 +Ycy 0042B +Yfr 1D51C +Yopf 1D550 +Yscr 1D4B4 +Yuml 00178 +ZHcy 00416 +Zacute 00179 +Zcaron 0017D +Zcy 00417 +Zdot 0017B +ZeroWidthSpace 0200B +Zeta 00396 +Zfr 02128 +Zopf 02124 +Zscr 1D4B5 +aacute 000E1 +abreve 00103 +ac 0223E acE 0223E 00333 -acd 0223F -acirc 000E2 -acute 000B4 -acy 00430 -aelig 000E6 -af 02061 -afr 1D51E -agrave 000E0 -alefsym 02135 -aleph 02135 -alpha 003B1 -amacr 00101 -amalg 02A3F -amp 00026 -and 02227 -andand 02A55 -andd 02A5C -andslope 02A58 -andv 02A5A -ang 02220 -ange 029A4 -angle 02220 -angmsd 02221 -angmsdaa 029A8 -angmsdab 029A9 -angmsdac 029AA -angmsdad 029AB -angmsdae 029AC -angmsdaf 029AD -angmsdag 029AE -angmsdah 029AF -angrt 0221F -angrtvb 022BE -angrtvbd 0299D -angsph 02222 -angst 000C5 -angzarr 0237C -aogon 00105 -aopf 1D552 -ap 02248 -apE 02A70 -apacir 02A6F -ape 0224A -apid 0224B -apos 00027 -approx 02248 -approxeq 0224A -aring 000E5 -ascr 1D4B6 -ast 0002A -asymp 02248 -asympeq 0224D -atilde 000E3 -auml 000E4 -awconint 02233 -awint 02A11 -bNot 02AED -backcong 0224C -backepsilon 003F6 -backprime 02035 -backsim 0223D -backsimeq 022CD -barvee 022BD -barwed 02305 -barwedge 02305 -bbrk 023B5 -bbrktbrk 023B6 -bcong 0224C -bcy 00431 -bdquo 0201E -becaus 02235 -because 02235 -bemptyv 029B0 -bepsi 003F6 -bernou 0212C -beta 003B2 -beth 02136 -between 0226C -bfr 1D51F -bigcap 022C2 -bigcirc 025EF -bigcup 022C3 -bigodot 02A00 -bigoplus 02A01 -bigotimes 02A02 -bigsqcup 02A06 -bigstar 02605 -bigtriangledown 025BD -bigtriangleup 025B3 -biguplus 02A04 -bigvee 022C1 -bigwedge 022C0 -bkarow 0290D -blacklozenge 029EB -blacksquare 025AA -blacktriangle 025B4 -blacktriangledown 025BE -blacktriangleleft 025C2 -blacktriangleright 025B8 -blank 02423 -blk12 02592 -blk14 02591 -blk34 02593 -block 02588 +acd 0223F +acirc 000E2 +acute 000B4 +acy 00430 +aelig 000E6 +af 02061 +afr 1D51E +agrave 000E0 +alefsym 02135 +aleph 02135 +alpha 003B1 +amacr 00101 +amalg 02A3F +amp 00026 +and 02227 +andand 02A55 +andd 02A5C +andslope 02A58 +andv 02A5A +ang 02220 +ange 029A4 +angle 02220 +angmsd 02221 +angmsdaa 029A8 +angmsdab 029A9 +angmsdac 029AA +angmsdad 029AB +angmsdae 029AC +angmsdaf 029AD +angmsdag 029AE +angmsdah 029AF +angrt 0221F +angrtvb 022BE +angrtvbd 0299D +angsph 02222 +angst 000C5 +angzarr 0237C +aogon 00105 +aopf 1D552 +ap 02248 +apE 02A70 +apacir 02A6F +ape 0224A +apid 0224B +apos 00027 +approx 02248 +approxeq 0224A +aring 000E5 +ascr 1D4B6 +ast 0002A +asymp 02248 +asympeq 0224D +atilde 000E3 +auml 000E4 +awconint 02233 +awint 02A11 +bNot 02AED +backcong 0224C +backepsilon 003F6 +backprime 02035 +backsim 0223D +backsimeq 022CD +barvee 022BD +barwed 02305 +barwedge 02305 +bbrk 023B5 +bbrktbrk 023B6 +bcong 0224C +bcy 00431 +bdquo 0201E +becaus 02235 +because 02235 +bemptyv 029B0 +bepsi 003F6 +bernou 0212C +beta 003B2 +beth 02136 +between 0226C +bfr 1D51F +bigcap 022C2 +bigcirc 025EF +bigcup 022C3 +bigodot 02A00 +bigoplus 02A01 +bigotimes 02A02 +bigsqcup 02A06 +bigstar 02605 +bigtriangledown 025BD +bigtriangleup 025B3 +biguplus 02A04 +bigvee 022C1 +bigwedge 022C0 +bkarow 0290D +blacklozenge 029EB +blacksquare 025AA +blacktriangle 025B4 +blacktriangledown 025BE +blacktriangleleft 025C2 +blacktriangleright 025B8 +blank 02423 +blk12 02592 +blk14 02591 +blk34 02593 +block 02588 bne 0003D 020E5 bnequiv 02261 020E5 -bnot 02310 -bopf 1D553 -bot 022A5 -bottom 022A5 -bowtie 022C8 -boxDL 02557 -boxDR 02554 -boxDl 02556 -boxDr 02553 -boxH 02550 -boxHD 02566 -boxHU 02569 -boxHd 02564 -boxHu 02567 -boxUL 0255D -boxUR 0255A -boxUl 0255C -boxUr 02559 -boxV 02551 -boxVH 0256C -boxVL 02563 -boxVR 02560 -boxVh 0256B -boxVl 02562 -boxVr 0255F -boxbox 029C9 -boxdL 02555 -boxdR 02552 -boxdl 02510 -boxdr 0250C -boxh 02500 -boxhD 02565 -boxhU 02568 -boxhd 0252C -boxhu 02534 -boxminus 0229F -boxplus 0229E -boxtimes 022A0 -boxuL 0255B -boxuR 02558 -boxul 02518 -boxur 02514 -boxv 02502 -boxvH 0256A -boxvL 02561 -boxvR 0255E -boxvh 0253C -boxvl 02524 -boxvr 0251C -bprime 02035 -breve 002D8 -brvbar 000A6 -bscr 1D4B7 -bsemi 0204F -bsim 0223D -bsime 022CD -bsol 0005C -bsolb 029C5 -bsolhsub 027C8 -bull 02022 -bullet 02022 -bump 0224E -bumpE 02AAE -bumpe 0224F -bumpeq 0224F -cacute 00107 -cap 02229 -capand 02A44 -capbrcup 02A49 -capcap 02A4B -capcup 02A47 -capdot 02A40 +bnot 02310 +bopf 1D553 +bot 022A5 +bottom 022A5 +bowtie 022C8 +boxDL 02557 +boxDR 02554 +boxDl 02556 +boxDr 02553 +boxH 02550 +boxHD 02566 +boxHU 02569 +boxHd 02564 +boxHu 02567 +boxUL 0255D +boxUR 0255A +boxUl 0255C +boxUr 02559 +boxV 02551 +boxVH 0256C +boxVL 02563 +boxVR 02560 +boxVh 0256B +boxVl 02562 +boxVr 0255F +boxbox 029C9 +boxdL 02555 +boxdR 02552 +boxdl 02510 +boxdr 0250C +boxh 02500 +boxhD 02565 +boxhU 02568 +boxhd 0252C +boxhu 02534 +boxminus 0229F +boxplus 0229E +boxtimes 022A0 +boxuL 0255B +boxuR 02558 +boxul 02518 +boxur 02514 +boxv 02502 +boxvH 0256A +boxvL 02561 +boxvR 0255E +boxvh 0253C +boxvl 02524 +boxvr 0251C +bprime 02035 +breve 002D8 +brvbar 000A6 +bscr 1D4B7 +bsemi 0204F +bsim 0223D +bsime 022CD +bsol 0005C +bsolb 029C5 +bsolhsub 027C8 +bull 02022 +bullet 02022 +bump 0224E +bumpE 02AAE +bumpe 0224F +bumpeq 0224F +cacute 00107 +cap 02229 +capand 02A44 +capbrcup 02A49 +capcap 02A4B +capcup 02A47 +capdot 02A40 caps 02229 0FE00 -caret 02041 -caron 002C7 -ccaps 02A4D -ccaron 0010D -ccedil 000E7 -ccirc 00109 -ccups 02A4C -ccupssm 02A50 -cdot 0010B -cedil 000B8 -cemptyv 029B2 -cent 000A2 -centerdot 000B7 -cfr 1D520 -chcy 00447 -check 02713 -checkmark 02713 -chi 003C7 -cir 025CB -cirE 029C3 -circ 002C6 -circeq 02257 -circlearrowleft 021BA -circlearrowright 021BB -circledR 000AE -circledS 024C8 -circledast 0229B -circledcirc 0229A -circleddash 0229D -cire 02257 -cirfnint 02A10 -cirmid 02AEF -cirscir 029C2 -clubs 02663 -clubsuit 02663 -colon 0003A -colone 02254 -coloneq 02254 -comma 0002C -commat 00040 -comp 02201 -compfn 02218 -complement 02201 -complexes 02102 -cong 02245 -congdot 02A6D -conint 0222E -copf 1D554 -coprod 02210 -copy 000A9 -copysr 02117 -crarr 021B5 -cross 02717 -cscr 1D4B8 -csub 02ACF -csube 02AD1 -csup 02AD0 -csupe 02AD2 -ctdot 022EF -cudarrl 02938 -cudarrr 02935 -cuepr 022DE -cuesc 022DF -cularr 021B6 -cularrp 0293D -cup 0222A -cupbrcap 02A48 -cupcap 02A46 -cupcup 02A4A -cupdot 0228D -cupor 02A45 +caret 02041 +caron 002C7 +ccaps 02A4D +ccaron 0010D +ccedil 000E7 +ccirc 00109 +ccups 02A4C +ccupssm 02A50 +cdot 0010B +cedil 000B8 +cemptyv 029B2 +cent 000A2 +centerdot 000B7 +cfr 1D520 +chcy 00447 +check 02713 +checkmark 02713 +chi 003C7 +cir 025CB +cirE 029C3 +circ 002C6 +circeq 02257 +circlearrowleft 021BA +circlearrowright 021BB +circledR 000AE +circledS 024C8 +circledast 0229B +circledcirc 0229A +circleddash 0229D +cire 02257 +cirfnint 02A10 +cirmid 02AEF +cirscir 029C2 +clubs 02663 +clubsuit 02663 +colon 0003A +colone 02254 +coloneq 02254 +comma 0002C +commat 00040 +comp 02201 +compfn 02218 +complement 02201 +complexes 02102 +cong 02245 +congdot 02A6D +conint 0222E +copf 1D554 +coprod 02210 +copy 000A9 +copysr 02117 +crarr 021B5 +cross 02717 +cscr 1D4B8 +csub 02ACF +csube 02AD1 +csup 02AD0 +csupe 02AD2 +ctdot 022EF +cudarrl 02938 +cudarrr 02935 +cuepr 022DE +cuesc 022DF +cularr 021B6 +cularrp 0293D +cup 0222A +cupbrcap 02A48 +cupcap 02A46 +cupcup 02A4A +cupdot 0228D +cupor 02A45 cups 0222A 0FE00 -curarr 021B7 -curarrm 0293C -curlyeqprec 022DE -curlyeqsucc 022DF -curlyvee 022CE -curlywedge 022CF -curren 000A4 -curvearrowleft 021B6 -curvearrowright 021B7 -cuvee 022CE -cuwed 022CF -cwconint 02232 -cwint 02231 -cylcty 0232D -dArr 021D3 -dHar 02965 -dagger 02020 -daleth 02138 -darr 02193 -dash 02010 -dashv 022A3 -dbkarow 0290F -dblac 002DD -dcaron 0010F -dcy 00434 -dd 02146 -ddagger 02021 -ddarr 021CA -ddotseq 02A77 -deg 000B0 -delta 003B4 -demptyv 029B1 -dfisht 0297F -dfr 1D521 -dharl 021C3 -dharr 021C2 -diam 022C4 -diamond 022C4 -diamondsuit 02666 -diams 02666 -die 000A8 -digamma 003DD -disin 022F2 -div 000F7 -divide 000F7 -divideontimes 022C7 -divonx 022C7 -djcy 00452 -dlcorn 0231E -dlcrop 0230D -dollar 00024 -dopf 1D555 -dot 002D9 -doteq 02250 -doteqdot 02251 -dotminus 02238 -dotplus 02214 -dotsquare 022A1 -doublebarwedge 02306 -downarrow 02193 -downdownarrows 021CA -downharpoonleft 021C3 -downharpoonright 021C2 -drbkarow 02910 -drcorn 0231F -drcrop 0230C -dscr 1D4B9 -dscy 00455 -dsol 029F6 -dstrok 00111 -dtdot 022F1 -dtri 025BF -dtrif 025BE -duarr 021F5 -duhar 0296F -dwangle 029A6 -dzcy 0045F -dzigrarr 027FF -eDDot 02A77 -eDot 02251 -eacute 000E9 -easter 02A6E -ecaron 0011B -ecir 02256 -ecirc 000EA -ecolon 02255 -ecy 0044D -edot 00117 -ee 02147 -efDot 02252 -efr 1D522 -eg 02A9A -egrave 000E8 -egs 02A96 -egsdot 02A98 -el 02A99 -elinters 023E7 -ell 02113 -els 02A95 -elsdot 02A97 -emacr 00113 -empty 02205 -emptyset 02205 -emptyv 02205 -emsp 02003 -emsp13 02004 -emsp14 02005 -eng 0014B -ensp 02002 -eogon 00119 -eopf 1D556 -epar 022D5 -eparsl 029E3 -eplus 02A71 -epsi 003B5 -epsilon 003B5 -epsiv 003F5 -eqcirc 02256 -eqcolon 02255 -eqsim 02242 -eqslantgtr 02A96 -eqslantless 02A95 -equals 0003D -equest 0225F -equiv 02261 -equivDD 02A78 -eqvparsl 029E5 -erDot 02253 -erarr 02971 -escr 0212F -esdot 02250 -esim 02242 -eta 003B7 -eth 000F0 -euml 000EB -euro 020AC -excl 00021 -exist 02203 -expectation 02130 -exponentiale 02147 -fallingdotseq 02252 -fcy 00444 -female 02640 -ffilig 0FB03 -fflig 0FB00 -ffllig 0FB04 -ffr 1D523 -filig 0FB01 +curarr 021B7 +curarrm 0293C +curlyeqprec 022DE +curlyeqsucc 022DF +curlyvee 022CE +curlywedge 022CF +curren 000A4 +curvearrowleft 021B6 +curvearrowright 021B7 +cuvee 022CE +cuwed 022CF +cwconint 02232 +cwint 02231 +cylcty 0232D +dArr 021D3 +dHar 02965 +dagger 02020 +daleth 02138 +darr 02193 +dash 02010 +dashv 022A3 +dbkarow 0290F +dblac 002DD +dcaron 0010F +dcy 00434 +dd 02146 +ddagger 02021 +ddarr 021CA +ddotseq 02A77 +deg 000B0 +delta 003B4 +demptyv 029B1 +dfisht 0297F +dfr 1D521 +dharl 021C3 +dharr 021C2 +diam 022C4 +diamond 022C4 +diamondsuit 02666 +diams 02666 +die 000A8 +digamma 003DD +disin 022F2 +div 000F7 +divide 000F7 +divideontimes 022C7 +divonx 022C7 +djcy 00452 +dlcorn 0231E +dlcrop 0230D +dollar 00024 +dopf 1D555 +dot 002D9 +doteq 02250 +doteqdot 02251 +dotminus 02238 +dotplus 02214 +dotsquare 022A1 +doublebarwedge 02306 +downarrow 02193 +downdownarrows 021CA +downharpoonleft 021C3 +downharpoonright 021C2 +drbkarow 02910 +drcorn 0231F +drcrop 0230C +dscr 1D4B9 +dscy 00455 +dsol 029F6 +dstrok 00111 +dtdot 022F1 +dtri 025BF +dtrif 025BE +duarr 021F5 +duhar 0296F +dwangle 029A6 +dzcy 0045F +dzigrarr 027FF +eDDot 02A77 +eDot 02251 +eacute 000E9 +easter 02A6E +ecaron 0011B +ecir 02256 +ecirc 000EA +ecolon 02255 +ecy 0044D +edot 00117 +ee 02147 +efDot 02252 +efr 1D522 +eg 02A9A +egrave 000E8 +egs 02A96 +egsdot 02A98 +el 02A99 +elinters 023E7 +ell 02113 +els 02A95 +elsdot 02A97 +emacr 00113 +empty 02205 +emptyset 02205 +emptyv 02205 +emsp 02003 +emsp13 02004 +emsp14 02005 +eng 0014B +ensp 02002 +eogon 00119 +eopf 1D556 +epar 022D5 +eparsl 029E3 +eplus 02A71 +epsi 003B5 +epsilon 003B5 +epsiv 003F5 +eqcirc 02256 +eqcolon 02255 +eqsim 02242 +eqslantgtr 02A96 +eqslantless 02A95 +equals 0003D +equest 0225F +equiv 02261 +equivDD 02A78 +eqvparsl 029E5 +erDot 02253 +erarr 02971 +escr 0212F +esdot 02250 +esim 02242 +eta 003B7 +eth 000F0 +euml 000EB +euro 020AC +excl 00021 +exist 02203 +expectation 02130 +exponentiale 02147 +fallingdotseq 02252 +fcy 00444 +female 02640 +ffilig 0FB03 +fflig 0FB00 +ffllig 0FB04 +ffr 1D523 +filig 0FB01 fjlig 00066 0006A -flat 0266D -fllig 0FB02 -fltns 025B1 -fnof 00192 -fopf 1D557 -forall 02200 -fork 022D4 -forkv 02AD9 -fpartint 02A0D -frac12 000BD -frac13 02153 -frac14 000BC -frac15 02155 -frac16 02159 -frac18 0215B -frac23 02154 -frac25 02156 -frac34 000BE -frac35 02157 -frac38 0215C -frac45 02158 -frac56 0215A -frac58 0215D -frac78 0215E -frasl 02044 -frown 02322 -fscr 1D4BB -gE 02267 -gEl 02A8C -gacute 001F5 -gamma 003B3 -gammad 003DD -gap 02A86 -gbreve 0011F -gcirc 0011D -gcy 00433 -gdot 00121 -ge 02265 -gel 022DB -geq 02265 -geqq 02267 -geqslant 02A7E -ges 02A7E -gescc 02AA9 -gesdot 02A80 -gesdoto 02A82 -gesdotol 02A84 +flat 0266D +fllig 0FB02 +fltns 025B1 +fnof 00192 +fopf 1D557 +forall 02200 +fork 022D4 +forkv 02AD9 +fpartint 02A0D +frac12 000BD +frac13 02153 +frac14 000BC +frac15 02155 +frac16 02159 +frac18 0215B +frac23 02154 +frac25 02156 +frac34 000BE +frac35 02157 +frac38 0215C +frac45 02158 +frac56 0215A +frac58 0215D +frac78 0215E +frasl 02044 +frown 02322 +fscr 1D4BB +gE 02267 +gEl 02A8C +gacute 001F5 +gamma 003B3 +gammad 003DD +gap 02A86 +gbreve 0011F +gcirc 0011D +gcy 00433 +gdot 00121 +ge 02265 +gel 022DB +geq 02265 +geqq 02267 +geqslant 02A7E +ges 02A7E +gescc 02AA9 +gesdot 02A80 +gesdoto 02A82 +gesdotol 02A84 gesl 022DB 0FE00 -gesles 02A94 -gfr 1D524 -gg 0226B -ggg 022D9 -gimel 02137 -gjcy 00453 -gl 02277 -glE 02A92 -gla 02AA5 -glj 02AA4 -gnE 02269 -gnap 02A8A -gnapprox 02A8A -gne 02A88 -gneq 02A88 -gneqq 02269 -gnsim 022E7 -gopf 1D558 -grave 00060 -gscr 0210A -gsim 02273 -gsime 02A8E -gsiml 02A90 -gt 0003E -gtcc 02AA7 -gtcir 02A7A -gtdot 022D7 -gtlPar 02995 -gtquest 02A7C -gtrapprox 02A86 -gtrarr 02978 -gtrdot 022D7 -gtreqless 022DB -gtreqqless 02A8C -gtrless 02277 -gtrsim 02273 +gesles 02A94 +gfr 1D524 +gg 0226B +ggg 022D9 +gimel 02137 +gjcy 00453 +gl 02277 +glE 02A92 +gla 02AA5 +glj 02AA4 +gnE 02269 +gnap 02A8A +gnapprox 02A8A +gne 02A88 +gneq 02A88 +gneqq 02269 +gnsim 022E7 +gopf 1D558 +grave 00060 +gscr 0210A +gsim 02273 +gsime 02A8E +gsiml 02A90 +gt 0003E +gtcc 02AA7 +gtcir 02A7A +gtdot 022D7 +gtlPar 02995 +gtquest 02A7C +gtrapprox 02A86 +gtrarr 02978 +gtrdot 022D7 +gtreqless 022DB +gtreqqless 02A8C +gtrless 02277 +gtrsim 02273 gvertneqq 02269 0FE00 gvnE 02269 0FE00 -hArr 021D4 -hairsp 0200A -half 000BD -hamilt 0210B -hardcy 0044A -harr 02194 -harrcir 02948 -harrw 021AD -hbar 0210F -hcirc 00125 -hearts 02665 -heartsuit 02665 -hellip 02026 -hercon 022B9 -hfr 1D525 -hksearow 02925 -hkswarow 02926 -hoarr 021FF -homtht 0223B -hookleftarrow 021A9 -hookrightarrow 021AA -hopf 1D559 -horbar 02015 -hscr 1D4BD -hslash 0210F -hstrok 00127 -hybull 02043 -hyphen 02010 -iacute 000ED -ic 02063 -icirc 000EE -icy 00438 -iecy 00435 -iexcl 000A1 -iff 021D4 -ifr 1D526 -igrave 000EC -ii 02148 -iiiint 02A0C -iiint 0222D -iinfin 029DC -iiota 02129 -ijlig 00133 -imacr 0012B -image 02111 -imagline 02110 -imagpart 02111 -imath 00131 -imof 022B7 -imped 001B5 -in 02208 -incare 02105 -infin 0221E -infintie 029DD -inodot 00131 -int 0222B -intcal 022BA -integers 02124 -intercal 022BA -intlarhk 02A17 -intprod 02A3C -iocy 00451 -iogon 0012F -iopf 1D55A -iota 003B9 -iprod 02A3C -iquest 000BF -iscr 1D4BE -isin 02208 -isinE 022F9 -isindot 022F5 -isins 022F4 -isinsv 022F3 -isinv 02208 -it 02062 -itilde 00129 -iukcy 00456 -iuml 000EF -jcirc 00135 -jcy 00439 -jfr 1D527 -jmath 00237 -jopf 1D55B -jscr 1D4BF -jsercy 00458 -jukcy 00454 -kappa 003BA -kappav 003F0 -kcedil 00137 -kcy 0043A -kfr 1D528 -kgreen 00138 -khcy 00445 -kjcy 0045C -kopf 1D55C -kscr 1D4C0 -lAarr 021DA -lArr 021D0 -lAtail 0291B -lBarr 0290E -lE 02266 -lEg 02A8B -lHar 02962 -lacute 0013A -laemptyv 029B4 -lagran 02112 -lambda 003BB -lang 027E8 -langd 02991 -langle 027E8 -lap 02A85 -laquo 000AB -larr 02190 -larrb 021E4 -larrbfs 0291F -larrfs 0291D -larrhk 021A9 -larrlp 021AB -larrpl 02939 -larrsim 02973 -larrtl 021A2 -lat 02AAB -latail 02919 -late 02AAD +hArr 021D4 +hairsp 0200A +half 000BD +hamilt 0210B +hardcy 0044A +harr 02194 +harrcir 02948 +harrw 021AD +hbar 0210F +hcirc 00125 +hearts 02665 +heartsuit 02665 +hellip 02026 +hercon 022B9 +hfr 1D525 +hksearow 02925 +hkswarow 02926 +hoarr 021FF +homtht 0223B +hookleftarrow 021A9 +hookrightarrow 021AA +hopf 1D559 +horbar 02015 +hscr 1D4BD +hslash 0210F +hstrok 00127 +hybull 02043 +hyphen 02010 +iacute 000ED +ic 02063 +icirc 000EE +icy 00438 +iecy 00435 +iexcl 000A1 +iff 021D4 +ifr 1D526 +igrave 000EC +ii 02148 +iiiint 02A0C +iiint 0222D +iinfin 029DC +iiota 02129 +ijlig 00133 +imacr 0012B +image 02111 +imagline 02110 +imagpart 02111 +imath 00131 +imof 022B7 +imped 001B5 +in 02208 +incare 02105 +infin 0221E +infintie 029DD +inodot 00131 +int 0222B +intcal 022BA +integers 02124 +intercal 022BA +intlarhk 02A17 +intprod 02A3C +iocy 00451 +iogon 0012F +iopf 1D55A +iota 003B9 +iprod 02A3C +iquest 000BF +iscr 1D4BE +isin 02208 +isinE 022F9 +isindot 022F5 +isins 022F4 +isinsv 022F3 +isinv 02208 +it 02062 +itilde 00129 +iukcy 00456 +iuml 000EF +jcirc 00135 +jcy 00439 +jfr 1D527 +jmath 00237 +jopf 1D55B +jscr 1D4BF +jsercy 00458 +jukcy 00454 +kappa 003BA +kappav 003F0 +kcedil 00137 +kcy 0043A +kfr 1D528 +kgreen 00138 +khcy 00445 +kjcy 0045C +kopf 1D55C +kscr 1D4C0 +lAarr 021DA +lArr 021D0 +lAtail 0291B +lBarr 0290E +lE 02266 +lEg 02A8B +lHar 02962 +lacute 0013A +laemptyv 029B4 +lagran 02112 +lambda 003BB +lang 027E8 +langd 02991 +langle 027E8 +lap 02A85 +laquo 000AB +larr 02190 +larrb 021E4 +larrbfs 0291F +larrfs 0291D +larrhk 021A9 +larrlp 021AB +larrpl 02939 +larrsim 02973 +larrtl 021A2 +lat 02AAB +latail 02919 +late 02AAD lates 02AAD 0FE00 -lbarr 0290C -lbbrk 02772 -lbrace 0007B -lbrack 0005B -lbrke 0298B -lbrksld 0298F -lbrkslu 0298D -lcaron 0013E -lcedil 0013C -lceil 02308 -lcub 0007B -lcy 0043B -ldca 02936 -ldquo 0201C -ldquor 0201E -ldrdhar 02967 -ldrushar 0294B -ldsh 021B2 -le 02264 -leftarrow 02190 -leftarrowtail 021A2 -leftharpoondown 021BD -leftharpoonup 021BC -leftleftarrows 021C7 -leftrightarrow 02194 -leftrightarrows 021C6 -leftrightharpoons 021CB -leftrightsquigarrow 021AD -leftthreetimes 022CB -leg 022DA -leq 02264 -leqq 02266 -leqslant 02A7D -les 02A7D -lescc 02AA8 -lesdot 02A7F -lesdoto 02A81 -lesdotor 02A83 +lbarr 0290C +lbbrk 02772 +lbrace 0007B +lbrack 0005B +lbrke 0298B +lbrksld 0298F +lbrkslu 0298D +lcaron 0013E +lcedil 0013C +lceil 02308 +lcub 0007B +lcy 0043B +ldca 02936 +ldquo 0201C +ldquor 0201E +ldrdhar 02967 +ldrushar 0294B +ldsh 021B2 +le 02264 +leftarrow 02190 +leftarrowtail 021A2 +leftharpoondown 021BD +leftharpoonup 021BC +leftleftarrows 021C7 +leftrightarrow 02194 +leftrightarrows 021C6 +leftrightharpoons 021CB +leftrightsquigarrow 021AD +leftthreetimes 022CB +leg 022DA +leq 02264 +leqq 02266 +leqslant 02A7D +les 02A7D +lescc 02AA8 +lesdot 02A7F +lesdoto 02A81 +lesdotor 02A83 lesg 022DA 0FE00 -lesges 02A93 -lessapprox 02A85 -lessdot 022D6 -lesseqgtr 022DA -lesseqqgtr 02A8B -lessgtr 02276 -lesssim 02272 -lfisht 0297C -lfloor 0230A -lfr 1D529 -lg 02276 -lgE 02A91 -lhard 021BD -lharu 021BC -lharul 0296A -lhblk 02584 -ljcy 00459 -ll 0226A -llarr 021C7 -llcorner 0231E -llhard 0296B -lltri 025FA -lmidot 00140 -lmoust 023B0 -lmoustache 023B0 -lnE 02268 -lnap 02A89 -lnapprox 02A89 -lne 02A87 -lneq 02A87 -lneqq 02268 -lnsim 022E6 -loang 027EC -loarr 021FD -lobrk 027E6 -longleftarrow 027F5 -longleftrightarrow 027F7 -longmapsto 027FC -longrightarrow 027F6 -looparrowleft 021AB -looparrowright 021AC -lopar 02985 -lopf 1D55D -loplus 02A2D -lotimes 02A34 -lowast 02217 -lowbar 0005F -loz 025CA -lozenge 025CA -lozf 029EB -lpar 00028 -lparlt 02993 -lrarr 021C6 -lrcorner 0231F -lrhar 021CB -lrhard 0296D -lrm 0200E -lrtri 022BF -lsaquo 02039 -lscr 1D4C1 -lsh 021B0 -lsim 02272 -lsime 02A8D -lsimg 02A8F -lsqb 0005B -lsquo 02018 -lsquor 0201A -lstrok 00142 -lt 0003C -ltcc 02AA6 -ltcir 02A79 -ltdot 022D6 -lthree 022CB -ltimes 022C9 -ltlarr 02976 -ltquest 02A7B -ltrPar 02996 -ltri 025C3 -ltrie 022B4 -ltrif 025C2 -lurdshar 0294A -luruhar 02966 +lesges 02A93 +lessapprox 02A85 +lessdot 022D6 +lesseqgtr 022DA +lesseqqgtr 02A8B +lessgtr 02276 +lesssim 02272 +lfisht 0297C +lfloor 0230A +lfr 1D529 +lg 02276 +lgE 02A91 +lhard 021BD +lharu 021BC +lharul 0296A +lhblk 02584 +ljcy 00459 +ll 0226A +llarr 021C7 +llcorner 0231E +llhard 0296B +lltri 025FA +lmidot 00140 +lmoust 023B0 +lmoustache 023B0 +lnE 02268 +lnap 02A89 +lnapprox 02A89 +lne 02A87 +lneq 02A87 +lneqq 02268 +lnsim 022E6 +loang 027EC +loarr 021FD +lobrk 027E6 +longleftarrow 027F5 +longleftrightarrow 027F7 +longmapsto 027FC +longrightarrow 027F6 +looparrowleft 021AB +looparrowright 021AC +lopar 02985 +lopf 1D55D +loplus 02A2D +lotimes 02A34 +lowast 02217 +lowbar 0005F +loz 025CA +lozenge 025CA +lozf 029EB +lpar 00028 +lparlt 02993 +lrarr 021C6 +lrcorner 0231F +lrhar 021CB +lrhard 0296D +lrm 0200E +lrtri 022BF +lsaquo 02039 +lscr 1D4C1 +lsh 021B0 +lsim 02272 +lsime 02A8D +lsimg 02A8F +lsqb 0005B +lsquo 02018 +lsquor 0201A +lstrok 00142 +lt 0003C +ltcc 02AA6 +ltcir 02A79 +ltdot 022D6 +lthree 022CB +ltimes 022C9 +ltlarr 02976 +ltquest 02A7B +ltrPar 02996 +ltri 025C3 +ltrie 022B4 +ltrif 025C2 +lurdshar 0294A +luruhar 02966 lvertneqq 02268 0FE00 lvnE 02268 0FE00 -mDDot 0223A -macr 000AF -male 02642 -malt 02720 -maltese 02720 -map 021A6 -mapsto 021A6 -mapstodown 021A7 -mapstoleft 021A4 -mapstoup 021A5 -marker 025AE -mcomma 02A29 -mcy 0043C -mdash 02014 -measuredangle 02221 -mfr 1D52A -mho 02127 -micro 000B5 -mid 02223 -midast 0002A -midcir 02AF0 -middot 000B7 -minus 02212 -minusb 0229F -minusd 02238 -minusdu 02A2A -mlcp 02ADB -mldr 02026 -mnplus 02213 -models 022A7 -mopf 1D55E -mp 02213 -mscr 1D4C2 -mstpos 0223E -mu 003BC -multimap 022B8 -mumap 022B8 +mDDot 0223A +macr 000AF +male 02642 +malt 02720 +maltese 02720 +map 021A6 +mapsto 021A6 +mapstodown 021A7 +mapstoleft 021A4 +mapstoup 021A5 +marker 025AE +mcomma 02A29 +mcy 0043C +mdash 02014 +measuredangle 02221 +mfr 1D52A +mho 02127 +micro 000B5 +mid 02223 +midast 0002A +midcir 02AF0 +middot 000B7 +minus 02212 +minusb 0229F +minusd 02238 +minusdu 02A2A +mlcp 02ADB +mldr 02026 +mnplus 02213 +models 022A7 +mopf 1D55E +mp 02213 +mscr 1D4C2 +mstpos 0223E +mu 003BC +multimap 022B8 +mumap 022B8 nGg 022D9 00338 nGt 0226B 020D2 nGtv 0226B 00338 -nLeftarrow 021CD -nLeftrightarrow 021CE +nLeftarrow 021CD +nLeftrightarrow 021CE nLl 022D8 00338 nLt 0226A 020D2 nLtv 0226A 00338 -nRightarrow 021CF -nVDash 022AF -nVdash 022AE -nabla 02207 -nacute 00144 +nRightarrow 021CF +nVDash 022AF +nVdash 022AE +nabla 02207 +nacute 00144 nang 02220 020D2 -nap 02249 +nap 02249 napE 02A70 00338 napid 0224B 00338 -napos 00149 -napprox 02249 -natur 0266E -natural 0266E -naturals 02115 -nbsp 000A0 +napos 00149 +napprox 02249 +natur 0266E +natural 0266E +naturals 02115 +nbsp 000A0 nbump 0224E 00338 nbumpe 0224F 00338 -ncap 02A43 -ncaron 00148 -ncedil 00146 -ncong 02247 +ncap 02A43 +ncaron 00148 +ncedil 00146 +ncong 02247 ncongdot 02A6D 00338 -ncup 02A42 -ncy 0043D -ndash 02013 -ne 02260 -neArr 021D7 -nearhk 02924 -nearr 02197 -nearrow 02197 +ncup 02A42 +ncy 0043D +ndash 02013 +ne 02260 +neArr 021D7 +nearhk 02924 +nearr 02197 +nearrow 02197 nedot 02250 00338 -nequiv 02262 -nesear 02928 +nequiv 02262 +nesear 02928 nesim 02242 00338 -nexist 02204 -nexists 02204 -nfr 1D52B +nexist 02204 +nexists 02204 +nfr 1D52B ngE 02267 00338 -nge 02271 -ngeq 02271 +nge 02271 +ngeq 02271 ngeqq 02267 00338 ngeqslant 02A7E 00338 nges 02A7E 00338 -ngsim 02275 -ngt 0226F -ngtr 0226F -nhArr 021CE -nharr 021AE -nhpar 02AF2 -ni 0220B -nis 022FC -nisd 022FA -niv 0220B -njcy 0045A -nlArr 021CD +ngsim 02275 +ngt 0226F +ngtr 0226F +nhArr 021CE +nharr 021AE +nhpar 02AF2 +ni 0220B +nis 022FC +nisd 022FA +niv 0220B +njcy 0045A +nlArr 021CD nlE 02266 00338 -nlarr 0219A -nldr 02025 -nle 02270 -nleftarrow 0219A -nleftrightarrow 021AE -nleq 02270 +nlarr 0219A +nldr 02025 +nle 02270 +nleftarrow 0219A +nleftrightarrow 021AE +nleq 02270 nleqq 02266 00338 nleqslant 02A7D 00338 nles 02A7D 00338 -nless 0226E -nlsim 02274 -nlt 0226E -nltri 022EA -nltrie 022EC -nmid 02224 -nopf 1D55F -not 000AC -notin 02209 +nless 0226E +nlsim 02274 +nlt 0226E +nltri 022EA +nltrie 022EC +nmid 02224 +nopf 1D55F +not 000AC +notin 02209 notinE 022F9 00338 notindot 022F5 00338 -notinva 02209 -notinvb 022F7 -notinvc 022F6 -notni 0220C -notniva 0220C -notnivb 022FE -notnivc 022FD -npar 02226 -nparallel 02226 +notinva 02209 +notinvb 022F7 +notinvc 022F6 +notni 0220C +notniva 0220C +notnivb 022FE +notnivc 022FD +npar 02226 +nparallel 02226 nparsl 02AFD 020E5 npart 02202 00338 -npolint 02A14 -npr 02280 -nprcue 022E0 +npolint 02A14 +npr 02280 +nprcue 022E0 npre 02AAF 00338 -nprec 02280 +nprec 02280 npreceq 02AAF 00338 -nrArr 021CF -nrarr 0219B +nrArr 021CF +nrarr 0219B nrarrc 02933 00338 nrarrw 0219D 00338 -nrightarrow 0219B -nrtri 022EB -nrtrie 022ED -nsc 02281 -nsccue 022E1 +nrightarrow 0219B +nrtri 022EB +nrtrie 022ED +nsc 02281 +nsccue 022E1 nsce 02AB0 00338 -nscr 1D4C3 -nshortmid 02224 -nshortparallel 02226 -nsim 02241 -nsime 02244 -nsimeq 02244 -nsmid 02224 -nspar 02226 -nsqsube 022E2 -nsqsupe 022E3 -nsub 02284 +nscr 1D4C3 +nshortmid 02224 +nshortparallel 02226 +nsim 02241 +nsime 02244 +nsimeq 02244 +nsmid 02224 +nspar 02226 +nsqsube 022E2 +nsqsupe 022E3 +nsub 02284 nsubE 02AC5 00338 -nsube 02288 +nsube 02288 nsubset 02282 020D2 -nsubseteq 02288 +nsubseteq 02288 nsubseteqq 02AC5 00338 -nsucc 02281 +nsucc 02281 nsucceq 02AB0 00338 -nsup 02285 +nsup 02285 nsupE 02AC6 00338 -nsupe 02289 +nsupe 02289 nsupset 02283 020D2 -nsupseteq 02289 +nsupseteq 02289 nsupseteqq 02AC6 00338 -ntgl 02279 -ntilde 000F1 -ntlg 02278 -ntriangleleft 022EA -ntrianglelefteq 022EC -ntriangleright 022EB -ntrianglerighteq 022ED -nu 003BD -num 00023 -numero 02116 -numsp 02007 -nvDash 022AD -nvHarr 02904 +ntgl 02279 +ntilde 000F1 +ntlg 02278 +ntriangleleft 022EA +ntrianglelefteq 022EC +ntriangleright 022EB +ntrianglerighteq 022ED +nu 003BD +num 00023 +numero 02116 +numsp 02007 +nvDash 022AD +nvHarr 02904 nvap 0224D 020D2 -nvdash 022AC +nvdash 022AC nvge 02265 020D2 nvgt 0003E 020D2 -nvinfin 029DE -nvlArr 02902 +nvinfin 029DE +nvlArr 02902 nvle 02264 020D2 nvlt 0003C 020D2 nvltrie 022B4 020D2 -nvrArr 02903 +nvrArr 02903 nvrtrie 022B5 020D2 nvsim 0223C 020D2 -nwArr 021D6 -nwarhk 02923 -nwarr 02196 -nwarrow 02196 -nwnear 02927 -oS 024C8 -oacute 000F3 -oast 0229B -ocir 0229A -ocirc 000F4 -ocy 0043E -odash 0229D -odblac 00151 -odiv 02A38 -odot 02299 -odsold 029BC -oelig 00153 -ofcir 029BF -ofr 1D52C -ogon 002DB -ograve 000F2 -ogt 029C1 -ohbar 029B5 -ohm 003A9 -oint 0222E -olarr 021BA -olcir 029BE -olcross 029BB -oline 0203E -olt 029C0 -omacr 0014D -omega 003C9 -omicron 003BF -omid 029B6 -ominus 02296 -oopf 1D560 -opar 029B7 -operp 029B9 -oplus 02295 -or 02228 -orarr 021BB -ord 02A5D -order 02134 -orderof 02134 -ordf 000AA -ordm 000BA -origof 022B6 -oror 02A56 -orslope 02A57 -orv 02A5B -oscr 02134 -oslash 000F8 -osol 02298 -otilde 000F5 -otimes 02297 -otimesas 02A36 -ouml 000F6 -ovbar 0233D -par 02225 -para 000B6 -parallel 02225 -parsim 02AF3 -parsl 02AFD -part 02202 -pcy 0043F -percnt 00025 -period 0002E -permil 02030 -perp 022A5 -pertenk 02031 -pfr 1D52D -phi 003C6 -phiv 003D5 -phmmat 02133 -phone 0260E -pi 003C0 -pitchfork 022D4 -piv 003D6 -planck 0210F -planckh 0210E -plankv 0210F -plus 0002B -plusacir 02A23 -plusb 0229E -pluscir 02A22 -plusdo 02214 -plusdu 02A25 -pluse 02A72 -plusmn 000B1 -plussim 02A26 -plustwo 02A27 -pm 000B1 -pointint 02A15 -popf 1D561 -pound 000A3 -pr 0227A -prE 02AB3 -prap 02AB7 -prcue 0227C -pre 02AAF -prec 0227A -precapprox 02AB7 -preccurlyeq 0227C -preceq 02AAF -precnapprox 02AB9 -precneqq 02AB5 -precnsim 022E8 -precsim 0227E -prime 02032 -primes 02119 -prnE 02AB5 -prnap 02AB9 -prnsim 022E8 -prod 0220F -profalar 0232E -profline 02312 -profsurf 02313 -prop 0221D -propto 0221D -prsim 0227E -prurel 022B0 -pscr 1D4C5 -psi 003C8 -puncsp 02008 -qfr 1D52E -qint 02A0C -qopf 1D562 -qprime 02057 -qscr 1D4C6 -quaternions 0210D -quatint 02A16 -quest 0003F -questeq 0225F -quot 00022 -rAarr 021DB -rArr 021D2 -rAtail 0291C -rBarr 0290F -rHar 02964 +nwArr 021D6 +nwarhk 02923 +nwarr 02196 +nwarrow 02196 +nwnear 02927 +oS 024C8 +oacute 000F3 +oast 0229B +ocir 0229A +ocirc 000F4 +ocy 0043E +odash 0229D +odblac 00151 +odiv 02A38 +odot 02299 +odsold 029BC +oelig 00153 +ofcir 029BF +ofr 1D52C +ogon 002DB +ograve 000F2 +ogt 029C1 +ohbar 029B5 +ohm 003A9 +oint 0222E +olarr 021BA +olcir 029BE +olcross 029BB +oline 0203E +olt 029C0 +omacr 0014D +omega 003C9 +omicron 003BF +omid 029B6 +ominus 02296 +oopf 1D560 +opar 029B7 +operp 029B9 +oplus 02295 +or 02228 +orarr 021BB +ord 02A5D +order 02134 +orderof 02134 +ordf 000AA +ordm 000BA +origof 022B6 +oror 02A56 +orslope 02A57 +orv 02A5B +oscr 02134 +oslash 000F8 +osol 02298 +otilde 000F5 +otimes 02297 +otimesas 02A36 +ouml 000F6 +ovbar 0233D +par 02225 +para 000B6 +parallel 02225 +parsim 02AF3 +parsl 02AFD +part 02202 +pcy 0043F +percnt 00025 +period 0002E +permil 02030 +perp 022A5 +pertenk 02031 +pfr 1D52D +phi 003C6 +phiv 003D5 +phmmat 02133 +phone 0260E +pi 003C0 +pitchfork 022D4 +piv 003D6 +planck 0210F +planckh 0210E +plankv 0210F +plus 0002B +plusacir 02A23 +plusb 0229E +pluscir 02A22 +plusdo 02214 +plusdu 02A25 +pluse 02A72 +plusmn 000B1 +plussim 02A26 +plustwo 02A27 +pm 000B1 +pointint 02A15 +popf 1D561 +pound 000A3 +pr 0227A +prE 02AB3 +prap 02AB7 +prcue 0227C +pre 02AAF +prec 0227A +precapprox 02AB7 +preccurlyeq 0227C +preceq 02AAF +precnapprox 02AB9 +precneqq 02AB5 +precnsim 022E8 +precsim 0227E +prime 02032 +primes 02119 +prnE 02AB5 +prnap 02AB9 +prnsim 022E8 +prod 0220F +profalar 0232E +profline 02312 +profsurf 02313 +prop 0221D +propto 0221D +prsim 0227E +prurel 022B0 +pscr 1D4C5 +psi 003C8 +puncsp 02008 +qfr 1D52E +qint 02A0C +qopf 1D562 +qprime 02057 +qscr 1D4C6 +quaternions 0210D +quatint 02A16 +quest 0003F +questeq 0225F +quot 00022 +rAarr 021DB +rArr 021D2 +rAtail 0291C +rBarr 0290F +rHar 02964 race 0223D 00331 -racute 00155 -radic 0221A -raemptyv 029B3 -rang 027E9 -rangd 02992 -range 029A5 -rangle 027E9 -raquo 000BB -rarr 02192 -rarrap 02975 -rarrb 021E5 -rarrbfs 02920 -rarrc 02933 -rarrfs 0291E -rarrhk 021AA -rarrlp 021AC -rarrpl 02945 -rarrsim 02974 -rarrtl 021A3 -rarrw 0219D -ratail 0291A -ratio 02236 -rationals 0211A -rbarr 0290D -rbbrk 02773 -rbrace 0007D -rbrack 0005D -rbrke 0298C -rbrksld 0298E -rbrkslu 02990 -rcaron 00159 -rcedil 00157 -rceil 02309 -rcub 0007D -rcy 00440 -rdca 02937 -rdldhar 02969 -rdquo 0201D -rdquor 0201D -rdsh 021B3 -real 0211C -realine 0211B -realpart 0211C -reals 0211D -rect 025AD -reg 000AE -rfisht 0297D -rfloor 0230B -rfr 1D52F -rhard 021C1 -rharu 021C0 -rharul 0296C -rho 003C1 -rhov 003F1 -rightarrow 02192 -rightarrowtail 021A3 -rightharpoondown 021C1 -rightharpoonup 021C0 -rightleftarrows 021C4 -rightleftharpoons 021CC -rightrightarrows 021C9 -rightsquigarrow 0219D -rightthreetimes 022CC -ring 002DA -risingdotseq 02253 -rlarr 021C4 -rlhar 021CC -rlm 0200F -rmoust 023B1 -rmoustache 023B1 -rnmid 02AEE -roang 027ED -roarr 021FE -robrk 027E7 -ropar 02986 -ropf 1D563 -roplus 02A2E -rotimes 02A35 -rpar 00029 -rpargt 02994 -rppolint 02A12 -rrarr 021C9 -rsaquo 0203A -rscr 1D4C7 -rsh 021B1 -rsqb 0005D -rsquo 02019 -rsquor 02019 -rthree 022CC -rtimes 022CA -rtri 025B9 -rtrie 022B5 -rtrif 025B8 -rtriltri 029CE -ruluhar 02968 -rx 0211E -sacute 0015B -sbquo 0201A -sc 0227B -scE 02AB4 -scap 02AB8 -scaron 00161 -sccue 0227D -sce 02AB0 -scedil 0015F -scirc 0015D -scnE 02AB6 -scnap 02ABA -scnsim 022E9 -scpolint 02A13 -scsim 0227F -scy 00441 -sdot 022C5 -sdotb 022A1 -sdote 02A66 -seArr 021D8 -searhk 02925 -searr 02198 -searrow 02198 -sect 000A7 -semi 0003B -seswar 02929 -setminus 02216 -setmn 02216 -sext 02736 -sfr 1D530 -sfrown 02322 -sharp 0266F -shchcy 00449 -shcy 00448 -shortmid 02223 -shortparallel 02225 -shy 000AD -sigma 003C3 -sigmaf 003C2 -sigmav 003C2 -sim 0223C -simdot 02A6A -sime 02243 -simeq 02243 -simg 02A9E -simgE 02AA0 -siml 02A9D -simlE 02A9F -simne 02246 -simplus 02A24 -simrarr 02972 -slarr 02190 -smallsetminus 02216 -smashp 02A33 -smeparsl 029E4 -smid 02223 -smile 02323 -smt 02AAA -smte 02AAC +racute 00155 +radic 0221A +raemptyv 029B3 +rang 027E9 +rangd 02992 +range 029A5 +rangle 027E9 +raquo 000BB +rarr 02192 +rarrap 02975 +rarrb 021E5 +rarrbfs 02920 +rarrc 02933 +rarrfs 0291E +rarrhk 021AA +rarrlp 021AC +rarrpl 02945 +rarrsim 02974 +rarrtl 021A3 +rarrw 0219D +ratail 0291A +ratio 02236 +rationals 0211A +rbarr 0290D +rbbrk 02773 +rbrace 0007D +rbrack 0005D +rbrke 0298C +rbrksld 0298E +rbrkslu 02990 +rcaron 00159 +rcedil 00157 +rceil 02309 +rcub 0007D +rcy 00440 +rdca 02937 +rdldhar 02969 +rdquo 0201D +rdquor 0201D +rdsh 021B3 +real 0211C +realine 0211B +realpart 0211C +reals 0211D +rect 025AD +reg 000AE +rfisht 0297D +rfloor 0230B +rfr 1D52F +rhard 021C1 +rharu 021C0 +rharul 0296C +rho 003C1 +rhov 003F1 +rightarrow 02192 +rightarrowtail 021A3 +rightharpoondown 021C1 +rightharpoonup 021C0 +rightleftarrows 021C4 +rightleftharpoons 021CC +rightrightarrows 021C9 +rightsquigarrow 0219D +rightthreetimes 022CC +ring 002DA +risingdotseq 02253 +rlarr 021C4 +rlhar 021CC +rlm 0200F +rmoust 023B1 +rmoustache 023B1 +rnmid 02AEE +roang 027ED +roarr 021FE +robrk 027E7 +ropar 02986 +ropf 1D563 +roplus 02A2E +rotimes 02A35 +rpar 00029 +rpargt 02994 +rppolint 02A12 +rrarr 021C9 +rsaquo 0203A +rscr 1D4C7 +rsh 021B1 +rsqb 0005D +rsquo 02019 +rsquor 02019 +rthree 022CC +rtimes 022CA +rtri 025B9 +rtrie 022B5 +rtrif 025B8 +rtriltri 029CE +ruluhar 02968 +rx 0211E +sacute 0015B +sbquo 0201A +sc 0227B +scE 02AB4 +scap 02AB8 +scaron 00161 +sccue 0227D +sce 02AB0 +scedil 0015F +scirc 0015D +scnE 02AB6 +scnap 02ABA +scnsim 022E9 +scpolint 02A13 +scsim 0227F +scy 00441 +sdot 022C5 +sdotb 022A1 +sdote 02A66 +seArr 021D8 +searhk 02925 +searr 02198 +searrow 02198 +sect 000A7 +semi 0003B +seswar 02929 +setminus 02216 +setmn 02216 +sext 02736 +sfr 1D530 +sfrown 02322 +sharp 0266F +shchcy 00449 +shcy 00448 +shortmid 02223 +shortparallel 02225 +shy 000AD +sigma 003C3 +sigmaf 003C2 +sigmav 003C2 +sim 0223C +simdot 02A6A +sime 02243 +simeq 02243 +simg 02A9E +simgE 02AA0 +siml 02A9D +simlE 02A9F +simne 02246 +simplus 02A24 +simrarr 02972 +slarr 02190 +smallsetminus 02216 +smashp 02A33 +smeparsl 029E4 +smid 02223 +smile 02323 +smt 02AAA +smte 02AAC smtes 02AAC 0FE00 -softcy 0044C -sol 0002F -solb 029C4 -solbar 0233F -sopf 1D564 -spades 02660 -spadesuit 02660 -spar 02225 -sqcap 02293 +softcy 0044C +sol 0002F +solb 029C4 +solbar 0233F +sopf 1D564 +spades 02660 +spadesuit 02660 +spar 02225 +sqcap 02293 sqcaps 02293 0FE00 -sqcup 02294 +sqcup 02294 sqcups 02294 0FE00 -sqsub 0228F -sqsube 02291 -sqsubset 0228F -sqsubseteq 02291 -sqsup 02290 -sqsupe 02292 -sqsupset 02290 -sqsupseteq 02292 -squ 025A1 -square 025A1 -squarf 025AA -squf 025AA -srarr 02192 -sscr 1D4C8 -ssetmn 02216 -ssmile 02323 -sstarf 022C6 -star 02606 -starf 02605 -straightepsilon 003F5 -straightphi 003D5 -strns 000AF -sub 02282 -subE 02AC5 -subdot 02ABD -sube 02286 -subedot 02AC3 -submult 02AC1 -subnE 02ACB -subne 0228A -subplus 02ABF -subrarr 02979 -subset 02282 -subseteq 02286 -subseteqq 02AC5 -subsetneq 0228A -subsetneqq 02ACB -subsim 02AC7 -subsub 02AD5 -subsup 02AD3 -succ 0227B -succapprox 02AB8 -succcurlyeq 0227D -succeq 02AB0 -succnapprox 02ABA -succneqq 02AB6 -succnsim 022E9 -succsim 0227F -sum 02211 -sung 0266A -sup 02283 -sup1 000B9 -sup2 000B2 -sup3 000B3 -supE 02AC6 -supdot 02ABE -supdsub 02AD8 -supe 02287 -supedot 02AC4 -suphsol 027C9 -suphsub 02AD7 -suplarr 0297B -supmult 02AC2 -supnE 02ACC -supne 0228B -supplus 02AC0 -supset 02283 -supseteq 02287 -supseteqq 02AC6 -supsetneq 0228B -supsetneqq 02ACC -supsim 02AC8 -supsub 02AD4 -supsup 02AD6 -swArr 021D9 -swarhk 02926 -swarr 02199 -swarrow 02199 -swnwar 0292A -szlig 000DF -target 02316 -tau 003C4 -tbrk 023B4 -tcaron 00165 -tcedil 00163 -tcy 00442 -tdot 020DB -telrec 02315 -tfr 1D531 -there4 02234 -therefore 02234 -theta 003B8 -thetasym 003D1 -thetav 003D1 -thickapprox 02248 -thicksim 0223C -thinsp 02009 -thkap 02248 -thksim 0223C -thorn 000FE -tilde 002DC -times 000D7 -timesb 022A0 -timesbar 02A31 -timesd 02A30 -tint 0222D -toea 02928 -top 022A4 -topbot 02336 -topcir 02AF1 -topf 1D565 -topfork 02ADA -tosa 02929 -tprime 02034 -trade 02122 -triangle 025B5 -triangledown 025BF -triangleleft 025C3 -trianglelefteq 022B4 -triangleq 0225C -triangleright 025B9 -trianglerighteq 022B5 -tridot 025EC -trie 0225C -triminus 02A3A -triplus 02A39 -trisb 029CD -tritime 02A3B -trpezium 023E2 -tscr 1D4C9 -tscy 00446 -tshcy 0045B -tstrok 00167 -twixt 0226C -twoheadleftarrow 0219E -twoheadrightarrow 021A0 -uArr 021D1 -uHar 02963 -uacute 000FA -uarr 02191 -ubrcy 0045E -ubreve 0016D -ucirc 000FB -ucy 00443 -udarr 021C5 -udblac 00171 -udhar 0296E -ufisht 0297E -ufr 1D532 -ugrave 000F9 -uharl 021BF -uharr 021BE -uhblk 02580 -ulcorn 0231C -ulcorner 0231C -ulcrop 0230F -ultri 025F8 -umacr 0016B -uml 000A8 -uogon 00173 -uopf 1D566 -uparrow 02191 -updownarrow 02195 -upharpoonleft 021BF -upharpoonright 021BE -uplus 0228E -upsi 003C5 -upsih 003D2 -upsilon 003C5 -upuparrows 021C8 -urcorn 0231D -urcorner 0231D -urcrop 0230E -uring 0016F -urtri 025F9 -uscr 1D4CA -utdot 022F0 -utilde 00169 -utri 025B5 -utrif 025B4 -uuarr 021C8 -uuml 000FC -uwangle 029A7 -vArr 021D5 -vBar 02AE8 -vBarv 02AE9 -vDash 022A8 -vangrt 0299C -varepsilon 003F5 -varkappa 003F0 -varnothing 02205 -varphi 003D5 -varpi 003D6 -varpropto 0221D -varr 02195 -varrho 003F1 -varsigma 003C2 +sqsub 0228F +sqsube 02291 +sqsubset 0228F +sqsubseteq 02291 +sqsup 02290 +sqsupe 02292 +sqsupset 02290 +sqsupseteq 02292 +squ 025A1 +square 025A1 +squarf 025AA +squf 025AA +srarr 02192 +sscr 1D4C8 +ssetmn 02216 +ssmile 02323 +sstarf 022C6 +star 02606 +starf 02605 +straightepsilon 003F5 +straightphi 003D5 +strns 000AF +sub 02282 +subE 02AC5 +subdot 02ABD +sube 02286 +subedot 02AC3 +submult 02AC1 +subnE 02ACB +subne 0228A +subplus 02ABF +subrarr 02979 +subset 02282 +subseteq 02286 +subseteqq 02AC5 +subsetneq 0228A +subsetneqq 02ACB +subsim 02AC7 +subsub 02AD5 +subsup 02AD3 +succ 0227B +succapprox 02AB8 +succcurlyeq 0227D +succeq 02AB0 +succnapprox 02ABA +succneqq 02AB6 +succnsim 022E9 +succsim 0227F +sum 02211 +sung 0266A +sup 02283 +sup1 000B9 +sup2 000B2 +sup3 000B3 +supE 02AC6 +supdot 02ABE +supdsub 02AD8 +supe 02287 +supedot 02AC4 +suphsol 027C9 +suphsub 02AD7 +suplarr 0297B +supmult 02AC2 +supnE 02ACC +supne 0228B +supplus 02AC0 +supset 02283 +supseteq 02287 +supseteqq 02AC6 +supsetneq 0228B +supsetneqq 02ACC +supsim 02AC8 +supsub 02AD4 +supsup 02AD6 +swArr 021D9 +swarhk 02926 +swarr 02199 +swarrow 02199 +swnwar 0292A +szlig 000DF +target 02316 +tau 003C4 +tbrk 023B4 +tcaron 00165 +tcedil 00163 +tcy 00442 +tdot 020DB +telrec 02315 +tfr 1D531 +there4 02234 +therefore 02234 +theta 003B8 +thetasym 003D1 +thetav 003D1 +thickapprox 02248 +thicksim 0223C +thinsp 02009 +thkap 02248 +thksim 0223C +thorn 000FE +tilde 002DC +times 000D7 +timesb 022A0 +timesbar 02A31 +timesd 02A30 +tint 0222D +toea 02928 +top 022A4 +topbot 02336 +topcir 02AF1 +topf 1D565 +topfork 02ADA +tosa 02929 +tprime 02034 +trade 02122 +triangle 025B5 +triangledown 025BF +triangleleft 025C3 +trianglelefteq 022B4 +triangleq 0225C +triangleright 025B9 +trianglerighteq 022B5 +tridot 025EC +trie 0225C +triminus 02A3A +triplus 02A39 +trisb 029CD +tritime 02A3B +trpezium 023E2 +tscr 1D4C9 +tscy 00446 +tshcy 0045B +tstrok 00167 +twixt 0226C +twoheadleftarrow 0219E +twoheadrightarrow 021A0 +uArr 021D1 +uHar 02963 +uacute 000FA +uarr 02191 +ubrcy 0045E +ubreve 0016D +ucirc 000FB +ucy 00443 +udarr 021C5 +udblac 00171 +udhar 0296E +ufisht 0297E +ufr 1D532 +ugrave 000F9 +uharl 021BF +uharr 021BE +uhblk 02580 +ulcorn 0231C +ulcorner 0231C +ulcrop 0230F +ultri 025F8 +umacr 0016B +uml 000A8 +uogon 00173 +uopf 1D566 +uparrow 02191 +updownarrow 02195 +upharpoonleft 021BF +upharpoonright 021BE +uplus 0228E +upsi 003C5 +upsih 003D2 +upsilon 003C5 +upuparrows 021C8 +urcorn 0231D +urcorner 0231D +urcrop 0230E +uring 0016F +urtri 025F9 +uscr 1D4CA +utdot 022F0 +utilde 00169 +utri 025B5 +utrif 025B4 +uuarr 021C8 +uuml 000FC +uwangle 029A7 +vArr 021D5 +vBar 02AE8 +vBarv 02AE9 +vDash 022A8 +vangrt 0299C +varepsilon 003F5 +varkappa 003F0 +varnothing 02205 +varphi 003D5 +varpi 003D6 +varpropto 0221D +varr 02195 +varrho 003F1 +varsigma 003C2 varsubsetneq 0228A 0FE00 varsubsetneqq 02ACB 0FE00 varsupsetneq 0228B 0FE00 varsupsetneqq 02ACC 0FE00 -vartheta 003D1 -vartriangleleft 022B2 -vartriangleright 022B3 -vcy 00432 -vdash 022A2 -vee 02228 -veebar 022BB -veeeq 0225A -vellip 022EE -verbar 0007C -vert 0007C -vfr 1D533 -vltri 022B2 +vartheta 003D1 +vartriangleleft 022B2 +vartriangleright 022B3 +vcy 00432 +vdash 022A2 +vee 02228 +veebar 022BB +veeeq 0225A +vellip 022EE +verbar 0007C +vert 0007C +vfr 1D533 +vltri 022B2 vnsub 02282 020D2 vnsup 02283 020D2 -vopf 1D567 -vprop 0221D -vrtri 022B3 -vscr 1D4CB +vopf 1D567 +vprop 0221D +vrtri 022B3 +vscr 1D4CB vsubnE 02ACB 0FE00 vsubne 0228A 0FE00 vsupnE 02ACC 0FE00 vsupne 0228B 0FE00 -vzigzag 0299A -wcirc 00175 -wedbar 02A5F -wedge 02227 -wedgeq 02259 -weierp 02118 -wfr 1D534 -wopf 1D568 -wp 02118 -wr 02240 -wreath 02240 -wscr 1D4CC -xcap 022C2 -xcirc 025EF -xcup 022C3 -xdtri 025BD -xfr 1D535 -xhArr 027FA -xharr 027F7 -xi 003BE -xlArr 027F8 -xlarr 027F5 -xmap 027FC -xnis 022FB -xodot 02A00 -xopf 1D569 -xoplus 02A01 -xotime 02A02 -xrArr 027F9 -xrarr 027F6 -xscr 1D4CD -xsqcup 02A06 -xuplus 02A04 -xutri 025B3 -xvee 022C1 -xwedge 022C0 -yacute 000FD -yacy 0044F -ycirc 00177 -ycy 0044B -yen 000A5 -yfr 1D536 -yicy 00457 -yopf 1D56A -yscr 1D4CE -yucy 0044E -yuml 000FF -zacute 0017A -zcaron 0017E -zcy 00437 -zdot 0017C -zeetrf 02128 -zeta 003B6 -zfr 1D537 -zhcy 00436 -zigrarr 021DD -zopf 1D56B -zscr 1D4CF -zwj 0200D -zwnj 0200C
\ No newline at end of file +vzigzag 0299A +wcirc 00175 +wedbar 02A5F +wedge 02227 +wedgeq 02259 +weierp 02118 +wfr 1D534 +wopf 1D568 +wp 02118 +wr 02240 +wreath 02240 +wscr 1D4CC +xcap 022C2 +xcirc 025EF +xcup 022C3 +xdtri 025BD +xfr 1D535 +xhArr 027FA +xharr 027F7 +xi 003BE +xlArr 027F8 +xlarr 027F5 +xmap 027FC +xnis 022FB +xodot 02A00 +xopf 1D569 +xoplus 02A01 +xotime 02A02 +xrArr 027F9 +xrarr 027F6 +xscr 1D4CD +xsqcup 02A06 +xuplus 02A04 +xutri 025B3 +xvee 022C1 +xwedge 022C0 +yacute 000FD +yacy 0044F +ycirc 00177 +ycy 0044B +yen 000A5 +yfr 1D536 +yicy 00457 +yopf 1D56A +yscr 1D4CE +yucy 0044E +yuml 000FF +zacute 0017A +zcaron 0017E +zcy 00437 +zdot 0017C +zeetrf 02128 +zeta 003B6 +zfr 1D537 +zhcy 00436 +zigrarr 021DD +zopf 1D56B +zscr 1D4CF +zwj 0200D +zwnj 0200C
\ No newline at end of file diff --git a/ext/standard/html_tables/html_table_gen.php b/ext/standard/html_tables/html_table_gen.php index 5d7a0066cf..d850d1c7ff 100644 --- a/ext/standard/html_tables/html_table_gen.php +++ b/ext/standard/html_tables/html_table_gen.php @@ -188,10 +188,10 @@ foreach ($encodings as $e) { if (preg_match("/^0x([0-9A-Z]{2})\t0x([0-9A-Z]{2,})/i", $l, $matches)) $map[] = array($matches[1], $matches[2]); } - + $mappy = array(); foreach ($map as $v) { $mappy[hexdec($v[0])] = hexdec($v[1]); } - + $mstable = array("ident" => $e['ident']); /* calculate two-stage tables */ for ($i = 0; $i < 4; $i++) { @@ -200,7 +200,7 @@ foreach ($encodings as $e) { $mstable[$i][$j] = isset($mappy[$cp]) ? $mappy[$cp] : NULL; } } - + echo "/* {{{ Stage 2 tables for {$e['name']} */\n\n"; @@ -210,9 +210,9 @@ foreach ($encodings as $e) { $s2tables_idents[$i] = $encodings[$t[0]/5]["ident"]; continue; } - + $s2tables_idents[$i] = $e["ident"]; - + echo "static const enc_to_uni_stage2 enc_to_uni_s2_{$e['ident']}_". sprintf("%02X", $i << 6)." = { {\n"; for ($j = 0; $j < 64; $j++) { @@ -225,10 +225,10 @@ foreach ($encodings as $e) { echo "0xFFFF,"; /* special value; indicates no mapping */ } echo "\n} };\n\n"; - + $prevStage2[] = $mstable[$i]; } - + echo "/* end of stage 2 tables for {$e['name']} }}} */\n\n"; @@ -331,23 +331,23 @@ foreach ($encodings as $e) { if (preg_match("/^0x([0-9A-Z]{2})\t0x([0-9A-Z]{2,})\s+#\s*(.*)$/i", $l, $matches)) $map[] = array($matches[1], $matches[2], rtrim($matches[3])); } - + $mappy = array(); foreach ($map as $v) { if (hexdec($v[0]) >= $e['range'][0] && hexdec($v[0]) <= $e['range'][1]) $mappy[hexdec($v[1])] = array(hexdec($v[0]), strtolower($v[2])); } ksort($mappy); - + echo "static const uni_to_enc unimap_{$e['ident']}[] = {\n"; - + foreach ($mappy as $k => $v) { echo "\t{ ", sprintf("0x%04X", $k), ", ", sprintf("0x%02X", $v[0]), " },\t/* ", $v[1], " */\n"; } echo "};\n"; - + echo "/* {{{ end of mappings *from* Unicode for {$e['name']} */\n\n"; } @@ -474,7 +474,7 @@ foreach ($multicp_rows as $k => $v) { $v['default'] = "gt"; echo "\t{ {", sprintf("\"%-21s", $v["default"].'",'), "\t", sprintf("%02d", (count($v) - 1)), ",\t\t", - sprintf("% 2d", strlen($v["default"])), '} },', "\n"; + sprintf("% 2d", strlen($v["default"])), '} },', "\n"; } else { echo "\t{ {", sprintf("%-22s", 'NULL,'), "\t", sprintf("%02d", count($v)), ",\t\t0} },\n"; @@ -482,7 +482,7 @@ foreach ($multicp_rows as $k => $v) { unset($v["default"]); foreach ($v as $l => $w) { echo "\t{ {", sprintf("\"%-21s", $w.'",'), "\t", sprintf("0x%05s", $l), ",\t", - sprintf("% 2d", strlen($w)), '} },', "\n"; + sprintf("% 2d", strlen($w)), '} },', "\n"; } echo "};\n"; } @@ -559,7 +559,7 @@ for ($i = 0; $i < 0x1E; $i++) { else echo "{1, { {(void *)", sprintf("multi_cp_{$ident}_%05X", ($i << 12) | ($k << 6) | $y ), ", 0} } },"; - + } echo "\n};\n\n"; } @@ -683,7 +683,7 @@ echo // die("violated assumption for traverse_for_entities"); // } // } -// +// // $k++; //} //echo "\n};\n\n"; diff --git a/ext/standard/strnatcmp.c b/ext/standard/strnatcmp.c index 64ff8fc37d..6d394ba9d8 100644 --- a/ext/standard/strnatcmp.c +++ b/ext/standard/strnatcmp.c @@ -144,7 +144,7 @@ PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len else if (ap == aend) return -1; else if (bp == bend) - return 1; + return 1; else { /* Keep on comparing from the current point. */ ca = *ap; cb = *bp; diff --git a/ext/standard/tests/ini_info/scandir/0.ini b/ext/standard/tests/ini_info/scandir/0.ini index fa0980299c..ecc77af06e 100644 --- a/ext/standard/tests/ini_info/scandir/0.ini +++ b/ext/standard/tests/ini_info/scandir/0.ini @@ -1,4 +1,4 @@ -; This file is named 0.ini so it should be the first line of +; This file is named 0.ini so it should be the first line of ; any scanned ini output date.timezone = Antarctica/McMurdo
\ No newline at end of file diff --git a/ext/xmlreader/README b/ext/xmlreader/README index f85e4a2121..66f16b6cbc 100644 --- a/ext/xmlreader/README +++ b/ext/xmlreader/README @@ -1,5 +1,5 @@ -XMLReader represents a reader that provides non-cached, -forward-only access to XML data. It is based upon the +XMLReader represents a reader that provides non-cached, +forward-only access to XML data. It is based upon the xmlTextReader api from libxml This extension is designed to only work under PHP 5+. diff --git a/ext/xmlrpc/EXPERIMENTAL b/ext/xmlrpc/EXPERIMENTAL index 6443e99646..51f50405ea 100644 --- a/ext/xmlrpc/EXPERIMENTAL +++ b/ext/xmlrpc/EXPERIMENTAL @@ -1,5 +1,5 @@ this extension is experimental, -its functions may change their names -or move to extension all together -so do not rely to much on them +its functions may change their names +or move to extension all together +so do not rely to much on them you have been warned! diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.m4 b/ext/xmlrpc/libxmlrpc/xmlrpc.m4 index 87da92db8a..955376072f 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc.m4 +++ b/ext/xmlrpc/libxmlrpc/xmlrpc.m4 @@ -1,4 +1,4 @@ -AC_DEFUN([XMLRPC_CHECKS],[ +AC_DEFUN([XMLRPC_CHECKS],[ AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_PROG_LN_S]) diff --git a/ext/xsl/config.w32 b/ext/xsl/config.w32 index 0fbf74e57b..5425e1bfd1 100644 --- a/ext/xsl/config.w32 +++ b/ext/xsl/config.w32 @@ -40,7 +40,7 @@ if (PHP_XSL != "no") { ADD_FLAG("LDFLAGS_XSL", "/nodefaultlib:msvcrt"); } } - + } else { WARNING("xsl not enabled; libraries and headers not found"); } diff --git a/ext/zip/examples/oldapi.php b/ext/zip/examples/oldapi.php index 2f17f43ebd..82a6277f3a 100644 --- a/ext/zip/examples/oldapi.php +++ b/ext/zip/examples/oldapi.php @@ -8,8 +8,8 @@ if ($zip) { while ($zip_entry = zip_read($zip)) { var_dump($zip_entry); $txt = zip_entry_read($zip_entry, 10); - echo $i . ": " . $txt . "size: " . zip_entry_filesize($zip_entry) . - "comp_method: " . zip_entry_compressionmethod($zip_entry) . + echo $i . ": " . $txt . "size: " . zip_entry_filesize($zip_entry) . + "comp_method: " . zip_entry_compressionmethod($zip_entry) . "\n"; $i++; } diff --git a/ext/zlib/tests/data.inc b/ext/zlib/tests/data.inc index 441199ff08..dce79b0204 100644 --- a/ext/zlib/tests/data.inc +++ b/ext/zlib/tests/data.inc @@ -36,17 +36,17 @@ With this regard their currents turn away, And lose the name of action. -Hath not a Jew eyes? Hath not a Jew hands, organs, dimensions, -senses, affections, passions; fed with the same food, hurt with -the same weapons, subject to the same diseases, heal'd by -the same means, warm'd and cool'd by the same winter and summer -as a Christian is? If you prick us, do we not bleed? If you -tickle us, do we not laugh? If you poison us, do we not die? -And if you wrong us, shall we not revenge? If we are like you -in the rest, we will resemble you in that. If a Jew wrong a -Christian, what is his humility? Revenge. If a Christian wrong -a Jew, what should his sufferance be by Christian example? Why, -revenge. The villainy you teach me, I will execute, and it +Hath not a Jew eyes? Hath not a Jew hands, organs, dimensions, +senses, affections, passions; fed with the same food, hurt with +the same weapons, subject to the same diseases, heal'd by +the same means, warm'd and cool'd by the same winter and summer +as a Christian is? If you prick us, do we not bleed? If you +tickle us, do we not laugh? If you poison us, do we not die? +And if you wrong us, shall we not revenge? If we are like you +in the rest, we will resemble you in that. If a Jew wrong a +Christian, what is his humility? Revenge. If a Christian wrong +a Jew, what should his sufferance be by Christian example? Why, +revenge. The villainy you teach me, I will execute, and it shall go hard but I will better the instruction. Is this a dagger which I see before me, @@ -65,7 +65,7 @@ Or else worth all the rest; I see thee still, And on thy blade and dudgeon gouts of blood, Which was not so before. There's no such thing: -It is the bloody business which informs Thus to mine eyes. +It is the bloody business which informs Thus to mine eyes. Now o'er the one halfworld Nature seems dead, and wicked dreams abuse The curtain'd sleep; witchcraft celebrates Pale Hecate's offerings, and wither'd murder, @@ -73,7 +73,7 @@ Alarum'd by his sentinel, the wolf, Whose howl's his watch, thus with his stealthy pace. With Tarquin's ravishing strides, towards his design Moves like a ghost. Thou sure and firm-set earth, -Hear not my steps, which way they walk, +Hear not my steps, which way they walk, for fear Thy very stones prate of my whereabout, And take the present horror from the time, Which now suits with it. diff --git a/ext/zlib/zlib_win32_howto.txt b/ext/zlib/zlib_win32_howto.txt index 59ff3c4f4c..89bdb29f1e 100644 --- a/ext/zlib/zlib_win32_howto.txt +++ b/ext/zlib/zlib_win32_howto.txt @@ -13,4 +13,3 @@ Start Visual Studio, load php_modules.dsw, select the ZLIB projects, and build it. -
\ No newline at end of file @@ -12,9 +12,9 @@ # php-X.Y.Z[sub] # # The distribution ends up in a .tar.gz file that contains the distribution -# in a directory called php-<version>. +# in a directory called php-<version>. # A .tar.bz2 file is also created. -# +# # Written by Stig Bakken <ssb@guardian.no> 1997-05-28. # Adapted to git by Stanislav Malyshev <stas@php.net> @@ -115,7 +115,7 @@ sed -i 's,^int zendparse\(.*\),ZEND_API int zendparse\1,g' $MY_OLDPWD/php-$VER/Z sed -i 's,^int zendparse\(.*\),ZEND_API int zendparse\1,g' $MY_OLDPWD/php-$VER/Zend/zend_language_parser.h sed -i 's,^#ifndef YYTOKENTYPE,#include "zend.h"\n#ifndef YYTOKENTYPE,g' $MY_OLDPWD/php-$VER/Zend/zend_language_parser.h -# download pear +# download pear $ECHO_N "makedist: Attempting to download PEAR's phar archive" if test ! -x wget; then wget https://pear.php.net/install-pear-nozlib.phar -nd -P pear/ diff --git a/php.ini-development b/php.ini-development index 9edeb0780a..9da3a1d5d3 100644 --- a/php.ini-development +++ b/php.ini-development @@ -582,7 +582,7 @@ html_errors = On ; to syslog. Only used when error_log is set to syslog. ;syslog.ident = php -; The syslog facility is used to specify what type of program is logging +; The syslog facility is used to specify what type of program is logging ; the message. Only used when error_log is set to syslog. ;syslog.facility = user @@ -882,7 +882,7 @@ default_socket_timeout = 60 ; For example: ; ; extension=mysqli -; +; ; When the extension library to load is not located in the default extension ; directory, You may specify an absolute path to the library file: ; diff --git a/php.ini-production b/php.ini-production index dbd417558f..ede9ac60b6 100644 --- a/php.ini-production +++ b/php.ini-production @@ -589,7 +589,7 @@ html_errors = On ; to syslog. Only used when error_log is set to syslog. ;syslog.ident = php -; The syslog facility is used to specify what type of program is logging +; The syslog facility is used to specify what type of program is logging ; the message. Only used when error_log is set to syslog. ;syslog.facility = user @@ -889,7 +889,7 @@ default_socket_timeout = 60 ; For example: ; ; extension=mysqli -; +; ; When the extension library to load is not located in the default extension ; directory, You may specify an absolute path to the library file: ; diff --git a/sapi/apache2handler/README b/sapi/apache2handler/README index 4defa336c6..d624141c9f 100644 --- a/sapi/apache2handler/README +++ b/sapi/apache2handler/README @@ -3,7 +3,7 @@ WHAT IS THIS? This module exploits the layered I/O support in Apache 2.0. HOW DOES IT WORK? - + In Apache 2.0, you have handlers which generate content (like reading a script from disk). The content goes then through a chain of filters. PHP can be such a filter, so that it processes @@ -12,10 +12,10 @@ HOW DOES IT WORK? DOES IT WORK? - Currently the issues with the module are: + Currently the issues with the module are: * Thread safety of external PHP modules - * The lack of re-entrancy of PHP. due to this I have disabled the 'virtual' - function, and tried to stop any method where a php script can run another php + * The lack of re-entrancy of PHP. due to this I have disabled the 'virtual' + function, and tried to stop any method where a php script can run another php script while it is being run. @@ -36,15 +36,15 @@ HOW TO INSTALL $ cd php-4.x $ ./configure --with-apxs2=/path/to/apache-2.0/bin/apxs $ make install - + At the end of conf/httpd.conf, add: AddType application/x-httpd-php .php If you would like to enable source code highlighting functionality add: - + AddType application/x-httpd-php-source .phps - + That's it. Now start bin/httpd. HOW TO CONFIGURE @@ -57,15 +57,15 @@ HOW TO CONFIGURE PHPINIDir "conf" DEBUGGING APACHE AND PHP - + To debug Apache, we recommend: 1. Use the Prefork MPM (Apache 1.3-like process model) by configuring Apache with '--with-mpm=prefork'. 2. Start httpd using -DONE_PROCESS (e.g. (gdb) r -DONE_PROCESS). - If you want to debug a part of the PHP startup procedure, set a - breakpoint on 'load_module'. Step through it until apr_dso_load() is + If you want to debug a part of the PHP startup procedure, set a + breakpoint on 'load_module'. Step through it until apr_dso_load() is done. Then you can set a breakpoint on any PHP-related symbol. TODO @@ -73,4 +73,4 @@ TODO PHP functions like apache_sub_req (see php_functions.c) Source Code Highlighting Protocol handlers - + diff --git a/sapi/cgi/README.FastCGI b/sapi/cgi/README.FastCGI index f0f11e102d..4d34ff3dac 100644 --- a/sapi/cgi/README.FastCGI +++ b/sapi/cgi/README.FastCGI @@ -91,8 +91,8 @@ use the above configuration, but rather the following. Alias /fcgi-bin/ /space/fcgi-bin/ FastCgiServer /path/to/php-cgi -processes 5 -For either of the above configurations, we need to tell Apache to -use the FastCGI binary /fcgi-bin/php to deliver PHP pages. +For either of the above configurations, we need to tell Apache to +use the FastCGI binary /fcgi-bin/php to deliver PHP pages. All that is needed is: AddType application/x-httpd-fastphp .php diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 336bee186c..9e7d7726df 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -2134,8 +2134,8 @@ consult the installation file that came with this distribution, or visit \n\ int i; ZeroMemory(&kid_cgi_ps, sizeof(kid_cgi_ps)); - kids = children < WIN32_MAX_SPAWN_CHILDREN ? children : WIN32_MAX_SPAWN_CHILDREN; - + kids = children < WIN32_MAX_SPAWN_CHILDREN ? children : WIN32_MAX_SPAWN_CHILDREN; + InitializeCriticalSection(&cleanup_lock); SetConsoleCtrlHandler(fastcgi_cleanup, TRUE); @@ -2242,7 +2242,7 @@ consult the installation file that came with this distribution, or visit \n\ WaitForMultipleObjects(kids, kid_cgi_ps, FALSE, INFINITE); } - + parent_loop_end: /* restore my env */ SetEnvironmentVariable("PHP_FCGI_CHILDREN", kid_buf); diff --git a/sapi/cli/README b/sapi/cli/README index 8720250f6a..5b303aa82d 100644 --- a/sapi/cli/README +++ b/sapi/cli/README @@ -1,5 +1,5 @@ The CLI (command line interface) SAPI has been introduced -with a goal of making PHP better at supporting the creation of +with a goal of making PHP better at supporting the creation of stand alone applications. It is based on CGI SAPI with all CGI specific things removed. @@ -11,7 +11,7 @@ The main differences between the two: * It does not change the working directory to that of the script. (-C switch kept for compatibility) * Plain text error message -* $argc and $argv registered irrespective of the register_argc_argv +* $argc and $argv registered irrespective of the register_argc_argv php.ini setting. * implicit_flush always on * -r option which allows execution of PHP code directly from diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index 5d82093c0a..88a43d30cb 100644 --- a/sapi/cli/php.1.in +++ b/sapi/cli/php.1.in @@ -8,32 +8,32 @@ [options] [ .B \-f\fP ] .IR file -[[\-\-] +[[\-\-] .IR args.\|.\|. ] .LP .B @program_prefix@php -[options] -.B \-r +[options] +.B \-r .IR code [[\-\-] .IR args.\|.\|. ] .LP .B @program_prefix@php -[options] [\-B +[options] [\-B .IR begin_code ] -.B \-R +.B \-R .IR code -[\-E +[\-E .IR end_code ] [[\-\-] .IR args.\|.\|. ] .LP .B @program_prefix@php -[options] [\-B +[options] [\-B .IR begin_code ] -.B \-F +.B \-F .IR file -[\-E +[\-E .IR end_code ] [[\-\-] .IR args.\|.\|. ] @@ -51,39 +51,39 @@ .IR docroot ] .LP .SH DESCRIPTION -\fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for +\fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for Web development and can be embedded into HTML. This is the command line interface that enables you to do the following: .P -You can parse and execute files by using parameter \-f followed by the name of the -.IR file +You can parse and execute files by using parameter \-f followed by the name of the +.IR file to be executed. .LP -Using parameter \-r you can directly execute PHP -.IR code +Using parameter \-r you can directly execute PHP +.IR code simply as you would do inside a .B \.php -file when using the -.B eval() +file when using the +.B eval() function. .LP It is also possible to process the standard input line by line using either the parameter \-R or \-F. In this mode each separate input line causes the -.IR code -specified by \-R or the +.IR code +specified by \-R or the .IR file specified by \-F to be executed. You can access the input line by \fB$argn\fP. While processing the input lines -.B $argi +.B $argi contains the number of the actual line being processed. Further more -the parameters \-B and \-E can be used to execute +the parameters \-B and \-E can be used to execute .IR code (see \-r) before and after all input lines have been processed respectively. Notice that the input is read from .B STDIN -and therefore reading from -.B STDIN +and therefore reading from +.B STDIN explicitly changes the next input line or skips input lines. .LP PHP also contains an built-in web server for application development purpose. By using the \-S option where @@ -92,9 +92,9 @@ point to a local address and port PHP will listen to HTTP requests on that addre .B docroot passed by the \-t option. .LP -If none of \-r \-f \-B \-R \-F \-E or \-S is present but a single parameter is given -then this parameter is taken as the filename to parse and execute (same as -with \-f). If no parameter is present then the standard input is read and +If none of \-r \-f \-B \-R \-F \-E or \-S is present but a single parameter is given +then this parameter is taken as the filename to parse and execute (same as +with \-f). If no parameter is present then the standard input is read and executed. .SH OPTIONS .TP 15 @@ -140,8 +140,8 @@ Measure execution time of script repeated count times (CGI only). .TP .PD 1 .B \-c \fIpath\fP|\fIfile\fP -Look for -.B php.ini +Look for +.B php.ini file in the directory .IR path or use the specified @@ -152,8 +152,8 @@ or use the specified .TP .PD 1 .B \-n -No -.B php.ini +No +.B php.ini file will be used .TP .PD 0 @@ -161,8 +161,8 @@ file will be used .TP .PD 1 .B \-d \fIfoo\fP[=\fIbar\fP] -Define INI entry -.IR foo +Define INI entry +.IR foo with value .IR bar .TP @@ -174,7 +174,7 @@ Generate extended information for debugger/profiler .TP .PD 1 .B \-f \fIfile\fP -Parse and execute +Parse and execute .IR file .TP .PD 0 @@ -189,8 +189,8 @@ This help .TP .PD 1 .B \-H -Hide script name (\fIfile\fP) and parameters (\fIargs\.\.\.\fP) from external -tools. For example you may want to use this when a php script is started as +Hide script name (\fIfile\fP) and parameters (\fIargs\.\.\.\fP) from external +tools. For example you may want to use this when a php script is started as a daemon and the command line contains sensitive data such as passwords. .TP .PD 0 @@ -219,7 +219,7 @@ Show compiled in modules .TP .PD 1 .B \-r \fIcode\fP -Run PHP +Run PHP .IR code without using script tags .B '<?..?>' @@ -229,7 +229,7 @@ without using script tags .TP .PD 1 .B \-B \fIbegin_code\fP -Run PHP +Run PHP .IR begin_code before processing input lines .TP @@ -238,7 +238,7 @@ before processing input lines .TP .PD 1 .B \-R \fIcode\fP -Run PHP +Run PHP .IR code for every input line .TP @@ -247,7 +247,7 @@ for every input line .TP .PD 1 .B \-F \fIfile\fP -Parse and execute +Parse and execute .IR file for every input line .TP @@ -256,7 +256,7 @@ for every input line .TP .PD 1 .B \-E \fIend_code\fP -Run PHP +Run PHP .IR end_code after processing all input lines .TP @@ -300,14 +300,14 @@ Output source with stripped comments and whitespace .TP .PD 1 .B \-z \fIfile\fP -Load Zend extension +Load Zend extension .IR file .TP .IR args.\|.\|. -Arguments passed to script. Use +Arguments passed to script. Use .B '\-\-' .IR args -when first argument starts with +when first argument starts with .B '\-' or script is read from stdin .TP @@ -369,7 +369,7 @@ Show configuration file names The configuration file for the CLI version of PHP. .TP .B php.ini -The standard configuration file will only be used when +The standard configuration file will only be used when .B php\-cli.ini cannot be found. .SH EXAMPLES @@ -388,24 +388,24 @@ have such a function. For dba use: .RE .TP \fI@program_prefix@php \-R 'echo strip_tags($argn)."\\n";'\fP -This PHP command strips off the HTML tags line by line and outputs the +This PHP command strips off the HTML tags line by line and outputs the result. To see how it works you can first look at the following PHP command \'\fIphp \-d html_errors=1 \-i\fP\' which uses PHP to output HTML formatted -configuration information. If you then combine those two +configuration information. If you then combine those two \'\fIphp \.\.\.|php \.\.\.\fP\' you'll see what happens. .TP \fI@program_prefix@php \-E 'echo "Lines: $argi\\n";'\fP Using this PHP command you can count the lines being input. .TP \fI@program_prefix@php \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP -In this example PHP expects each input line being a file. It counts all lines -of the files specified by each input line and shows the summarized result. +In this example PHP expects each input line being a file. It counts all lines +of the files specified by each input line and shows the summarized result. You may combine this with tools like find and change the php scriptlet. .TP \fI@program_prefix@php \-R 'echo "$argn\\n"; fgets(STDIN);'\fP -Since you have access to STDIN from within \-B \-R \-F and \-E you can skip -certain input lines with your code. But note that in such cases $argi only -counts the lines being processed by php itself. Having read this you will +Since you have access to STDIN from within \-B \-R \-F and \-E you can skip +certain input lines with your code. But note that in such cases $argi only +counts the lines being processed by php itself. Having read this you will guess what the above program does: skipping every second input line. .SH TIPS You can use a shebang line to automatically invoke php @@ -449,7 +449,7 @@ A List of active developers can be found here: .B http://www.php.net/credits.php .PD 1 .P -And last but not least PHP was developed with the help of a huge amount of +And last but not least PHP was developed with the help of a huge amount of contributors all around the world. .SH VERSION INFORMATION This manpage describes \fBphp\fP, version @PHP_VERSION@. diff --git a/sapi/embed/EXPERIMENTAL b/sapi/embed/EXPERIMENTAL index 293159a693..3ea19fd320 100644 --- a/sapi/embed/EXPERIMENTAL +++ b/sapi/embed/EXPERIMENTAL @@ -1,5 +1,5 @@ this module is experimental, -its functions may change their names -or move to extension all together -so do not rely to much on them +its functions may change their names +or move to extension all together +so do not rely to much on them you have been warned! diff --git a/sapi/fpm/Makefile.frag b/sapi/fpm/Makefile.frag index b4c08b4fa5..c6a290f9d5 100644 --- a/sapi/fpm/Makefile.frag +++ b/sapi/fpm/Makefile.frag @@ -18,7 +18,7 @@ install-fpm: $(SAPI_FPM_PATH) $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \ fi - + @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8 @$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8 diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in index 4497e6e61c..86edaa894f 100644 --- a/sapi/fpm/php-fpm.8.in +++ b/sapi/fpm/php-fpm.8.in @@ -7,7 +7,7 @@ php-fpm \- PHP FastCGI Process Manager 'PHP-FPM' [options] .LP .SH DESCRIPTION -\fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for +\fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for Web development and can be embedded into HTML. This is a variant of PHP that will run in the background as a daemon, listening for CGI requests. Output is logged to @php_fpm_localstatedir@/log/php-fpm.log. .LP Most options are set in the configuration file. The configuration file is @php_fpm_sysconfdir@/php-fpm.conf. By default, php-fpm will respond to CGI requests listening on localhost http port 9000. Therefore php-fpm expects your webserver to forward all requests for '.php' files to port 9000 and you should edit your webserver configuration file appropriately. @@ -21,8 +21,8 @@ Do not chdir to the script's directory .TP .PD 1 .B \-c \fIpath\fP|\fIfile\fP -Look for -.B php.ini +Look for +.B php.ini file in the directory .IR path or use the specified @@ -33,8 +33,8 @@ or use the specified .TP .PD 1 .B \-n -No -.B php.ini +No +.B php.ini file will be used .TP .PD 0 @@ -42,8 +42,8 @@ file will be used .TP .PD 1 .B \-d \fIfoo\fP[=\fIbar\fP] -Define INI entry -.IR foo +Define INI entry +.IR foo with value .IR bar .TP @@ -208,7 +208,7 @@ A List of active developers can be found here: .B http://www.php.net/credits.php .PD 1 .P -And last but not least PHP was developed with the help of a huge amount of +And last but not least PHP was developed with the help of a huge amount of contributors all around the world. .SH VERSION INFORMATION This manpage describes \fBphp-fpm\fP, version @PHP_VERSION@. diff --git a/sapi/fpm/status.html.in b/sapi/fpm/status.html.in index 7b5aedc425..863fcf3b54 100644 --- a/sapi/fpm/status.html.in +++ b/sapi/fpm/status.html.in @@ -5,9 +5,9 @@ The PHP License, version 3.01 This is sample real-time status page for FPM. You can change it to better fit your needs. --> - <head> + <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> - <style type="text/css"> + <style type="text/css"> body {background-color: #ffffff; color: #000000;} body, td, th, h1, h2 {font-family: sans-serif;} pre {margin: 0px; font-family: monospace;} @@ -32,40 +32,40 @@ } img {float: right; border: 0px;} hr {width: 600px; background-color: #cccccc; border: 0px; height: 1px; color: #000000;} - </style> + </style> <title>PHP-FPM status page</title> - <meta name="ROBOTS" content="NOINDEX,NOFOLLOW,NOARCHIVE" /></head> + <meta name="ROBOTS" content="NOINDEX,NOFOLLOW,NOARCHIVE" /></head> <body> <div class="center"> <table border="0" cellpadding="3" width="95%"> <tr class="h"> - <td> + <td> <a href="http://www.php.net/"><img border="0" src="https://static.php.net/www.php.net/images/php.gif" alt="PHP Logo" /></a><h1 class="p">PHP-FPM real-time status page</h1> </td> </tr> </table> <br /> <table border="0" cellpadding="3" width="95%"> - <tr><td class="e">Status URL</td><td class="v"><input type="text" id="url" size="45" /></td></tr> - <tr><td class="e">Ajax status</td><td class="v" id="status"></td></tr> - <tr><td class="e">Refresh Rate</td><td class="v"><input type="text" id="rate" value="1" /></td></tr> + <tr><td class="e">Status URL</td><td class="v"><input type="text" id="url" size="45" /></td></tr> + <tr><td class="e">Ajax status</td><td class="v" id="status"></td></tr> + <tr><td class="e">Refresh Rate</td><td class="v"><input type="text" id="rate" value="1" /></td></tr> <tr> <td class="e">Actions</td> <td class="v"> <button onclick="javascript:refresh();">Manual Refresh</button> <button id="play" onclick="javascript:playpause();">Play</button> </td> - </tr> + </tr> </table> - <h1>Pool Status</h1> + <h1>Pool Status</h1> <table border="0" cellpadding="3" width="95%" id="short"> <tr style="display: none;"><td> </td></tr> </table> - <h1>Active Processes status</h1> + <h1>Active Processes status</h1> <table border="0" cellpadding="3" width="95%" id="active"> <tr class="h"><th>PID↓</th><th>Start Time</th><th>Start Since</th><th>Requests Served</th><th>Request Duration</th><th>Request method</th><th>Request URI</th><th>Content Length</th><th>User</th><th>Script</th></tr> </table> - <h1>Idle Processes status</h1> + <h1>Idle Processes status</h1> <table border="0" cellpadding="3" width="95%" id="idle"> <tr class="h"><th>PID↓</th><th>Start Time</th><th>Start Since</th><th>Requests Served</th><th>Request Duration</th><th>Request method</th><th>Request URI</th><th>Content Length</th><th>User</th><th>Script</th><th>Last Request %CPU</th><th>Last Request Memory</th></tr> </table> diff --git a/sapi/fpm/tests/fcgi.inc b/sapi/fpm/tests/fcgi.inc index 71bdad17b9..07603a808e 100644 --- a/sapi/fpm/tests/fcgi.inc +++ b/sapi/fpm/tests/fcgi.inc @@ -603,7 +603,7 @@ class Client } if ($resp['type'] == self::END_REQUEST) { $this->_requests[$resp['requestId']]['state'] = self::REQ_STATE_OK; - if ($resp['requestId'] == $requestId) { + if ($resp['requestId'] == $requestId) { break; } } diff --git a/sapi/litespeed/README.md b/sapi/litespeed/README.md index 99967ce3d6..e744030de7 100644 --- a/sapi/litespeed/README.md +++ b/sapi/litespeed/README.md @@ -3,27 +3,27 @@ Introduction LiteSpeed SAPI module is a dedicated interface for PHP integration with LiteSpeed Web Server. LiteSpeed SAPI has similar architecture to the -FastCGI SAPI with there major enhancements: better performance, dynamic +FastCGI SAPI with there major enhancements: better performance, dynamic spawning and PHP configuration modification through web server -configuration and .htaccess files. +configuration and .htaccess files. Our simple benchmark test ("hello world") shows that PHP with LiteSpeed SAPI has 30% better performance over PHP with FastCGI SAPI, -which is nearly twice the performance that Apache mod_php can deliver. - +which is nearly twice the performance that Apache mod_php can deliver. + A major drawback of FastCGI PHP comparing to Apache mod_php is lacking -the flexibilities in PHP configurations. PHP configurations cannot be +the flexibilities in PHP configurations. PHP configurations cannot be changed at runtime via configuration files like .htaccess files or web -server's virtual host configuration. In shared hosting environment, -each hosting account will has its own "open_basedir" overridden in +server's virtual host configuration. In shared hosting environment, +each hosting account will has its own "open_basedir" overridden in server configuration to enhance server security when mod_php is used. -usually, FastCGI PHP is not an option in shared hosting environment +usually, FastCGI PHP is not an option in shared hosting environment due to lacking of this flexibility. LiteSpeed SAPI is carefully designed -to address this issue. PHP configurations can be modified the same way -as that in mod_php with the same configuration directives. +to address this issue. PHP configurations can be modified the same way +as that in mod_php with the same configuration directives. -PHP with LiteSpeed SAPI is highly recommended over FastCGI PHP for -PHP scripting with LiteSpeed web server. +PHP with LiteSpeed SAPI is highly recommended over FastCGI PHP for +PHP scripting with LiteSpeed web server. Building PHP with LiteSpeed SAPI @@ -31,9 +31,9 @@ Building PHP with LiteSpeed SAPI You need to add "--with-litespeed" to the configure command to build PHP with LiteSpeed SAPI, all other SAPI related configure options -should be removed. +should be removed. -For example: +For example: ./configure --with-litespeed make @@ -42,17 +42,17 @@ directory after the compilation succeeds. Copy it to 'lsws/fcgi-bin/lsphp' or wherever you prefer, if LiteSpeed web server has been configured to run PHP with LiteSpeed SAPI already, you just need to overwrite the old executable with this one and you are all -set. +set. Start PHP from command line =========================== Usually, lsphp is managed by LiteSpeed web server in a single server -installation. lsphp can be used in clustered environment with one -LiteSpeed web server at the front, load balancing lsphp processes +installation. lsphp can be used in clustered environment with one +LiteSpeed web server at the front, load balancing lsphp processes running on multiple backend servers. In such environment, lsphp can be -start manually from command with option "-b <socket_address>", socket -address can be IPv4, IPv6 or Unix Domain Socket address. +start manually from command with option "-b <socket_address>", socket +address can be IPv4, IPv6 or Unix Domain Socket address. for example: ./lsphp -b [::]:3000 @@ -76,56 +76,56 @@ Using LiteSpeed PHP with LiteSpeed Web Server ============================================= Detailed information about how to configure LiteSpeed web server with -PHP support is available from our website, at: +PHP support is available from our website, at: https://www.litespeedtech.com/docs/webserver Usually, PHP support has been configured out of box, you don't need to change it unless you want to change PHP interface from FastCGI to -LiteSpeed SAPI or vice versa. +LiteSpeed SAPI or vice versa. Brief instructions are as follow: 1) Login to web administration interface, go to 'Server'->'Ext App' tab, add an external application of type "LSAPI app", "Command" should be - set to a shell command that executes the PHP binary you just built. - "Instances" should be set to "1". Add "LSAPI_CHILDREN" environment - variable to match the value of "Max Connections". More tunable - environment variable described below can be added. + set to a shell command that executes the PHP binary you just built. + "Instances" should be set to "1". Add "LSAPI_CHILDREN" environment + variable to match the value of "Max Connections". More tunable + environment variable described below can be added. 2) Go to 'Server'->'Script Handler' tab, add a script handler configuration: set 'suffix' to 'php', 'Handler Type' to 'LiteSpeed API', 'Handler Name' should be the name of external application - just defined. + just defined. -3) Click 'Apply Changes' link on the top left of the page, then click - 'graceful restart'. Now PHP is running with LiteSpeed SAPI. +3) Click 'Apply Changes' link on the top left of the page, then click + 'graceful restart'. Now PHP is running with LiteSpeed SAPI. Tunings ------- There are a few environment variables that can be tweaked to control the -behavior of LSAPI application. +behavior of LSAPI application. * LSAPI_CHILDREN or PHP_LSAPI_CHILDREN (default: 0) -There are two ways to let PHP handle multiple requests concurrently, -Server Managed Mode and Self Managed Mode. In Server Managed Mode, +There are two ways to let PHP handle multiple requests concurrently, +Server Managed Mode and Self Managed Mode. In Server Managed Mode, LiteSpeed web server dynamically spawn/stop PHP processes, in this mode -"Instances" should match "Max Connections" configuration for PHP -external application. To start PHP in Self Managed Mode, "Instances" +"Instances" should match "Max Connections" configuration for PHP +external application. To start PHP in Self Managed Mode, "Instances" should be set to "1", while "LSAPI_CHILDREN" environment variable should -be set to match the value of "Max Connections" and >1. Web Server will -start one PHP process, this process will start/stop children PHP processes -dynamically based on on demand. If "LSAPI_CHILDREN" <=1, PHP will be +be set to match the value of "Max Connections" and >1. Web Server will +start one PHP process, this process will start/stop children PHP processes +dynamically based on on demand. If "LSAPI_CHILDREN" <=1, PHP will be started in server managed mode. -Self Managed Mode is preferred because all PHP processes can share one +Self Managed Mode is preferred because all PHP processes can share one shared memory block for the opcode cache. Usually, there is no need to set value of LSAPI_CHILDREN over 100 in -most server environment. +most server environment. * LSAPI_AVOID_FORK (default: 0) @@ -151,22 +151,22 @@ LSAPI_CHIDLREN, When LSAPI_AVOID_FORK is set to 1, the default value is 0. * LSAPI_MAX_REQS or PHP_LSAPI_MAX_REQUESTS (default value: 10000) This controls how many requests each child process will handle before -it exits automatically. Several PHP functions have been identified -having memory leaks. This parameter can help reducing memory usage -of leaky PHP functions. +it exits automatically. Several PHP functions have been identified +having memory leaks. This parameter can help reducing memory usage +of leaky PHP functions. * LSAPI_MAX_IDLE (default value: 300 seconds) -In Self Managed Mode, LSAPI_MAX_IDLE controls how long a idle child -process will wait for a new request before it exits. This option help +In Self Managed Mode, LSAPI_MAX_IDLE controls how long a idle child +process will wait for a new request before it exits. This option help releasing system resources taken by idle processes. * LSAPI_MAX_IDLE_CHILDREN (default value: 1/3 of LSAPI_CHILDREN or LSAPI_CHILDREN) -In Self Managed Mode, LSAI_MAX_IDLE_CHILDREN controls how many idle +In Self Managed Mode, LSAI_MAX_IDLE_CHILDREN controls how many idle children processes are allowed. Excessive idle children processes will be killed by the parent process immediately. When LSAPI_AVOID_FORK is set to 0, the default value is 1/3 of @@ -176,10 +176,10 @@ is LSAPI_CHILDREN. * LSAPI_MAX_PROCESS_TIME (default value: 300 seconds) -In Self Managed Mode, LSAPI_MAX_PROCESS_TIME controls the maximum +In Self Managed Mode, LSAPI_MAX_PROCESS_TIME controls the maximum processing time allowed when processing a request. If a child process -can not finish processing of a request in the given time period, it -will be killed by the parent process. This option can help getting rid +can not finish processing of a request in the given time period, it +will be killed by the parent process. This option can help getting rid of dead or runaway child process. @@ -187,26 +187,26 @@ of dead or runaway child process. In Self Managed Mode, LSAPI_PGRP_MAX_IDLE controls how long the parent process will wait before exiting when there is no child process. -This option help releasing system resources taken by an idle parent +This option help releasing system resources taken by an idle parent process. * LSAPI_PPID_NO_CHECK By default a LSAPI application check the existence of its parent process -and exits automatically if the parent process died. This is to reduce -orphan process when web server is restarted. However, it is desirable -to disable this feature, such as when a LSAPI process was started -manually from command line. LSAPI_PPID_NO_CHECK should be set when +and exits automatically if the parent process died. This is to reduce +orphan process when web server is restarted. However, it is desirable +to disable this feature, such as when a LSAPI process was started +manually from command line. LSAPI_PPID_NO_CHECK should be set when you want to disable the checking of existence of parent process. -When PHP started by "-b" option, it is disabled automatically. +When PHP started by "-b" option, it is disabled automatically. Compatibility with Apache mod_php ================================= -LSAPI PHP supports PHP configuration overridden via web server configuration -as well as .htaccess. +LSAPI PHP supports PHP configuration overridden via web server configuration +as well as .htaccess. Since 4.0 release "apache_response_headers" function is supported. diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c index c4ed6bb4d6..685892e708 100644 --- a/sapi/litespeed/lsapilib.c +++ b/sapi/litespeed/lsapilib.c @@ -153,7 +153,7 @@ static int s_max_busy_workers = -1; static char *s_stderr_log_path = NULL; static int s_ignore_pid = -1; -LSAPI_Request g_req = +LSAPI_Request g_req = { .m_fdListen = -1, .m_fd = -1 }; static char s_secret[24]; @@ -216,7 +216,7 @@ static int HTTP_HEADER_LEN[H_TRANSFER_ENCODING+1] = }; -static const char *s_log_level_names[8] = +static const char *s_log_level_names[8] = { "", "DEBUG","INFO", "NOTICE", "WARN", "ERROR", "CRIT", "FATAL" }; @@ -229,7 +229,7 @@ void LSAPI_Log(int flag, const char * fmt, ...) if (flag & LSAPI_LOG_TIMESTAMP_BITS) { struct timeval tv; - struct tm tm; + struct tm tm; gettimeofday(&tv, NULL); localtime_r(&tv.tv_sec, &tm); if (flag & LSAPI_LOG_TIMESTAMP_FULL) @@ -244,20 +244,20 @@ void LSAPI_Log(int flag, const char * fmt, ...) tm.tm_hour, tm.tm_min, tm.tm_sec); } } - + int level = flag & LSAPI_LOG_LEVEL_BITS; if (level && level <= LSAPI_LOG_FLAG_FATAL) { p += snprintf(p, 100, "[%s] ", s_log_level_names[level]); } - + if (flag & LSAPI_LOG_PID) { p += snprintf(p, 100, "[%d] ", s_pid); } - + if (p > buf) - fprintf(stderr, "%.*s", (int)(p - buf), buf); + fprintf(stderr, "%.*s", (int)(p - buf), buf); va_list ap; va_start(ap, fmt); vfprintf(stderr, fmt, ap); @@ -276,7 +276,7 @@ void LSAPI_Log(int flag, const char * fmt, ...) #endif -static int lsapi_parent_dead() +static int lsapi_parent_dead() { // Return non-zero if the parent is dead. 0 if still alive. if (!s_ppid) { @@ -409,7 +409,7 @@ static void lsapi_close_connection(LSAPI_Request *pReq) __sync_fetch_and_sub(s_busy_workers, 1); if (s_worker_status) s_worker_status->m_connected = 0; -} +} static inline ssize_t lsapi_read( int fd, void * pBuf, size_t len ) @@ -868,7 +868,7 @@ int LSAPI_is_suEXEC_Daemon(void) static int LSAPI_perror_r( LSAPI_Request * pReq, const char * pErr1, const char *pErr2 ) { char achError[4096]; - int n = snprintf(achError, sizeof(achError), "[%d] %s:%s: %s\n", getpid(), + int n = snprintf(achError, sizeof(achError), "[%d] %s:%s: %s\n", getpid(), pErr1, (pErr2)?pErr2:"", strerror(errno)); if (n > (int)sizeof(achError)) n = sizeof(achError); @@ -1258,7 +1258,7 @@ static struct lsapi_packet_header s_ack = {'L', 'S', LSAPI_REQ_RECEIVED, LSAPI_ENDIAN, {LSAPI_PACKET_HEADER_LEN} }; static struct lsapi_packet_header s_conn_close_pkt = {'L', 'S', LSAPI_CONN_CLOSE, LSAPI_ENDIAN, {LSAPI_PACKET_HEADER_LEN} }; - + static inline int send_notification_pkt( int fd, struct lsapi_packet_header *pkt ) { @@ -1575,7 +1575,7 @@ int LSAPI_Accept_r( LSAPI_Request * pReq ) static struct lsapi_packet_header finish = {'L', 'S', LSAPI_RESP_END, LSAPI_ENDIAN, {LSAPI_PACKET_HEADER_LEN} }; - + int LSAPI_Finish_r( LSAPI_Request * pReq ) { /* finish req body */ @@ -2792,7 +2792,7 @@ static void lsapi_sigchild( int signal ) { int status, pid; lsapi_child_status * child_status; - if (g_prefork_server == NULL) + if (g_prefork_server == NULL) return; while( 1 ) { @@ -2842,9 +2842,9 @@ static void lsapi_sigchild( int signal ) static int lsapi_init_children_status(void) { int size = 4096; - int max_children = g_prefork_server->m_iMaxChildren + int max_children = g_prefork_server->m_iMaxChildren + g_prefork_server->m_iExtraChildren; - + char * pBuf; size = max_children * sizeof( lsapi_child_status ) * 2 + 3 * sizeof(int); size = (size + 4095) / 4096 * 4096; @@ -2878,11 +2878,11 @@ static void dump_debug_info( lsapi_child_status * pStatus, long tmCur ) fprintf( stderr, "[%s] Possible runaway process, PPID: %d, PID: %d, " "reqCount: %d, process time: %ld, checkpoint time: %ld, start " - "time: %ld\n", ctime(&tmCur), getpid(), pStatus->m_pid, - pStatus->m_iReqCounter, tmCur - pStatus->m_tmReqBegin, + "time: %ld\n", ctime(&tmCur), getpid(), pStatus->m_pid, + pStatus->m_iReqCounter, tmCur - pStatus->m_tmReqBegin, tmCur - pStatus->m_tmLastCheckPoint, tmCur - pStatus->m_tmStart ); snprintf( achCmd, 1024, "gdb --batch -ex \"attach %d\" -ex \"set height 0\" " - "-ex \"bt\" >&2;PATH=$PATH:/usr/sbin lsof -p %d >&2", + "-ex \"bt\" >&2;PATH=$PATH:/usr/sbin lsof -p %d >&2", pStatus->m_pid, pStatus->m_pid ); if ( system( achCmd ) == -1 ) perror( "system()" ); @@ -2907,8 +2907,8 @@ static void lsapi_check_child_status( long tmCur ) if ( !pStatus->m_inProcess ) { - if (g_prefork_server->m_iCurChildren - dying - > g_prefork_server->m_iMaxChildren + if (g_prefork_server->m_iCurChildren - dying + > g_prefork_server->m_iMaxChildren || idle > g_prefork_server->m_iMaxIdleChildren) { ++pStatus->m_iKillSent; @@ -2916,7 +2916,7 @@ static void lsapi_check_child_status( long tmCur ) } else { - if (s_max_idle_secs> 0 + if (s_max_idle_secs> 0 && tmCur - pStatus->m_tmWaitBegin > s_max_idle_secs + 5) { ++pStatus->m_iKillSent; @@ -2949,7 +2949,7 @@ static void lsapi_check_child_status( long tmCur ) } if ( tobekilled ) { - if (( kill( pStatus->m_pid, tobekilled ) == -1 ) && + if (( kill( pStatus->m_pid, tobekilled ) == -1 ) && ( errno == ESRCH )) { pStatus->m_pid = 0; @@ -2967,7 +2967,7 @@ static void lsapi_check_child_status( long tmCur ) if ( abs( g_prefork_server->m_iCurChildren - count ) > 1 ) { fprintf( stderr, "Children tracking is wrong: PID: %d, Cur Children: %d," - " count: %d, idle: %d, dying: %d\n", getpid(), + " count: %d, idle: %d, dying: %d\n", getpid(), g_prefork_server->m_iCurChildren, count, idle, dying ); } } @@ -2993,7 +2993,7 @@ static void lsapi_check_child_status( long tmCur ) //} -static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, +static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Request * pReq ) { struct sigaction act, old_term, old_quit, old_int, @@ -3062,13 +3062,13 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, FD_ZERO( &readfds ); FD_SET( pServer->m_fd, &readfds ); - timeout.tv_sec = 1; + timeout.tv_sec = 1; timeout.tv_usec = 0; ret = (*g_fnSelect)(pServer->m_fd+1, &readfds, NULL, NULL, &timeout); if (ret == 1 ) { - if (pServer->m_iCurChildren >= pServer->m_iMaxChildren - && s_accepting_workers + if (pServer->m_iCurChildren >= pServer->m_iMaxChildren + && s_accepting_workers && (ret = __sync_add_and_fetch(s_accepting_workers, 0)) > 0) { usleep( 200 ); @@ -3087,13 +3087,13 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, continue; } - if (pServer->m_iCurChildren >= + if (pServer->m_iCurChildren >= pServer->m_iMaxChildren + pServer->m_iExtraChildren) { fprintf( stderr, "Reached max children process limit: %d, extra: %d," " current: %d, busy: %d, please increase LSAPI_CHILDREN.\n", - pServer->m_iMaxChildren, pServer->m_iExtraChildren, - pServer->m_iCurChildren, + pServer->m_iMaxChildren, pServer->m_iExtraChildren, + pServer->m_iCurChildren, s_busy_workers ? *s_busy_workers : -1 ); usleep( 100000 ); continue; @@ -3192,7 +3192,7 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, void lsapi_error( const char * pMessage, int err_no ) { - fprintf( stderr, "%d: %s, errno: %d (%s)\n", getpid(), pMessage, err_no, + fprintf( stderr, "%d: %s, errno: %d (%s)\n", getpid(), pMessage, err_no, strerror( err_no ) ); } @@ -3222,7 +3222,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq ) lsapi_close_connection(pReq); } } - + if ( (unsigned int)s_req_processed > s_max_reqs ) return -1; @@ -3249,7 +3249,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq ) { if ( !g_running ) return -1; - if (s_req_processed && s_worker_status + if (s_req_processed && s_worker_status && s_worker_status->m_iKillSent) return -1; FD_ZERO( &readfds ); @@ -3267,7 +3267,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq ) if (s_accepting_workers) __sync_fetch_and_sub(s_accepting_workers, 1); } - + if ( ret == 0 ) { if ( s_worker_status ) @@ -3291,7 +3291,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq ) } else if ( ret >= 1 ) { - if (s_req_processed && s_worker_status + if (s_req_processed && s_worker_status && s_worker_status->m_iKillSent) return -1; if ( fd == pReq->m_fdListen ) @@ -3305,7 +3305,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq ) __sync_fetch_and_add(s_busy_workers, 1); fd = pReq->m_fd; - + lsapi_set_nblock( fd, 0 ); //init_conn_key( pReq->m_fd ); if ( !s_keepListener ) @@ -3337,7 +3337,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq ) s_worker_status->m_iKillSent = 0; s_worker_status->m_inProcess = 1; ++s_worker_status->m_iReqCounter; - s_worker_status->m_tmReqBegin = + s_worker_status->m_tmReqBegin = s_worker_status->m_tmLastCheckPoint = time(NULL); } ++s_req_processed; @@ -3411,7 +3411,7 @@ void LSAPI_No_Check_ppid(void) } -int LSAPI_Get_ppid() +int LSAPI_Get_ppid() { return(s_ppid); } @@ -3521,7 +3521,7 @@ static int lsapi_check_path(const char *p, char *final, int max_len) return -1; } p = final; - if (realpath(p, resolved_path) == NULL + if (realpath(p, resolved_path) == NULL && errno != ENOENT && errno != EACCES) return -1; if (strncmp(resolved_path, "/etc/", 5) == 0) @@ -3576,13 +3576,13 @@ int LSAPI_Init_Env_Parameters( fn_select_t fp ) const char *p; int n; int avoidFork = 0; - + p = getenv("LSAPI_STDERR_LOG"); if (p) { lsapi_reopen_stderr(p); } - + p = getenv( "PHP_LSAPI_MAX_REQUESTS" ); if ( !p ) p = getenv( "LSAPI_MAX_REQS" ); @@ -3675,7 +3675,7 @@ int LSAPI_Init_Env_Parameters( fn_select_t fp ) { LSAPI_No_Check_ppid(); } - + p = getenv("LSAPI_MAX_BUSY_WORKER"); if (p) { @@ -3684,7 +3684,7 @@ int LSAPI_Init_Env_Parameters( fn_select_t fp ) if (n >= 0) LSAPI_No_Check_ppid(); } - + p = getenv( "LSAPI_DUMP_DEBUG_INFO" ); if ( p ) @@ -3950,7 +3950,7 @@ static void lsapi_MD5Transform(uint32 buf[4], uint32 const in[16]) } -int LSAPI_Set_Restored_Parent_Pid(int pid) +int LSAPI_Set_Restored_Parent_Pid(int pid) { int old_ppid = s_ppid; s_restored_ppid = pid; diff --git a/sapi/litespeed/lscriu.h b/sapi/litespeed/lscriu.h index 9f40df37d5..cc0186ef79 100644 --- a/sapi/litespeed/lscriu.h +++ b/sapi/litespeed/lscriu.h @@ -21,18 +21,18 @@ All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are -met: +met: * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. + notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided - with the distribution. + with the distribution. * Neither the name of the Lite Speed Technologies Inc nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior - written permission. + written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -44,7 +44,7 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef _LSCRIU_H_ diff --git a/sapi/phpdbg/.phpdbginit b/sapi/phpdbg/.phpdbginit index 1ad35218ed..7ee34fccaa 100644 --- a/sapi/phpdbg/.phpdbginit +++ b/sapi/phpdbg/.phpdbginit @@ -25,7 +25,7 @@ */ /* -function my_debugging_function() +function my_debugging_function() { var_dump(func_get_args()); } @@ -49,31 +49,31 @@ if (function_exists('readline_completion_function')) { /* Setting argv made trivial ... - + argv 1 2 3 4 ^ set argv for next execution - + argv ^ unset argv for next execution - + */ function argv() { $argv = func_get_args(); - + if (!$argv) { $_SERVER['argv'] = array(); $_SERVER['argc'] = 0; return; } - + $_SERVER['argv'] = array_merge ( array("phpdbg"), $argv - ); + ); $_SERVER['argc'] = count($_SERVER['argv']); - + return $_SERVER['argv']; } :> diff --git a/sapi/phpdbg/phpdbg.init.d b/sapi/phpdbg/phpdbg.init.d index 99a1ab328b..1f0b1fdbf9 100755 --- a/sapi/phpdbg/phpdbg.init.d +++ b/sapi/phpdbg/phpdbg.init.d @@ -44,7 +44,7 @@ insanity() return 1 fi fi - + return 0 } diff --git a/sapi/phpdbg/web-bootstrap.php b/sapi/phpdbg/web-bootstrap.php index 7b8c5d30de..046062997e 100644 --- a/sapi/phpdbg/web-bootstrap.php +++ b/sapi/phpdbg/web-bootstrap.php @@ -1,26 +1,26 @@ <?php /** * The following file shows how to bootstrap phpdbg so that you can mock specific server environments - * + * * eval include("web-bootstrap.php") * exec index.php * compile * break ... * run */ -if (!defined('PHPDBG_BOOTSTRAPPED')) +if (!defined('PHPDBG_BOOTSTRAPPED')) { /* define these once */ define("PHPDBG_BOOTPATH", "/opt/php-zts/htdocs"); define("PHPDBG_BOOTSTRAP", "index.php"); - define("PHPDBG_BOOTSTRAPPED", sprintf("/%s", PHPDBG_BOOTSTRAP)); + define("PHPDBG_BOOTSTRAPPED", sprintf("/%s", PHPDBG_BOOTSTRAP)); } /* * Superglobals are JIT, phpdbg will not over-write whatever you set during bootstrap */ -$_SERVER = array +$_SERVER = array ( 'HTTP_HOST' => 'localhost', 'HTTP_CONNECTION' => 'keep-alive', diff --git a/sapi/phpdbg/xml.md b/sapi/phpdbg/xml.md index 56dcaaa1f7..c02f80f2ca 100644 --- a/sapi/phpdbg/xml.md +++ b/sapi/phpdbg/xml.md @@ -297,7 +297,7 @@ info (subcommands) - <classinfo num="" /> with num having an integer value, indicating the number of loaded user-defined classes - Each class is enumerated with first a <class>, then an optional <parents> container and then a <classsource> element -- The <parents> container contains the <class> elements of the parent of the last <class> element. +- The <parents> container contains the <class> elements of the parent of the last <class> element. - <class type="" flags="" name="" methodcount="" /> - type: either "User" or "Internal" - flags: either "Interface", "Class" or "Abstract Class" diff --git a/scripts/dev/find_tested.php b/scripts/dev/find_tested.php index 4e1e2a3bb4..24e49d092c 100644 --- a/scripts/dev/find_tested.php +++ b/scripts/dev/find_tested.php @@ -71,7 +71,7 @@ $extension_method_info = mark_methods_as_tested($extension_method_info, $phpt_fi /** * The loop to output the test coverage info * Should output: Extension, Class Name, Method/Function Name, Test Status, Test Files - */ + */ foreach($extension_method_info as $record) { echo $record[EXTENSION_NAME] . ","; echo $record[CLASS_NAME] . ","; @@ -84,7 +84,7 @@ foreach($extension_method_info as $record) { * Marks the "tested" status of methods in $method_info according * to whether they are tested in $phpt_files */ -function mark_methods_as_tested($method_info, $phpt_files) { +function mark_methods_as_tested($method_info, $phpt_files) { foreach($phpt_files as $phpt_file) { $tested_functions = extract_tests($phpt_file); @@ -97,7 +97,7 @@ function mark_methods_as_tested($method_info, $phpt_files) { // matched the method name if ($current_method_record[IS_DUPLICATE] == true) { // we cannot be sure which class this method corresponds to, - // so mark method as needing to be verified + // so mark method as needing to be verified $current_method_record[IS_TESTED] = "verify"; } else { $current_method_record[IS_TESTED] = "yes"; @@ -114,7 +114,7 @@ function mark_methods_as_tested($method_info, $phpt_files) { * returns an array containing a record for each defined method. */ function populate_method_info() { - + $method_info = array(); // get functions @@ -197,21 +197,21 @@ function get_phpt_files($dir, &$phpt_file_count, &$all_phpt) } /** - * Extract tests from a specified file, returns an array of tested function tokens - */ + * Extract tests from a specified file, returns an array of tested function tokens + */ function extract_tests($file) { $code = file_get_contents($file); - + if (!preg_match('/--FILE--\s*(.*)\s*--(EXPECTF|EXPECTREGEX|EXPECT)?--/is', $code, $r)) { //print "Unable to get code in ".$file."\n"; return array(); } - + $tokens = token_get_all($r[1]); $functions = array_filter($tokens, 'filter_functions'); $functions = array_map( 'map_token_value',$functions); $functions = array_unique($functions); - + return $functions; } diff --git a/scripts/dev/gen_verify_stub b/scripts/dev/gen_verify_stub index 1dc3ba0cee..ac6dc4434d 100755 --- a/scripts/dev/gen_verify_stub +++ b/scripts/dev/gen_verify_stub @@ -39,7 +39,7 @@ do done for TARBALL in "$PHPROOT/php-$RELEASE_VER.tar.bz2" "$PHPROOT/php-$RELEASE_VER.tar.gz" "$PHPROOT/php-$RELEASE_VER.tar.xz" -do +do basename $TARBALL echo "SHA256 hash: `sha256sum $TARBALL | cut -d' ' -f1`"; echo PGP signature: diff --git a/scripts/man1/phpize.1.in b/scripts/man1/phpize.1.in index d2852fdcc5..b885326bfe 100644 --- a/scripts/man1/phpize.1.in +++ b/scripts/man1/phpize.1.in @@ -44,5 +44,5 @@ available through the world-wide-web at the following url: .P If you did not receive a copy of the PHP license and are unable to obtain it through the world-wide-web, please send a note to -.B license@php.net +.B license@php.net so we can mail you a copy immediately. diff --git a/scripts/phpize.in b/scripts/phpize.in index 362a2c9515..3e81ad4f5a 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -31,7 +31,7 @@ phpize_no_configm4() echo "Cannot find config.m4. " echo "Make sure that you run '$0$clean' in the top level source directory of the module" - echo + echo } phpize_clean() @@ -107,8 +107,8 @@ phpize_check_shtool() if test ! -x "$builddir/build/shtool"; then cat <<EOF -shtool at '$builddir/build/shtool' does not exist or is not executable. -Make sure that the file exists and is executable and then rerun this script. +shtool at '$builddir/build/shtool' does not exist or is not executable. +Make sure that the file exists and is executable and then rerun this script. EOF exit 1 @@ -121,7 +121,7 @@ phpize_check_autotools() { test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader - + if test ! -x "$PHP_AUTOCONF" && test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then cat <<EOF Cannot find autoconf. Please check your autoconf installation and the @@ -143,7 +143,7 @@ EOF phpize_copy_files() { test -d build || mkdir build - + (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build) (cd "$phpdir" && cp $FILES "$builddir") (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4) @@ -164,7 +164,7 @@ phpize_autotools() # Main script -case "$1" in +case "$1" in # Cleanup --clean) phpize_check_configm4 1 diff --git a/server-tests-config.php b/server-tests-config.php index 5961deea98..645a5e8e98 100755 --- a/server-tests-config.php +++ b/server-tests-config.php @@ -6,7 +6,7 @@ that are directly executed, so you can also set things like PHPRC here to force an executable to use a specific php.ini file. */ - + $conf = array( /* path to the php source tree */ 'TEST_PHP_SRCDIR' => NULL, @@ -43,7 +43,7 @@ $conf = array( TEST_WEB_BASE_URL should be the base url pointing to TEST_PHP_SRCDIR, which should then be accessible via an http server. - + An example would be: TEST_WEB_BASE_URL=http://localhost/test TEST_BASE_PATH=/path/to/htdocs/test diff --git a/travis/ext/pgsql/setup.sh b/travis/ext/pgsql/setup.sh index 32b39a4044..ef13733edc 100755 --- a/travis/ext/pgsql/setup.sh +++ b/travis/ext/pgsql/setup.sh @@ -1,4 +1,4 @@ #!/bin/bash -echo ' +echo ' <?php $conn_str .= " user=postgres"; ?>' >> "./ext/pgsql/tests/config.inc" psql -c 'create database test;' -U postgres
\ No newline at end of file diff --git a/win32/build/Makefile b/win32/build/Makefile index b47c3c0aca..29ec59d9b6 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -87,14 +87,14 @@ Zend\zend_language_parser.c Zend\zend_language_parser.h: Zend\zend_language_pars sapi\phpdbg\phpdbg_parser.c sapi\phpdbg\phpdbg_parser.h: sapi\phpdbg\phpdbg_parser.y $(BISON) --output=sapi/phpdbg/phpdbg_parser.c -v -d -p phpdbg_ sapi/phpdbg/phpdbg_parser.y - + !if $(RE2C) != "" Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.l $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l Zend\zend_language_scanner.c: Zend\zend_language_scanner.l $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l - + sapi\phpdbg\phpdbg_lexer.c: sapi\phpdbg\phpdbg_lexer.l $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.l !endif @@ -147,7 +147,7 @@ $(BUILD_DIR) $(BUILD_DIRS_SUB) $(BUILD_DIR_DEV): @for %D in ($(BUILD_DIRS_SUB)) do @if not exist %D @mkdir %D > NUL @if not exist $(BUILD_DIR_DEV) @mkdir $(BUILD_DIR_DEV) > NUL @cd "$(PHP_SRC_DIR)" - + clean-sapi: @echo Cleaning SAPI diff --git a/win32/build/buildconf.js b/win32/build/buildconf.js index e20e92848b..ff8025362a 100644 --- a/win32/build/buildconf.js +++ b/win32/build/buildconf.js @@ -55,17 +55,17 @@ function find_config_w32(dirname) var c, i, ok, n; var item = null; var re_dep_line = new RegExp("ADD_EXTENSION_DEP\\([^,]*\\s*,\\s*['\"]([^'\"]+)['\"].*\\)", "gm"); - + for (; !fc.atEnd(); fc.moveNext()) { ok = true; /* check if we already picked up a module with the same dirname; * if we have, don't include it here */ n = FSO.GetFileName(fc.item()); - + if (n == '.svn' || n == 'tests') continue; - + // WScript.StdOut.WriteLine("checking " + dirname + "/" + n); if (MODULES.Exists(n)) { WScript.StdOut.WriteLine("Skipping " + dirname + "/" + n + " -- already have a module with that name"); diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 19ab8421ae..b49218b0f0 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -70,7 +70,7 @@ if (VS_TOOLSET) { if(PHP_DEBUG == 'yes') { STDOUT.WriteLine('WARNING: Debug builds cannot be built using multi processing'); } else { - // no from disable-all + // no from disable-all if(PHP_MP == 'auto' || PHP_MP == 'no') { ADD_FLAG('CFLAGS', ' /MP '); PHP_MP_DISABLED = false; diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in index 62d4f6148b..6acbfdfb86 100644 --- a/win32/build/config.w32.phpize.in +++ b/win32/build/config.w32.phpize.in @@ -46,7 +46,7 @@ ARG_WITH('prefix', 'PHP installation prefix', PHP_PREFIX); ARG_WITH('mp', 'Tell Visual Studio use up to [n,auto,disable] processes for compilation', 'auto'); var PHP_MP_DISABLED = true; if (VS_TOOLSET && PHP_MP != 'disable') { - // no from disable-all + // no from disable-all if(PHP_MP == 'auto' || PHP_MP == 'no') { ADD_FLAG('CFLAGS', ' /MP '); PHP_MP_DISABLED = false; diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 24ffc48922..0d64e68fa4 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -49,7 +49,7 @@ var PHP_TEST_INI_EXT_EXCLUDE = ""; var PHP_MAKEFILE_FRAGMENTS = PHP_SRC_DIR + "\\Makefile.fragments.w32"; -/* Care also about NTDDI_VERSION and _WIN32_WINNT in config.w32.h.in +/* Care also about NTDDI_VERSION and _WIN32_WINNT in config.w32.h.in and manifest. */ var WINVER = "0x0601"; /* 7/2008r2 */ @@ -126,7 +126,7 @@ var PHP_VERSION_STRING = "7.3.0"; function get_version_numbers() { var cin = file_get_contents("configure.ac"); - + if (cin.match(new RegExp("PHP_MAJOR_VERSION=(\\d+)"))) { PHP_VERSION = RegExp.$1; } @@ -228,7 +228,7 @@ function condense_path(path) /* on a different drive */ break; } - + return path; } @@ -243,7 +243,7 @@ function ConfigureArg(type, optname, helptext, defval) this.arg = "--" + type + "-" + optname; this.imparg = "--" + opptype + "-" + optname; } - + this.optname = optname; this.helptext = helptext; this.defval = defval; @@ -290,7 +290,7 @@ function word_wrap_and_indent(indent, text, line_suffix, indent_char) if (text == null) { return ""; } - + var words = text.split(new RegExp("\\s+", "g")); var i = 0; var ret_text = ""; @@ -310,7 +310,7 @@ function word_wrap_and_indent(indent, text, line_suffix, indent_char) for (i = 0; i < indent; i++) { space += indent_char; } - + for (i = 0; i < words.length; i++) { if (this_line.length) { t = this_line + " " + words[i]; @@ -349,7 +349,7 @@ function conf_process_args() var analyzed = false; var nice = "cscript /nologo configure.js "; var disable_all = false; - + args = WScript.Arguments; for (i = 0; i < args.length; i++) { arg = args(i); @@ -478,7 +478,7 @@ can be built that way. \ analyzed = analyze_arg(arg.defval); shared = analyzed[0]; argval = analyzed[1]; - + // Don't trust a default "yes" answer for a non-core module // in a snapshot build if (PHP_SNAPSHOT_BUILD != "no" && argval == "yes" && !shared) { @@ -507,7 +507,7 @@ can be built that way. \ } } } - + if (PHP_SNAPSHOT_BUILD != "no" && argval == "no") { force = true; for (j = 0; j < snapshot_build_exclusions.length; j++) { @@ -810,7 +810,7 @@ function CHECK_LIB(libnames, target, path_to_check, common_name) var i, j, k, libname; var location = false; var path = path_to_check.split(';'); - + for (i = 0; i < libnames.length; i++) { libname = libnames[i]; @@ -883,7 +883,7 @@ function OLD_CHECK_LIB(libnames, target, path_to_check) } else { target = "_" + target.toUpperCase(); } - + if (path_to_check == null) { path_to_check = php_usual_lib_suspects; } else { @@ -962,7 +962,7 @@ function CHECK_FUNC_IN_HEADER(header_name, func_name, path_to_check, add_to_flag return c; } STDOUT.WriteLine("No"); - return false; + return false; } function GREP_HEADER(header_name, regex, path_to_check) @@ -984,7 +984,7 @@ function GREP_HEADER(header_name, regex, path_to_check) if (typeof(p) == "string") { c = file_get_contents(p); } - } + } if (!c) { return false; } @@ -1004,7 +1004,7 @@ function GREP_HEADER(header_name, regex, path_to_check) function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env, add_dir_part, add_to_flag_only) { var dir_part_to_add = ""; - + if (use_env == null) { use_env = true; } @@ -1022,7 +1022,7 @@ function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env } else { path_to_check += ";" + php_usual_include_suspects; } - + var p = search_paths(header_name, path_to_check, use_env ? "INCLUDE" : null); var have = 0; var sym; @@ -1039,7 +1039,7 @@ function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env if (typeof(p) == "string" && add_dir_part) { ADD_FLAG(flag_name, '/I "' + p + dir_part_to_add + '" '); } - } + } have = p ? 1 : 0 sym = header_name.toUpperCase(); @@ -1159,15 +1159,15 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": $(PHP_DIR)\\build\\template.rc"); MFO.WriteLine("\t" + CMD_MOD1 + "$(RC) /nologo $(BASE_INCLUDES) /I $(PHP_DIR)/include /n /fo $(BUILD_DIR)\\" + resname + logo + debug + ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"' - + makefiletarget + '\\"" /d URL="\\"' + project_url + - '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning + + + makefiletarget + '\\"" /d URL="\\"' + project_url + + '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning + '\\"" /d THANKS_GUYS="\\"' + thanks + '\\"" $(PHP_DIR)\\build\\template.rc'); } else { MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": win32\\build\\template.rc"); MFO.WriteLine("\t" + CMD_MOD1 + "$(RC) /nologo $(BASE_INCLUDES) /n /fo $(BUILD_DIR)\\" + resname + logo + debug + ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"' - + makefiletarget + '\\"" /d URL="\\"' + project_url + - '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning + + + makefiletarget + '\\"" /d URL="\\"' + project_url + + '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning + '\\"" /d THANKS_GUYS="\\"' + thanks + '\\"" win32\\build\\template.rc'); } MFO.WriteBlankLines(1); @@ -1227,7 +1227,7 @@ function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir) resname = generate_version_info_resource(makefiletarget, sapiname, configure_module_dirname, true); manifest_name = generate_version_info_manifest(makefiletarget); - + MFO.WriteLine(makefiletarget + ": $(BUILD_DIR)\\" + makefiletarget); MFO.WriteLine("\t" + CMD_MOD2 + "echo SAPI " + sapiname_for_printing + " build complete"); if (MODE_PHPIZE) { @@ -1247,7 +1247,7 @@ function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir) ldflags = "$(LDFLAGS)"; manifest = "-" + CMD_MOD2 + "$(_VC_MANIFEST_EMBED_EXE)"; } - + if (PHP_SANITIZER == "yes") { if (CLANG_TOOLSET) { add_asan_opts("CFLAGS_" + SAPI, "LIBS_" + SAPI, (is_lib ? "ARFLAGS_" : "LDFLAGS_") + SAPI); @@ -1287,7 +1287,7 @@ function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir) if (manifest) { MFO.WriteLine("\t" + manifest); } - + DEFINE('CFLAGS_' + SAPI + '_OBJ', '$(CFLAGS_' + SAPI + ')'); if (configure_module_dirname.match("pecl")) { @@ -1307,7 +1307,7 @@ function ADD_DIST_FILE(filename) } else { ADD_FLAG("PHP_EXTRA_DIST_FILES", filename); } -} +} function file_get_contents(filename) { @@ -1417,7 +1417,7 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) if (force_all_shared()) { shared = true; eval("PHP_" + EXT + "_SHARED = true;"); - } else { + } else { eval("shared = PHP_" + EXT + "_SHARED;"); } } else { @@ -1447,7 +1447,7 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) MFO.WriteBlankLines(1); ADD_SOURCES(configure_module_dirname, file_list, extname, obj_dir); - + MFO.WriteBlankLines(1); if (shared) { @@ -1495,7 +1495,7 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) MFO.WriteLine(dllname + ": $(BUILD_DIR)\\" + dllname); MFO.WriteLine("\t" + CMD_MOD2 + "echo EXT " + extname + " build complete"); MFO.WriteBlankLines(1); - + DEFINE('CFLAGS_' + EXT + '_OBJ', '$(CFLAGS_' + EXT + ')'); } else { ADD_FLAG("STATIC_EXT_OBJS", "$(" + EXT + "_GLOBAL_OBJS)"); @@ -1532,9 +1532,9 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) } } } - + extension_module_ptrs += '\tphpext_' + extname + '_ptr,\r\n'; - + DEFINE('CFLAGS_' + EXT + '_OBJ', '$(CFLAGS_PHP) $(CFLAGS_' + EXT + ')'); } if (MODE_PHPIZE) { @@ -1600,7 +1600,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) var _tmp = src.split("\\"); var filename = _tmp.pop(); - + // build the obj out dir and use it as a key var dirname = _tmp.join("\\"); @@ -1626,7 +1626,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) var build_dir = (dirname ? obj_dir + "\\" + dirname : obj_dir).replace(new RegExp("^..\\\\"), ""); } - obj = sub_build + build_dir + "\\" + filename.replace(re, ".obj"); + obj = sub_build + build_dir + "\\" + filename.replace(re, ".obj"); if (i > 0) { srcs_line += " " + dir + "\\" + src; @@ -1641,7 +1641,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) if (!srcs_by_dir.hasOwnProperty(build_dir)) { srcs_by_dir[build_dir] = []; - } + } /* storing the index from the file_list */ srcs_by_dir[build_dir].push(i); @@ -1671,7 +1671,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) if (PHP_ANALYZER == "clang") { var analyzer_base_args = X64 ? "-m64" : "-m32"; var analyzer_base_flags = ""; - + analyzer_base_args += " --analyze"; var vc_ver; @@ -1691,7 +1691,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) } else { analyzer_base_flags += " -D _MSC_VER=" + probe_binary(PATH_PROG('cl', null)); } - + if (X64) { analyzer_base_flags += " -D _M_X64 -D _WIN64"; } else { @@ -1715,7 +1715,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) "--library=win32\\build\\cppcheck.cfg " + "--library=" + cppcheck_lib + " " + /* "--rule-file=win32\build\cppcheck_rules.xml " + */ - " --std=c89 --std=c++11 " + + " --std=c89 --std=c++11 " + "--quiet --inconclusive --template=vs -j 4 " + "--suppress=unmatchedSuppression " + "--suppressions-list=win32\\build\\cppcheck_suppress.txt "; @@ -1737,9 +1737,9 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) MFO.WriteLine("\t" + CMD_MOD1 + "$(CC) $(" + flags + ") $(CFLAGS) $(" + bd_flags_name + ") /c " + dir + "\\" + src + " /Fo" + sub_build + d + obj); if ("clang" == PHP_ANALYZER) { - MFO.WriteLine("\t" + CMD_MOD1 + "\"$(CLANG_CL)\" " + analyzer_base_args + " $(" + flags + "_ANALYZER) $(CFLAGS_ANALYZER) $(" + bd_flags_name + "_ANALYZER) " + dir + "\\" + src); + MFO.WriteLine("\t" + CMD_MOD1 + "\"$(CLANG_CL)\" " + analyzer_base_args + " $(" + flags + "_ANALYZER) $(CFLAGS_ANALYZER) $(" + bd_flags_name + "_ANALYZER) " + dir + "\\" + src); } else if ("cppcheck" == PHP_ANALYZER) { - MFO.WriteLine("\t\"" + CMD_MOD1 + "$(CPPCHECK)\" " + analyzer_base_args + " $(" + flags + "_ANALYZER) $(CFLAGS_ANALYZER) $(" + bd_flags_name + "_ANALYZER) " + analyzer_base_flags + " " + dir + "\\" + src); + MFO.WriteLine("\t\"" + CMD_MOD1 + "$(CPPCHECK)\" " + analyzer_base_args + " $(" + flags + "_ANALYZER) $(CFLAGS_ANALYZER) $(" + bd_flags_name + "_ANALYZER) " + analyzer_base_flags + " " + dir + "\\" + src); }else if (PHP_ANALYZER == "pvs") { MFO.WriteLine("\t" + CMD_MOD1 + "\"$(PVS_STUDIO)\" --cl-params $(" + flags + ") $(CFLAGS) $(" + bd_flags_name + ") /c " + dir + "\\" + src + " --source-file " + dir + "\\" + src + " --cfg PVS-Studio.conf --errors-off \"V122 V117 V111\" "); @@ -1764,8 +1764,8 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) DEFINE(sym, tv); - /* Generate the object response file and define it to the Makefile. This can be - useful when getting the "command line too long" linker errors. + /* Generate the object response file and define it to the Makefile. This can be + useful when getting the "command line too long" linker errors. TODO pack this into a function when response files are used for other kinds of info. */ var obj_lst_fh = null; if (!FSO.FileExists(obj_lst_fn)) { @@ -1809,11 +1809,11 @@ function generate_internal_functions() var indata; STDOUT.WriteLine("Generating main/internal_functions.c"); - + infile = FSO.OpenTextFile("main/internal_functions.c.in", 1); indata = infile.ReadAll(); infile.Close(); - + indata = indata.replace("@EXT_INCLUDE_CODE@", extension_include_code); indata = indata.replace("@EXT_MODULE_PTRS@", extension_module_ptrs); @@ -2022,7 +2022,7 @@ function generate_tmp_php_ini() if ("shared" != extensions_enabled[i][1]) { continue; } - + var directive = (extensions_enabled[i][2] ? 'zend_extension' : 'extension'); var ext_name = extensions_enabled[i][0]; @@ -2249,11 +2249,11 @@ function generate_config_h() prefix = PHP_PREFIX.replace(new RegExp("\\\\", "g"), "\\\\"); STDOUT.WriteLine("Generating main/config.w32.h"); - + infile = FSO.OpenTextFile("win32/build/config.w32.h.in", 1); indata = infile.ReadAll(); infile.Close(); - + outfile = FSO.CreateTextFile("main/config.w32.h", true); indata = indata.replace(new RegExp("@PREFIX@", "g"), prefix); @@ -2295,7 +2295,7 @@ function generate_config_h() pieces += '" "'; } } - + outfile.WriteLine("#define " + keys[i] + " " + pieces); } @@ -2311,7 +2311,7 @@ function generate_config_h() } } - + outfile.Close(); } @@ -2327,7 +2327,7 @@ function generate_phpize() var MF = FSO.CreateTextFile(dest + "/phpize.js", true); var DEPS = FSO.CreateTextFile(dest + "/ext_deps.js", true); - + prefix = get_define("PHP_PREFIX"); prefix = prefix.replace(new RegExp("/", "g"), "\\"); prefix = prefix.replace(new RegExp("\\\\", "g"), "\\\\"); @@ -2449,7 +2449,7 @@ function handle_analyzer_makefile_flags(fd, key, val) } val = new_val; - if ("clang" == PHP_ANALYZER) { + if ("clang" == PHP_ANALYZER) { val = val.replace(/\/FD /, "") .replace(/\/Fp.+? /, "") .replace(/\/Fo.+? /, "") @@ -2514,7 +2514,7 @@ function generate_makefile() /* \s+\/ eliminates extra whitespace caused when using \ for string continuation, whereby \/ is the start of the next compiler switch */ var val = trim(configure_subst.Item(keys[i])).replace(/\s+\//gm, " /"); - + MF.WriteLine(keys[i] + "=" + val + " "); MF.WriteBlankLines(1); @@ -2542,7 +2542,7 @@ function generate_makefile() MF.WriteLine(" " + CMD_MOD2 + "for %D in ($(INSTALL_HEADERS_DIR)) do " + CMD_MOD2 + "if not exist $(BUILD_DIR_DEV)\\include\\%D mkdir $(BUILD_DIR_DEV)\\include\\%D >nul"); for (i in headers_install) { if (headers_install[i][2] != "") { - MF.WriteLine(" " + CMD_MOD2 + "if not exist $(BUILD_DIR_DEV)\\include\\" + headers_install[i][2] + " mkdir $(BUILD_DIR_DEV)\\include\\" + + MF.WriteLine(" " + CMD_MOD2 + "if not exist $(BUILD_DIR_DEV)\\include\\" + headers_install[i][2] + " mkdir $(BUILD_DIR_DEV)\\include\\" + headers_install[i][2] + ">nul"); MF.WriteLine(" " + CMD_MOD2 + "copy " + headers_install[i][0] + " " + "$(BUILD_DIR_DEV)\\include\\" + headers_install[i][2] + " /y >nul"); } @@ -2620,7 +2620,7 @@ function generate_makefile() FSO.DeleteFile(PHP_MAKEFILE_FRAGMENTS, true); } - MF.Close(); + MF.Close(); } function ADD_FLAG(name, flags, target) @@ -2635,7 +2635,7 @@ function ADD_FLAG(name, flags, target) /* Prefix with a space, thus making sure the current flag is not a substring of some other. It's still not a complete check if - some flags with spaces got added. + some flags with spaces got added. TODO rework to use an array, so direct match can be done. This will also @@ -2644,7 +2644,7 @@ function ADD_FLAG(name, flags, target) if (curr_flags.indexOf(" " + flags) >= 0 || curr_flags.indexOf(flags + " ") >= 0) { return; } - + flags = curr_flags + " " + flags; configure_subst.Remove(name); } @@ -2721,7 +2721,7 @@ function copy_and_subst(srcname, destname, subst_array) content = content.replace(re, rep); } - + var f = FSO.CreateTextFile(destname, true); f.Write(content); f.Close(); @@ -2742,14 +2742,14 @@ function glob(path_pattern) if (FSO.FileExists(path_pattern)) { return new Array(path_pattern); } - + // first, build as much as possible that doesn't have a pattern for (p = 0; p < path_parts.length; p++) { if (path_parts[p].match(is_pat_re)) break; if (p) base += "\\"; - base += path_parts[p]; + base += path_parts[p]; } return _inner_glob(base, p, path_parts); @@ -3113,7 +3113,7 @@ function toolset_is_64() return null != full.match(/x86_64/);*/ /* Even executed within an environment setup with vcvars32.bat, - clang-cl doesn't recognize the arch toolset. But as it needs + clang-cl doesn't recognize the arch toolset. But as it needs the VS environment, checking the arch of cl.exe is correct. */ return probe_binary(PATH_PROG('cl', null), 64); } else if (ICC_TOOLSET) { diff --git a/win32/build/default.manifest b/win32/build/default.manifest index 8c394ca649..aa5da5c4d0 100644 --- a/win32/build/default.manifest +++ b/win32/build/default.manifest @@ -7,8 +7,8 @@ </requestedPrivileges> </security> </trustInfo> - <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> - <application> + <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> <!-- Windows 7 --> <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> <!-- Windows 8 --> @@ -17,7 +17,7 @@ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <!-- Windows 10 --> <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> - </application> + </application> </compatibility> <application xmlns="urn:schemas-microsoft-com:asm.v3"> <windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings"> diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php index 30e8ee1564..3f8d6e05c1 100644 --- a/win32/build/mkdist.php +++ b/win32/build/mkdist.php @@ -68,13 +68,13 @@ function get_depends($module) "api-ms-win-crt-.+\.dll", ); global $build_dir, $extra_dll_deps, $ext_targets, $sapi_targets, $pecl_targets, $phpdll, $per_module_deps, $pecl_dll_deps; - + $bd = strtolower(realpath($build_dir)); $is_pecl = in_array($module, $pecl_targets); - + $cmd = "$GLOBALS[build_dir]\\deplister.exe \"$module\" \"$GLOBALS[build_dir]\""; - $proc = proc_open($cmd, + $proc = proc_open($cmd, array(1 => array("pipe", "w")), $pipes); @@ -106,7 +106,7 @@ function get_depends($module) continue; } } - + if ($is_pecl) { if (!in_array($dep, $pecl_dll_deps)) { $pecl_dll_deps[] = $dep; @@ -203,7 +203,7 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */ $hdr['size'] = octdec(trim($hdr['size'])); echo "File: $hdr[filename] $hdr[size]\n"; - + if ($filename == $hdr['filename']) { echo "Found the file we want\n"; $dest = fopen($destfilename, 'wb'); @@ -212,14 +212,14 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */ echo "Wrote $x bytes into $destfilename\n"; break; } - + /* skip body of the file */ $size = 512 * ceil((int)$hdr['size'] / 512); echo "Skipping $size bytes\n"; gzseek($fp, gztell($fp) + $size); - + } while (!$done); - + } /* }}} */ @@ -251,7 +251,7 @@ if(sizeof($pecl_targets)) { $text_files = array( "LICENSE" => "license.txt", "NEWS" => "news.txt", - "INSTALL" => "install.txt", + "INSTALL" => "install.txt", "README.REDIST.BINS" => "readme-redist-bins.txt", "php.ini-development" => "php.ini-development", "php.ini-production" => "php.ini-production" @@ -327,9 +327,9 @@ foreach ($extra_dll_deps as $dll) { } /* TODO: -add sanity check and test if all required DLLs are present, per version +add sanity check and test if all required DLLs are present, per version This version works at least for 3.6, 3.8 and 4.0 (5.3-vc6, 5.3-vc9 and HEAD). -Add ADD_DLLS to add extra DLLs like dynamic dependencies for standard +Add ADD_DLLS to add extra DLLs like dynamic dependencies for standard deps. For example, libenchant.dll loads libenchant_myspell.dll or libenchant_ispell.dll */ @@ -451,7 +451,7 @@ function copy_test_dir($directory, $dest) } } - closedir($directory_list); + closedir($directory_list); } function make_phar_dot_phar($dist_dir) @@ -537,7 +537,7 @@ if (!$use_pear_template) { extract_file_from_tarball('Archive_Tar', 'Archive/Tar.php', "$dist_dir/PEAR/go-pear-bundle"); extract_file_from_tarball('Console_Getopt', 'Console/Getopt.php', "$dist_dir/PEAR/go-pear-bundle"); } - + /* add extras from the template dir */ if (file_exists($snapshot_template)) { $items = glob("$snapshot_template/*"); @@ -567,7 +567,7 @@ if (file_exists($snapshot_template)) { } } } - + /* copy c++ runtime */ $items = glob("$snapshot_template/dlls/*.CRT"); diff --git a/win32/codepage.c b/win32/codepage.c index 16e480e5ff..73645bc22b 100644 --- a/win32/codepage.c +++ b/win32/codepage.c @@ -177,7 +177,7 @@ PW32CP wchar_t *php_win32_cp_conv_ascii_to_w(const char* in, size_t in_len, size } ret_idx += 8; - { + { const __m128i hi = _mm_unpackhi_epi8(block, mask); _mm_storeu_si128((__m128i *)ret_idx, hi); } |