Merge pull request #10 from php/master

sysnc

Author: chopins

.cirrus.yml

@@ -0,0 +1,28 @@
+env:
+  CIRRUS_CLONE_DEPTH: 1
+  ARCH: amd64
+
+freebsd_instance:
+  image_family: freebsd-13-0
+
+task:
+  name: FREEBSD_DEBUG_NTS
+  install_script:
+    #- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
+    #- pkg upgrade -y
+    - kldload accf_http
+    - pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 krb5 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif
+  script:
+    - ./buildconf -f
+    - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-kerberos --with-ffi --enable-zend-test --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d
+    - gmake -j2
+    - mkdir /etc/php.d
+    - gmake install
+    - echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
+    - echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
+    # Specify opcache.preload_user as we're running as root.
+    - echo opcache.preload_user=root >> /etc/php.d/opcache.ini
+  tests_script:
+    - export SKIP_IO_CAPTURE_TESTS=1
+    - export CI_NO_IPV6=1
+    - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so

.gdbinit

@@ -11,9 +11,7 @@ end
 
 define ____executor_globals
 	if basic_functions_module.zts
-		if !$tsrm_ls
-			set $tsrm_ls = ts_resource_ex(0, 0)
-		end
+		set $tsrm_ls = _tsrm_ls_cache
 		set $eg = ((zend_executor_globals*) (*((void ***) $tsrm_ls))[executor_globals_id-1])
 		set $cg = ((zend_compiler_globals*) (*((void ***) $tsrm_ls))[compiler_globals_id-1])
 		set $eg_ptr = $eg
@@ -340,7 +338,8 @@ define ____print_ht
 			end
 			printf "[%d] ", $i
 			if $p->key
-				printf "%s => ", $p->key->val
+				____print_str $p->key->val $p->key->len
+				printf " => "
 			else
 				printf "%d => ", $p->h
 			end

.gitignore

@@ -41,6 +41,9 @@
 # Standard object files generated during build process
 *.o
 
+# Dependency files generated during build process
+*.dep
+
 # Cache directories created by Autoconf tools
 autom4te.cache/
 

.travis.yml

@@ -68,18 +68,10 @@ env:
 
 jobs:
     include:
-        - env: ENABLE_ZTS=0 ENABLE_DEBUG=0
-          arch: amd64
-          if: type = cron
-        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1
-          arch: amd64
-          if: type = cron
-        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
+        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 ARM64=1
           arch: arm64
-          if: type = cron
-        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 S390X=1
+        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 S390X=1
           arch: s390x
-          if: type = cron
 
 before_script:
     - ccache --version
@@ -95,9 +87,9 @@ before_script:
 
 # Run PHPs run-tests.php
 script:
-    # ARM64 CI reports nproc=32, which is excessive.
-    - if [ -z "$ARM64" ]; then export JOBS=$(nproc); else export JOBS=16; fi
-    - ./sapi/cli/php run-tests.php -P -d extension=`pwd`/modules/zend_test.so $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120 -j$JOBS
+    - ./travis/test.sh -d opcache.jit_buffer_size=16M -d opcache.jit=tracing
+    - if [[ "$ARM64" == 1 ]]; then ./travis/test.sh -d opcache.jit_buffer_size=16M -d opcache.jit=function; fi
+    - if [[ "$ARM64" == 1 ]]; then ./travis/test.sh -d opcache.jit_buffer_size=16M -d opcache.jit=tracing --repeat 2; fi
     - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
 
 after_success:

CODING_STANDARDS.md

@@ -1,41 +1,39 @@
 # PHP coding standards
 
-This file lists several standards that any programmer adding or changing code in
-PHP should follow. Since this file was added at a very late stage of the
-development of PHP v3.0, the code base does not fully follow it, but new
-features are going in that general direction. Many sections have been recoded to
-use these rules.
+This file lists standards that any programmer adding or changing code in
+PHP should follow. The code base does not yet fully follow it, but new
+features are going in that general direction. Many sections have been
+rewritten to comply with these rules.
 
 ## Code implementation
 
 1. Document your code in source files and the manual. (tm)
 
 2. Functions that are given pointers to resources should not free them.
 
