diff options
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r-- | CONTRIBUTING.md | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a084bdea98..ba7ac7c8ac 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -262,8 +262,8 @@ included. - 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-maintainer-zts` to check your change compiles on - multi-threaded web servers. +- Rebuild PHP with `--enable-zts` to check your change compiles and operates + correctly in a thread safe PHP. - Review the change once more just before submitting it. ## What happens after submitting contribution? @@ -323,8 +323,8 @@ Having said that, here are the organizational rules: `make test`. 7. For development use the `--enable-debug` switch to avoid memory leaks and the - `--enable-maintainer-zts` switch to ensure your code handles TSRM correctly - and doesn't break for those who need that. + `--enable-zts` switch to ensure your code handles TSRM correctly and doesn't + break for those who need that. Currently we have the following branches in use: @@ -410,8 +410,6 @@ New source code files should include the following header block: ```c /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | |