PHP 5.3.17

BFN
- Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
2026-11-10 18:50:50 +00:00 · 2012-09-12 23:27:16 +02:00 · 2012-09-12 23:25:56 +02:00 · 2012-09-12 23:22:48 +02:00 · 2012-09-12 23:20:28 +02:00
2192 changed files with 35083 additions and 55958 deletions
@@ -1,9 +1,10 @@
 language: php

-branches:
-    except:
-        - /^PHP-5\.3.*/
-        - /^PHP-5\.4.*/
+php:
+    # We only specify one version so we only get one worker
+    - 5.4

 notifications:
    email: false
+
+script: exit 0
@@ -2,11 +2,11 @@
  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
+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 (yet) fully
 follow it, but it's going in that general direction.  Since we are now
-well into version 5 releases, many sections have been recoded to use
+well into the version 4 releases, many sections have been recoded to use
 these rules.

 Code Implementation
@@ -98,9 +98,7 @@ test: all
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
 			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
-		TEST_RESULT_EXIT_CODE=$$?; \
 		rm $(top_builddir)/tmp-php.ini; \
-		exit $$TEST_RESULT_EXIT_CODE; \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi
@@ -1,363 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 20??, PHP 5.3.30
-
-You should not add anything to this tree. PHP 5.3 reached EOL.
-
-14 Aug 2014, PHP 5.3.29
-
- Core:
-  . Fixed bug #66127 (Segmentation fault with ArrayObject unset). (Stas)
-  . Fixed bug #67247 (spl_fixedarray_resize integer overflow). (Stas)
-  . Fixed bug #67249 (printf out-of-bounds read). (Stas)
-  . Fixed bug #67250 (iptcparse out-of-bounds read). (Stas)
-  . Fixed bug #67252 (convert_uudecode out-of-bounds read). (Stas)
-  . Fixed bug #67359 (Segfault in recursiveDirectoryIterator). (Laruence)
-  . Fixed bug #67390 (insecure temporary file use in the configure script).
-    (Remi) (CVE-2014-3981)
-  . Fixed bug #67399 (putenv with empty variable may lead to crash). (Stas)
-  . Fixed bug #67492 (unserialize() SPL ArrayObject / SPLObjectStorage Type 
-    Confusion) (CVE-2014-3515). (Stefan Esser)
-  . Fixed bug #67498 (phpinfo() Type Confusion Information Leak Vulnerability).
-    (Stefan Esser)
-
- COM:
-  . Fixed missing type checks in com_event_sink (Yussuf Khalil, Stas).
-
- Date:
-  . Fixed bug #66060 (Heap buffer over-read in DateInterval). (CVE-2013-6712)
-    (Remi)
-  . Fixed bug #67251 (date_parse_from_format out-of-bounds read). (Stas)
-  . Fixed bug #67253 (timelib_meridian_with_check out-of-bounds read). (Stas)
-
- Exif:
-  . Fixed bug #65873 (Integer overflow in exif_read_data()). (Stas)
-
- Fileinfo:
-  . Fixed bug #66307 (Fileinfo crashes with powerpoint files). (Anatol)
-  . Fixed bug #67326 (fileinfo: cdf_read_short_sector insufficient boundary
-    check). (CVE-2014-0207)
-  . Fixed bug #67327 (fileinfo: CDF infinite loop in nelements DoS).
-    (CVE-2014-0238)
-  . Fixed bug #67328 (fileinfo: fileinfo: numerous file_printf calls resulting
-    in performance degradation). (CVE-2014-0237)
-  . Fixed bug #67410 (fileinfo: mconvert incorrect handling of truncated pascal
-    string size). (Francisco Alonso, Jan Kaluza, Remi)
-  . Fixed bug #67411 (fileinfo: cdf_check_stream_offset insufficient boundary
-    check). (Francisco Alonso, Jan Kaluza, Remi)
-  . Fixed bug #67412 (fileinfo: cdf_count_chain insufficient boundary check).
-    (Francisco Alonso, Jan Kaluza, Remi)
-  . Fixed bug #67413 (fileinfo: cdf_read_property_info insufficient boundary
-    check). (Francisco Alonso, Jan Kaluza, Remi)
-
- Intl:
-  . Fixed bug #67349 (Locale::parseLocale Double Free). (Stas)
-  . Fixed bug #67397 (Buffer overflow in locale_get_display_name and
-    uloc_getDisplayName (libicu 4.8.1)). (Stas)
-
- Network:
-  . Fixed bug #67432 (Fix potential segfault in dns_check_record()).
-    (CVE-2014-4049). (Sara)
-
- OpenSSL:
-  . Fixed missing type checks in OpenSSL options (Yussuf Khalil, Stas).
-
- Session:
-  . Fixed missing type checks in php_session_create_id (Yussuf Khalil, Stas).
-
-12 Dec 2013, PHP 5.3.28
-
- Openssl:
-  . Fixed handling null bytes in subjectAltName (CVE-2013-4073).
-    (Christian Heimes)
-  . Fixed memory corruption in openssl_x509_parse() (CVE-2013-6420).
-    (Stefan Esser).
-
- FPM:
-  . Fixed bug #67060 (sapi/fpm: possible privilege escalation due to insecure
-    default configuration) (CVE-2014-0185). (Stas)
-
-11 Jul 2013, PHP 5.3.27
-
- Core:
-  . Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC). (Laruence)
-  . Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence)
-  . Fixed bug #64934 (Apache2 TS crash with get_browser()). (Anatol)
-  . Fixed bug #63186 (compile failure on netbsd). (Matteo)
-
- DateTime:
-  . Fixed bug #53437 (Crash when using unserialized DatePeriod instance).
-    (Gustavo, Derick, Anatol)
-
- PDO_firebird:
-  . Fixed bug #64037 (Firebird return wrong value for numeric field).
-    (Matheus Degiovani, Matteo)
-  . Fixed bug #62024 (Cannot insert second row with null using parametrized
-    query). (patch by james@kenjim.com, Matheus Degiovani, Matteo)
-
- PDO_pgsql:
-  . Fixed bug #64949 (Buffer overflow in _pdo_pgsql_error). (Remi)
-
- pgsql:
-  . Fixed bug #64609 (pg_convert enum type support). (Matteo)
-
- SPL:
-  . Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 
-    64-bits systems). (Laruence)
-
- XML:
-  . Fixed bug #65236 (heap corruption in xml parser). (Rob)
-
-06 Jun 2013, PHP 5.3.26
-
- Core:
-  . Fixed bug #64879 (Heap based buffer overflow in quoted_printable_encode,
-    CVE 2013-2110). (Stas)
-
- Calendar:
-  . Fixed bug #64895 (Integer overflow in SndToJewish). (Remi)
-
- FPM:
-  . Fixed some possible memory or resource leaks and possible null dereference
-    detected by code coverity scan. (Remi)
-  . Log a warning when a syscall fails. (Remi)
-
- MySQLi:
-  . Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB
-    pointer has closed). (Laruence)
-
- Phar
-  . Fixed bug #64214 (PHAR PHPTs intermittently crash when run on DFS, SMB or 
-    with non std tmp dir). (Pierre)
-
- Streams:
-  . Fixed bug #64770 (stream_select() fails with pipes returned by proc_open()
-    on Windows x64). (Anatol)
-
- Zend Engine:
-  . Fixed bug #64821 (Custom Exception crash when internal properties
-    overridden). (Anatol)
-
-09 May 2013, PHP 5.3.25
-
- Core:
-  . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: 
-    segfault). (Laruence)
-  . Fixed bug #64458 (dns_get_record result with string of length -1). (Stas)
-  . Fixed bugs #47675 and #64577 (fd leak on Solaris). (Rasmus)
-
- Streams:
-  . Fixed Windows x64 version of stream_socket_pair() and improved error
-    handling. (Anatol Belski)
-
- Zip:
-  . Fixed bug #64342 (ZipArchive::addFile() has to check for file existence).
-    (Anatol)
-
-11 Apr 2013, PHP 5.3.24
-
- Core
-  . Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']).
-    (Anatol)
-  . Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle
-    exceptions properly). (Jeff Welch)
-  . Fixed bug #62343 (Show class_alias In get_declared_classes()) (Dmitry)
-
- PCRE:
-  . Merged PCRE 8.32). (Anatol)
-
- mysqlnd
-  . Fixed bug #63530 (mysqlnd_stmt::bind_one_parameter crashes, uses wrong alloc
-    for stmt->param_bind). (Andrey)
-
- DateTime
-  . Fixed bug #62852 (Unserialize Invalid Date causes crash). (Anatol)
-
- Zip:
-  . Bug #64452 (Zip crash intermittently). (Anatol)
-
-
-14 Mar 2013, PHP 5.3.23
-
- Phar:
-  . Fixed timestamp update on Phar contents modification. (Dmitry)
-
- SPL:
-  . Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence)
-  . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS).
-    (patch by kriss@krizalys.com, Laruence)
-  . Fixed bug #52861 (unset fails with ArrayObject and deep arrays). 
-    (Mike Willbanks)
-
-21 Feb 2013, PHP 5.3.22
-
- Zend Engine:
-  . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). (Johannes)
-  . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence)
-
- Core
-  . Fixed bug #63943 (Bad warning text from strpos() on empty needle).
-    (Laruence)
-
- Date:
-  . Fixed bug #55397 (comparsion of incomplete DateTime causes SIGSEGV).
-    (Laruence, Derick)
-
- FPM:
-  . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam)
-
- SOAP
-  . Added check that soap.wsdl_cache_dir conforms to open_basedir
-    (CVE-2013-1635). (Dmitry)
-  . Disabled external entities loading (CVE-2013-1643). (Dmitry)
-
- SPL:
-  . Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended). (Nikita Popov)
-
-17 Jan 2013, PHP 5.3.21
-
- Zend Engine:
-  . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user).
-    (Johannes)
-
- cURL extension:
-  . Fixed bug (segfault due to libcurl connection caching). (Pierrick)
-  . Fixed bug #63795 (CURL >= 7.28.0 no longer support value 1 for
-    CURLOPT_SSL_VERIFYHOST). (Pierrick)
-  . Fixed bug #63352 (Can't enable hostname validation when using curl stream
-    wrappers). (Pierrick)
-  . Fixed bug #55438 (Curlwapper is not sending http header randomly).
-    (phpnet@lostreality.org, Pierrick)
-
-20 Dec 2012, PHP 5.3.20
-
- Zend Engine:
-  . Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry)
-  . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes 
-    from value). (Pierrick)
-  . Fixed bug #63468 (wrong called method as callback with inheritance).
-    (Laruence)
-
- Core:
-  . Fixed bug #63451 (config.guess file does not have AIX 7 defined, 
-    shared objects are not created). (kemcline at au1 dot ibm dot com)
-  . Fixed bug #63377 (Segfault on output buffer).
-    (miau dot jp at gmail dot com, Laruence)
-
- Apache2 Handler SAPI:
-  . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
-
- Date:
-  . Fixed bug #63435 (Datetime::format('u') sometimes wrong by 1 microsecond).
-    (Remi)
-
- Fileinfo:
-  . Fixed bug #63248 (Load multiple magic files from a directory under Windows).
-    (Anatoliy)
-  . Fixed bug #63590 (Different results in TS and NTS under Windows).
-    (Anatoliy)
-
- FPM:
-  . Fixed bug #63581 (Possible null dereference and buffer overflow). (Remi)
-
- Imap:
-  . Fixed bug #63126 (DISABLE_AUTHENTICATOR ignores array). (Remi)
-
- MySQLnd:
-  . Fixed bug #63398 (Segfault when polling closed link). (Laruence)
-
- Reflection:
-  . Fixed Bug #63614 (Fatal error on Reflection). (Laruence)
-
- SOAP
-  . Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests).
-    (John Jawed, Dmitry)
-
-22 Nov 2012, PHP 5.3.19
-
- Core
-  . Fixed bug #63241 (PHP fails to open Windows deduplicated files).
-    (daniel dot stelter-gliese at innogames dot de)
-  . Fixed bug #62444 (Handle leak in is_readable on windows). 
-    (krazyest at seznam dot cz)
-
- Libxml
-  . Fixed bug #63389 (Missing context check on libxml_set_streams_context()
-    causes memleak). (Laruence)
-
- Mbstring:
-  . Fixed bug #63447 (max_input_vars doesn't filter variables when
-    mbstring.encoding_translation = On). (Laruence)
-
- MySQL:
-  . Fixed compilation failure on mixed 32/64 bit systems. (Andrey)
-
- OCI8:
-  . Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
-    (Chris Jones)
-
- PCRE:
-  . Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite).
-    (Dmitry, Laruence)
-  . Fixed bug #63284 (Upgrade PCRE to 8.31). (Anatoliy)
-
- PDO:
-  . Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec).
-    (Martin Osvald, Remi)
-
- PDO_pgsql:
-  . Fixed bug #62593 (Emulate prepares behave strangely with PARAM_BOOL).
-    (Will Fitch)
-
- Streams:
-  . Fixed bug #63240 (stream_get_line() return contains delimiter string).
-    (Tjerk, Gustavo)
-
- Phar:
-  . Fixed bug #63297 (Phar fails to write an openssl based signature).
-    (Anatoliy)
-
-18 Oct 2012, PHP 5.3.18
-
- Core:
-  . Fixed bug #63111 (is_callable() lies for abstract static method). (Dmitry)
-  . Fixed bug #63093 (Segfault while load extension failed in zts-build).
-    (Laruence)
-  . Fixed bug #62976 (Notice: could not be converted to int when comparing
-    some builtin classes). (Laruence)
-  . Fixed bug #61767 (Shutdown functions not called in certain error
-    situation). (Dmitry)
-  . Fixed bug #61442 (exception threw in __autoload can not be catched).
-    (Laruence)
-  . Fixed bug #60909 (custom error handler throwing Exception + fatal error
-    = no shutdown function). (Dmitry)
-
- cURL:
-  . Fixed bug #62085 (file_get_contents a remote file by Curl wrapper will
-    cause cpu Soaring). (Pierrick)
-
- FPM:
-  . Fixed bug #62954 (startup problems fpm / php-fpm). (fat)
-  . Fixed bug #62886 (PHP-FPM may segfault/hang on startup). (fat)
-  . Fixed bug #63085 (Systemd integration and daemonize). (remi, fat)
-  . Fixed bug #62947 (Unneccesary warnings on FPM). (fat)
-  . Fixed bug #62887 (Only /status?plain&full gives "last request cpu"). (fat)
-  . Fixed bug #62216 (Add PID to php-fpm init.d script). (fat)
-
- Intl:
-  . Fix bug #62915 (defective cloning in several intl classes). (Gustavo)
-
- OCI8:
-  . Fixed bug #60901 (Improve "tail" syntax for AIX installation) (Chris Jones)
-
- SOAP
-  . Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
-    (Dmitry)
-
- SPL:
-  . Bug #62987 (Assigning to ArrayObject[null][something] overrides all 
-    undefined variables). (Laruence)
-
 13 Sep 2012, PHP 5.3.17

 - Core:
@@ -373,13 +15,13 @@ You should not add anything to this tree. PHP 5.3 reached EOL.

 - CURL:
  . Fixed bug #62839 (curl_copy_handle segfault with CURLOPT_FILE). (Pierrick)
-   . Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false).
-     (r.hampartsumyan@gmail.com, Laruence)
-  
- - DateTime:
-   . Fixed bug #62852 (Unserialize invalid DateTime causes crash).
-     (reeze.xia@gmail.com)
-   . Fixed bug #62500 (Segfault in DateInterval class when extended). (Laruence)
+
+- DateTime:
+  . Fixed bug #62852 (Unserialize invalid DateTime causes crash).
+    (reeze.xia@gmail.com)
+
+- Intl:
+  . Fix null pointer dereferences in some classes of ext/intl. (Gustavo)

 - MySQLnd:
  . Fixed bug #62885 (mysqli_poll - Segmentation fault). (Laruence)
@@ -419,7 +61,6 @@ You should not add anything to this tree. PHP 5.3 reached EOL.
  . Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance
    gives Segmentation fault). (Laruence, Gustavo)

-
 19 Jul 2012, PHP 5.3.15

 - Zend Engine:
@@ -1672,7 +1313,6 @@ You should not add anything to this tree. PHP 5.3 reached EOL.

 - GD extension:
  . Fixed bug #53492 (fix crash if anti-aliasing steps are invalid). (Pierre)
