PHP 5.3.25

improved errorhandling in the socketpair() implementation.

.gdbinit

@@ -1,8 +1,8 @@
 define ____executor_globals
 	if basic_functions_module.zts
 		set $tsrm_ls = ts_resource_ex(0, 0)
-		set $eg = ((zend_executor_globals) (*((void ***) $tsrm_ls))[executor_globals_id-1])
-		set $cg = ((zend_compiler_globals) (*((void ***) $tsrm_ls))[compiler_globals_id-1])
+		set $eg = ((zend_executor_globals*) (*((void ***) $tsrm_ls))[executor_globals_id-1])
+		set $cg = ((zend_compiler_globals*) (*((void ***) $tsrm_ls))[compiler_globals_id-1])
 	else
 		set $eg = executor_globals
 		set $cg = compiler_globals

.gitattributes

@@ -0,0 +1,174 @@
+ext/mysqlnd/mysqlnd.h           ident
+ext/simplexml/simplexml.c       ident
+ext/iconv/php_iconv.h           ident
+ext/posix/posix.c               ident
+ext/recode/recode.c             ident
+ext/skeleton/create_stubs       ident
+ext/phar/phar/pharcommand.inc   ident
+ext/phar/phar.c                 ident
+ext/sysvmsg/sysvmsg.c           ident
+ext/enchant/enchant.c           ident
+ext/reflection/php_reflection.c ident
+ext/oci8/oci8.c                 ident
+ext/dba/libinifile/inifile.c    ident
+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
+sapi/continuity/capi.c          ident
+Zend/RFCs/002.txt               ident
+Zend/RFCs/003.txt               ident
+NEWS                            merge=NEWS
+/ext/bz2/tests/005.phpt	-crlf
+/ext/dom/tests/dom005.phpt	-crlf
+/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt	-crlf
+/ext/ereg/tests/009.phpt	-crlf
+/ext/iconv/tests/eucjp2sjis.phpt	-crlf
+/ext/iconv/tests/eucjp2utf8.phpt	-crlf
+/ext/iconv/tests/iconv_stream_filter_delimiter.phpt	-crlf
+/ext/iconv/tests/iconv_stream_filter.phpt	-crlf
+/ext/mbstring/tests/mb_split-compat-01.phpt	-crlf
+/ext/phar/tests/005.phpt	-crlf
+/ext/phar/tests/phar_commitwrite.phpt	-crlf
+/ext/phar/tests/phar_create_in_cwd.phpt	-crlf
+/ext/phar/tests/phar_mount.phpt	-crlf
+/ext/reflection/tests/009.phpt	-crlf
+/ext/reflection/tests/025.phpt	-crlf
+/ext/standard/tests/general_functions/highlight_heredoc.phpt	-crlf
+/ext/standard/tests/general_functions/parse_ini_file.phpt	-crlf
+/ext/standard/tests/general_functions/parse_ini_string_002.phpt	-crlf
+/ext/standard/tests/strings/006.phpt	-crlf
+/ext/standard/tests/strings/addslashes_variation2.phpt	-crlf
+/ext/standard/tests/strings/addslashes_variation3.phpt	-crlf
+/ext/standard/tests/strings/bug21453.phpt	-crlf
+/ext/standard/tests/strings/chop_variation3.phpt	-crlf
+/ext/standard/tests/strings/chunk_split_variation11.phpt	-crlf
+/ext/standard/tests/strings/chunk_split_variation12.phpt	-crlf
+/ext/standard/tests/strings/chunk_split_variation4.phpt	-crlf
+/ext/standard/tests/strings/crc32_variation2.phpt	-crlf
+/ext/standard/tests/strings/crc32_variation3.phpt	-crlf
+/ext/standard/tests/strings/crc32_variation4.phpt	-crlf
+/ext/standard/tests/strings/highlight_file.phpt	-crlf
+/ext/standard/tests/strings/htmlentities_html4.phpt	-crlf
+/ext/standard/tests/strings/lcfirst.phpt	-crlf
+/ext/standard/tests/strings/ltrim.phpt	-crlf
+/ext/standard/tests/strings/nl2br_variation2.phpt	-crlf
+/ext/standard/tests/strings/php_strip_whitespace.phpt	-crlf
+/ext/standard/tests/strings/rtrim.phpt	-crlf
+/ext/standard/tests/strings/sprintf_f_2.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation15.phpt	-crlf
+/ext/standard/tests/strings/strcspn_variation6.phpt	-crlf
+/ext/standard/tests/strings/strcspn_variation7.phpt	-crlf
+/ext/standard/tests/strings/strcspn_variation8.phpt	-crlf
+/ext/standard/tests/strings/stripos_variation1.phpt	-crlf
+/ext/standard/tests/strings/stripos_variation3.phpt	-crlf
+/ext/standard/tests/strings/stripos_variation4.phpt	-crlf
+/ext/standard/tests/strings/stripos_variation5.phpt	-crlf
+/ext/standard/tests/strings/stripos_variation6.phpt	-crlf
+/ext/standard/tests/strings/stripslashes_variation2.phpt	-crlf
+/ext/standard/tests/strings/stripslashes_variation3.phpt	-crlf
+/ext/standard/tests/strings/stripslashes_variation4.phpt	-crlf
+/ext/standard/tests/strings/stripslashes_variation5.phpt	-crlf
+/ext/standard/tests/strings/str_ireplace.phpt	-crlf
+/ext/standard/tests/strings/strnatcmp_basic.phpt	-crlf
+/ext/standard/tests/strings/strncasecmp_variation9.phpt	-crlf
+/ext/standard/tests/strings/strpos.phpt	-crlf
+/ext/standard/tests/strings/strrchr_variation1.phpt	-crlf
+/ext/standard/tests/strings/strrchr_variation2.phpt	-crlf
+/ext/standard/tests/strings/strrchr_variation3.phpt	-crlf
+/ext/standard/tests/strings/strrchr_variation4.phpt	-crlf
+/ext/standard/tests/strings/strrchr_variation6.phpt	-crlf
+/ext/standard/tests/strings/strrchr_variation7.phpt	-crlf
+/ext/standard/tests/strings/str_replace.phpt	-crlf
+/ext/standard/tests/strings/strrev_variation3.phpt	-crlf
+/ext/standard/tests/strings/strrev_variation4.phpt	-crlf
+/ext/standard/tests/strings/strripos_variation1.phpt	-crlf
+/ext/standard/tests/strings/strripos_variation2.phpt	-crlf
+/ext/standard/tests/strings/strripos_variation3.phpt	-crlf
+/ext/standard/tests/strings/strripos_variation4.phpt	-crlf
+/ext/standard/tests/strings/strripos_variation5.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation1.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation2.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation3.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation4.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation5.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation6.phpt	-crlf
+/ext/standard/tests/strings/strspn_variation5.phpt	-crlf
+/ext/standard/tests/strings/strspn_variation6.phpt	-crlf
+/ext/standard/tests/strings/strspn_variation7.phpt	-crlf
+/ext/standard/tests/strings/strspn_variation8.phpt	-crlf
+/ext/standard/tests/strings/strstr.phpt	-crlf
+/ext/standard/tests/strings/strtok_variation1.phpt	-crlf
+/ext/standard/tests/strings/strtok_variation3.phpt	-crlf
+/ext/standard/tests/strings/strtr_variation1.phpt	-crlf
+/ext/standard/tests/strings/strtr_variation2.phpt	-crlf
+/ext/standard/tests/strings/str_word_count.phpt	-crlf
+/ext/standard/tests/strings/trim1.phpt	-crlf
+/ext/standard/tests/strings/ucfirst.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation10.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation12.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation16.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation18.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation4.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation6.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation7.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation8.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation10.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation12.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation14.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation18.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation4.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation6.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation7.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation8.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation10.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation12.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation14.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation16.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation4.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation6.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation7.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation8.phpt	-crlf
+/ext/standard/tests/strings/wordwrap.phpt	-crlf
+/ext/tidy/tests/010.phpt	-crlf
+/ext/tidy/tests/012.phpt	-crlf
+/ext/tidy/tests/025.phpt	-crlf
+/ext/tidy/tests/030.phpt	-crlf
+/ext/tokenizer/tests/bug26463.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation12.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation13.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation14.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation15.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation16.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation17.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation18.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation19.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation4.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation5.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation6.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation7.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation8.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation9.phpt	-crlf
+/ext/xml/tests/bug26614_libxml.phpt	-crlf
+/ext/xmlwriter/tests/004.phpt		-crlf
+/ext/xmlwriter/tests/OO_004.phpt	-crlf
+/ext/zlib/tests/005.phpt			-crlf
+/ext/zlib/tests/gzfile_basic2.phpt	-crlf
+/ext/zlib/tests/gzfile_basic.phpt	-crlf
+/ext/zlib/tests/gzfilegzreadfile.phpt	-crlf
+/ext/zlib/tests/readgzfile_basic2.phpt	-crlf
+/ext/zlib/tests/readgzfile_basic.phpt	-crlf
+/sapi/cli/tests/014.phpt			-crlf
+/tests/run-test/test010.phpt		-crlf
+/Zend/tests/bug35655.phpt			-crlf
+/Zend/tests/bug48930.phpt			-crlf
+/Zend/tests/bug61095.phpt			-crlf
+/Zend/tests/heredoc_017.phpt		-crlf
+/Zend/tests/heredoc_018.phpt		-crlf
+/Zend/tests/nowdoc_013.phpt			-crlf
+/Zend/tests/nowdoc_014.phpt			-crlf
+/Zend/tests/nowdoc_015.phpt			-crlf

