PHP 5.3.15RC1

.gitattributes

@@ -15,7 +15,6 @@ ext/dba/libflatfile/flatfile.c  ident
 ext/dba/libcdb/cdb_make.c       ident
 ext/dba/libcdb/cdb.c            ident
 ext/filter/filter.c             ident
-ext/zip/php_zip.c               ident
 README.input_filter             ident
 run-tests.php                   ident
 sapi/nsapi/nsapi.c              ident

.travis.yml

@@ -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

CODING_STANDARDS

@@ -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

INSTALL

@@ -24,7 +24,6 @@ Installing PHP
           + Installing a PHP extension on Windows
           + Compiling shared PECL extensions with the pecl command
           + Compiling shared PECL extensions with phpize
-          + php-config
           + Compiling PECL extensions statically into PHP
      * Problems?
           + Read the FAQ
@@ -84,7 +83,7 @@ General Installation Considerations
    With  PHP you can also write desktop GUI applications using the PHP-GTK
    extension.  This  is  a  completely different approach than writing web
    pages,  as  you  do not output any HTML, but manage windows and objects
-   within  them.  For  more  information about PHP-GTK, please » visit the
+   within  them.  For  more information about PHP-GTK, please » visit the
    site  dedicated  to  this  extension.  PHP-GTK  is  not included in the
    official PHP distribution.
 
@@ -93,9 +92,9 @@ General Installation Considerations
    will  also  find  information  on  the  command  line executable in the
    following sections.
 
-   PHP  source  code  and binary distributions for Windows can be found at
-   » http://www.php.net/downloads.php.   We  recommend  you  to  choose  a
-   » mirror nearest to you for downloading the distributions.
+   PHP source code and binary distributions for Windows can be found at »
+   http://www.php.net/downloads.php. We recommend you to choose a » mirror
+   nearest to you for downloading the distributions.
      __________________________________________________________________
      __________________________________________________________________
 
@@ -141,9 +140,9 @@ Table of Contents
      * A web server
      * Any module specific components (such as GD, PDF libs, etc.)
 
-   When  building  directly from Git sources or after custom modifications
+   When  building  directly from SVN sources or after custom modifications
    you might also need:
-     * autoconf: 2.13+ (for PHP < 5.4.0), 2.59+ (for PHP >= 5.4.0)
+     * autoconf: 2.13
      * automake: 1.4+
      * libtool: 1.4.x+ (except 1.4.2)
      * re2c: Version 0.13.4 or newer
@@ -376,12 +375,12 @@ Apache 2.x on Unix systems
    For  information  on  why,  read the related FAQ entry on using Apache2
    with a threaded MPM
 
-   The   » Apache  Documentation  is  the  most  authoritative  source  of
+   The  »  Apache  Documentation  is  the  most  authoritative  source of
    information   on   the   Apache  2.x  server.  More  information  about
    installation options for Apache may be found there.
 
-   The  most  recent  version  of  Apache HTTP Server may be obtained from
-   » Apache  download  site,  and  a  fitting  PHP  version from the above
+   The  most  recent version of Apache HTTP Server may be obtained from »
+   Apache  download  site,  and  a  fitting  PHP  version  from  the above
    mentioned  places.  This  quick  guide  covers  only  the basics to get
    started with Apache 2.x and PHP. For more information read the » Apache
    Documentation.  The  version  numbers have been omitted here, to ensure
@@ -499,7 +498,7 @@ service httpd restart
 
    This  should  not be undertaken without being aware of the consequences
    of  this  decision,  and  having  at  least a fair understanding of the
-   implications.   The   Apache   documentation   regarding  » MPM-Modules
+   implications.   The   Apache  documentation  regarding  »  MPM-Modules
    discusses MPMs in a great deal more detail.
 
      Note:
@@ -521,7 +520,7 @@ Lighttpd 1.4 on Unix systems
    This section contains notes and hints specific to Lighttpd 1.4 installs
    of PHP on Unix systems.
 
-   Please  use  the  » Lighttpd  trac  to  learn  how  to install Lighttpd
+   Please  use  the  »  Lighttpd  trac  to  learn how to install Lighttpd
    properly before continuing.
 
    Fastcgi  is  the preferred SAPI to connect PHP and Lighttpd. Fastcgi is
@@ -628,15 +627,15 @@ Sun, iPlanet and Netscape servers on Sun Solaris
    current web servers read the note about subrequests.
 
    You  can  find  more  information about setting up PHP for the Netscape
-   Enterprise Server (NES) here:
-   » http://benoit.noss.free.fr/php/install-php4.html
+   Enterprise Server (NES) here: »
+   http://benoit.noss.free.fr/php/install-php4.html
 
    To  build  PHP  with  Sun JSWS/Sun ONE WS/iPlanet/Netscape web servers,
    enter  the  proper install directory for the --with-nsapi=[DIR] option.
    The  default directory is usually /opt/netscape/suitespot/. Please also
    read /php-xxx-version/sapi/nsapi/nsapi-readme.txt.
 
-    1. Install  the following packages from »  http://www.sunfreeware.com/
+    1. Install  the following packages from » http://www.sunfreeware.com/
        or another download site:
           + autoconf-2.13
           + automake-1.4
@@ -838,7 +837,7 @@ Testing
 Using Variables
 
    Some  server  supplied  environment  variables  are  not defined in the
-   current  » CGI/1.1  specification.  Only  the  following  variables are
+   current  »  CGI/1.1  specification.  Only  the following variables are
    defined     there:     AUTH_TYPE,     CONTENT_LENGTH,     CONTENT_TYPE,
    GATEWAY_INTERFACE,     PATH_INFO,     PATH_TRANSLATED,    QUERY_STRING,
    REMOTE_ADDR,  REMOTE_HOST,  REMOTE_IDENT,  REMOTE_USER, REQUEST_METHOD,
@@ -856,20 +855,20 @@ HP-UX specific installation notes
    There  are two main options for installing PHP on HP-UX systems. Either
    compile it, or install a pre-compiled binary.
 
-   Official      pre-compiled      packages      are     located     here:
-   » http://software.hp.com/
+   Official     pre-compiled     packages    are    located    here:    »
+   http://software.hp.com/
 
    Until  this  manual  section  is  rewritten,  the  documentation  about
    compiling  PHP  (and  related  extensions)  on  HP-UX  systems has been
-   removed.  For  now,  consider  reading the following external resource:
-   » Building Apache and PHP on HP-UX 11.11
+   removed.  For now, consider reading the following external resource: »
+   Building Apache and PHP on HP-UX 11.11
      __________________________________________________________________
      __________________________________________________________________
 
 OpenBSD installation notes
 
-   This  section  contains  notes  and hints specific to installing PHP on
-   » OpenBSD 3.6.
+   This  section contains notes and hints specific to installing PHP on »
+   OpenBSD 3.6.
 
 Using Binary Packages
 
@@ -901,12 +900,12 @@ Using Binary Packages
   (install the PEAR libraries)
 # pkg_add php4-pear-4.3.8.tgz
 
-   Read  the  » packages(7)  manual page for more information about binary
+   Read  the  » packages(7) manual page for more information about binary
    packages on OpenBSD.
 
 Using Ports
 
-   You  can  also  compile  up  PHP  from  source  using the » ports tree.
+   You  can  also  compile  up  PHP  from  source using the » ports tree.
    However,  this is only recommended for users familiar with OpenBSD. The
    PHP  4 port is split into two sub-directories: core and extensions. The
    extensions  directory  generates  sub-packages for all of the supported
@@ -927,7 +926,7 @@ Common Problems
        automatically  installs  into the correct chroot directories, so no
        special  modification  is  needed  there.  More  information on the
        OpenBSD Apache is available in the » OpenBSD FAQ.
-     * The  OpenBSD 3.6 package for the » gd extension requires XFree86 to
+     * The OpenBSD 3.6 package for the » gd extension requires XFree86 to
        be  installed.  If you do not wish to use some of the font features
        that  require  X11,  install  the  php4-gd-4.3.8-no_x11.tgz package
        instead.
@@ -952,26 +951,18 @@ Required software
 
    Solaris  installs  often lack C compilers and their related tools. Read
    this  FAQ  for  information on why using GNU versions for some of these
-   tools is necessary.
-
-   For unpacking the PHP distribution you need
-     * tar
-     * gzip or
-     * bzip2
-
-   For compiling PHP you need
+   tools is necessary. The required software is as follows:
      * gcc (recommended, other C compilers may work)
      * make
-     * GNU sed
-
-   For building extra extensions or hacking the code of PHP you might also
-   need
-     * flex (up to PHP 5.2)
-     * re2c
+     * flex
      * bison
      * m4
      * autoconf
      * automake
+     * perl
+     * gzip
+     * tar
+     * GNU sed
 
    In  addition,  you  will  need  to  install  (and possibly compile) any
    additional  software  specific to your configuration, such as Oracle or
@@ -980,16 +971,14 @@ Required software
 Using Packages
 
    You can simplify the Solaris install process by using pkgadd to install
-   most  of  your  needed components. The Image Packaging System (IPS) for
-   Solaris  11  Express  also contains most of the required components for
-   installation using the pkg command.
+   most of your needed components.
      __________________________________________________________________
      __________________________________________________________________
 
 Debian GNU/Linux installation notes
 
-   This  section  contains  notes  and hints specific to installing PHP on
-   » Debian GNU/Linux.
+   This  section contains notes and hints specific to installing PHP on »
+   Debian GNU/Linux.
    Warning
 
    Unofficial  builds  from third-parties are not supported here. Any bugs
@@ -1216,7 +1205,6 @@ Table of Contents
      * Installing a PHP extension on Windows
      * Compiling shared PECL extensions with the pecl command
      * Compiling shared PECL extensions with phpize
-     * php-config
      * Compiling PECL extensions statically into PHP
      __________________________________________________________________
 
@@ -1239,8 +1227,8 @@ Introduction to PECL Installations
    To this php.ini file, or through the use of the dl() function.
 
    When  building  PHP modules, it's important to have known-good versions
-   of  the  required  tools  (autoconf,  automake,  libtool, etc.) See the
-   » Anonymous  Git  Instructions  for  details on the required tools, and
+   of  the  required  tools (autoconf, automake, libtool, etc.) See the »
+   Anonymous  SVN  Instructions  for  details  on  the required tools, and
    required versions.
      __________________________________________________________________
      __________________________________________________________________
@@ -1259,7 +1247,7 @@ Downloading PECL extensions
        the PECL web site are available for download and installation using
        the » pecl command. Specific revisions may also be specified.
      * SVN  Most  PECL extensions also reside in SVN. A web-based view may
-       be  seen at » http://svn.php.net/viewvc/pecl/. To download straight
+       be seen at » http://svn.php.net/viewvc/pecl/. To download straight
        from SVN, the following sequence of commands may be used:
        $   svn  checkout  http://svn.php.net/repository/pecl/extname/trunk
        extname
@@ -1291,7 +1279,7 @@ Where to find an extension?
 
    PHP   extensions   are  usually  called  "php_*.dll"  (where  the  star
    represents  the  name  of the extension) and they are located under the
-   "PHP\ext" ("PHP\extensions" in PHP 4) folder.
+   "PHP\ext" ("PHP\extensions" in PHP4) folder.
 
    PHP   ships  with  the  extensions  most  useful  to  the  majority  of
    developers. They are called "core" extensions.
@@ -1377,7 +1365,7 @@ Resolving problems
 
 Compiling shared PECL extensions with the pecl command
 
-   PECL  makes  it  easy to create shared PHP extensions. Using the » pecl
+   PECL  makes  it easy to create shared PHP extensions. Using the » pecl
    command, do the following:
 
    $ pecl install extname
@@ -1436,51 +1424,6 @@ $ make
      __________________________________________________________________
      __________________________________________________________________
 
-php-config
-
-   php-config is a simple shell script for obtaining information about the
-   installed PHP configuration.
-
-   When compiling extensions, if you have multiple PHP versions installed,
-   you may specify for which installation you'd like to build by using the
-   --with-php-config  option  during configuration, specifying the path of
-   the respective php-config script.
-
-   The  list of command line options provided by the php-config script can
-   be queried anytime by running php-config with the -h switch:
-Usage: /usr/local/bin/php-config [OPTION]
-Options:
-  --prefix            [...]
-  --includes          [...]
-  --ldflags           [...]
-  --libs              [...]
-  --extension-dir     [...]
-  --include-dir       [...]
-  --php-binary        [...]
-  --php-sapis         [...]
-  --configure-options [...]
-  --version           [...]
-  --vernum            [...]
-
-   CAPTION: Command line options
-
-   Option Description
-   --prefix Directory prefix where PHP is installed, e.g. /usr/local
-   --includes List of -I options with all include files
-   --ldflags LD Flags which PHP was compiled with
-   --libs Extra libraries which PHP was compiled with
-   --extension-dir Directory where extensions are searched by default
-   --include-dir Directory prefix where header files are installed by
-   default
-   --php-binary Full path to php CLI or CGI binary
-   --php-sapis Show all SAPI modules available
-   --configure-options  Configure  options  to  recreate  configuration of
-   current PHP installation
-   --version PHP version
-   --vernum PHP version as integer
-     __________________________________________________________________
-     __________________________________________________________________
-
 Compiling PECL extensions statically into PHP
 
    You  might find that you need to build a PECL extension statically into
@@ -1542,11 +1485,11 @@ Other problems
    If  you  are  still stuck, someone on the PHP installation mailing list
    may  be  able  to  help you. You should check out the archive first, in
    case  someone already answered someone else who had the same problem as
-   you.   The   archives   are   available   from   the  support  page  on
-   » http://www.php.net/support.php.  To subscribe to the PHP installation
-   mailing list, send an empty mail to
-   » php-install-subscribe@lists.php.net.  The  mailing  list  address  is
-   » php-install@lists.php.net.
+   you.   The   archives  are  available  from  the  support  page  on  »
+   http://www.php.net/support.php.  To  subscribe  to the PHP installation
+   mailing list, send an empty mail to »
+   php-install-subscribe@lists.php.net.  The  mailing  list  address is »
+   php-install@lists.php.net.
 
    If  you  want to get help on the mailing list, please try to be precise
    and  give the necessary details about your environment (which operating
@@ -1561,11 +1504,11 @@ Bug reports
    If  you  think  you  have found a bug in PHP, please report it. The PHP
    developers  probably  don't  know  about  it, and unless you report it,
    chances  are  it  won't  be  fixed.  You  can  report  bugs  using  the
-   bug-tracking  system  at » http://bugs.php.net/. Please do not send bug
+   bug-tracking  system at » http://bugs.php.net/. Please do not send bug
    reports  in  mailing  list  or personal letters. The bug system is also
    suitable to submit feature requests.
 
-   Read  the  » How  to  report  a  bug document before submitting any bug
+   Read  the  »  How  to  report a bug document before submitting any bug
    reports!
      __________________________________________________________________
      __________________________________________________________________
@@ -1585,14 +1528,14 @@ The configuration file
 
    The  configuration  file  (php.ini) is read when PHP starts up. For the
    server  module  versions  of  PHP,  this happens only once when the web
-   server  is  started.  For the CGI and CLI versions, it happens on every
+   server  is  started.  For  the CGI and CLI version, it happens on every
    invocation.
 
-   php.ini is searched for in these locations (in order):
+   php.ini is searched in these locations (in order):
      * SAPI  module specific location (PHPIniDir directive in Apache 2, -c
        command  line  option  in  CGI and CLI, php_ini parameter in NSAPI,
        PHP_INI_PATH environment variable in THTTPD)
-     * The  PHPRC environment variable. Before PHP 5.2.0, this was checked
+     * The  PHPRC  environment variable. Before PHP 5.2.0 this was checked
        after the registry key mentioned below.
      * As  of  PHP  5.2.0, the location of the php.ini file can be set for
        different versions of PHP. The following registry keys are examined
@@ -1600,33 +1543,33 @@ The configuration file
        [HKEY_LOCAL_MACHINE\SOFTWARE\PHP\x.y] and
        [HKEY_LOCAL_MACHINE\SOFTWARE\PHP\x],  where x, y and z mean the PHP
        major,  minor  and  release  versions.  If  there  is  a  value for
-       IniFilePath  in any of these keys, the first one found will be used
-       as the location of the php.ini (Windows only).
+       IniFilePath in these keys, then the first one found will be used as
+       the location of the php.ini (Windows only).
      * [HKEY_LOCAL_MACHINE\SOFTWARE\PHP],  value  of  IniFilePath (Windows
        only).
-     * Current working directory (except CLI).
+     * Current working directory (except CLI)
      * The  web server's directory (for SAPI modules), or directory of PHP
-       (otherwise in Windows).
+       (otherwise in Windows)
      * Windows  directory  (C:\windows  or  C:\winnt)  (for  Windows),  or
-       --with-config-file-path compile time option.
+       --with-config-file-path compile time option
 
-   If php-SAPI.ini exists (where SAPI is the SAPI in use, so, for example,
-   php-cli.ini or php-apache.ini), it is used instead of php.ini. The SAPI
-   name can be determined with php_sapi_name().
+   If  php-SAPI.ini  exists  (where  SAPI is used SAPI, so the filename is
+   e.g. php-cli.ini or php-apache.ini), it's used instead of php.ini. SAPI
+   name can be determined by php_sapi_name().
 
      Note:
 
-     The  Apache  web  server  changes  the directory to root at startup,
+     The  Apache  web  server  changes  the  directory to root at startup
      causing  PHP  to attempt to read php.ini from the root filesystem if
      it exists.
 
-   The  php.ini  directives  handled  by  extensions are documented on the
-   respective  pages  of  the  extensions  themselves.  A list of the core
-   directives  is  available  in  the appendix. Not all PHP directives are
-   necessarily   documented  in  this  manual:  for  a  complete  list  of
+   The   php.ini   directives   handled   by   extensions  are  documented
+   respectively on the pages of the extensions themselves. The list of the
+   core  directives  is  available  in  the appendix. Probably not all PHP
+   directives  are documented in the manual though. For a complete list of
    directives  available  in  your  PHP  version,  please  read  your well
-   commented  php.ini  file.  Alternatively,  you  may  find  » the latest
-   php.ini from Git helpful too.
+   commented  php.ini  file. Alternatively, you may find the » the latest
+   php.ini from SVN helpful too.
 
    Example #1 php.ini example
 ; any text on a line after an unquoted semicolon (;) is ignored
@@ -1692,13 +1635,12 @@ Where a configuration setting may be set
 
    CAPTION: Definition of PHP_INI_* modes
 
-   Mode Meaning
-   PHP_INI_USER Entry can be set in user scripts (like with ini_set()) or
-   in the Windows registry. Since PHP 5.3, entry can be set in .user.ini
-   PHP_INI_PERDIR  Entry  can  be set in php.ini, .htaccess, httpd.conf or
-   .user.ini (since PHP 5.3)
-   PHP_INI_SYSTEM Entry can be set in php.ini or httpd.conf
-   PHP_INI_ALL Entry can be set anywhere
+        Mode      Value                        Meaning
+   PHP_INI_USER   1     Entry can be set in user scripts (like with ini_set())
+                        or in the Windows registry
+   PHP_INI_PERDIR 6     Entry can be set in php.ini, .htaccess or httpd.conf
+   PHP_INI_SYSTEM 4     Entry can be set in php.ini or httpd.conf
+   PHP_INI_ALL    7     Entry can be set anywhere
      __________________________________________________________________
      __________________________________________________________________
 
@@ -1846,9 +1788,13 @@ Installation
           each  request to play in, further weaknesses are introduced into
           PHP's system.
 
-          If   you  want  to  use  a  threaded  MPM,  look  at  a  FastCGI
+          If  you  feel  you have to use a threaded MPM, look at a FastCGI
           configuration where PHP is running in its own memory space.
 
+          And finally, this warning against using a threaded MPM is not as
+          strong  for  Windows  systems  because  most  libraries  on that
+          platform tend to be threadsafe.
+
    Unix/Windows: Where should my php.ini file be located?
           By  default  on  Unix  it  should  be in /usr/local/lib which is
           <install-path>/lib.  Most  people  will  want  to change this at

Makefile.global

@@ -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

NEWS

@@ -1,423 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-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:
-  . Fixed bug (segfault while build with zts and GOTO vm-kind). (Laruence)
-  . Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" 
-    Windows registry). (aserbulov at parallels dot com)
-  . Fixed bug #62763 (register_shutdown_function and extending class). 
-    (Laruence)
-  . Fixed bug #62744 (dangling pointers made by zend_disable_class). (Laruence)
-  . Fixed bug #62716 (munmap() is called with the incorrect length). 
-    (slangley@google.com)
-  . Fixed bug ##62460 (php binaries installed as binary.dSYM). (Reeze Xia)
-
-- 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)
-
-- MySQLnd:
-  . Fixed bug #62885 (mysqli_poll - Segmentation fault). (Laruence)
-
-- PDO:
-  . Fixed bug #62685 (Wrong return datatype in PDO::inTransaction()). (Laruence)
-
-- Session:
-  . Fixed bug (segfault due to retval is not initialized). (Laruence)
-
-- SPL:
-  . Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)
-    (Laruence)
-
-- Enchant:
-  . Fixed bug #62838 (enchant_dict_quick_check() destroys zval, but fails to 
-  initialize it). (Tony, Mateusz Goik).
-
-16 Aug 2012, PHP 5.3.16
-
-- Core:
-  . Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK
-    with run-test.php). (Laruence)
-
-- CURL:
-  . Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false).
-    (r.hampartsumyan@gmail.com, Laruence)
-
-- DateTime:
-  . Fixed Bug #62500 (Segfault in DateInterval class when extended). (Laruence)
-
-- Reflection:
-  . Fixed bug #62715 (ReflectionParameter::isDefaultValueAvailable() wrong
-    result). (Laruence)
-
-- SPL:
-  . Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance
-    gives Segmentation fault). (Laruence, Gustavo)
-
-
-19 Jul 2012, PHP 5.3.15
-
+05 Jul 2012, PHP 5.3.15RC1
 - Zend Engine:
   . Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that
     includes a semi-colon). (Pierrick)