-  . Fixed potential memory leak on a png error (Rasmus, Paul Saab)

 - GMP extension:
  . Fixed bug #52906 (gmp_mod returns negative result when non-negative is 
@@ -45,15 +45,14 @@ Currently we have the following branches in use::

  master    The active development branch. 

-  PHP-5.5   Is used to release the PHP 5.5.x series. This is a current
+  PHP-5.4   Is used to release the PHP 5.4.x series. It still allows for
+            larger enhancements.
+
+  PHP-5.3   Is used to release the PHP 5.3.x series. This is current 
            stable version and is open for bugfixes only.

-  PHP-5.4   Is used to release the PHP 5.4.x series. This is a current
-            stable version and is open for bugfixes only.
-
-  PHP-5.3   This branch is closed.
-
-  PHP-5.2   This branch is closed.
+  PHP-5.2   Is used to release the PHP 5.2.x series. It is closed for 
+            changes now.

  PHP-5.1   This branch is closed.

@@ -61,7 +60,7 @@ Currently we have the following branches in use::

 The next few rules are more of a technical nature::

-   1. All changes should first go to the lowest branch (i.e. 5.4) and then
+   1. All changes should first go to the lowest branch (i.e. 5.3) and then 
      get merged up to all other branches. If a change is not needed for
      later branches (i.e. fixes for features which where dropped from later
      branches) an empty merge should be done.
@@ -8,16 +8,15 @@ General notes and tips
 1. Do not release on Fridays, Saturdays or Sundays
 because the sysadmins can not upgrade stuff then.

-2. Package two days before a release. So if the release is to be on Thursday,
-package on Tuesday. Think about timezones as well.
+2. Package the day before a release. So if the release is to be on Thursday,
+package on Wednesday.

 3. Ensure that Windows builds will work before packaging

-4. Follow all steps to the letter. When unclear ask previous RM's (David/Julien/
-Johannes/Stas/Derick/Ilia) before proceeding. Ideally make sure that for the
-first releases one of the previous RM's is around to answer questions. For the
-steps related to the php/QA/bug websites try to have someone from the webmaster
-team (Bjori) on hand.
+4. Follow all steps to the letter. When unclear ask previous RM's (Derick/Ilia)
+before proceeding. Ideally make sure that for the first releases one of the
+previous RM's is around to answer questions. For the steps related to the
+php/QA/bug websites try to have someone from the webmaster team (Bjori) on hand.

 5. Verify the tags to be extra sure everything was tagged properly.

@@ -51,44 +50,38 @@ Rolling a non stable release (alpha/beta/RC)
 2. run the "scripts/dev/credits" script in php-src and commit the changes in the
 credits files in ext/standard.

-3. Checkout the release branch for this release (e.g., PHP-5.4.2) from the main branch.
+3. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
+Do not use abbreviations for alpha and beta.

-4. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
-Do not use abbreviations for alpha and beta. Do not use dashes, you should
-``#define PHP_VERSION "5.4.22RC1"`` and not ``#define PHP_VERSION "5.4.22-RC1"``
+4. Commit those changes and note the revision id.

-5. Compile and make test, with and without ZTS, using the right Bison version
-(for example, for 5.5, Bison 2.4.1 is used)
+5. tag the repository with the version. To do the tag in a fast way do a svn copy on the server using full URLs. You should use the revision id from the above commit to prevent mistakes in case there was a commit in between. f.e. "``svn cp https://svn.php.net/repository/php/php-src/branches/PHP_5_3@308399  https://svn.php.net/repository/php/php-src/tags/php_5_3_6RC1``"
+(of course, you need to change that to the version you're rolling an RC for). Mail php-internals to announce the tag so tests/validation/check can be done prior to package it. It is especially important for RCs.

-6. Check ./sapi/cli/php -v output for version matching.
+6. Bump up the version numbers in ``main/php_version.h``, ``configure.in``
+and possibly ``NEWS`` again, to the **next** version. F.e. if the release
+candidate was "4.4.1RC1" then the new one should be "4.4.1RC2-dev" - regardless
+if we get a new RC or not. This is to make sure ``version_compare()`` can
+correctly work.

-7. If all is right, commit the changes to the release branch with ``git commit -a``.
+7. Commit those changes

-8. Tag the repository release branch with the version, e.g.: 
-``git tag -u YOURKEYID php-5.4.2RC2``
+8. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4
+branch if you're rolling 4.4.x releases).

-9. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and ``NEWS``
-in the *main* branch (PHP-5.4 for example) to prepare for the **next** version.
-F.e. if the RC is "5.4.1RC1" then the new one should be "5.4.2-dev" - regardless if we get
-a new RC or not. This is to make sure ``version_compare()`` can correctly work.
-Commit the changes to the main branch.
+9. You do not have to update the tree, but of course you can with "``svn up``".

-10. Push the changes to the main repo, the tag, the main branch and the release branch :
-``git push --tags origin HEAD``
-``git push origin {main branch}``
-``git push origin {release branch}``
+10. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure
+and build two tarballs (one gz and one bz2).

-11. run: ``PHPROOT=. ./makedist 5.4.2RC2``, this will export the tree, create configure
-and build three tarballs (gz, bz2 and xz).
-
-12. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there should be a
+11. Copy those two tarballs to www.php.net, in your homedir there should be a
 directory "downloads/". Copy them into there, so that the system can generate
-MD5 sums. If you do not have this directory, talk to Derick or Dan.
+MD5 sums. If you do not have this directory, talk to Derick.

-13. Now the RC can be found on http://downloads.php.net/yourname,
+12. Now the RC can be found on http://downloads.php.net/yourname,
 f.e. http://downloads.php.net/derick/

-14. Once the release has been tagged, contact the PHP Windows development team
+13. Once the release has been tagged, contact the PHP Windows development team
 (internals-win@lists.php.net) so that Windows binaries can be created. Once
 those are made, they should be placed into the same directory as the source snapshots.

@@ -101,10 +94,10 @@ pointing out "the location of the release" and "the possible release date of
 either the next RC, or the final release".

 2. Send an email (see example here http://news.php.net/php.pear.qa/5201) **To**
-``php-qa@lists.php.net`` and ``primary-qa-tester@lists.php.net``.
+``php-qa@lists.php.net`` and ``primary-qa-tests@lists.php.net``.
 This email is to notify the selected projects about a new release so that they
 can make sure their projects keep working. Make sure that you have been setup
-as a moderator for ``primary-qa-tester@lists.php.net`` by having someone (Hannes, Dan,
+as a moderator for ``primary-qa-tests@lists.php.net`` by having someone (Wez,
 Derick) run the following commands for you:

 ``ssh lists.php.net``
@@ -120,9 +113,9 @@ Derick) run the following commands for you:

   Note: Remember to update the MD5 checksum information.

-4. Update ``web/php.git/include/version.inc`` (x=major version number)
+4. Update ``php.git/include/version.inc`` (x=major version number)

- a. ``$PHP_x_RC`` = "5.4.0RC1"  (should be set to "false" before)
+ a. ``$PHP_x_RC`` = "5.3.0RC1"

 b. ``$PHP_x_RC_DATE`` = "06 September 2007"

@@ -133,64 +126,58 @@ Derick) run the following commands for you:
 6. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
 INSTALL and win32/install.txt files which are generated from the PHP manual sources.

+7. Publish the announce on www.php.net as well (for all releases, alpha, RCs or other)
+
 Rolling a stable release
 ------------------------

-1. Checkout your release branch, you should have created when releasing previous RC
-and bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
+1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.)