.gitignore

@@ -0,0 +1,254 @@
+# General Ignores
+*~
+.#*
+*.
+*.slo
+*.mk
+*.mem
+*.gcda
+*.gcno
+*.la
+*.lo
+*.o
+*.a
+*.ncb
+*.opt
+*.plg
+*swp
+*.patch
+*.tgz
+*.tar.gz
+*.tar.bz2
+.FBCIndex
+.FBCLockFolder
+.deps
+.libs
+phpt.*
+core
+dynlib.m4
+Debug
+Debug_TS
+Makefile
+Makefile.fragments
+Makefile.objects
+Release
+Release_TS
+Release_TSDbg
+Release_TS_inline
+Release_inline
+ZendEngine1
+_libs
+acconfig.h
+aclocal.m4
+autom4te.cache
+bsd_converted
+buildconf.stamp
+buildmk.stamp
+confdefs.h
+config.h
+config.guess
+config.cache
+config.h.in
+config.log
+config.nice
+config.nice.bat
+config.status
+config.sub
+config_vars.mk
+configuration-parser.c
+configuration-parser.h
+configuration-parser.output
+configuration-scanner.c
+configure
+configure.bat
+configure.js
+conftest
+conftest.c
+debug.log
+diff
+generated_lists
+include
+install-sh
+internal_functions.c
+lcov_data
+lcov_html
+libs
+libtool
+meta_cc
+meta_ccld
+missing
+mkinstalldirs
+modules
+php
+php-*.tar.gz
+php5.spec
+php_lcov.info
+php_test_results_*.txt
+php_version.h
+results.txt
+shlibtool
+stamp-h
+test.php3
+tmp-php.ini
+want_dependencies
+x64
+stamp-h.in
+scan_makefile_in.awk
+TSRM/tsrm_config.h
+Zend/zend_config.h
+Zend/zend_ini_parser.c
+Zend/zend_ini_parser.h
+Zend/zend_ini_parser.output
+Zend/zend_language_parser.c
+Zend/zend_language_parser.h
+Zend/zend_language_parser.output
+ext/date/lib/timelib_config.h
+ext/iconv/php_iconv_aliased_libiconv.h
+ext/phar/phar.php
+main/php_config.h
+main/php_config.h.in
+
+# Test specific Ignores
+tests/*/*.diff
+tests/*/*.out
+tests/*/*.php
+tests/*/*.exp
+tests/*/*.log
+tests/*/*.sh
+*/tests/*.diff
+*/tests/*.out
+*/tests/*.php
+*/tests/*.exp
+*/tests/*.log
+*/tests/*.sh
+*/tests/*/*.diff
+*/tests/*/*.out
+*/tests/*/*.php
+*/tests/*/*.exp
+*/tests/*/*.log
+*/tests/*/*.sh
+*/*/tests/*.diff
+*/*/tests/*.out
+*/*/tests/*.php
+*/*/tests/*.exp
+*/*/tests/*.log
+*/*/tests/*.sh
+*/*/tests/*/*.diff
+*/*/tests/*/*.out
+*/*/tests/*/*.php
+*/*/tests/*/*.exp
+*/*/tests/*/*.log
+*/*/tests/*/*.sh
+
+# Extension specifc ignores
+ext/*/configure.in
+ext/*/ltmain.sh
+ext/*/libs.mk
+ext/*/build
+ext/*/scan_makefile_in.awk
+ext/*/Makefile.global
+ext/*/acinclude.m4
+ext/*/config.sub
+
+# Extension specific
+ext/iconv/scan_makefile_in.awk
+ext/iconv/php_have_bsd_iconv.h
+ext/iconv/php_have_ibm_iconv.h
+ext/iconv/php_have_libiconv.h
+ext/iconv/php_php_iconv_h_path.h
+ext/iconv/php_have_glibc_iconv.h
+ext/iconv/php_php_iconv_impl.h
+ext/iconv/php_have_iconv.h
+ext/iconv/php_iconv_supports_errno.h
+ext/mbstring/libmbfl/Makefile.in
+ext/mbstring/libmbfl/autoscan.log
+ext/mbstring/libmbfl/config.sub
+ext/mbstring/libmbfl/depcomp
+ext/mbstring/libmbfl/ltmain.sh
+ext/mbstring/libmbfl/stamp-h1
+ext/mbstring/libmbfl/*.dll
+ext/mbstring/libmbfl/*.lib
+ext/mbstring/libmbfl/*.RES
+ext/mbstring/libmbfl/*.res
+ext/mbstring/libmbfl/*.obj
+ext/mbstring/libmbfl/*.tds
+ext/mbstring/libmbfl/filters/Makefile.in
+ext/mbstring/libmbfl/mbfl/Makefile.in
+ext/mbstring/libmbfl/mbfl/EastAsianWidth.txt
+ext/mbstring/libmbfl/nls/Makefile.in
+ext/mssql/#*#
+ext/mssql/Makefile.global
+ext/mssql/acinclude.m4
+ext/mssql/config.sub
+ext/mssql/configure.in
+ext/mssql/ltmain.sh
+ext/mysql/weztest.sqlite
+ext/oci8/tests/*.tmp
+ext/oci8/tests/*.vglog
+ext/pdo/conftest*
+ext/pdo/tests/*.db
+ext/pdo/tests/*.tmp
+ext/pdo_firebird/conftest*
+ext/pdo_mysql/conftest*
+ext/pdo_mysql/tests/*.db
+ext/pdo_mysql/tests/*.tmp
+ext/pdo_oci/conftest*
+ext/pdo_odbc/tests/*.db
+ext/pdo_odbc/tests/*.tmp
+ext/pdo_odbc/tests/*.mdb
+ext/pdo_pgsql/conftest*
+ext/pdo_pgsql/tests/*.db
+ext/pdo_pgsql/tests/*.tmp
+ext/pdo_sqlite/conftest*
+ext/pdo_sqlite/sqlite3.h
+ext/pdo_sqlite/tests/*.db
+ext/pdo_sqlite/tests/*.tmp
+ext/phar/phar.phar
+ext/pspell/tests/*.tmp
+ext/reflection/xml
+ext/reflection/html
+ext/reflection/spl.chm
+ext/simplexml/examples/security.new.xml
+ext/spl/examples/.htaccess
+ext/spl/examples/*.phps
+ext/sqlite/weztest.sqlite
+ext/sqlite/libsqlite/src/sqlite.h
+ext/sqlite/libsqlite/src/parse.out
+ext/sqlite/libsqlite/src/libsqlite.dsw
+ext/sqlite3/tests/phpsql*
+ext/sqlite3/tests/*.db
+ext/sqlite3/tests/*.tmp
+ext/standard/tests/misc/*.txt
+ext/standard/tests/strings/*.txt
+main/build-defs.h
+main/internal_functions_cli.c
+main/config.w32.h
+main/stamp-h1
+main/streams/build-defs.h
+main/streams/stamp-h1
+pear/install-pear-nozlib.phar
+pear/phpize
+pear/run-tests
+pear/php-config
+pear/scripts
+sapi/apache/libphp5.module
+sapi/apache2handler/libphp5.module
+sapi/apache_hooks/libphp5.module
+sapi/cgi/php-cgi
+sapi/cli/php.1
+sapi/fpm/php-fpm
+sapi/fpm/php-fpm.1
+sapi/fpm/init.d.php-fpm
+sapi/fpm/php-fpm.conf
+sapi/fpm/fpm/php-cgi
+scripts/php-config
+scripts/phpize
+scripts/man1/*.1
+win32/*.suo
+win32/*.aps
+win32/*.positions
+win32/ext
+win32/phpts.def
+win32/wsyslog.h
+win32/win32.dsp
+win32/php.dsw

.travis.yml

@@ -0,0 +1,9 @@
+language: php
+
+branches:
+    except:
+        - /^PHP-5\.3.*/
+        - /^PHP-5\.4.*/
+
+notifications:
+    email: false

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 the version 4 releases, many sections have been recoded to use
+well into version 5 releases, many sections have been recoded to use
 these rules.
 
 Code Implementation

EXTENSIONS

@@ -337,7 +337,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           curl
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>,Ilia Alshanetsky <iliaa@php.net>
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>, Ilia Alshanetsky <iliaa@php.net>, Pierrick Charron <pierrick@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.2

INSTALL

@@ -24,6 +24,7 @@ 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
@@ -83,7 +84,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.
 
@@ -92,9 +93,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.
      __________________________________________________________________
      __________________________________________________________________
 
@@ -140,9 +141,9 @@ Table of Contents
      * A web server
      * Any module specific components (such as GD, PDF libs, etc.)
 
-   When  building  directly from SVN sources or after custom modifications
+   When  building  directly from Git sources or after custom modifications
    you might also need:
-     * autoconf: 2.13
+     * autoconf: 2.13+ (for PHP < 5.4.0), 2.59+ (for PHP >= 5.4.0)
      * automake: 1.4+
      * libtool: 1.4.x+ (except 1.4.2)
      * re2c: Version 0.13.4 or newer