@@ -426,8 +9,8 @@ PHP                                                                        NEWS
   . Fixed bug #62146 com_dotnet cannot be built shared. (Johannes)
 
 - Core:
-  . Fixed potential overflow in _php_stream_scandir, CVE-2012-2688. (Jason 
-    Powell, Stas)
+  . Fixed potential overflow in _php_stream_scandir. (Jason Powell,
+    Stas)
   . Fixed bug #62432 (ReflectionMethod random corrupt memory on high
     concurrent). (Johannes)
   . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed 
@@ -461,7 +44,7 @@ PHP                                                                        NEWS
   . Fixed bug #60785 (memory leak in IntlDateFormatter constructor). (Gustavo)
 
 - JSON:
-  . Reverted fix for bug #61537. (Johannes)
+  . Improved error handling. (Nikita Popov)
 
 - Phar:
   . Fixed bug #62227 (Invalid phar stream path causes crash). (Felipe)
@@ -476,10 +59,6 @@ PHP                                                                        NEWS
   . Fixed bug #62262 (RecursiveArrayIterator does not implement Countable).
     (Nikita Popov)
 
-- SQLite:
-  . Fixed open_basedir bypass, CVE-2012-3365. (Johannes, reported by Yury
-    Maryshev)
-
 - XML Writer:
   . Fixed bug #62064 (memory leak in the XML Writer module). 
     (jean-pierre dot lozi at lip6 dot fr)
@@ -1668,7 +1247,6 @@ PHP                                                                        NEWS
 
 - 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 

README.GIT-RULES

@@ -45,17 +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   Is used to release the PHP 5.3.x series. This is currently 
-            in extended support and open forsecurity fixes only. Triaged
-            via security@php.net
-
-  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.
 

README.RELEASE_PROCESS

@@ -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)
 --------------------------------------
 

TSRM/tsrm_nw.c

@@ -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        |

TSRM/tsrm_nw.h

@@ -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        |

TSRM/tsrm_virtual_cwd.c

@@ -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;

TSRM/tsrm_virtual_cwd.h

@@ -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        |

TSRM/tsrm_win32.c

@@ -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;

TSRM/tsrm_win32.h

@@ -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        |

UPGRADING

@@ -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
 =====================

Zend/acconfig.h

@@ -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        |

Zend/acinclude.m4

@@ -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