-    For instance, `function int mail(char *to, char *from)` should NOT free to
-    and/or from.
+    For instance, `function int mail(char *to, char *from)` should NOT free `to`
+    and/or `from`.
 
     Exceptions:
 
     * The function's designated behavior is freeing that resource. E.g.
       `efree()`
 
     * The function is given a boolean argument, that controls whether or not the
-      function may free its arguments (if true - the function must free its
-      arguments, if false - it must not)
+      function may free its arguments (if true, the function must free its
+      arguments; if false, it must not)
 
     * Low-level parser routines, that are tightly integrated with the token
       cache and the bison code for minimum memory copying overhead.
 
 3. Functions that are tightly integrated with other functions within the same
-    module, and rely on each other non-trivial behavior, should be documented as
+    module, and rely on each other's non-trivial behavior, should be documented as
     such and declared `static`. They should be avoided if possible.
 
 4. Use definitions and macros whenever possible, so that constants have
-    meaningful names and can be easily manipulated. The only exceptions to this
-    rule are 0 and 1, when used as `false` and `true` (respectively). Any other
-    use of a numeric constant to specify different behavior or actions should be
-    done through a `#define`.
+    meaningful names and can be easily manipulated. Any use of a numeric
+    constant to specify different behavior or actions should be done through
+    a `#define`.
 
 5. When writing functions that deal with strings, be sure to remember that PHP
     holds the length property of each string, and that it shouldn't be
@@ -260,35 +258,18 @@ use these rules.
     ```
 
 4. When indenting, use the tab character. A tab is expected to represent four
-    spaces. It is important to maintain consistency in indenture so that
+    spaces. It is important to maintain consistency in indentation so that
     definitions, comments, and control structures line up correctly.
 
 5. Preprocessor statements (`#if` and such) MUST start at column one. To indent
     preprocessor directives you should put the `#` at the beginning of a line,
-    followed by any number of whitespace.
+    followed by any number of spaces.
 
 ## Testing
 
-1. Extensions should be well tested using `*.phpt` tests. Read about that at
+1. Extensions should be well tested using `*.phpt` tests. Read more at
     [qa.php.net](https://qa.php.net/write-test.php) documentation.
 
-## Folding hooks
-
-Use `{{{` symbols for the folding mode in Emacs and vim (`set fdm=marker`).
-Folding is very useful when dealing with large files because you can scroll
-through the file quickly and just unfold the function you wish to work on.
-The `}}}` at the end of each function marks the end of the fold, and should
-be on a separate line.
-
-```c
-/* {{{ Returns the absolute value of the number */
-PHP_FUNCTION(abs)
-{
-    ...
-}
-/* }}} */
-```
-
 ## New and experimental functions
 
 To reduce the problems normally associated with the first public implementation
@@ -302,8 +283,8 @@ The file labelled `EXPERIMENTAL` should include the following information:
 * Any authoring information (known bugs, future directions of the module).
 * Ongoing status notes which may not be appropriate for Git comments.
 
-In general new features should go to PECL or experimental branches until there
-are specific reasons for directly adding it to the core distribution.
+In general, new features should go to PECL or experimental branches until there
+are specific reasons for directly adding them to the core distribution.
 
 ## Aliases & legacy documentation
 

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Anybody who programs in PHP can be a contributing member of the community that
 develops and deploys it; the task of deploying PHP, documentation and associated
-websites is a never ending one. With every release, or release candidate comes a
+websites is a never-ending one. With every release or release candidate comes a
 wave of work, which takes a lot of organization and co-ordination.
 
 You don't need any special access to download, build, debug and begin submitting
@@ -85,7 +85,7 @@ for additional notes on the best way to approach submitting an RFC.
 
 ## Writing tests
 
-We love getting new tests! PHP is a huge project and improving code coverage is
+We love getting new tests! PHP is a huge project and improving test coverage is
 a huge win for every PHP user.
 
 [Our QA site includes a page detailing how to write test cases.](https://qa.php.net/write-test.php)
@@ -135,6 +135,7 @@ locations.
  ├─ .git/                           # Git configuration and source directory
  ├─ TSRM/                           # Thread Safe Resource Manager
  └─ Zend/                           # Zend Engine
+    ├─ asm/                         # Bundled from src/asm in https://github.com/boostorg/context
     ├─ zend_vm_execute.h            # Generated by `Zend/zend_vm_gen.php`
     ├─ zend_vm_opcodes.c            # Generated by `Zend/zend_vm_gen.php`
     ├─ zend_vm_opcodes.h            # Generated by `Zend/zend_vm_gen.php`
@@ -146,6 +147,7 @@ locations.
     ├─ config.sub                   # https://git.savannah.gnu.org/cgit/config.git
     ├─ libtool.m4                   # https://git.savannah.gnu.org/cgit/libtool.git
     ├─ ltmain.sh                    # https://git.savannah.gnu.org/cgit/libtool.git
+    ├─ pkg.m4                       # https://gitlab.freedesktop.org/pkg-config/pkg-config
     ├─ shtool                       # https://www.gnu.org/software/shtool/
     └─ ...
  ├─ docs/                           # PHP internals and repository documentation
@@ -253,30 +255,30 @@ included.
 
 - Read [Coding standards](/CODING_STANDARDS.md) before you start working.
 - Update git source just before running your final `diff` and before testing.
-- Add in-line comments and/or have external documentation ready. Use only
+- Add inline comments and/or have external documentation ready. Use only
   `/* */` style comments, not `//`.
 - Create test scripts for use with `make test`.
 - Run `make test` to check your change doesn't break other features.
 - Rebuild PHP with `--enable-debug` which will show some kinds of memory errors
   and check the PHP and web server error logs after running your PHP tests.
 - Rebuild PHP with `--enable-zts` to check your change compiles and operates
-  correctly in a thread safe PHP.
+  correctly in a thread-safe PHP.
 - Review the change once more just before submitting it.
 
 ## What happens after submitting contribution?
 
 If your change is easy to review and obviously has no side-effects, it might be
 committed relatively quickly.
 
-Because PHP is a volunteer-driven effort more complex changes will require
+Because PHP is a volunteer-driven effort, more complex changes will require
 patience on your side. If you do not receive feedback in a few days, consider
 bumping. Before doing this think about these questions:
 
 - Did I send the patch to the right mailing list?
 - Did I review the mailing list archives to see if these kind of changes had
   been discussed before?
 - Did I explain my change clearly?
-- Is my change too hard to review? Because of what factors?
+- Is my change too hard to review? If so, why?
 
 ## What happens when your contribution is applied?
 
@@ -327,7 +329,8 @@ Currently we have the following branches in use:
 
 | Branch    |           |
 | --------- | --------- |
-| master    | Active development branch for PHP 8.1, which is open for backwards incompatible changes and major internal API changes. |
+| master    | Active development branch for PHP 8.2, which is open for backwards incompatible changes and major internal API changes. |
+| PHP-8.1   | Is used to release the PHP 8.1.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-8.0   | Is used to release the PHP 8.0.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-7.4   | Is used to release the PHP 7.4.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-7.3   | Is used to release the PHP 7.3.x series. This is a current stable version and is open for bugfixes only. |
@@ -398,9 +401,6 @@ Example:
 When you change the NEWS file for a bug fix, then please keep the bugs sorted in
 decreasing order under the fixed version.
 
-You can use [gitweb](https://git.php.net/) to look at PHP Git repository in
-various ways.
-
 ## Copyright and license headers
 
 New source code files should include the following header block:

LICENSE

@@ -1,6 +1,6 @@
 --------------------------------------------------------------------
                   The PHP License, version 3.01
-Copyright (c) 1999 - 2019 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2021 The PHP Group. All rights reserved.
 --------------------------------------------------------------------
 
 Redistribution and use in source and binary forms, with or without

NEWS

@@ -1,25 +1,22 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.1.0alpha1
+?? ??? ????, PHP 8.2.0alpha1
 
-- Core:
-  . Fixed inclusion order for phpize builds on Windows. (cmb)
-  . Added missing hashtable insertion APIs for arr/obj/ref. (Sara)
-
-- FTP:
-  . Convert resource<ftp> to object \FTPConnection. (Sara)
+- CLI:
+  . Fixed bug #81496 (Server logs incorrect request method). (lauri)
 
-- GD:
-  . Convert resource<gd font> to object \GdFont. (Sara)
+- Core:
+  . Fixed bug #81380 (Observer may not be initialized properly). (krakjoe)
 
-- hash:
-  . Implemented FR #68109 (Add MurmurHash V3). (Anatol, Michael)
+- Intl:
+  . Update all grandfathered language tags with preferred values
 
-- OpenSSL:
-  . Bump minimal OpenSSL version to 1.0.2. (Jakub Zelenka)
+- OCI8:
+  . Added oci8.prefetch_lob_size directive to tune LOB query performance
 
-- PSpell:
-  . Convert resource<pspell> to object \PSpell. (Sara)
-  . Convert resource<pspell config> to object \PSPellConfig. (Sara)
+- Zip:
+  . add ZipArchive::clearError() method
+  . add ZipArchive::getStreamName() method
+  . add ZipArchive::getStreamIndex() method
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

README.md

@@ -14,7 +14,7 @@ web development. Fast, flexible and pragmatic, PHP powers everything from your
 blog to the most popular websites in the world. PHP is distributed under the
 [PHP License v3.01](LICENSE).
 
-[![Build status](https://travis-ci.org/php/php-src.svg?branch=master)](https://travis-ci.org/php/php-src)
+[![Build status](https://travis-ci.com/php/php-src.svg?branch=master)](https://travis-ci.com/php/php-src)
 [![Build status](https://ci.appveyor.com/api/projects/status/meyur6fviaxgdwdy/branch/master?svg=true)](https://ci.appveyor.com/project/php/php-src)
 [![Build Status](https://dev.azure.com/phpazuredevops/php/_apis/build/status/php.php-src?branchName=master)](https://dev.azure.com/phpazuredevops/php/_build/latest?definitionId=1&branchName=master)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/php.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:php)
@@ -40,12 +40,17 @@ For other systems, see the [installation chapter](https://php.net/install).
 *For Windows, see [Build your own PHP on Windows](https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2).*
 
 For a minimal PHP build from Git, you will need autoconf, bison, and re2c. For
-a default build, you will additionally need libxml2 and libsqlite3. On Ubuntu,
-you can install these using:
+a default build, you will additionally need libxml2 and libsqlite3.
+
+On Ubuntu, you can install these using:
 
     sudo apt install -y pkg-config build-essential autoconf bison re2c \
                         libxml2-dev libsqlite3-dev
 
+On Fedora, you can install these using:
+
+    sudo dnf install re2c bison autoconf make libtool ccache libxml2-devel sqlite-devel
+
 Generate configure:
 
     ./buildconf
@@ -98,10 +103,8 @@ Extension Community Library - [PECL](https://pecl.php.net).
 
 ## Contributing
 
-The PHP source code is located in the Git repository at
-[git.php.net](https://git.php.net). Contributions are most welcome by forking
-the [GitHub mirror repository](https://github.com/php/php-src) and sending a
-pull request.
+Contributions are most welcome by forking the
+[GitHub repository](https://github.com/php/php-src) and sending a pull request.
 
 Discussions are done on GitHub, but depending on the topic can also be relayed
 to the official PHP developer mailing list [email protected].
@@ -122,9 +125,8 @@ ticket at [bugs.php.net](https://bugs.php.net) and reference the bug id using
     magic_quotes behavior and therefore should not raise a warning at any time.
     The patch removes this warning.
 
-Pull requests are not merged directly on GitHub. All PRs will be pulled and
-pushed through [git.php.net](https://git.php.net). See
-[Git workflow](https://wiki.php.net/vcs/gitworkflow) for more details.
+See [Git workflow](https://wiki.php.net/vcs/gitworkflow) for more details on the
+pull request workflow.
 
 ### Guidelines for contributors
 
@@ -133,7 +135,7 @@ contribute:
 
 - [Contributing to PHP](/CONTRIBUTING.md)
 - [PHP coding standards](/CODING_STANDARDS.md)
-- [Mailinglist rules](/docs/mailinglist-rules.md)
+- [Mailing list rules](/docs/mailinglist-rules.md)
 - [PHP release process](/docs/release-process.md)
 
 ## Credits