-2. If a CVE commit needs to be merged to the release, then have it commited to
-the base branches and merged upwards as usual (f.e commit the CVE fix to 5.3,
-merge to 5.4, 5.5 etc...). Then you can cherry-pick it in your release branch.
-Don't forget to update NEWS manually in an extra commit then.
+2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.

-3. Commit those changes
+3. **Merge** all related sections in NEWS (f.e. merge the 4.4.1RC1 and 4.4.0 sections)

-4. run the "scripts/dev/credits" script in php-src and commit the changes in the
+4. Commit those changes
+
+5. run the "scripts/dev/credits" script in php-src and commit the changes in the
 credits files in ext/standard.

-5. Compile and make test, with and without ZTS, using the right Bison version
-(for example, for 5.5, Bison 2.4.1 is used)
+6. tag the repository with the version f.e. "``cvs tag php_4_4_1``"
+(of course, you need to change that to the version you're rolling an RC for).
+When making 5.X release, you need to tag the Zend directory separately!!

-6. Check ./sapi/cli/php -v output for version matching.
+7. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and
+possibly ``NEWS`` again, to the **next** version. F.e. if the release candidate
+was "4.4.1RC1" then the new one should be "4.4.1RC2-dev" - regardless if we get
+a new RC or not. This is to make sure ``version_compare()`` can correctly work.

-7. tag the repository with the version f.e. "``git tag -s php-5.4.1``"
+8. Commit those changes

-8. Push the tag f.e. "``git push origin php-5.4.1``"
+9. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4
+branch if you're rolling 4.4.x releases).

-9. run: ``PHPROOT=. ./makedist php 5.4.1``, this will export the tag, create configure
-and build three tarballs (gz, bz2 and xz).
-Check if the pear files are updated (phar).
+10. You do not have to update the tree, but of course you can with "``cvs up -dP``".

-10. Generate the GPG signature files for the archives.
-  ``gpg -u YOUREMAIL --armor --detach-sign php-X.Y.Z.tar.xxx``
+11. run: ``./makedist php 4.4.1``, this will export the tree, create configure
+and build two tarballs (one gz and one bz2).

-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: 
-    ``git submodule init;
-    git submodule update;
-    cd distributions;
-    git pull origin master;
-    cd ..;
-    git commit distributions;
-    git push;``
-This is to fetch the last commit id from php-distributions.git and commit this
-last commit id to web/php.git, then, mirrors will now sync
+12. Commit those two tarballs to CVS (phpweb/distributions)

-12. Once the release has been tagged, contact the PHP Windows development team
-(internals-win@lists.php.net) so that Windows binaries can be created.
+13. Once the release has been tagged, contact the PHP Windows development team
+(internals-win@lists.php.net) so that Windows binaries can be created. Once
+those are made, they should be committed to SVN too.
+
+14. Check if the pear files are updated (phar for 5.1+ or run pear/make-pear-bundle.php with 4.4)
+
+15. When making a final release, also remind the PHP Windows development team
+(internals-win@lists.php.net) to prepare the installer packages for Win32.

 Getting the stable release announced
 ------------------------------------

 1. Run the bumpRelease script for phpweb on your local checkout

- a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php)
-    The release announcement file should list in detail security fixes and
-    changes in behavior (whether due to a bug fix or not).
-
- b. In case multiple PHP minor versions are in active development you have
-    to manually copy the old information to include/releases.inc
+ a. ``php bin/bumpRelease 5`` (or ``php bin/bumpRelease 4`` for PHP4)

 2. Edit ``phpweb/include/version.inc`` and change (X=major release number):

