Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:23607 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 92914 invoked by uid 1010); 21 May 2006 08:40:25 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 92899 invoked from network); 21 May 2006 08:40:25 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 21 May 2006 08:40:25 -0000 X-PHP-List-Original-Sender: markus@fischer.name X-Host-Fingerprint: 213.46.255.14 viefep14-int.chello.at Solaris 8 (1) Received: from ([213.46.255.14:48562] helo=viefep16-int.chello.at) by pb1.pair.com (ecelerity 2.0 beta r(6323M)) with SMTP id 82/6E-19568-67720744 for ; Sun, 21 May 2006 04:40:23 -0400 Received: from genuine ([80.108.128.16]) by viefep16-int.chello.at (InterMail vM.6.01.04.04 201-2131-118-104-20050224) with ESMTP id <20060521084018.UDTV23972.viefep16-int.chello.at@genuine> for ; Sun, 21 May 2006 10:40:18 +0200 Received: from laptop.home ([192.168.1.50]) by genuine with esmtpa (Exim 4.50) id 1FhjR4-0002rD-KR for internals@lists.php.net; Sun, 21 May 2006 10:37:17 +0200 Message-ID: <44702771.2040003@fischer.name> Date: Sun, 21 May 2006 10:40:17 +0200 User-Agent: Thunderbird 1.5.0.2 (Windows/20060308) MIME-Version: 1.0 To: internals@lists.php.net X-Enigmail-Version: 0.94.0.0 Content-Type: multipart/mixed; boundary="------------020403040107070506030808" X-Spam-Score: -27 X-Spam-Level: -- X-Spam-Report: Spam detection software, running on the system "genuine", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, attached are just a few one-line changes to the current README.CVS-RULES files in 5.2 and HEAD, maybe it needs even more massaging. [...] Content analysis details: (-2.8 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.8 ALL_TRUSTED Did not pass through any untrusted hosts Subject: README.CVS very small updates From: markus@fischer.name (Markus Fischer) --------------020403040107070506030808 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, attached are just a few one-line changes to the current README.CVS-RULES files in 5.2 and HEAD, maybe it needs even more massaging. - - Markus -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFEcCdx1nS0RcInK9ARAu1BAJ428qhMzN77T9KR5+aBuK0PaK5itQCdHd6D 0D+UDo1QSyNbkrO9F82199U= =qPn1 -----END PGP SIGNATURE----- --------------020403040107070506030808 Content-Type: text/plain; name="README.CVS-RULES.head.diff.txt" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="README.CVS-RULES.head.diff.txt" Index: README.CVS-RULES =================================================================== RCS file: /repository/php-src/README.CVS-RULES,v retrieving revision 1.19 diff -u -r1.19 README.CVS-RULES --- README.CVS-RULES 17 Aug 2005 19:52:03 -0000 1.19 +++ README.CVS-RULES 21 May 2006 08:35:06 -0000 @@ -34,11 +34,11 @@ code handles TSRM correctly and doesn't break for thos who need that. Currently we have the following branches in use: -HEAD Will become PHP 5.1. This CVS branch is for active development. -PHP_5_0 Is used to release the PHP 5.0.x series. Only minor feature +HEAD Will become PHP 6.0. This CVS branch is for active development. +PHP_5_2 Is used to release the PHP 5.2.x series. Only minor feature enhancements may go in here, but please keep that as infrequent as possible. -PHP_4_3 Is used to release the PHP 4.3.x series. Only bugfixes are permitted +PHP_4_4 Is used to release the PHP 4.3.x series. Only bugfixes are permitted on this branch. The next few rules are more of a technical nature. --------------020403040107070506030808 Content-Type: text/plain; name="README.CVS-RULES.php_5_2.diff.txt" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="README.CVS-RULES.php_5_2.diff.txt" Index: README.CVS-RULES =================================================================== RCS file: /repository/php-src/README.CVS-RULES,v retrieving revision 1.18.2.1 diff -u -r1.18.2.1 README.CVS-RULES --- README.CVS-RULES 4 Dec 2005 23:19:44 -0000 1.18.2.1 +++ README.CVS-RULES 21 May 2006 08:35:37 -0000 @@ -30,8 +30,12 @@ 6. Test your changes before committing them. We mean it. Really. + 7. For development use the --enable-maintainer-zts switch to ensure your + code handles TSRM correctly and doesn't break for thos who need that. + Currently we have the following branches in use: HEAD Will become PHP 6.0. This CVS branch is for active development. +PHP_5_2 Is used to release the PHP 5.2.x series. PHP_5_1 Is used to release the PHP 5.1.x series. Only minor feature enhancements may go in here, but please keep that as infrequent as possible. --------------020403040107070506030808--