@@ -375,12 +376,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
@@ -498,7 +499,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:
@@ -520,7 +521,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
@@ -627,15 +628,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
@@ -837,7 +838,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,
@@ -855,20 +856,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
 
@@ -900,12 +901,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
@@ -926,7 +927,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.
@@ -951,18 +952,26 @@ 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. The required software is as follows:
+   tools is necessary.
+
+   For unpacking the PHP distribution you need
+     * tar
+     * gzip or
+     * bzip2
+
+   For compiling PHP you need
      * gcc (recommended, other C compilers may work)
      * make
-     * flex
+     * GNU sed
+
+   For building extra extensions or hacking the code of PHP you might also
+   need
+     * flex (up to PHP 5.2)
+     * re2c
      * 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
@@ -971,14 +980,16 @@ Required software
 Using Packages
 
    You can simplify the Solaris install process by using pkgadd to install
-   most of your needed components.
+   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.
      __________________________________________________________________
      __________________________________________________________________
 
 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
@@ -1205,6 +1216,7 @@ 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
      __________________________________________________________________
 
@@ -1227,8 +1239,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  SVN  Instructions  for  details  on  the required tools, and
+   of  the  required  tools  (autoconf,  automake,  libtool, etc.) See the
+   » Anonymous  Git  Instructions  for  details on the required tools, and
    required versions.
      __________________________________________________________________
      __________________________________________________________________
@@ -1247,7 +1259,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
@@ -1279,7 +1291,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 PHP4) folder.
+   "PHP\ext" ("PHP\extensions" in PHP 4) folder.
 
    PHP   ships  with  the  extensions  most  useful  to  the  majority  of
    developers. They are called "core" extensions.
@@ -1365,7 +1377,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
@@ -1424,6 +1436,51 @@ $ 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
@@ -1485,11 +1542,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
@@ -1504,11 +1561,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!
      __________________________________________________________________
      __________________________________________________________________
@@ -1528,14 +1585,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 version, it happens on every
+   server  is  started.  For the CGI and CLI versions, it happens on every
    invocation.
 
-   php.ini is searched in these locations (in order):
+   php.ini is searched for 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
@@ -1543,33 +1600,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 these keys, then the first one found will be used as
-       the location of the php.ini (Windows only).
+       IniFilePath  in any of these keys, 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 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().
+   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().
 
      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
-   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
+   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
    directives  available  in  your  PHP  version,  please  read  your well
-   commented  php.ini  file. Alternatively, you may find the » the latest
-   php.ini from SVN helpful too.
+   commented  php.ini  file.  Alternatively,  you  may  find  » the latest
+   php.ini from Git helpful too.
 
    Example #1 php.ini example
 ; any text on a line after an unquoted semicolon (;) is ignored
@@ -1635,12 +1692,13 @@ Where a configuration setting may be set
 
    CAPTION: Definition of PHP_INI_* modes
 
-        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
+   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
      __________________________________________________________________
      __________________________________________________________________
 
@@ -1788,13 +1846,9 @@ Installation
           each  request to play in, further weaknesses are introduced into
           PHP's system.
 
-          If  you  feel  you have to use a threaded MPM, look at a FastCGI
+          If   you  want  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.gcov

@@ -12,7 +12,8 @@ php_lcov.info: lcov-test
 	@rm -rf lcov_data/
 	@$(mkinstalldirs) lcov_data/
 	@echo
-	-@find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq | while read x; do \
+	-@files=`find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq` ;\
+	for x in $$files; do \
 		echo -n . ;\
 		y=`echo $$x | sed -e 's!\.libs/!!'`; \
 		dir=lcov_data/`dirname $$x`; \

NEWS

@@ -1,19 +1,854 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-23 Aug 2011, PHP 5.3.8
+09 May 2013, PHP 5.3.25
 
 - Core:
-  . Fixed bug #55439 (crypt() returns only the salt for MD5). (Stas)
+  . 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
+
+- Zend Engine:
+  . Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that
+    includes a semi-colon). (Pierrick)
+
+- COM:
+  . 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 bug #62432 (ReflectionMethod random corrupt memory on high
+    concurrent). (Johannes)
+  . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed 
+    Salt). (Anthony Ferrara)
+
+- Fileinfo:
+  . Fixed magic file regex support. (Felipe)
+
+- FPM:
+  . Fixed bug #61045 (fpm don't send error log to fastcgi clients). (fat)
+  . Fixed bug #61835 (php-fpm is not allowed to run as root). (fat)
+  . Fixed bug #61295 (php-fpm should not fail with commented 'user'
+    for non-root start). (fat)
+  . Fixed bug #61026 (FPM pools can listen on the same address). (fat)
+  . Fixed bug #62033 (php-fpm exits with status 0 on some failures to start).
+    (fat)
+  . Fixed bug #62153 (when using unix sockets, multiples FPM instances
+    can be launched without errors). (fat)
+  . Fixed bug #62160 (Add process.priority to set nice(2) priorities). (fat)
+  . Fixed bug #61218 (FPM drops connection while receiving some binary values
+    in FastCGI requests). (fat)
+  . Fixed bug #62205 (php-fpm segfaults (null passed to strstr)). (fat)
+
+- Intl:
+  . Fixed bug #62083 (grapheme_extract() memory leaks). (Gustavo)
+  . Fixed bug #62081 (IntlDateFormatter constructor leaks memory when called
+    twice). (Gustavo)
+  . Fixed bug #62070 (Collator::getSortKey() returns garbage). (Gustavo)
+  . Fixed bug #62017 (datefmt_create with incorrectly encoded timezone leaks
+    pattern). (Gustavo)
+  . Fixed bug #60785 (memory leak in IntlDateFormatter constructor). (Gustavo)
+
+- JSON:
+  . Reverted fix for bug #61537. (Johannes)
+
+- Phar:
+  . Fixed bug #62227 (Invalid phar stream path causes crash). (Felipe)
+
+- Reflection:
+  . Fixed bug #62384 (Attempting to invoke a Closure more than once causes 
+    segfault). (Felipe)
+  . Fixed bug #62202 (ReflectionParameter::getDefaultValue() memory leaks 
+    with constant). (Laruence)
+
+- SPL:
+  . 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)
+
+- Zip:
+  . Upgraded libzip to 0.10.1 (Anatoliy)
+
+14 Jun 2012, PHP 5.3.14
+
+- CLI SAPI:
+  . Fixed bug #61546 (functions related to current script failed when chdir() 
+    in cli sapi). (Laruence, reeze.xia@gmail.com)
+
+- CURL:
+  . Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction).
+    (Laruence)
+
+- COM:
+  . Fixed bug #62146 com_dotnet cannot be built shared. (Johannes)
+
+- Core:
+  . Fixed CVE-2012-2143. (Solar Designer)
+  . Fixed missing bound check in iptcparse(). (chris at chiappa.net)
+  . Fixed bug #62373 (serialize() generates wrong reference to the object).
+    (Moriyoshi)
+  . Fixed bug #62005 (unexpected behavior when incrementally assigning to a 
+    member of a null object). (Laruence)
+  . Fixed bug #61991 (long overflow in realpath_cache_get()). (Anatoliy)
+  . Fixed bug #61764 ('I' unpacks n as signed if n > 2^31-1 on LP64). (Gustavo)
+  . Fixed bug #61730 (Segfault from array_walk modifying an array passed by
+    reference). (Laruence)
+  . Fixed bug #61713 (Logic error in charset detection for htmlentities).
+    (Anatoliy)
+  . Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename
+    set to null). (Anatoliy)
+  . Changed php://fd to be available only for CLI.
+
+- Fileinfo:
+  . Fixed bug #61812 (Uninitialised value used in libmagic). 
+    (Laruence, Gustavo)
+
+- Iconv extension:
+  . Fixed a bug that iconv extension fails to link to the correct library
+    when another extension makes use of a library that links to the iconv
+    library. See https://bugs.gentoo.org/show_bug.cgi?id=364139 for detail.
+    (Moriyoshi)
+
+- Intl:
+  . Fixed bug #62082 (Memory corruption in internal function
+    get_icu_disp_value_src_php()). (Gustavo)
+
+- JSON
+  . Fixed bug #61537 (json_encode() incorrectly truncates/discards
+    information). (Adam)
+
+- PDO:
+  . Fixed bug #61755 (A parsing bug in the prepared statements can lead to
+    access violations). (Johannes)
+
+- Phar:
+  . Fix bug #61065 (Secunia SA44335). (Rasmus)
+
+- Streams:
+  . Fixed bug #61961 (file_get_contents leaks when access empty file with
+    maxlen set). (Reeze)
+
+08 May 2012, PHP 5.3.13
+- CGI
+  . Improve fix for PHP-CGI query string parameter vulnerability, CVE-2012-2311.
+    (Stas)
+
+03 May 2012, PHP 5.3.12
+- Fix PHP-CGI query string parameter vulnerability, CVE-2012-1823. (Rasmus)
+
+26 Apr 2012, PHP 5.3.11
+
+- Core:
+  . Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables
+    (without apache2)). (Laruence)
+  . Fixed bug #61273 (call_user_func_array with more than 16333 arguments
+    leaks / crashes). (Laruence)
+  . Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
+  . Improved max_input_vars directive to check nested variables (Dmitry).
+  . Fixed bug #61095 (Incorect lexing of 0x00*+<NUM>). (Etienne)
+  . Fixed bug #61087 (Memory leak in parse_ini_file when specifying
+    invalid scanner mode). (Nikic, Laruence)
+  . Fixed bug #61072 (Memory leak when restoring an exception handler).
+    (Nikic, Laruence)
+  . Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX).
+    (Laruence)
+  . Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831).
+    (Ondřej Surý)
+  . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical
+    vars). (Laruence)
+  . Fixed bug #60895 (Possible invalid handler usage in windows random
+    functions). (Pierre)
+  . Fixed bug #60825 (Segfault when running symfony 2 tests).
+    (Dmitry, Laruence)
+  . Fixed bug #60801 (strpbrk() mishandles NUL byte). (Adam)
+  . Fixed bug #60569 (Nullbyte truncates Exception $message). (Ilia)
+  . Fixed bug #60227 (header() cannot detect the multi-line header with CR).
+    (rui, Gustavo)
+  . Fixed bug #60222 (time_nanosleep() does validate input params). (Ilia)
+  . Fixed bug #54374 (Insufficient validating of upload name leading to 
+    corrupted $_FILES indices). (CVE-2012-1172). (Stas, lekensteyn at
+    gmail dot com, Pierre)
+  . Fixed bug #52719 (array_walk_recursive crashes if third param of the
+    function is by reference). (Nikita Popov)
+  . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry)
+
+- DOM
+  . Added debug info handler to DOM objects. (Gustavo, Joey Smith)
+
+- FPM
+  . Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
+    (michaelhood at gmail dot com, Ilia)
+
+- Ibase
+  . Fixed bug #60947 (Segmentation fault while executing ibase_db_info).
+    (Ilia)
+
+- Installation
+  . Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones)
+
+- Fileinfo
+  . Upgraded libmagic to 5.11 (Pierre, Anatoliy)
+  . Fixed bug #61565 where php_stream_open_wrapper_ex tries to open a
+    directory descriptor under windows. (Anatoliy)
+  . Fixed bug #61566 failure caused by the posix lseek and read versions
+    under windows in cdf_read(). (Anatoliy)
+  . Fixed bug #61173 (Unable to detect error from finfo constructor). (Gustavo)
+
+- Firebird Database extension (ibase):
+  . Fixed bug #60802 (ibase_trans() gives segfault when passing params).
+
+- Libxml:
+  . Fixed bug #61367 (open_basedir bypass using libxml RSHUTDOWN). 
+    (Tim Starling)
+
+- mysqli
+  . Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes).
+
+- PDO_mysql
+  . Fixed bug #61207 (PDO::nextRowset() after a multi-statement query doesn't
+    always work). (Johannes)
+  . Fixed bug #61194 (PDO should export compression flag with myslqnd).
+    (Johannes)
+
+- PDO_odbc 
+  . Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). (Ilia)
+
+- PDO_pgsql
+  . Fixed bug #61267 (pdo_pgsql's PDO::exec() returns the number of SELECTed
+    rows on postgresql >= 9). (ben dot pineau at gmail dot com)
+
+- PDO_Sqlite extension:
+  . Add createCollation support. (Damien)
+
+- pgsql:
+  . Fixed bug #60718 (Compile problem with libpq (PostgreSQL 7.3 or less).
+    (Yasuo Ohgaki)
+
+- Phar:
+  . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL
+    bytes). (Nikic)
+
+- PHP-FPM SAPI:
+  . Fixed bug #60811 (php-fpm compilation problem). (rasmus)
+
+- Readline:
+  . Fixed bug #61088 (Memory leak in readline_callback_handler_install).
+    (Nikic, Laruence)
+  . Add open_basedir checks to readline_write_history and readline_read_history.
+    (Rasmus, reported by Mateusz Goik)
+
+- Reflection:
+  . Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
+    when get_properties returns a hash table with (inaccessible) dynamic
+    numeric properties). (Gustavo)
+  . Fixed bug #60968 (Late static binding doesn't work with 
+    ReflectionMethod::invokeArgs()). (Laruence)
+
+- SOAP
+  . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
+  . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
+    User-Agent header). (carloschilazo at gmail dot com)
+  . Fixed bug #60842, #51775 (Chunked response parsing error when 
+    chunksize length line is > 10 bytes). (Ilia)
+  . Fixed bug #49853 (Soap Client stream context header option ignored).
+    (Dmitry)
+
+- SPL
+  . Fixed memory leak when calling SplFileInfo's constructor twice. (Felipe)
+  . Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
+    FilesystemIterator's iterators are requested more than once without
+    having had its dtor callback called in between). (Gustavo)
+  . Fixed bug #61347 (inconsistent isset behavior of Arrayobject). (Laruence)
+  . Fixed bug #61326 (ArrayObject comparison). (Gustavo)
+
+- SQLite3 extension:
+  . Add createCollation() method. (Brad Dewar)
+
+- Session:
+  . Fixed bug #60860 (session.save_handler=user without defined function core
+    dumps). (Felipe)
+  . Fixed bug #60634 (Segmentation fault when trying to die() in
+    SessionHandler::write()). (Ilia)
+
+- Streams:
+  . Fixed bug #61371 (stream_context_create() causes memory leaks on use
+    streams_socket_create). (Gustavo)
+  . Fixed bug #61253 (Wrappers opened with errors concurrency problem on ZTS).
+    (Gustavo)
+  . Fixed bug #61115 (stream related segfault on fatal error in
+    php_stream_context_link). (Gustavo)
+  . Fixed bug #60817 (stream_get_line() reads from stream even when there is
+    already sufficient data buffered). stream_get_line() now behaves more like
+    fgets(), as is documented. (Gustavo)
+  . Further fix for bug #60455 (stream_get_line misbehaves if EOF is not
+    detected together with the last read). (Gustavo)
+  . Fixed bug #60106 (stream_socket_server silently truncates long unix
+    socket paths). (Ilia)
+
+- Tidy:
+  . Fixed bug #54682 (tidy null pointer dereference). (Tony, David Soria Parra)
+
+- XMLRPC:
+  . Fixed bug #61264 (xmlrpc_parse_method_descriptions leaks temporary
+    variable). (Nikita Popov)
+  . Fixed bug #61097 (Memory leak in xmlrpc functions copying zvals). (Nikic)
+
+- Zlib:
+  . Fixed bug #61139 (gzopen leaks when specifying invalid mode). (Nikic)
+
+02 Feb 2012, PHP 5.3.10
+
+- Core:
+  . Fixed arbitrary remote code execution vulnerability reported by Stefan 
+    Esser, CVE-2012-0830. (Stas, Dmitry)
+
+10 Jan 2012, PHP 5.3.9
+
+- Core:
+  . Added max_input_vars directive to prevent attacks based on hash collisions
+    (CVE-2011-4885) (Dmitry).
+  . Fixed bug #60205 (possible integer overflow in content_length). (Laruence)
+  . Fixed bug #60139 (Anonymous functions create cycles not detected by the
+    GC). (Dmitry)
+  . Fixed bug #60138 (GC crash with referenced array in RecursiveArrayIterator)
+    (Dmitry).
+  . Fixed bug #60120 (proc_open's streams may hang with stdin/out/err when 
+    the data exceeds or is equal to 2048 bytes). (Pierre, Pascal Borreli)
+  . Fixed bug #60099 (__halt_compiler() works in braced namespaces). (Felipe)
+  . Fixed bug #60019 (Function time_nanosleep() is undefined on OS X). (Ilia)
+  . Fixed bug #55874 (GCC does not provide __sync_fetch_and_add on some archs).
+    (klightspeed at netspace dot net dot au)
+  . Fixed bug #55798 (serialize followed by unserialize with numeric object
+    prop. gives integer prop). (Gustavo)
+  . Fixed bug #55749 (TOCTOU issue in getenv() on Windows builds). (Pierre)
+  . Fixed bug #55707 (undefined reference to `__sync_fetch_and_add_4' on Linux
+    parisc). (Felipe)
+  . Fixed bug #55674 (fgetcsv & str_getcsv skip empty fields in some
+    tab-separated records). (Laruence)
+  . Fixed bug #55649 (Undefined function Bug()). (Laruence)
+  . Fixed bug #55622 (memory corruption in parse_ini_string). (Pierre)
+  . Fixed bug #55576 (Cannot conditionally move uploaded file without race
+    condition). (Gustavo)
+  . Fixed bug #55510: $_FILES 'name' missing first character after upload.
+    (Arpad)
+  . Fixed bug #55509 (segfault on x86_64 using more than 2G memory). (Laruence)
+  . Fixed bug #55504 (Content-Type header is not parsed correctly on
+    HTTP POST request). (Hannes)
+  . Fixed bug #55475 (is_a() triggers autoloader, new optional 3rd argument to
+    is_a and is_subclass_of). (alan_k)
   . Fixed bug #52461 (Incomplete doctype and missing xmlns). 
     (virsacer at web dot de, Pierre)
+  . Fixed bug #55366 (keys lost when using substr_replace an array). (Arpad)
+  . Fixed bug #55273 (base64_decode() with strict rejects whitespace after
+    pad). (Ilia)
+  . Fixed bug #52624 (tempnam() by-pass open_basedir with nonnexistent
+    directory). (Felipe)
+  . Fixed bug #50982 (incorrect assumption of PAGE_SIZE size). (Dmitry)
+  . Fixed invalid free in call_user_method() function. (Felipe)
+  . Fixed bug #43200 (Interface implementation / inheritence not possible in
+    abstract classes). (Felipe)
+
+
+- BCmath:
+  . Fixed bug #60377 (bcscale related crashes on 64bits platforms). (shm)
+
+- Calendar:
+  . Fixed bug #55797 (Integer overflow in SdnToGregorian leads to segfault (in
+    optimized builds). (Gustavo)
+
+- cURL:
+  . Fixed bug #60439 (curl_copy_handle segfault when used with
+    CURLOPT_PROGRESSFUNCTION). (Pierrick)
+  . Fixed bug #54798 (Segfault when CURLOPT_STDERR file pointer is closed
+    before calling curl_exec). (Hannes)
+  . Fixed issues were curl_copy_handle() would sometimes lose copied
+    preferences. (Hannes)
+
+- DateTime:
+  . Fixed bug #60373 (Startup errors with log_errors on cause segfault).
+    (Derick)
+  . Fixed bug #60236 (TLA timezone dates are not converted properly from
+    timestamp). (Derick)
+  . Fixed bug #55253 (DateTime::add() and sub() result -1 hour on objects with
+    time zone type 2). (Derick)
+  . Fixed bug #54851 (DateTime::createFromFormat() doesn't interpret "D").
+    (Derick)
+  . Fixed bug #53502 (strtotime with timezone memory leak). (Derick)
+  . Fixed bug #52062 (large timestamps with DateTime::getTimestamp and
+    DateTime::setTimestamp). (Derick)
+  . Fixed bug #51994 (date_parse_from_format is parsing invalid date using 'yz'
+    format). (Derick)
+  . Fixed bug #52113 (Seg fault while creating (by unserialization)
+    DatePeriod). (Derick)
+  . Fixed bug #48476 (cloning extended DateTime class without calling
+    parent::__constr crashed PHP). (Hannes)
+
+- EXIF:
+  . Fixed bug #60150 (Integer overflow during the parsing of invalid exif
+    header). (CVE-2011-4566) (Stas, flolechaud at gmail dot com)
+
+- Fileinfo:
+  . Fixed bug #60094 (C++ comment fails in c89). (Laruence)
+  . Fixed possible memory leak in finfo_open(). (Felipe)
+  . Fixed memory leak when calling the Finfo constructor twice. (Felipe)
+
+- Filter:
+  . Fixed Bug #55478 (FILTER_VALIDATE_EMAIL fails with internationalized 
+    domain name addresses containing >1 -). (Ilia)
+
+- FTP:
+  . Fixed bug #60183 (out of sync ftp responses). (bram at ebskamp dot me,
+    rasmus)
+
+- Gd:
+  . Fixed bug #60160 (imagefill() doesn't work correctly
+    for small images). (Florian)
+
+- Intl:
+  . Fixed bug #61487 (Incorrent bounds checking in grapheme_strpos).
+    (Stas)
+  . Fixed bug #60192 (SegFault when Collator not constructed
+    properly). (Florian)
+  . Fixed memory leak in several Intl locale functions. (Felipe)
+
+- Json:
+  . Fixed bug #55543 (json_encode() with JSON_NUMERIC_CHECK fails on objects
+    with numeric string properties). (Ilia, dchurch at sciencelogic dot com)
+
+- Mbstring:
+  . Fixed possible crash in mb_ereg_search_init() using empty pattern. (Felipe)
+
+- MS SQL:
+  . Fixed bug #60267 (Compile failure with freetds 0.91). (Felipe)
+
+- MySQL:
+  . Fixed bug #55550 (mysql.trace_mode miscounts result sets). (Johannes)
+
+- MySQLi extension:
+  . Fixed bug #55859 (mysqli->stat property access gives error). (Andrey)
+  . Fixed bug #55582 (mysqli_num_rows() returns always 0 for unbuffered, when
+    mysqlnd is used). (Andrey)
+  . Fixed bug #55703 (PHP crash when calling mysqli_fetch_fields). 
+    (eran at zend dot com, Laruence)
+
+- mysqlnd
+  . Fixed bug #55609 (mysqlnd cannot be built shared). (Johannes)
+  . Fixed bug #55067 (MySQL doesn't support compression - wrong config option).
+    (Andrey)
 
 - NSAPI SAPI:
   . Don't set $_SERVER['HTTPS'] on unsecure connection (bug #55403). (Uwe
     Schindler)
 
 - OpenSSL:
-  . Reverted a change in timeout handling restoring PHP 5.3.6 behavior. (Pierre,
-    Andrey, Johannes)
+  . Fixed bug #60279 (Fixed NULL pointer dereference in
+    stream_socket_enable_crypto, case when ssl_handle of session_stream is not
+    initialized.) (shm)
+  . Fix segfault with older versions of OpenSSL. (Scott)
+
+- Oracle Database extension (OCI8):
+  . Fixed bug #59985 (show normal warning text for OCI_NO_DATA).
+    (Chris Jones)
+  . Increased maximum Oracle error message buffer length for new 11.2.0.3 size.
+    (Chris Jones)
+  . Improve internal initalization failure error messages. (Chris Jones)
+
+- PDO
+  . Fixed bug #55776 (PDORow to session bug). (Johannes)
+
+- PDO Firebird:
+  . Fixed bug #48877 ("bindValue" and "bindParam" do not work for PDO Firebird).
+    (Mariuz)
+  . Fixed bug #47415 (PDO_Firebird segfaults when passing lowercased column name to bindColumn).
+  . Fixed bug #53280 (PDO_Firebird segfaults if query column count less than param count).
+    (Mariuz)
+
+- PDO MySQL driver:
+  . Fixed bug #60155 (pdo_mysql.default_socket ignored). (Johannes)
+  . Fixed bug #55870 (PDO ignores all SSL parameters when used with mysql 
+    native driver). (Pierre)
+  . Fixed bug #54158 (MYSQLND+PDO MySQL requires #define 
+    MYSQL_OPT_LOCAL_INFILE). (Andrey)
+
+- PDO OCI driver:
+  . Fixed bug #55768 (PDO_OCI can't resume Oracle session after it's been
+    killed). (mikhail dot v dot gavrilov at gmail dot com, Chris Jones, Tony)
+
+- Phar:
+  . Fixed bug #60261 (NULL pointer dereference in phar). (Felipe)
+  . Fixed bug #60164 (Stubs of a specific length break phar_open_from_fp
+    scanning for __HALT_COMPILER). (Ralph Schindler)
+  . Fixed bug #53872 (internal corruption of phar). (Hannes)
+  . Fixed bug #52013 (Unable to decompress files in a compressed phar). (Hannes)
+
+- PHP-FPM SAPI:
+  . Dropped restriction of not setting the same value multiple times, the last
+    one holds. (giovanni at giacobbi dot net, fat)
+  . Added .phar to default authorized extensions. (fat)
+  . Fixed bug #60659 (FPM does not clear auth_user on request accept).
+    (bonbons at linux-vserver dot org)
+  . Fixed bug #60629 (memory corruption when web server closed the fcgi fd).
+    (fat)
+  . Enhance error log when the primary script can't be open. FR #60199. (fat)
+  . Fixed bug #60179 (php_flag and php_value does not work properly). (fat)
+  . Fixed bug #55577 (status.html does not install). (fat)
+  . Fixed bug #55533 (The -d parameter doesn't work). (fat)
+  . Fixed bug #55526 (Heartbeat causes a lot of unnecessary events). (fat)
+  . Fixed bug #55486 (status show BIG processes number). (fat)
+  . Enhanced security by limiting access to user defined extensions.
+    FR #55181. (fat)
+  . Added process.max to control the number of process FPM can fork. FR #55166.
+    (fat)
+  . Implemented FR #54577 (Enhanced status page with full status and details
+    about each processes. Also provide a web page (status.html) for
+    real-time FPM status. (fat)
+  . Lowered default value for Process Manager. FR #54098. (fat)
+  . Implemented FR #52569 (Add the "ondemand" process-manager
+    to allow zero children). (fat)
+  . Added partial syslog support (on error_log only). FR #52052. (fat)
+
+- Postgres:
+  . Fixed bug #60244 (pg_fetch_* functions do not validate that row param 
+    is >0). (Ilia)
+
+- Reflection:
+  . Fixed bug #60367 (Reflection and Late Static Binding). (Laruence)
+
+- Session:
+  . Fixed bug #55267 (session_regenerate_id fails after header sent). (Hannes)
+
+- SimpleXML:
+  . Reverted the SimpleXML->query() behaviour to returning empty arrays
+    instead of false when no nodes are found as it was since 5.3.3 
+    (bug #48601). (chregu, rrichards)
+
+- SOAP
+  . Fixed bug #54911 (Access to a undefined member in inherit SoapClient may
+    cause Segmentation Fault). (Dmitry)
+  . Fixed bug #48216 (PHP Fatal error: SOAP-ERROR: Parsing WSDL:
+    Extra content at the end of the doc, when server uses chunked transfer
+    encoding with spaces after chunk size). (Dmitry)
+  . Fixed bug #44686 (SOAP-ERROR: Parsing WSDL with references). (Dmitry)
+
+- Sockets:
+  . Fixed bug #60048 (sa_len a #define on IRIX). (china at thewrittenword dot
+    com)
+
+- SPL:
+  . Fixed bug #60082 (Crash in ArrayObject() when using recursive references).
+    (Tony)
+  . Fixed bug #55807 (Wrong value for splFileObject::SKIP_EMPTY).
+    (jgotti at modedemploi dot fr, Hannes)
+  . Fixed bug #54304 (RegexIterator::accept() doesn't work with scalar values).
+    (Hannes)
+
+- Streams:
+  . Fixed bug #60455 (stream_get_line misbehaves if EOF is not detected together
+    with the last read). (Gustavo)
+
+- Tidy:
+  . Fixed bug #54682 (Tidy::diagnose() NULL pointer dereference).
+    (Maksymilian Arciemowicz, Felipe)
+
+- XSL:
+  . Added xsl.security_prefs ini option to define forbidden operations within
+    XSLT stylesheets, default is not to enable write operations. This option 
+    won't be in 5.4, since there's a new method. Fixes Bug #54446. (Chregu,
+    Nicolas Gregoire)
+
+23 Aug 2011, PHP 5.3.8
+
+- Core:
+  . Fixed bug #55439 (crypt() returns only the salt for MD5). (Stas)
+
+- OpenSSL:
+  . Reverted a change in timeout handling restoring PHP 5.3.6 behavior,
+    as the new behavior caused mysqlnd SSL connections to hang (#55283).
+    (Pierre, Andrey, Johannes)
 
 18 Aug 2011, PHP 5.3.7
 - Upgraded bundled SQLite to version 3.7.7.1. (Scott)
@@ -128,7 +963,7 @@ PHP                                                                        NEWS
     exception and fatal error). (Hannes)
 
 - DBA extension:
-  . Supress warning on non-existent file open with Berkeley DB 5.2 (Chris Jones)
+  . Supress warning on non-existent file open with Berkeley DB 5.2. (Chris Jones)
   . Fixed bug #54242 (dba_insert returns true if key already exists). (Felipe)
 
 - Exif extesion:
@@ -197,7 +1032,7 @@ PHP                                                                        NEWS
 
 - Oracle Database extension (OCI8):
   . Added oci_client_version() returning the runtime Oracle client library
-    version (Chris Jones)
+    version. (Chris Jones)
 
 . PCRE extension:
   . Increased the backtrack limit from 100000 to 1000000 (Rasmus)
@@ -496,7 +1331,7 @@ PHP                                                                        NEWS
 
 - Tokenizer Extension
   . Fixed bug #54089 (token_get_all() does not stop after __halt_compiler).
-    (Ilia)
+    (Nikita Popov, Ilia)
 
 - XSL extension:
   . Fixed memory leaked introduced by the NULL poisoning patch.
@@ -699,6 +1534,7 @@ 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

@@ -0,0 +1,124 @@
+====================
+  Git Commit Rules
+====================
+
+This is the first file you should be reading when contributing code via Git.
+We'll assume you're basically familiar with Git, but feel free to post
+your questions on the mailing list. Please have a look at
+http://git-scm.com/ for more detailed information on Git.
+
+PHP is developed through the efforts of a large number of people.
+Collaboration is a Good Thing(tm), and Git lets us do this. Thus, following
+some basic rules with regards to Git usage will::
+
+   a. Make everybody happier, especially those responsible for maintaining
+      Git itself.
+
+   b. Keep the changes consistently well documented and easily trackable.
+
+   c. Prevent some of those 'Oops' moments.
+
+   d. Increase the general level of good will on planet Earth.
+
+Having said that, here are the organizational rules::
+
+   1. Respect other people working on the project.
+
+   2. Discuss any significant changes on the list before committing and get
+      confirmation from the release manager for the given branch.
+
+   3. Look at EXTENSIONS file to see who is the primary maintainer of
+      the code you want to contribute to.
+
+   4. If you "strongly disagree" about something another person did, don't
+      start fighting publicly - take it up in private email.
+
+   5. If you don't know how to do something, ask first!
+
+   6. Test your changes before committing them. We mean it. Really.
+      To do so use "make test".
+
+   7. For development use the --enable-maintainer-zts switch to ensure your
+      code handles TSRM correctly and doesn't break for those who need that.
+
+Currently we have the following branches in use::
+
+  master    The active development branch. 
+
+  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.2   Is used to release the PHP 5.2.x series. It is closed for 
+            changes now.
+
+  PHP-5.1   This branch is closed.
+
+  PHP-4.4   This branch is closed.
+
+The next few rules are more of a technical nature::
+
+   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.
+
+   2. All news updates intended for public viewing, such as new features,
+      bug fixes, improvements, etc., should go into the NEWS file of the
+      *first* to be released version with the given change. In other words
+      any NEWS file change only needs to done in one branch.
+
+   3. Do not commit multiple file and dump all messages in one commit. If you
+      modified several unrelated files, commit each group separately and
+      provide a nice commit message for each one. See example below.
+
+   4. Do write your commit message in such a way that it makes sense even
+      without the corresponding diff. One should be able to look at it, and
+      immediately know what was modified. Definitely include the function name
+      in the message as shown below.
+
+   5. In your commit messages, keep each line shorter than 80 characters. And
+      try to align your lines vertically, if they wrap. It looks bad otherwise.
+
+   6. If you modified a function that is callable from PHP, prepend PHP to
+      the function name as shown below.
+
+
+The format of the commit messages is pretty simple.
+
+<max 79 characters short description>\n
+\n
+<long description, 79 chars per line>
+\n
+
+An Example from the git project (commit 2b34e486bc):
+
+pack-objects: Fix compilation with NO_PTHREDS
+  
+It looks like commit 99fb6e04 (pack-objects: convert to use
+parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but
+hasn't noticed that the 'arg' variable no longer is available.
+
+If you fix some bugs, you should note the bug ID numbers in your
+commit message. Bug ID should be prefixed by "#" for easier access to
+bug report when developers are browsing CVS via LXR or Bonsai.
+
+Example::
+
+  Fixed bug #14016 (pgsql notice handler double free crash bug.)
+
+When you change the NEWS file for a bug fix, then please keep the bugs
+sorted in decreasing order under the fixed version.
+
+You can use OpenGrok (http://lxr.php.net/) and gitweb (http://git.php.net/)
+to look at PHP Git repository in various ways.
+
+
+For further information on the process and further details please refer to
+https://wiki.php.net/vcs/gitworkflow and https://wiki.php.net/vcs/gitfaq
+
+Happy hacking,
+
+PHP Team

README.RELEASE_PROCESS

@@ -20,12 +20,18 @@ 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.
 
-6. Moving extensions from/to PECL requires root level access to the CVS server.
-Contact systems@php.net to get this taken care of.
+6. Moving extensions from/to PECL requires write acces to the destination.
+Most developers should have this. 
 
 Moving extensions from php-src to PECL
-- Filesystem: cp -r php-src/ext/foo pecl/foo
-- cvs rm php-src/ext/foo
+- Checkout the pecl directory, most likely you want a sparse-root checkout
+  svn co --depth=empty https://svn.php.net/repository/pecl
+- Create an directory for the extension incl. branch and tag structure,
+  no trunk at this point and commit this to svn
+  cd pecl; mkdir foo foo/tags foo/branches; svn add foo; svn commit
+- Move the extension from php-src to the new location
+  svn mv https://svn.php.net/repository/php/php-src/trunk/ext/foo \
+         https://svn.php.net/repository/pecl/foo/trunk
 
 If the extension is still usable or not dead, in cooperation with the extension
 maintainers if any:
@@ -33,26 +39,24 @@ maintainers if any:
 - create the package.xml, commit
 - release the package
 
-Moving extensions from PECL to php-src
-- Filesystem: cp -r pecl/foo php-src/ext/foo
-OR depending on the wishes from the PECL extension maintainer.
-- Filesystem: ln -s pecl/foo php-src/ext/foo
+For Moving extensions from PECL to php-src the svn mv has to be tone the other
+way round.
 
 Rolling a non stable release (alpha/beta/RC)
 --------------------------------------------
 
-1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.)
+1. Check windows snapshot builder logs (http://windows.php.net/downloads/snaps/ the last revision)
 
-2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
-Do not use abbreviations for alpha and beta.
-
-3. Commit those changes
-
-4. run the "scripts/dev/credits" script in php-src and commit the changes in the
+2. run the "scripts/dev/credits" script in php-src and commit the changes in the
 credits files in ext/standard.
 
-5. tag the repository with the version f.e. "``cvs tag php_4_4_1RC1``"
-(of course, you need to change that to the version you're rolling an RC for).
+3. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
+Do not use abbreviations for alpha and beta.
+
+4. Commit those changes and note the revision id.
+
+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. 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
@@ -65,7 +69,7 @@ correctly work.
 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. You do not have to update the tree, but of course you can with "``cvs up -dP``".
+9. You do not have to update the tree, but of course you can with "``svn up``".
 
 10. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure
 and build two tarballs (one gz and one bz2).
@@ -100,7 +104,7 @@ Derick) run the following commands for you:
 
 ``sudo -u ezmlm ezmlm-sub ~ezmlm/primary-qa-tester/mod moderator-email-address``
 
-3. Update ``web/qa/trunk/include/release-qa.php`` with the appropriate information.
+3. Update ``qa.git/include/release-qa.php`` with the appropriate information.
    See the documentation within release-qa.php for more information, but all releases
    and RCs are configured here. Only $QA_RELEASES needs to be edited.
 
@@ -109,22 +113,21 @@ Derick) run the following commands for you:
 
    Note: Remember to update the MD5 checksum information.
 
-1. Update in ``php-bugs/trunk/include/functions.inc`` the ``show_version_option``
-function to include the new RC and commit.
-
-2. Update ``phpweb/include/version.inc`` (x=major version number)
+4. Update ``php.git/include/version.inc`` (x=major version number)
 
  a. ``$PHP_x_RC`` = "5.3.0RC1"
 
  b. ``$PHP_x_RC_DATE`` = "06 September 2007"
 
-3. Commit those changes:
+5. Commit and push those changes:
 
- a. ``cvs commit include/version.inc include/releases.inc``
+ a. ``git commit -a && git push origin master``
 
-4. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
+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
 ------------------------
 
@@ -132,37 +135,46 @@ Rolling a stable release
 
 2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
 
-3. **Merge** all related sections in NEWS (f.e. merge the 4.4.1RC1 and 4.4.0 sections)
+3. **Merge** all related sections in NEWS (f.e. merge the 5.4.1RC1 and 5.4.0 sections)
 
 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.
 
-6. tag the repository with the version f.e. "``cvs tag php_4_4_1``"
+6. tag the repository with the version f.e. "``git tag -s php-5.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!!
 
 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
+was "5.4.1RC1" then the new one should be "5.4.1RC2-dev" - regardless if we get
 a new RC or not. This is to make sure ``version_compare()`` can correctly work.
 
 8. Commit those changes
 
-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. Log in onto the snaps box and go into the correct tree (f.e. the PHP-5.4
+branch if you're rolling 5.5.x releases).
 
-10. You do not have to update the tree, but of course you can with "``cvs up -dP``".
+10. You do not have to update the tree, but of course you can with "``git pull
+origin <branch>``".
 
-11. run: ``./makedist php 4.4.1``, this will export the tree, create configure
+11. run: ``./makedist php 5.4.1``, this will export the tree, create configure
 and build two tarballs (one gz and one bz2).
 
-12. Commit those two tarballs to CVS (phpweb/distributions)
+12. Commit those two tarballs 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;
 
 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 CVS too.
+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)
 
@@ -176,6 +188,9 @@ Getting the stable release announced
 
  a. ``php bin/bumpRelease 5`` (or ``php bin/bumpRelease 4`` for PHP4)
 
+ b. In case multiple PHP minor versions are in active development you have
+    to manually copy the old information to include/releases.inc
+
 2. Edit ``phpweb/include/version.inc`` and change (X=major release number):
 
  a. ``$PHP_X_VERSION`` to the correct version
@@ -192,7 +207,7 @@ Getting the stable release announced
  f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")
 
 3. Update the ChangeLog file for the given major version
-f.e. ``ChangeLog-4.php`` from the NEWS file
+f.e. ``ChangeLog-5.php`` from the NEWS file
 
  a. go over the list and put every element on one line
 
@@ -212,9 +227,9 @@ f.e. ``ChangeLog-4.php`` from the NEWS file
 
   V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/``
 
-4. ``cp releases/4_4_0.php releases/4_4_1.php``
+4. ``cp releases/5_4_0.php releases/5_4_1.php``
 
-5. ``cvs add releases/4_4_1.php``
+5. ``git add releases/5_4_1.php``
 
 6. Update the ``releases/*.php`` file with relevant data. The release
 announcement file should list in detail:
@@ -237,17 +252,6 @@ to upgrade.
 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)
 --------------------------------------
 

README.SVN-RULES

@@ -1,146 +0,0 @@
-====================
-  SVN Commit Rules
-====================
-
-This is the first file you should be reading after you get your SVN account.
-We'll assume you're basically familiar with SVN, but feel free to post
-your questions on the mailing list. Please have a look at
-http://svnbook.red-bean.com/ for more detailed information on SVN.
-
-PHP is developed through the efforts of a large number of people.
-Collaboration is a Good Thing(tm), and SVN lets us do this. Thus, following
-some basic rules with regards to SVN usage will::
-
-   a. Make everybody happier, especially those responsible for maintaining
-      the SVN itself.
-
-   b. Keep the changes consistently well documented and easily trackable.
-
-   c. Prevent some of those 'Oops' moments.
-
-   d. Increase the general level of good will on planet Earth.
-
-Having said that, here are the organizational rules::
-
-   1. Respect other people working on the project.
-
-   2. Discuss any significant changes on the list before committing and get
-      confirmation from the release manager for the given branch.
-
-   3. Look at EXTENSIONS file to see who is the primary maintainer of
-      the code you want to contribute to.
-
-   4. If you "strongly disagree" about something another person did, don't
-      start fighting publicly - take it up in private email.
-
-   5. If you don't know how to do something, ask first!
-
-   6. Test your changes before committing them. We mean it. Really.
-      To do so use "make test".
-
-   7. For development use the --enable-maintainer-zts switch to ensure your
-      code handles TSRM correctly and doesn't break for thos who need that.
-
-Currently we have the following branches in use::
-
-  trunk             Will become PHP 6.0. This CVS branch is for active development.
-
-  branches/PHP_5_3  Is used to release the PHP 5.3.x series. It still allows for
-                    larger enhancements.
-
-  branches/PHP_5_2  Is used to release the PHP 5.2.x series. Only bugfixes are permitted
-                    on this branch (Consult the releasemaster prior to commit).
-
-  branches/PHP_5_1  This branch is closed.
-
-  branches/PHP_4_4  This branch is closed.
-
-The next few rules are more of a technical nature::
-
-   1. All changes should first go to trunk and then get merged from trunk
-      (aka MFH'ed) to all other relevant branches.
-
-   2. DO NOT TOUCH ChangeLog! It is automagically updated from the commit
-      messages every day. Woe be to those who attempt to mess with it.
-
-   3. All news updates intended for public viewing, such as new features,
-      bug fixes, improvements, etc., should go into the NEWS file of the
-      *first* to be released version with the given change. In other words
-      any NEWS file change only needs to done in one branch.
-
-      NB! Lines, starting with @ will go automagically into NEWS file, but
-      this is NOT recommended, though. Please, add news entries directly to
-      NEWS file and don't forget to keep them adjusted and sorted.
-
-   4. Do not commit multiple file and dump all messages in one commit. If you
-      modified several unrelated files, commit each group separately and
-      provide a nice commit message for each one. See example below.
-
-   5. Do write your commit message in such a way that it makes sense even
-      without the corresponding diff. One should be able to look at it, and
-      immediately know what was modified. Definitely include the function name
-      in the message as shown below.
-
-   6. In your commit messages, keep each line shorter than 80 characters. And
-      try to align your lines vertically, if they wrap. It looks bad otherwise.
-
-   7. If you modified a function that is callable from PHP, prepend PHP to
-      the function name as shown below.
-
-
-The format of the commit messages is pretty simple.
-
-Use a - to start a new item in your commit message.
-
-If a line begins with #, it is taken to be a comment and will not appear
-in the ChangeLog. Everything else goes into the ChangeLog.
-
-It is important to note that if your comment or news logline spans multiple
-lines, you have to put # at the beginning of **every** such line.
-
-Example. Say you modified two files, datetime.c and string.c. In datetime.c you
-added a new format option for the date() function, and in string.c you fixed a
-memory leak in php_trim(). Don't commit both of these at once. Commit them
-separately and try to make sure your commit messages look something like the
-following.
-
-For datetime.c::
-
-  - Added new 'K' format modifier to date() for printing out number of days
-    until New Year's Eve.
-
-For string.c::
-
-  - Fixed a memory leak in php_trim() resulting from improper use of zval_dtor().
-  #- Man, that thing was leaking all over the place!
-
-The # lines will be omitted from the ChangeLog automagically.
-
-Use the [DOC] tag in your log message whenever you feel that your changes
-imply a documentation modification. The php-doc team will automatically
-get notified about your commit through the php-doc mailing list.
-
-If you fix some bugs, you should note the bug ID numbers in your
-commit message. Bug ID should be prefixed by "#" for easier access to
-bug report when developers are browsing CVS via LXR or Bonsai.
-
-Example::
-
-  Fixed bug #14016 (pgsql notice handler double free crash bug.)
-
-If you don't see your messages in ChangeLog right away, don't worry!
-These files are updated once a day, so your stuff will not show up until
-somewhat later.
-
-When you change the NEWS file for a bug fix, then please keep the bugs
-sorted in decreasing order under the fixed version.
-
-You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
-to look at PHP SVN repository in various ways.
-
-To receive daily updates to ChangeLog and NEWS, send an empty message to
-php-cvs-daily-subscribe@lists.php.net.
-
-Happy hacking,
-
-PHP Team

README.Zeus

@@ -1,112 +0,0 @@
-Using PHP 5 with the Zeus Web Server
------------------------------------
-
-Zeus fully supports running PHP in combination with our
-webserver. There are three different interfaces that can be used to
-enable PHP:
-
-* CGI
-* ISAPI
-* FastCGI
-
-Of the three, we recommend using FastCGI, which has been tested and
-benchmarked as providing the best performance and reliability.
-
-Full details of how to install PHP are available from our
-website, at:
-
-http://support.zeus.com/products/php.html
-
-If you have any problems, please check the support site for more
-up-to-date information and advice.
-
-
-Quick guide to installing CGI/FastCGI with Zeus
------------------------------------------------
-
-Step 1 - Compile PHP as FastCGI.
-
-Compile as follows:
-        ./configure --enable-fastcgi
-        make
-
-Note that PHP has many options to the configure script -
-e.g. --with-mysql. You will probably want to select your usual options
-before compiling; the above is just a bare minimum, for illustration.
-
-After compilation finishes, you will be left with an executable
-program called 'php'. Copy this into your document root, under a
-dedicated FastCGI directory (e.g. $DOCROOT/fcgi-bin/php)
-
-
-Step 2 - configure Zeus
-
-Four stages:
-        -  enable FastCGI
-        -  configure FastCGI
-        -  setup alias for FastCGI
-        -  setup alias for PHP
-
-1) Using the admin server, go to the 'module configuration' page for
-your virtual server, and ensure that 'fastcgi' is enabled (select the
-tickbox to the left).
-
-2) While we can run FastCGI's locally, there are known problems with
-some OS's (specifically, the communication between web server and
-FastCGI happens over a unix domain socket, and some OS's have trouble
-sustaining high connection rates over these sockets). So instead, we
-are going to set up the PHP FastCGI to run 'remotely' over localhost
-(this uses TCP sockets, which do not suffer this problem). Go to the
-'fastcgi configuration' page, and under 'add remote fastcgi':
-        Add Remote FastCGI
-                Docroot path            /fcgi-bin/php
-                Remote machine          localhost:8002
-The first entry is where you saved PHP, above.
-The second entry is localhost:<any unused port>
-We will start the FastCGI listening on this port shortly.
-Click 'update' to commit these changes.
-
-3) Go to the path mapping module and add an alias for FastCGI:
-        Add Alias
-                Docroot path            /fcgi-bin
-                Filesystem directory    /path/to/docroot/fcgi-bin
-                Alias type              fastcgi
-Click 'update' to commit these changes
-
-4) Also on the path mapping module, add a handler for PHP:
-        Add handler
-                File extension          php
-                Handler                 /fcgi-bin/php
-Click 'update' to commit these changes
-
-Finally restart your virtual server for these changes to take effect.
-
-
-Step 3 - start PHP as a FastCGI runner
-
-When you start PHP, it will pre-fork a given number of child processes
-to handle incoming PHP requests. Each process will handle a given
-number of requests before exiting (and being replaced by a newly
-forked process). You can control these two parameters by setting the
-following environment variables BEFORE starting the FastCGI runner:
-
-PHP_FCGI_CHILDREN - the number of child processes to pre-fork. This
-variable MUST be set, if not then the PHP will not run as a FastCGI.
-We recommend a value of 8 for a fairly busy site. If you have many,
-long-running PHP scripts, then you may need to increase this further.
-
-PHP_FCGI_MAX_REQUESTS - the number of requests each PHP child process
-handles before exiting. If not set, defaults to 500.
-
-To start the FastCGI runner, execute '$ZEUSHOME/web/bin/fcgirunner
-8002 $DOCROOT/fcgi-bin/php'.  Substitute the appropriate values for
-$ZEUSHOME and $DOCROOT; also substitute for 8002 the port you chose,
-above.
-
-To stop the runner (e.g. to experiment with the above environment
-variables) you will need to manually stop and running PHP
-processes. (Use 'ps' and 'kill'). As it is PHP which is forking lots
-of children and not the runner, Zeus unfortunately cannot keep track
-of what processes are running, sorry. A typical command line may look
-like 'ps -efl | grep $DOCROOT/fcgi-bin/php | grep -v grep | awk
-'{print $4}' | xargs kill'

README.input_filter

@@ -88,7 +88,7 @@ PHP_MINFO_FUNCTION(my_input_filter)
 {
     php_info_print_table_start();
     php_info_print_table_row( 2, "My Input Filter Support", "enabled" );
-    php_info_print_table_row( 2, "Revision", "$Revision$");
+    php_info_print_table_row( 2, "Revision", "$Id$");
     php_info_print_table_end();
 }
 

TSRM/tsrm_nw.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2013 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-2011 The PHP Group                                |
+   | Copyright (c) 1997-2013 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-2011 The PHP Group                                |
+   | Copyright (c) 1997-2013 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,6 +40,10 @@
 #  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
@@ -773,6 +777,9 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 
 	while (1) {
 		if (len <= start) {
+			if (link_is_dir) {
+				*link_is_dir = 1;
+			}
 			return start;
 		}
 
@@ -789,6 +796,10 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 			continue;
 		} else if (i == len - 2 && path[i] == '.' && path[i+1] == '.') {
 			/* remove '..' and previous directory */
+			is_dir = 1;
+			if (link_is_dir) {
+				*link_is_dir = 1;
+			}
 			if (i - 1 <= start) {
 				return start ? start : len;
 			}
@@ -951,6 +962,11 @@ 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;
@@ -1214,9 +1230,14 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 				return 1;
 			}
 			memcpy(resolved_path, state->cwd, state_cwd_length);
-			resolved_path[state_cwd_length] = DEFAULT_SLASH;
-			memcpy(resolved_path + state_cwd_length + 1, path, path_length + 1);
-			path_length += state_cwd_length + 1;
+			if (resolved_path[state_cwd_length-1] == DEFAULT_SLASH) {
+				memcpy(resolved_path + state_cwd_length, path, path_length + 1);
+				path_length += state_cwd_length;
+			} else {
+				resolved_path[state_cwd_length] = DEFAULT_SLASH;
+				memcpy(resolved_path + state_cwd_length + 1, path, path_length + 1);
+				path_length += state_cwd_length + 1;
+			}
 		}
 	} else {
 #ifdef TSRM_WIN32

TSRM/tsrm_virtual_cwd.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2011 The PHP Group                                |
+   | Copyright (c) 1997-2013 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-2011 The PHP Group                                |
+   | Copyright (c) 1997-2013 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;
+	HANDLE thread_token = NULL;
 	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,6 +365,9 @@ 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-2011 The PHP Group                                |
+   | Copyright (c) 1997-2013 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

@@ -153,6 +153,20 @@ UPGRADE NOTES - PHP 5.3
 
 - SplObjectStorage now has ArrayAccess support. It is also now possible to
   store associative information with objects in SplObjectStorage.
+  
+=====================
+4.1 New in PHP 5.3.9
+=====================
+
+- Write operations within XSLT (for example with the extension sax:output) are
+  disabled by default. You can define what is forbidden with the INI option
+  xsl.security_prefs. This option will be marked as deprecated in 5.4 again. 
+  Use the method XsltProcess::setSecurityPrefs($options) there.
+
+- the following new directives were added
+
+  - max_input_vars - specifies how many GET/POST/COOKIE input variables may be
+    accepted. default value 1000. 
 
 =============
 5. Deprecated
@@ -334,6 +348,9 @@ UPGRADE NOTES - PHP 5.3
 
 - A new directive, request_order, controls the behavior of $_REQUEST
   independently of variables_order.
+- A new directive, called windows.show_crt_warning, has been introduced.
+  This directive shows the CRT warnings when enabled. These warnings were
+  displayed by default until now. It is disabled by default.
 
 - New INI directives: 
   - mail.add_x_header
@@ -462,6 +479,13 @@ UPGRADE NOTES - PHP 5.3
 - Firebird and SNMP support are no longer available on Windows. Firebird support
   may be reintroduced in the future.
 
+- As of PHP 5.3.15 and above the COM extension isn't compiled statically in PHP
+  anymore but shared. It'll still be delivered with the standard PHP release but
+  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/README.ZEND_MM

@@ -24,6 +24,14 @@ Zend MM disabled:
 
     $ USE_ZEND_ALLOC=0 valgrind --leak-check=full sapi/cli/php -r 'leak();'
 
+Shared extensions:
+------------------
+
+Since PHP 5.3.11 it is possible to prevent shared extensions from unloading so
+that valgrind can correctly track the memory leaks in shared extensions. For
+this there is the ZEND_DONT_UNLOAD_MODULES environment variable. If set, then
+DL_UNLOAD() is skipped during the shutdown of shared extensions.
+
 Tweaking:
 ---------
 

Zend/RFCs/002.txt

@@ -1,5 +1,5 @@
 Title:           Zend 2.0 Namespaces
-Version:         $Revision$
+Version:         $Id$
 Status:          declined
 Maintainer:      Stig S. Bakken <ssb@php.net>
 Created:         2001-09-08

Zend/RFCs/003.txt

@@ -1,5 +1,5 @@
 Title:           Loose type requirements for functions
-Version:         $Revision$
+Version:         $Id$
 Status:          draft
 Maintainer:      Brian Moon <brianm@dealnews.com>
 Created:         2001-09-17

Zend/acconfig.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2011 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2013 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"
+  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"
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed

Zend/tests/bug31683.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Bug #31683 (changes to $name in __get($name) override future parameters)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php