@@ -207,14 +194,8 @@ Getting the stable release announced

 f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")

-3. Update phpweb/include/releases.php with the old release info
-  (updates the download archives)
-
-4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
-   (prepare for next RC)
-
-5. Update the ChangeLog file for the given major version
-f.e. ``ChangeLog-5.php`` from the NEWS file
+3. Update the ChangeLog file for the given major version
+f.e. ``ChangeLog-4.php`` from the NEWS file

 a. go over the list and put every element on one line

@@ -233,10 +214,19 @@ 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
+4. ``cp releases/4_4_0.php releases/4_4_1.php``
+
+5. ``cvs add releases/4_4_1.php``
+
+6. Update the ``releases/*.php`` file with relevant data. The release
+announcement file should list in detail:
+
+ a. security fixes,
+
+ b. changes in behavior (whether due to a bug fix or not)
+
+7. 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.

@@ -244,16 +234,23 @@ to upgrade.

 b. Add the content for the news entry

-7. **Check mirrors have been synced before announcing or pushing news**
-  Try, f.e. http://www.php.net/get/php-5.5.1.tar.bz2/from/a/mirror
-  Try several mirrors, mirrors may update slowly (may take an hour)
-
-8. Commit all the changes to their respective git repos
+8. Commit all the changes.

 9. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 http://news.php.net/php.internals/17222.

+10. Update ``php-bugs-web/include/functions.php`` to include the new version
+number, and remove the RC from there.
+
+11. Update ``qaweb/include/release-qa.php``
+
+ - Update $QA_RELEASES with the appropriate information, which means bumping
+   the version number to an upcoming version. 
+
+   Example: If PHP 5.3.7 is being released, then PHP 5.3.8 is the next QA version,
+   so replace 5.3.7 with 5.3.8 within $QA_RELEASES.
+
 Re-releasing the same version (or -pl)
 --------------------------------------

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -40,10 +40,6 @@
 #  define IO_REPARSE_TAG_SYMLINK 0xA000000C
 # endif

-# ifndef IO_REPARSE_TAG_DEDUP
-#  define IO_REPARSE_TAG_DEDUP   0x80000013
-# endif
-
 # ifndef VOLUME_NAME_NT
 #  define VOLUME_NAME_NT 0x2
 # endif
@@ -962,11 +958,6 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 					return -1;
 				};
 				substitutename[substitutename_len] = 0;
-			}
-			else if (pbuffer->ReparseTag == IO_REPARSE_TAG_DEDUP) {
-				isabsolute = 1;
-				memcpy(substitutename, path, len + 1);
-				substitutename_len = len;
 			} else {
 				tsrm_free_alloca(pbuffer, use_heap_large);
 				return -1;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -193,7 +193,7 @@ Finished:
 TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 {
 	time_t t;
-	HANDLE thread_token = NULL;
+	HANDLE thread_token;
 	PSID token_sid;
 	SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;
 	GENERIC_MAPPING gen_map = { FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_GENERIC_EXECUTE, FILE_ALL_ACCESS };
@@ -365,9 +365,6 @@ Finished_Impersonate:
 		}

 Finished:
-		if(thread_token != NULL) {
-			CloseHandle(thread_token);
-		}
 		if(real_path != NULL) {
 			free(real_path);
 			real_path = NULL;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -484,8 +484,6 @@ UPGRADE NOTES - PHP 5.3
  must be activated manually with the "extension = php_com_dotnet.dll" directive
  in php.ini.

- Apache 2.4 handler is supported as of PHP 5.3.20
-
 =====================
 11.1 New in PHP 5.3.4
 =====================
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -4,7 +4,7 @@ dnl This file contains local autoconf functions.

 AC_DEFUN([LIBZEND_BISON_CHECK],[
  # we only support certain bison versions
-  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.4"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5"

  # for standalone build of Zend Engine
  test -z "$SED" && SED=sed
Author	SHA1	Message	Date
Johannes Schlüter	8244eea495	PHP 5.3.17	2012-09-12 23:27:16 +02:00
Johannes Schlüter	f9e407ec41	BFN	2012-09-12 23:25:56 +02:00
Felipe Pena	c1efbad899	- Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)	2012-09-12 23:22:48 +02:00
Johannes Schlüter	8d987032b3	Fix NEWS	2012-09-12 23:20:28 +02:00