summaryrefslogtreecommitdiff
path: root/README.GIT-RULES
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2016-08-18 12:30:24 +0200
committerNikita Popov <nikic@php.net>2016-08-18 12:31:09 +0200
commit59edefa5dce45ec849822ae4321317d797058c3e (patch)
tree739a3863790d8653d3f1693ce629e55937b895c5 /README.GIT-RULES
parentdd16fea06a5cce7f710810e58c36a330c1dd21e6 (diff)
downloadphp-git-59edefa5dce45ec849822ae4321317d797058c3e.tar.gz
Update GIT-RULES release list
[ci skip]
Diffstat (limited to 'README.GIT-RULES')
-rw-r--r--README.GIT-RULES17
1 files changed, 11 insertions, 6 deletions
diff --git a/README.GIT-RULES b/README.GIT-RULES
index a88a8c9f32..d7143e6b9d 100644
--- a/README.GIT-RULES
+++ b/README.GIT-RULES
@@ -38,21 +38,26 @@ Having said that, here are the organizational rules::
6. Test your changes before committing them. We mean it. Really.
To do so use "make test".
- 7. For development use the --enable-maintainer-zts switch to ensure your
- code handles TSRM correctly and doesn't break for those who need that.
+ 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.
Currently we have the following branches in use::
master The active development branch.
+ PHP-7.1 Is used to release the PHP 7.1.x series. This is a prerelease
+ version.
+
+ PHP-7.0 Is used to release the PHP 7.0.x series. This is a current
+ stable version and is open for bugfixes only.
+
PHP-5.6 Is used to release the PHP 5.6.x series. This is a current
stable version and is open for bugfixes only.
- PHP-5.5 Is used to release the PHP 5.5.x series. This is an old
- stable version and is open for security fixes only.
+ PHP-5.5 This branch is closed.
- PHP-5.4 Is used to release the PHP 5.4.x series. This is an old
- stable version and is open for security fixes only.
+ PHP-5.4 This branch is closed.
PHP-5.3 This branch is closed.