credits update

5.4.8
5.4.8RC1
2026-11-13 20:20:50 +00:00 · 2012-10-16 13:05:41 +03:00 · 2012-10-16 13:04:42 +03:00 · 2012-10-02 23:23:22 -07:00 · 2012-10-02 10:00:09 +02:00 · 2012-10-02 09:57:44 +02:00
877 changed files with 16779 additions and 28715 deletions
@@ -1,6 +1,19 @@
+define set_ts
+	set $tsrm_ls = $arg0
+end
+
+document set_ts
+	set the ts resource, it is impossible for gdb to
+	call ts_resource_ex while no process is running,
+	but we could get the resource from the argument 
+	of frame info.
+end
+
 define ____executor_globals
 	if basic_functions_module.zts
-		set $tsrm_ls = ts_resource_ex(0, 0)
+		if !$tsrm_ls
+			set $tsrm_ls = ts_resource_ex(0, 0)
+		end
 		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
@@ -38,12 +51,53 @@ define dump_bt
 	set $t = $arg0
 	while $t
 		printf "[%p] ", $t
-		if $t->function_state.function->common.function_name
-			if $t->function_state.arguments
-				set $count = (int)*($t->function_state.arguments)
-				printf "%s(", $t->function_state.function->common.function_name
+		set $fst = $t->function_state
+		if $fst.function->common.function_name
+			if $fst.arguments
+				set $count = (int)*($fst.arguments)
+
+				if $t->object
+					if $fst.function.common.scope
+						printf "%s->", $fst.function.common.scope->name
+					else
+						if !$eg
+							____executor_globals
+						end
+
+						set $known_class = 0
+						if $eg
+							set $handle = $t->object.value.obj.handle
+							set $handlers = $t->object.value.obj.handlers
+							set $zobj = (zend_object *)$eg.objects_store.object_buckets[$handle].bucket.obj.object
+
+							if $handlers->get_class_entry == &zend_std_object_get_class
+								set $known_class = 1
+
+								if $handlers.get_class_name
+									if $handlers.get_class_name != &zend_std_object_get_class_name
+										set $known_class = 0
+									end
+								end
+
+								if $known_class
+									printf "%s->", $zobj->ce.name
+								end
+							end
+						end
+
+						if !$known_class
+							printf "(Unknown)->"
+						end
+					end
+				else
+					if $fst.function.common.scope
+						printf "%s::", $fst.function.common.scope->name
+					end
+				end
+
+				printf "%s(", $fst.function->common.function_name
 				while $count > 0
-					set $zvalue = *(zval **)($t->function_state.arguments - $count)
+					set $zvalue = *(zval **)($fst.arguments - $count)
 					set $type = $zvalue->type
 					if $type == 0
 						printf "NULL"
@@ -73,7 +127,7 @@ define dump_bt
 					if $type == 7
 						printf "resource(#%d)", $zvalue->value.lval
 					end
-					if $type == 8 
+					if $type == 8
 						printf "constant"
 					end
 					if $type == 9
@@ -89,7 +143,7 @@ define dump_bt
 				end
 				printf ") "
 			else
-				printf "%s() ", $t->function_state.function->common.function_name
+				printf "%s() ", $fst.function->common.function_name
 			end
 		else
 			printf "??? "
@@ -600,7 +654,7 @@ define zmemcheck
 		end
 	end
 	if $not_found
-		printf "no such block that begins at %p.\n", $aptr 
+		printf "no such block that begins at %p.\n", $aptr
 	end
 	if $arg0 == 0
 		printf "-------------------------------------------------------------------------------\n"
@@ -15,6 +15,7 @@ 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
@@ -22,3 +23,153 @@ sapi/continuity/capi.c          ident
 Zend/RFCs/002.txt               ident
 Zend/RFCs/003.txt               ident
 NEWS                            merge=NEWS
+/ext/bz2/tests/with_strings.phpt	-crlf
+/ext/dom/tests/bug40836.phpt	-crlf
+/ext/dom/tests/domelement.phpt	-crlf
+/ext/ereg/tests/eregi_basic_002.phpt	-crlf
+/ext/iconv/tests/iconv004.phpt	-crlf
+/ext/iconv/tests/iconv_basic.phpt	-crlf
+/ext/iconv/tests/iconv_strpos.phpt	-crlf
+/ext/iconv/tests/iconv_strpos_variation2.phpt	-crlf
+/ext/mbstring/tests/mb_strtoupper_error2.phpt	-crlf
+/ext/phar/tests/delete_in_phar_confirm.phpt	-crlf
+/ext/phar/tests/frontcontroller12.phpt	-crlf
+/ext/phar/tests/security.phpt	-crlf
+/ext/phar/tests/test_signaturealgos.phpt	-crlf
+/ext/reflection/tests/ReflectionMethod_invokeArgs_basic.phpt	-crlf
+/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt	-crlf
+/ext/spl/tests/dllist_007.phpt	-crlf
+/ext/spl/tests/iterator_012.phpt	-crlf
+/ext/spl/tests/SplArray_fromArray.phpt	-crlf
+/ext/standard/tests/dir/scandir_variation3.phpt	-crlf
+/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt	-crlf
+/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt	-crlf
+/ext/standard/tests/strings/bug26817.phpt	-crlf
+/ext/standard/tests/strings/bug26973.phpt	-crlf
+/ext/standard/tests/strings/bug27457.phpt	-crlf
+/ext/standard/tests/strings/bug28386.phpt	-crlf
+/ext/standard/tests/strings/bug37262.phpt	-crlf
+/ext/standard/tests/strings/bug40637.phpt	-crlf
+/ext/standard/tests/strings/bug40915.phpt	-crlf
+/ext/standard/tests/strings/bug61374.phpt	-crlf
+/ext/standard/tests/strings/chop_error.phpt	-crlf
+/ext/standard/tests/strings/chop_variation2.phpt	-crlf
+/ext/standard/tests/strings/chunk_split_variation10.phpt	-crlf
+/ext/standard/tests/strings/chunk_split_variation8.phpt	-crlf
+/ext/standard/tests/strings/count_chars_variation2.phpt	-crlf
+/ext/standard/tests/strings/dirname_error.phpt	-crlf
+/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt	-crlf
+/ext/standard/tests/strings/highlight_file.phpt	-crlf
+/ext/standard/tests/strings/htmlentities03.phpt	-crlf
+/ext/standard/tests/strings/htmlentities04.phpt	-crlf
+/ext/standard/tests/strings/htmlentities08.phpt	-crlf
+/ext/standard/tests/strings/htmlentities15.phpt	-crlf
+/ext/standard/tests/strings/http_build_query.phpt	-crlf
+/ext/standard/tests/strings/metaphone.phpt	-crlf
+/ext/standard/tests/strings/ord_error.phpt	-crlf
+/ext/standard/tests/strings/printf_basic2.phpt	-crlf
+/ext/standard/tests/strings/printf_variation2.phpt	-crlf
+/ext/standard/tests/strings/quoted_printable_decode_basic.phpt	-crlf
+/ext/standard/tests/strings/rtrim.phpt	-crlf
+/ext/standard/tests/strings/setlocale_variation1.phpt	-crlf
+/ext/standard/tests/strings/sha1_basic.phpt	-crlf
+/ext/standard/tests/strings/similar_text_basic.phpt	-crlf
+/ext/standard/tests/strings/soundex.phpt	-crlf
+/ext/standard/tests/strings/sprintf_basic1.phpt	-crlf
+/ext/standard/tests/strings/sprintf_basic4.phpt	-crlf
+/ext/standard/tests/strings/sprintf_basic7.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation12.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation28.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation29.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation30.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation31.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation38.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation42.phpt	-crlf
+/ext/standard/tests/strings/sprintf_variation6.phpt	-crlf
+/ext/standard/tests/strings/sscanf_basic2.phpt	-crlf
+/ext/standard/tests/strings/sscanf_basic3.phpt	-crlf
+/ext/standard/tests/strings/str_getcsv_001.phpt	-crlf
+/ext/standard/tests/strings/stripcslashes_basic.phpt	-crlf
+/ext/standard/tests/strings/stripos_variation11.phpt	-crlf
+/ext/standard/tests/strings/stripos_variation13.phpt	-crlf
+/ext/standard/tests/strings/stripslashes_variation1.phpt	-crlf
+/ext/standard/tests/strings/stripslashes_variation2.phpt	-crlf
+/ext/standard/tests/strings/stristr_error.phpt	-crlf
+/ext/standard/tests/strings/strnatcasecmp_basic.phpt	-crlf
+/ext/standard/tests/strings/strncasecmp_variation6.phpt	-crlf
+/ext/standard/tests/strings/strncasecmp_variation7.phpt	-crlf
+/ext/standard/tests/strings/strncasecmp_variation8.phpt	-crlf
+/ext/standard/tests/strings/strrchr_error.phpt	-crlf
+/ext/standard/tests/strings/strrchr.phpt	-crlf
+/ext/standard/tests/strings/strrchr_variation11.phpt	-crlf
+/ext/standard/tests/strings/strrpos_error.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation4.phpt	-crlf
+/ext/standard/tests/strings/strrpos_variation8.phpt	-crlf
+/ext/standard/tests/strings/strstr2.phpt	-crlf
+/ext/standard/tests/strings/strtok_error.phpt	-crlf
+/ext/standard/tests/strings/strtok_variation2.phpt	-crlf
+/ext/standard/tests/strings/strtolower-win32.phpt	-crlf
+/ext/standard/tests/strings/substr_compare.phpt	-crlf
+/ext/standard/tests/strings/ucwords_variation1.phpt	-crlf
+/ext/standard/tests/strings/unpack.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation12.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt	-crlf
+/ext/standard/tests/strings/vfprintf_variation7.phpt	-crlf
+/ext/standard/tests/strings/vprintf_basic2.phpt	-crlf
+/ext/standard/tests/strings/vprintf_basic7_64bit.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation10.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation14_64bit.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation17.phpt	-crlf
+/ext/standard/tests/strings/vprintf_variation4.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_basic4.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_basic8.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation17.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt	-crlf
+/ext/standard/tests/strings/vsprintf_variation7.phpt	-crlf
+/ext/standard/tests/strings/wordwrap.phpt	-crlf
+/ext/standard/tests/strings/wordwrap_variation5.phpt	-crlf
+/ext/standard/tests/url/rawurldecode_variation_001.phpt	-crlf
+/ext/tidy/tests/009.phpt	-crlf
+/ext/tidy/tests/013.phpt	-crlf
+/ext/tidy/tests/021.phpt	-crlf
+/ext/tidy/tests/tidy_error.phpt	-crlf
+/ext/tokenizer/tests/002.phpt	-crlf
+/ext/tokenizer/tests/bug26463.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_error.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation11.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_variation18.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation19.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation1.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation2.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation3.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation5.phpt	-crlf
+/ext/tokenizer/tests/token_get_all_variation8.phpt	-crlf
+/ext/xml/tests/bug32001b.phpt		-crlf
+/ext/xmlwriter/tests/OO_003.phpt	-crlf
+/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt	-crlf
+/ext/zlib/tests/008.phpt			-crlf
+/ext/zlib/tests/gzopen_variation4.phpt	-crlf
+/ext/zlib/tests/gzrewind_error.phpt	-crlf
+/ext/zlib/tests/readgzfile_variation7.phpt	-crlf
+/ext/zlib/tests/readgzfile_variation8.phpt	-crlf
+/ext/zlib/tests/zlib_scheme_stat_basic.phpt	-crlf
+/sapi/cli/tests/006.phpt			-crlf
+/tests/run-test/test009.phpt		-crlf
+/Zend/tests/012.phpt				-crlf
+/Zend/tests/bug28072.phpt			-crlf
+/Zend/tests/bug38624.phpt			-crlf
+/Zend/tests/bug40784.phpt			-crlf
+/Zend/tests/bug43053.phpt			-crlf
+/Zend/tests/bug51176.phpt			-crlf
+/Zend/tests/each_003.phpt			-crlf
+/Zend/tests/errmsg_006.phpt			-crlf
@@ -0,0 +1,10 @@
+language: php
+
+php:
+    # We only specify one version so we only get one worker
+    - 5.4
+
+notifications:
+    email: false
+
+script: exit 0
@@ -2,11 +2,11 @@
  PHP Coding Standards
 ========================

-This file lists several standards that any programmer, adding or changing
-code in PHP, should follow.  Since this file was added at a very late
+This file lists several standards that any programmer adding or changing
+code in PHP should follow.  Since this file was added at a very late
 stage of the development of PHP v3.0, the code base does not (yet) fully
 follow it, but it's going in that general direction.  Since we are now
-well into 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
@@ -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
@@ -1,6 +1,394 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2012, PHP 5.4.1 RC1
+18 Oct 2012, PHP 5.4.8
+
+- CLI server:
+  . Changed response to unknown HTTP method to 501 according to RFC.
+    (Niklas Lindgren).
+  . Support HTTP PATCH method. Patch by Niklas Lindgren, GitHub PR #190.
+    (Lars)
+
+- Core:
+  . Added optional second argument for assert() to specify custom message. Patch
+    by Lonny Kapelushnik (lonny@lonnylot.com). (Lars)
+  . Support building PHP with the native client toolchain. (Stuart Langley)
+  . Added --offline option for tests. (Remi)
+  . Fixed bug #63162 (parse_url does not match password component). (husman)
+  . 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 #62955 (Only one directive is loaded from "Per Directory Values" 
+    Windows registry). (aserbulov at parallels dot com)
+  . Fixed bug #62907 (Double free when use traits). (Dmitry)
+  . Fixed bug #61767 (Shutdown functions not called in certain error
+    situation). (Dmitry)
+  . Fixed bug #60909 (custom error handler throwing Exception + fatal error
+    = no shutdown function). (Dmitry)
+  . Fixed bug #60723 (error_log error time has changed to UTC ignoring default
+    timezone). (Laruence)
+
+- cURL:
+  . Fixed bug #62085 (file_get_contents a remote file by Curl wrapper will
+    cause cpu Soaring). (Pierrick)
+
+- Date:
+  . Fixed bug #62896 ("DateTime->modify('+0 days')" modifies DateTime object)
+    (Lonny Kapelushnik)
+  . Fixed bug #62561 (DateTime add 'P1D' adds 25 hours). (Lonny Kapelushnik)
+
+- DOM:
+  . Fixed bug #63015 (Incorrect arginfo for DOMErrorHandler). (Rob)
+
+- 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)
+
+- OpenSSL:
+  . Implemented FR #61421 (OpenSSL signature verification missing RMD160, 
+    SHA224, SHA256, SHA384, SHA512). (Mark 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)
+
+- mbstring:
+  . Allow passing null as a default value to mb_substr() and mb_strcut(). Patch
+    by Alexander Moskaliov via GitHub PR #133. (Lars)
+
+- Filter extension:
+  . Bug #49510: Boolean validation fails with FILTER_NULL_ON_FAILURE with empty
+    string or false. (Lars)
+
+- Sockets
+  . Fixed bug #63000 (MCAST_JOIN_GROUP on OSX is broken, merge of PR 185 by
+    Igor Wiedler). (Lars)
+
+13 Sep 2012, PHP 5.4.7
+
+- Core:
+  . Fixed bug (segfault while build with zts and GOTO vm-kind). (Laruence)
+  . Fixed bug #62844 (parse_url() does not recognize //). (Andrew Faulds).
+  . Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not 
+    set). (Felipe)
+  . Fixed bug #62763 (register_shutdown_function and extending class).
+    (Laruence)
+  . Fixed bug #62725 (Calling exit() in a shutdown function does not return
+    the exit value). (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 #62358 (Segfault when using traits a lot). (Laruence)
+  . Fixed bug #62328 (implementing __toString and a cast to string fails)
+    (Laruence)
+  . Fixed bug #51363 (Fatal error raised by var_export() not caught by error 
+    handler). (Lonny Kapelushnik)
+  . Fixed bug #40459 (Stat and Dir stream wrapper methods do not call 
+    constructor). (Stas)
+
+- CURL:
+  . Fixed bug #62912 (CURLINFO_PRIMARY_* AND CURLINFO_LOCAL_* not exposed).
+	(Pierrick)
+  . Fixed bug #62839 (curl_copy_handle segfault with CURLOPT_FILE). (Pierrick)
+
+- Intl:
+  . Fixed Spoofchecker not being registered on ICU 49.1. (Gustavo)
+  . Fix bug #62933 (ext/intl compilation error on icu 3.4.1). (Gustavo)
+  . Fix bug #62915 (defective cloning in several intl classes). (Gustavo)
+
+- Installation:
+  . Fixed bug #62460 (php binaries installed as binary.dSYM). (Reeze Xia)
+
+- PCRE:
+  . Fixed bug #55856 (preg_replace should fail on trailing garbage). 
+    (reg dot php at alf dot nu)
+
+- PDO:
+  . Fixed bug #62685 (Wrong return datatype in PDO::inTransaction()). (Laruence)
+
+- Reflection:
+  . Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing 
+    trait methods as private). (Felipe)
+  . Fixed bug #62715 (ReflectionParameter::isDefaultValueAvailable() wrong
+    result). (Laruence)
+
+- Session:
+  . Fixed bug (segfault due to retval is not initialized). (Laruence)
+  . Fixed bug (segfault due to PS(mod_user_implemented) not be reseted 
+    when close handler call exit). (Laruence)
+
+- SOAP
+  . Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
+    (Dmitry)
+
+- SPL:
+  . Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)
+    (Laruence)
+  . Implemented FR #62840 (Add sort flag to ArrayObject::ksort). (Laruence)
+
+- Standard:
+  . Fixed bug #62836 (Seg fault or broken object references on unserialize()).
+    (Laruence)
+
+- FPM:
+  . Merged PR 121 by minitux to add support for slow request counting on PHP
+    FPM status page. (Lars)
+
+16 Aug 2012, PHP 5.4.6
+
+- CLI Server:
+  . Implemented FR #62700 (have the console output 'Listening on 
+    http://localhost:8000'). (pascal.chevrel@free.fr)
+
+- Core:
+  . Fixed bug #62661 (Interactive php-cli crashes if include() is used in
+    auto_prepend_file). (Laruence)
+  . Fixed bug #62653: (unset($array[$float]) causes a crash). (Nikita Popov,
+    Laruence)
+  . Fixed bug #62565 (Crashes due non-initialized internal properties_table).
+    (Felipe)
+  . 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)
+  
+- Fileinfo:
+  . Fixed bug #61964 (finfo_open with directory causes invalid free). 
+    (reeze.xia@gmail.com)
+
+- Intl:
+  . Fixed bug #62564 (Extending MessageFormatter and adding property causes 
+    crash). (Felipe)
+
+- MySQLnd:
+  . Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode). (Laruence)
+
+- readline:
+  . Fixed bug #62612 (readline extension compilation fails with
+    sapi/cli/cli.h: No such file). (Johannes)
+
+- Reflection:
+  . Implemented FR #61602 (Allow access to name of constant used as default 
+    value). (reeze.xia@gmail.com)
+  
+- SimpleXML:
+  . Implemented FR #55218 Get namespaces from current node. (Lonny)
+
+- SPL:
+  . Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance
+    gives Segmentation fault). (Laruence, Gustavo)
+  . Fixed bug #61527 (ArrayIterator gives misleading notice on next() when 
+    moved to the end). (reeze.xia@gmail.com)
+
+- Streams:
+  . Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build).
+    (Laruence)
+
+- Zlib:
+  . Fixed bug #55544 (ob_gzhandler always conflicts with
+    zlib.output_compression). (Laruence)
+
+19 Jul 2012, PHP 5.4.5
+
+- Core:
+  . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed 
+    Salt). (Anthony Ferrara)
+  . Fixed bug #62432 (ReflectionMethod random corrupt memory on high
+    concurrent). (Johannes)
+  . Fixed bug #62373 (serialize() generates wrong reference to the object).
+    (Moriyoshi)
+  . Fixed bug #62357 (compile failure: (S) Arguments missing for built-in
+    function __memcmp). (Laruence)
+  . Fixed bug #61998 (Using traits with method aliases appears to result in
+    crash during execution). (Dmitry)
+  . Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that
+    includes a semi-colon). (Pierrick)
+  . Fixed potential overflow in _php_stream_scandir (CVE-2012-2688). 
+    (Jason Powell, Stas)
+
+- EXIF:
+  . Fixed information leak in ext exif (discovered by Martin Noga, 
+    Matthew "j00ru" Jurczyk, Gynvael Coldwind)
+
+- FPM:
+  . Fixed bug #62205 (php-fpm segfaults (null passed to strstr)). (fat)
+  . Fixed bug #62160 (Add process.priority to set nice(2) priorities). (fat)
+  . Fixed bug #62153 (when using unix sockets, multiples FPM instances
+  . Fixed bug #62033 (php-fpm exits with status 0 on some failures to start).
+    (fat)
+  . Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm). (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'
+  . Fixed bug #61218 (FPM drops connection while receiving some binary values
+    in FastCGI requests). (fat)
+  . Fixed bug #61045 (fpm don't send error log to fastcgi clients). (fat)
+    for non-root start). (fat)
+  . Fixed bug #61026 (FPM pools can listen on the same address). (fat)
+    can be launched without errors). (fat)
+
+- Iconv:
+  . Fix bug #55042 (Erealloc in iconv.c unsafe). (Stas)
+
+- Intl:
+  . Fixed bug #62083 (grapheme_extract() memory leaks). (Gustavo)
+  . ResourceBundle constructor now accepts NULL for the first two arguments.
+    (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:
+  . Fixed bug #61359 (json_encode() calls too many reallocs). (Stas)
+
+- libxml:
+  . Fixed bug #62266 (Custom extension segfaults during xmlParseFile with FPM
+    SAPI). (Gustavo)
+
+- Phar:
+  . Fixed bug #62227 (Invalid phar stream path causes crash). (Felipe)
+
+- Readline:
+  . Fixed bug #62186 (readline fails to compile - void function should not
+    return a value). (Johannes)
+
+- 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)
+
+- Sockets:
+  . Fixed bug #62025 (__ss_family was changed on AIX 5.3). (Felipe)
+
+- SPL:
+  . Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to
+    dot files). (Laruence)
+  . Fixed bug #62262 (RecursiveArrayIterator does not implement Countable).
+    (Nikita Popov)
+
+- 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.4.4
+
+- COM:
+  . Fixed bug #62146 com_dotnet cannot be built shared. (Johannes)
+
+- CLI Server:
+  . Implemented FR #61977 (Need CLI web-server support for files with .htm & 
+    svg extensions). (Sixd, Laruence)
+  . Improved performance while sending error page, this also fixed
+    bug #61785 (Memory leak when access a non-exists file without router).
+    (Laruence)
+  . Fixed bug #61546 (functions related to current script failed when chdir() 
+    in cli sapi). (Laruence, reeze.xia@gmail.com)
+
+- Core:
+  . Fixed missing bound check in iptcparse(). (chris at chiappa.net)
+  . Fixed CVE-2012-2143. (Solar Designer)
+  . Fixed bug #62097 (fix for for bug #54547). (Gustavo)
+  . Fixed bug #62005 (unexpected behavior when incrementally assigning to a 
+    member of a null object). (Laruence)
+  . Fixed bug #61978 (Object recursion not detected for classes that implement
+    JsonSerializable). (Felipe)
+  . Fixed bug #61991 (long overflow in realpath_cache_get()). (Anatoliy)
+  . Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config).
+    (Laruence)
+  . Fixed bug #61827 (incorrect \e processing on Windows) (Anatoliy)
+  . Fixed bug #61782 (__clone/__destruct do not match other methods when checking
+    access controls). (Stas)
+  . Fixed bug #61764 ('I' unpacks n as signed if n > 2^31-1 on LP64). (Gustavo)
+  . Fixed bug #61761 ('Overriding' a private static method with a different 
+    signature causes crash). (Laruence)
+  . Fixed bug #61730 (Segfault from array_walk modifying an array passed by
+    reference). (Laruence)
+  . Fixed bug #61728 (PHP crash when calling ob_start in request_shutdown 
+    phase). (Laruence)
+  . Fixed bug #61713 (Logic error in charset detection for htmlentities).
+    (Anatoliy)
+  . Fixed bug #61660 (bin2hex(hex2bin($data)) != $data). (Nikita Popov)
+  . Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables
+    (without apache2)). (Laruence)
+  . Fixed bug #61605 (header_remove() does not remove all headers). (Laruence)
+  . Fixed bug #54547 (wrong equality of string numbers). (Gustavo)
+  . Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename
+    set to null). (Anatoliy)
+  . Changed php://fd to be available only for CLI.
+
+- CURL:
+  . Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction).
+    (Laruence)
+
+- Fileinfo
+  . Fixed bug #61812 (Uninitialised value used in libmagic). 
+    (Laruence, Gustavo)
+  . Fixed bug #61566 failure caused by the posix lseek and read versions
+    under windows in cdf_read(). (Anatoliy)
+  . Fixed bug #61565 where php_stream_open_wrapper_ex tries to open a
+    directory descriptor under windows. (Anatoliy)
+
+- Intl
+  . Fixed bug #62082 (Memory corruption in internal function 
+    get_icu_disp_value_src_php()). (Gustavo)
+
+- Libxml:
+  . Fixed bug #61617 (Libxml tests failed(ht is already destroyed)).
+    (Laruence)
+
+- PDO:
+  . Fixed bug #61755 (A parsing bug in the prepared statements can lead to
+    access violations). (Johannes)
+
+- Phar:
+  . Fixed bug #61065 (Secunia SA44335, CVE-2012-2386). (Rasmus)
+
+- Pgsql:
+  . Added pg_escape_identifier/pg_escape_literal. (Yasuo Ohgaki)
+
+- Streams:
+  . Fixed bug #61961 (file_get_contents leaks when access empty file with
+    maxlen set). (Reeze)
+
+- Zlib:
+  . Fixed bug #61820 (using ob_gzhandler will complain about headers already 
+    sent when no compression). (Mike)
+  . Fixed bug #61443 (can't change zlib.output_compression on the fly). (Mike)
+  . Fixed bug #60761 (zlib.output_compression fails on refresh). (Mike)
+
+08 May 2012, PHP 5.4.3
+
+- CGI
+  . Re-Fix PHP-CGI query string parameter vulnerability, CVE-2012-1823.
+    (Stas)
+  . Fix bug #61807 - Buffer Overflow in apache_request_headers.
+    (nyt-php at countercultured dot net). 
+
+03 May 2012, PHP 5.4.2
+
+- Fix PHP-CGI query string parameter vulnerability, CVE-2012-1823. (Rasmus)
+
+26 Apr 2012, PHP 5.4.1

 - CLI Server:
  . Fixed bug #61461 (missing checks around malloc() calls). (Ilia)
@@ -9,6 +397,7 @@ PHP                                                                        NEWS
  . "Connection: close" instead of "Connection: closed" (Gustavo)

 - Core:
+  . Fixed crash in ZTS using same class in many threads. (Johannes)
  . Fixed bug #61374 (html_entity_decode tries to decode code points that don't
    exist in ISO-8859-1). (Gustavo)
  . Fixed bug #61273 (call_user_func_array with more than 16333 arguments 
@@ -40,6 +429,9 @@ PHP                                                                        NEWS
    function is by reference). (Nikita Popov)
  . Improve performance of set_exception_handler while doing reset (Laruence)

+- fileinfo:
+  . Fix fileinfo test problems. (Anatoliy Belsky)
+
 - FPM
  . Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
    (michaelhood at gmail dot com, Ilia)
@@ -62,26 +454,10 @@ PHP                                                                        NEWS
  . Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes).

 - mysqlnd
+  . Fixed bug #61704 (Crash apache, phpinfo() threading issue). (Johannes)
  . Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled).
    (Johannes)

- Readline:
-  . Fixed bug #61088 (Memory leak in readline_callback_handler_install).
-    (Nikic, Laruence)
-
- Session
-  . Fixed bug #60634 (Segmentation fault when trying to die() in 
-    SessionHandler::write()). (Ilia)
-
- SOAP
-  . Fixed bug #61423 (gzip compression fails). (Ilia)
-  . 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)
-
 - PDO
  . Fixed bug #61292 (Segfault while calling a method on an overloaded PDO 
    object). (Laruence)
@@ -99,10 +475,29 @@ PHP                                                                        NEWS
  . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL
    bytes). (Nikita Popov)

+- Readline:
+  . Fixed bug #61088 (Memory leak in readline_callback_handler_install).
+    (Nikic, Laruence)
+
 - Reflection:
+  . Implemented FR #61602 (Allow access to the name of constant
+    used as function/method parameter's default value). (reeze.xia@gmail.com)
  . Fixed bug #60968 (Late static binding doesn't work with 
    ReflectionMethod::invokeArgs()). (Laruence)

+- Session
+  . Fixed bug #60634 (Segmentation fault when trying to die() in 
+    SessionHandler::write()). (Ilia)
+
+- SOAP
+  . Fixed bug #61423 (gzip compression fails). (Ilia)
+  . 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 bug #61453 (SplObjectStorage does not identify objects correctly).
    (Gustavo)
@@ -559,6 +954,228 @@ PHP                                                                        NEWS
  . Fixed bug #55544 (ob_gzhandler always conflicts with zlib.output_compression).
    (Mike)

+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 #61605 (header_remove() does not remove all headers).
+    (Laruence)
+  . Fixed bug #61541 (Segfault when using ob_* in output_callback).
+    (reeze.xia@gmail.com)
+  . 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
+  . 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 #61617 (Libxml tests failed(ht is already destroyed)).
+    (Laruence)
+  . 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)
+
+- 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:
@@ -771,6 +1388,7 @@ PHP                                                                        NEWS
 - Postgres:
  . Fixed bug #60244 (pg_fetch_* functions do not validate that row param 
    is >0). (Ilia)
+  . Added PGSQL_LIBPQ_VERSION/PGSQL_LIBPQ_VERSION_STR constants. (Yasuo)

 - Reflection:
  . Fixed bug #60367 (Reflection and Late Static Binding). (Laruence)
@@ -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
@@ -58,12 +58,12 @@ Do not use abbreviations for alpha and beta.
 5. Commit these changes to the branch with ``git commit -a``.

 6. Tag the repository with the version, e.g.: 
-``git tag -u YOURKEYID PHP-5.4.2-RC2``
+``git tag -u YOURKEYID php-5.4.2RC2``

 7. Push the changes to the main repo:
 ``git push --tags origin HEAD``

-8. run: ``./makedist 5.4.2-RC2``, this will export the tree, create configure
+8. run: ``./makedist 5.4.2RC2``, this will export the tree, create configure
 and build two tarballs (one gz and one bz2).

 9. Copy those two tarballs to www.php.net, in your homedir there should be a
@@ -127,33 +127,34 @@ 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 Git (php-distributions.git)

 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
@@ -171,6 +172,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
@@ -187,7 +191,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

@@ -207,9 +211,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:
@@ -232,17 +236,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)
 --------------------------------------

@@ -1,151 +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 those who need that.
-
-Currently we have the following branches in use::
-
-  trunk             The active development branch. 
-
-  branches/PHP_5_4  Is used to release the PHP 5.4.x series. In release
-                    process, only bugfixes and very small changes approved
-                    by RMs are allowed.
-
-  branches/PHP_5_3  Is used to release the PHP 5.3.x series. This is current 
-                    stable version and is open for bugfixes and small
-                    improvements (check with RMs if in doubt).
-
-  branches/PHP_5_2  Is used to release the PHP 5.2.x series. It is closed for 
-                    changes now.
-
-  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
@@ -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'
@@ -37,9 +37,9 @@ PHP 5.4 UPGRADE NOTES
 =============================

 - PHP 5.4 now checks at compile time if /dev/urandom or /dev/arandom
-  are present.  If either is available, session.entropy_file now
+  are present. If either is available, session.entropy_file now
  defaults to that file and session.entropy_length defaults to 32.
-  This provides non-blocking entropy to session id generation.  If you
+  This provides non-blocking entropy to session id generation. If you
  do not want extra entropy for your session ids, add:

    session.entropy_file=
@@ -89,9 +89,9 @@ PHP 5.4 UPGRADE NOTES
    session.upload_progress.min_freq

 - Added a zend.multibyte directive as a replacement of the PHP compile time
-  configuration option --enable-zend-multibyte.  Now the Zend Engine always
+  configuration option --enable-zend-multibyte. Now the Zend Engine always
  contains code for multibyte support, which can be enabled or disabled at
-  runtime.  Note: It doesn't make a lot of sense to enable this option if
+  runtime. Note: It doesn't make a lot of sense to enable this option if
  ext/mbstring is not enabled, because most functionality is implemented by
  mbstrings callbacks.

@@ -107,7 +107,7 @@ PHP 5.4 UPGRADE NOTES
  in a stream fashion (through php://input) without having it copied in memory
  multiple times.

- Added windows_show_crt_warning.  This directive shows the CRT warnings when
+- Added windows_show_crt_warning. This directive shows the CRT warnings when
  enabled. These warnings were displayed by default until now. It is disabled
  by default.

@@ -162,13 +162,17 @@ PHP 5.4 UPGRADE NOTES

 - Non-numeric string offsets, e.g. $a['foo'] where $a is a string, now
  return false on isset() and true on empty(), and produce warning if
-  trying to use them.  Offsets of types double, bool and null produce
+  trying to use them. Offsets of types double, bool and null produce
  notice. Numeric strings ($a['2']) still work as before.

  Note that offsets like '12.3' and '5 and a half' are considered
  non-numeric and produce warning, but are converted to 12 and 5
  respectively for backwards compatibility reasons.

+- Long numeric strings that do not fit in integer or double (such as
+  "92233720368547758070") are compared using string comparison if 
+  they could otherwise result in precision loss - since 5.4.4.
+
 - Closures now support scopes and $this and can be rebound to
  objects using Closure::bind() and Closure::bindTo().

@@ -178,6 +182,9 @@ PHP 5.4 UPGRADE NOTES
 - Parse error messages are changed to contain more information about
  the error.

+- __clone and __destruct since 5.4.4 follow the same scoping rules as 
+  the rest of the methods (see bug #61782 for details).
+
 ================================
 4. Changes to existing functions
 ================================
@@ -200,7 +207,7 @@ PHP 5.4 UPGRADE NOTES

 - htmlentities() and htmlspecialchars() are stricter in the code units they
  accept for the asian encodings. For Big5-HKSCS, the octets 0x80 and 0xFF are
-  rejected.  For GB2312/EUC-CN, the octets 0x8E, 0x8F, 0xA0 and 0xFF are
+  rejected. For GB2312/EUC-CN, the octets 0x8E, 0x8F, 0xA0 and 0xFF are
  rejected. For SJIS, the octets 0x80, 0xA0, 0xFD, 0xFE and 0xFF are rejected,
  except maybe after a valid starting byte. For EUC-JP, the octets 0xA0 and
  0xFF are rejected.
@@ -226,7 +233,7 @@ PHP 5.4 UPGRADE NOTES
  checks on the validity of the entities. Numerical entities are checked for a
  valid range (0 to 0x10FFFF); if the flag ENT_DISALLOWED is given, the
  validity of such numerical entity in the target document type is also
-  checked.  Named entities are checked for necessary existence in the target
+  checked. Named entities are checked for necessary existence in the target
  document type instead of only checking whether they were constituted by
  alphanumeric characters.

@@ -332,6 +339,17 @@ PHP 5.4 UPGRADE NOTES
 - ob_start() no longer starts multiple output buffers when passed
  array("callback1", "callback2", "callback3", ...).

+- Since 5.4.4, "php://fd" stream syntax is available only in CLI build.
+
+- Since 5.4.5, resourcebundle_create() accepts null for the first two arguments.
+
+- Since 5.4.6, SimpleXMLElement::getDocNamespaces() has and extra parameter which
+  allows for toggling if the list of namespaces starts from the document root
+  or from the node you call the method on
+
+- Since 5.4.7, ctor is always called when new user stream wrapper object is created.
+  Before, it was called only when stream_open was called.
+
 ==============================
 5. Changes to existing classes
 ==============================
@@ -364,6 +382,9 @@ PHP 5.4 UPGRADE NOTES
 - FilesystemIterator, GlobIterator and (Recursive)DirectoryIterator now use
  the default stream context.

+- Since 5.4.5, the constructor of ResourceBundle accepts NULL for the first two
+  arguments.
+
 ===========================
 7. Deprecated Functionality
 ===========================
@@ -422,7 +443,7 @@ d. Removed hash algorithms
 a. Extensions no longer maintained

   - ext/sqlite is no longer part of the base distribution and has been moved
-     to PECL.  Use sqlite3 or PDO_SQLITE instead.
+     to PECL. Use sqlite3 or PDO_SQLITE instead.

 b. Extensions with changed behavior

@@ -476,7 +497,7 @@ b. Extensions with changed behavior
 ===========================

 - A REQUEST_TIME_FLOAT value returns a floating point number indicating the
-  time with microsecond precision.  All SAPIs providing this value should be
+  time with microsecond precision. All SAPIs providing this value should be
  returning float and not time_t.

 - apache_child_terminate(), getallheaders(), apache_request_headers()
@@ -499,6 +520,11 @@ b. Extensions with changed behavior
 - is_link now works properly for symbolic links on Windows Vista
  or later. Earlier systems do not support symbolic links.

+- As of PHP 5.4.5 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.
+
 ==================
 12. New in PHP 5.4
 ==================
@@ -601,6 +627,10 @@ c. New functions
    - mysqli_error_list()
    - mysqli_stmt_error_list()

+  - pgsql
+    - pg_escape_identifier() (5.4.4)
+    - pg_escape_literal() (5.4.4)
+
  - Session:
    - session_register_shutdown()
    - session_status()
@@ -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"

  # for standalone build of Zend Engine
  test -z "$SED" && SED=sed
@@ -62,17 +62,17 @@ print "\nDone\n";

 ?>
 --EXPECTF--
-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d

 Notice: Uninitialized string offset: 0 in %s on line %d

 Notice: Uninitialized string offset: 0 in %s on line %d

-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d

 Notice: Uninitialized string offset: %i in %s on line %d

-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d

 Notice: Uninitialized string offset: %i in %s on line %d

@@ -88,16 +88,16 @@ Notice: Uninitialized string offset: 4 in %s on line %d

 Notice: Uninitialized string offset: 4 in %s on line %d

-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d

 Notice: Uninitialized string offset: 12 in %s on line %d

-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d

 Notice: Uninitialized string offset: 12 in %s on line %d

-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d

-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
 b
 Done
@@ -13,4 +13,10 @@ function eh()
 set_error_handler("eh");
 $a = $empty($b);
 --EXPECTF--
+Warning: Uncaught exception 'Exception' with message 'error!' in %sbug51394.php:4
+Stack trace:
+#0 %sbug51394.php(9): eh(8, 'Undefined varia...', '%s', 9, Array)
+#1 {main}
+  thrown in %sbug51394.php on line 4
+
 Fatal error: Function name must be a string in %sbug51394.php on line 9
@@ -0,0 +1,21 @@
+--TEST--
+Bug #54547: wrong equality of string numbers near LONG_MAX with 64-bit longs
+--SKIPIF--
+<?php
+if (PHP_INT_MAX !== 9223372036854775807)
+	die("skip for 64-bit long systems only");
+--FILE--
+<?php
+var_dump("9223372036854775807" == "9223372036854775808");
+var_dump("-9223372036854775808" == "-9223372036854775809");
+var_dump("0x7fffffffffffffff" == "9223372036854775808");
+
+/* not exactly what the bug is about, but closely related problem: */
+var_dump("999223372036854775807"=="999223372036854775808");
+var_dump("899223372036854775807">"00999223372036854775807");
+--EXPECT--
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
@@ -5,6 +5,12 @@ Bug #55509 (segfault on x86_64 using more than 2G memory)
 if (PHP_INT_SIZE == 4) {
  die('skip Not for 32-bits OS');
 }
+
+$zend_mm_enabled = getenv("USE_ZEND_ALLOC");
+if ($zend_mm_enabled === "0") {
+    die("skip Zend MM disabled");
+}
+
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 // check the available memory
 if (PHP_OS == 'Linux') {
@@ -0,0 +1,24 @@
+--TEST--
+Bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function).
+--FILE--
+<?php
+register_shutdown_function(function(){echo("\n\n!!!shutdown!!!\n\n");});
+set_error_handler(function($errno, $errstr, $errfile, $errline){
+ echo "error($errstr)";
+ throw new Exception("Foo");
+});
+
+require 'notfound.php';
+--EXPECTF--
+error(require(notfound.php): failed to open stream: No such file or directory)
+Warning: Uncaught exception 'Exception' with message 'Foo' in %sbug60909_1.php:5
+Stack trace:
+#0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8, Array)
+#1 %sbug60909_1.php(8): require()
+#2 {main}
+  thrown in %sbug60909_1.php on line 5
+
+Fatal error: main(): Failed opening required 'notfound.php' (include_path='%s') in %sbug60909_1.php on line 8
+
+
+!!!shutdown!!!
@@ -0,0 +1,20 @@
+--TEST--
+Bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function).
+--FILE--
+<?php
+register_shutdown_function(function(){echo("\n\n!!!shutdown!!!\n\n");});
+set_error_handler(function($errno, $errstr, $errfile, $errline){throw new Exception("Foo");});
+
+class Bad {
+    public function __toString() {
+        throw new Exception('Oops, I cannot do this');
+    }
+}
+
+$bad = new Bad();
+echo "$bad";
+--EXPECTF--
+Fatal error: Method Bad::__toString() must not throw an exception in %sbug60909_2.php on line 0
+
+
+!!!shutdown!!!
@@ -0,0 +1,19 @@
+--TEST--
+Bug #61761 ('Overriding' a private static method with a different signature causes crash)
+--FILE--
+<?php
+
+class A
+{
+        private static function test($a) { }
+}
+
+class B extends A
+{
+        private static function test($a, $b) { }
+}
+
+?>
+==DONE==
+--EXPECTF--
+==DONE==
@@ -0,0 +1,34 @@
+--TEST--
+Bug #61767 (Shutdown functions not called in certain error situation)
+--FILE--
+<?php
+set_error_handler(function($code, $msg, $file = null, $line = null) {
+    echo "Error handler called ($msg)\n";
+    throw new \ErrorException($msg, $code, 0, $file, $line);
+});
+
+register_shutdown_function(function(){
+    echo "Shutting down\n";
+    print_r(error_get_last());
+});
+
+//$undefined = null; // defined variable does not cause problems
+$undefined->foo();
+--EXPECTF--
+Error handler called (Undefined variable: undefined)
+
+Warning: Uncaught exception 'ErrorException' with message 'Undefined variable: undefined' in %sbug61767.php:13
+Stack trace:
+#0 %sbug61767.php(13): {closure}(8, 'Undefined varia...', '%s', 13, Array)
+#1 {main}
+  thrown in %sbug61767.php on line 13
+
+Fatal error: Call to a member function foo() on a non-object in %sbug61767.php on line 13
+Shutting down
+Array
+(
+    [type] => 1
+    [message] => Call to a member function foo() on a non-object
+    [file] => %sbug61767.php
+    [line] => 13
+)
@@ -0,0 +1,29 @@
+--TEST--
+Bug #61782 (__clone/__destruct do not match other methods when checking access controls)
+--FILE--
+<?php
+ abstract class BaseClass {
+        abstract protected function __clone();
+    }
+
+    class MommasBoy extends BaseClass {
+        protected function __clone() {
+            echo __METHOD__, "\n";
+        }
+    }
+
+    class LatchkeyKid extends BaseClass {
+        public function __construct() {
+            echo 'In ', __CLASS__, ":\n";
+            $kid = new MommasBoy();
+            $kid = clone $kid;
+        }
+        public function __clone() {}
+    }
+
+    $obj = new LatchkeyKid();
+echo "DONE\n";
+--EXPECT--
+In LatchkeyKid:
+MommasBoy::__clone
+DONE
@@ -0,0 +1,15 @@
+--TEST--
+Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object)
+--FILE--
+<?php
+function add_points($player, $points) {
+    $player->energy += $points;
+    print_r($player);
+}
+add_points(NULL, 2);
+--EXPECTF--
+Warning: Creating default object from empty value in %sbug62005.php on line %d
+stdClass Object
+(
+    [energy] => 2
+)
@@ -0,0 +1,17 @@
+--TEST--
+Bug #62097: fix for bug #54547 is wrong for 32-bit machines
+--SKIPIF--
+<?php
+if (PHP_INT_MAX !== 2147483647)
+	die('skip for system with 32-bit wide longs only');
+--FILE--
+<?php
+var_dump("02147483647" == "2147483647",
+		 "02147483648" == "2147483648",
+		 "09007199254740991" == "9007199254740991",
+		 "09007199254740992" == "9007199254740992");
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(false)
@@ -0,0 +1,32 @@
+--TEST--
+Bug #62358 (Segfault when using traits a lot)
+--SKIPIF--
+<?php
+if (getenv("USE_ZEND_ALLOC") !== "0") {
+    die("skip Need Zend MM enabled");
+}
+?>
+--FILE--
+<?php 
+
+trait T {
+    public function foo() {
+        echo "from T";
+    }
+}
+
+interface I {
+    public function foo();
+}
+
+abstract class A implements I{
+    use T;
+}
+
+class B extends A {
+   public function foo($var) {
+   } 
+}
+?>
+--EXPECTF--
+Strict Standards: Declaration of B::foo() should be compatible with A::foo() in %sbug62358.php on line %d
@@ -0,0 +1,33 @@
+--TEST--
+Bug #62653: unset($array[$float]) causes a crash
+--FILE--
+<?php
+$array = array("5"=>"bar");
+$foo = "10.0000"; // gettype($foo) = "string"
+$foo /= 2; //Makes $foo = 5 but still gettype($foo) = "double"
+unset($array[$foo]);
+print_r($array);
+
+$array = array("5"=>"bar");
+$foo = "5";
+unset($array[(float)$foo]);
+print_r($array);
+
+$array = array("5"=>"bar");
+$foo = "10.0000";
+$foo /= 2; //Makes $foo = 5 but still gettype($foo) = "double"
+$name = "foo";
+unset($array[$$name]);
+print_r($array);
+
+?>
+--EXPECT--
+Array
+(
+)
+Array
+(
+)
+Array
+(
+)
@@ -0,0 +1,11 @@
+--TEST--
+Bug #62680 (Function isset() throws fatal error on set array if non-existent key depth >= 3)
+--FILE--
+<?php
+$array = array("");
+var_dump(isset($array[0]["a"]["b"]));
+var_dump(isset($array[0]["a"]["b"]["c"]));
+?>
+--EXPECT--
+bool(false)
+bool(false)
@@ -0,0 +1,23 @@
+--TEST--
+Bug #62763 (register_shutdown_function and extending class)
+--FILE--
+<?php
+class test1 {
+    public function __construct() {
+        register_shutdown_function(array($this, 'shutdown')); 
+    }
+    public function shutdown() { 
+        exit(__METHOD__);
+    }
+}
+
+class test2 extends test1 {
+    public function __destruct() { 
+       exit (__METHOD__); 
+    }
+}
+new test1;
+new test2;
+?>
+--EXPECT--
+test1::shutdowntest2::__destruct
@@ -0,0 +1,21 @@
+--TEST--
+Bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private)
+--FILE--
+<?php
+ 
+trait myTrait {
+     public function run() {}
+}
+
+class myClass {
+     use myTrait {
+         MyTrait::run as private;
+     }
+}
+$class = new \ReflectionClass('myClass');
+var_dump($class->getTraitAliases());
+
+?>
+--EXPECTF--
+array(0) {
+}
@@ -0,0 +1,22 @@
+--TEST--
+Bug #62907 (Double free when use traits)
+--FILE--
+<?php
+function __autoload($name) {
+    if ($name == "B") {
+        eval ("abstract class B extends A { }");
+    } else if ($name == "A") {
+        eval ("abstract class A { use T { T::__construct as __asconstruct; }}"); 
+    } else if ($name == "T") {
+        eval ("trait T { public function __construct() { } }"); 
+    } 
+    return TRUE;
+} 
+
+class C extends B {
+    public function __construct() {
+    }
+}
+echo "okey";
+--EXPECT--
+okey
@@ -0,0 +1,20 @@
+--TEST--
+Bug #62956: "incompatible" signatures for private methods should not cause E_STRICT
+--FILE--
+<?php
+class Base
+{
+	private function test()
+	{}
+}
+
+class Extension extends Base
+{
+	private function test($arg)
+	{}
+}
+
+?>
+==DONE==
+--EXPECT--
+==DONE==
@@ -0,0 +1,36 @@
+--TEST--
+Bug #63111 (is_callable() lies for abstract static method)
+--FILE--
+<?php
+abstract class Foo {
+        abstract static function bar();
+}
+interface MyInterface {
+    static function bar();
+}
+abstract class Bar {
+	static function foo() {
+		echo "ok\n";
+	}
+}
+var_dump(is_callable(array("Foo", "bar")));
+var_dump(is_callable("Foo::bar"));
+var_dump(is_callable(array("MyInterface", "bar")));
+var_dump(is_callable("MyInterface::bar"));
+var_dump(is_callable(array("Bar", "foo")));
+var_dump(is_callable("Bar::foo"));
+Bar::foo();
+Foo::bar();
+?>
+--EXPECTF--
+Strict Standards: Static function Foo::bar() should not be abstract in %sbug63111.php on line 3
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+ok
+
+Fatal error: Cannot call abstract method Foo::bar() in %sbug63111.php on line 20
+
@@ -0,0 +1,12 @@
+--TEST--
+Bug #63173: Crash when invoking invalid array callback
+--FILE--
+<?php
+
+// the important part here are the indexes 1 and 2
+$callback = [1 => 0, 2 => 0];
+$callback();
+
+?>
+--EXPECTF--
+Fatal error: Array callback has to contain indices 0 and 1 in %s on line %d
@@ -1,5 +1,7 @@
 --TEST--
 GC 029: GC and destructors
+--SKIPIF--
+<?php if (PHP_ZTS) { print "skip only for no-zts build"; }
 --INI--
 zend.enable_gc=1
 --FILE--
@@ -0,0 +1,37 @@
+--TEST--
+GC 029: GC and destructors
+--SKIPIF-- 
+<?php if (!PHP_ZTS) { print "skip only for zts build"; }
+--INI--
+zend.enable_gc=1
+--FILE--
+<?php
+class Foo {
+	public $bar;
+	public $x = array(1,2,3);
+	function __destruct() {
+		if ($this->bar !== null) {
+			$this->x = null;
+			unset($this->bar);
+		}
+	}
+}
+class Bar {
+	public $foo;
+        function __destruct() {
+                if ($this->foo !== null) {
+                        unset($this->foo);
+                }
+        }
+
+}
+$foo = new Foo();
+$bar = new Bar();
+$foo->bar = $bar;
+$bar->foo = $foo;
+unset($foo);
+unset($bar);
+var_dump(gc_collect_cycles());
+?>
+--EXPECT--
+int(3)
@@ -30,10 +30,10 @@ echo "Done\n";
 --EXPECTF--
 string(1) "i"

-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
 string(1) "S"

-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
 string(1) "S"

 Warning: Illegal string offset 'run away' in %s on line %d
@@ -46,10 +46,10 @@ string(1) "o"
 Notice: A non well formed numeric value encountered in %s on line %d
 string(1) "r"

-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
 string(1) "i"

-Notice: String offset cast occured in %s on line %d
+Notice: String offset cast occurred in %s on line %d
 string(1) "S"

 Warning: Illegal offset type in %s on line %d
@@ -0,0 +1,68 @@
+--TEST--
+Bug #61998 (Using traits with method aliases appears to result in crash during execution)
+--FILE--
+<?php
+class Foo {
+    use T1 {
+       func as newFunc;
+    }
+
+    public function func() {
+        echo "From Foo\n";
+    }
+}
+
+trait T1 { 
+    public function func() {
+        echo "From T1\n";
+    }
+}
+
+class Bar {
+    public function func() {
+        echo "From Bar\n";
+    }
+    public function func2() {
+        echo "From Bar\n";
+    }
+    public function func3() {
+        echo "From Bar\n";
+    }
+    use T1 {
+        func as newFunc;
+        func as func2;
+    }
+    use T2 {
+        func2 as newFunc2;
+        func2 as newFunc3;
+        func2 as func3;
+    }
+}
+
+trait T2 { 
+    public function func2() {
+        echo "From T2\n";
+    }
+}
+
+$f = new Foo();
+
+$f->newFunc(); //from T1
+$f->func(); //from Foo
+
+$b = new Bar();
+$b->newFunc(); //from T1
+$b->func(); //from Bar
+$b->func2(); //from Bar
+$b->newFunc2(); //from T2
+$b->newFunc3(); //from T2
+$b->func3(); //from Bar
+--EXPECTF--
+From T1
+From Foo
+From T1
+From Bar
+From Bar
+From T2
+From T2
+From Bar
@@ -258,6 +258,9 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
 			{
 				TSRMLS_FETCH();

+				if (zend_std_cast_object_tostring(expr, expr_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
+					break;
+				}
 				if (Z_OBJ_HANDLER_P(expr, cast_object)) {
 					zval *val;

@@ -270,12 +273,6 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
 					}
 					zval_ptr_dtor(&val);
 				}
-				/* Standard PHP objects */
-				if (Z_OBJ_HT_P(expr) == &std_object_handlers || !Z_OBJ_HANDLER_P(expr, cast_object)) {
-					if (zend_std_cast_object_tostring(expr, expr_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
-						break;
-					}
-				}
 				if (!Z_OBJ_HANDLER_P(expr, cast_object) && Z_OBJ_HANDLER_P(expr, get)) {
 					zval *z = Z_OBJ_HANDLER_P(expr, get)(expr TSRMLS_CC);

@@ -781,6 +778,8 @@ void zend_register_standard_ini_entries(TSRMLS_D) /* {{{ */
 void zend_post_startup(TSRMLS_D) /* {{{ */
 {
 #ifdef ZTS
+	zend_encoding **script_encoding_list;
+
 	zend_compiler_globals *compiler_globals = ts_resource(compiler_globals_id);
 	zend_executor_globals *executor_globals = ts_resource(executor_globals_id);

@@ -795,7 +794,12 @@ void zend_post_startup(TSRMLS_D) /* {{{ */
 	zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
 	free(compiler_globals->function_table);
 	free(compiler_globals->class_table);
-	compiler_globals_ctor(compiler_globals, tsrm_ls);
+	if ((script_encoding_list = (zend_encoding **)compiler_globals->script_encoding_list)) {
+		compiler_globals_ctor(compiler_globals, tsrm_ls);
+		compiler_globals->script_encoding_list = (const zend_encoding **)script_encoding_list;
+	} else {
+		compiler_globals_ctor(compiler_globals, tsrm_ls);
+	}
 	free(EG(zend_constants));
 	executor_globals_ctor(executor_globals, tsrm_ls);
 	global_persistent_list = &EG(persistent_list);
@@ -1024,6 +1028,29 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 	zend_stack context_stack;
 	TSRMLS_FETCH();

+	/* Report about uncaught exception in case of fatal errors */
+	if (EG(exception)) {
+		switch (type) {
+			case E_CORE_ERROR:
+			case E_ERROR:
+			case E_RECOVERABLE_ERROR:
+			case E_PARSE:
+			case E_COMPILE_ERROR:
+			case E_USER_ERROR:
+				if (zend_is_executing(TSRMLS_C)) {
+					error_lineno = zend_get_executed_lineno(TSRMLS_C);
+				}
+				zend_exception_error(EG(exception), E_WARNING TSRMLS_CC);
+				EG(exception) = NULL;
+				if (zend_is_executing(TSRMLS_C) && EG(opline_ptr)) {
+					active_opline->lineno = error_lineno;
+				}
+				break;
+			default:
+				break;
+		}
+	}
+
 	/* Obtain relevant filename and lineno */
 	switch (type) {
 		case E_CORE_ERROR:
@@ -1254,6 +1281,7 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co
 	zend_file_handle *file_handle;
 	zend_op_array *orig_op_array = EG(active_op_array);
 	zval **orig_retval_ptr_ptr = EG(return_value_ptr_ptr);
+    long orig_interactive = CG(interactive);

 	va_start(files, file_count);
 	for (i = 0; i < file_count; i++) {
@@ -1261,6 +1289,15 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co
 		if (!file_handle) {
 			continue;
 		}
+
+        if (orig_interactive) {
+            if (file_handle->filename[0] != '-' || file_handle->filename[1]) {
+                CG(interactive) = 0;
+            } else {
+                CG(interactive) = 1;
+            }
+        }
+       
 		EG(active_op_array) = zend_compile_file(file_handle, type TSRMLS_CC);
 		if (file_handle->opened_path) {
 			int dummy = 1;
@@ -1302,12 +1339,14 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co
 			va_end(files);
 			EG(active_op_array) = orig_op_array;
 			EG(return_value_ptr_ptr) = orig_retval_ptr_ptr;
+            CG(interactive) = orig_interactive;
 			return FAILURE;
 		}
 	}
 	va_end(files);
 	EG(active_op_array) = orig_op_array;
 	EG(return_value_ptr_ptr) = orig_retval_ptr_ptr;
+    CG(interactive) = orig_interactive;

 	return SUCCESS;
 }
@@ -1093,7 +1093,12 @@ ZEND_API void object_properties_init(zend_object *object, zend_class_entry *clas
 		for (i = 0; i < class_type->default_properties_count; i++) {
 			object->properties_table[i] = class_type->default_properties_table[i];
 			if (class_type->default_properties_table[i]) {
+#if ZTS
+				ALLOC_ZVAL( object->properties_table[i]);
+				MAKE_COPY_ZVAL(&class_type->default_properties_table[i], object->properties_table[i]);
+#else
 				Z_ADDREF_P(object->properties_table[i]);
+#endif
 			}
 		}
 		object->properties = NULL;
@@ -2260,7 +2265,9 @@ void module_destructor(zend_module_entry *module) /* {{{ */
 	/* Deinitilaise module globals */
 	if (module->globals_size) {
 #ifdef ZTS
-		ts_free_id(*module->globals_id_ptr);
+		if (*module->globals_id_ptr) {
+			ts_free_id(*module->globals_id_ptr);
+		}
 #else
 		if (module->globals_dtor) {
 			module->globals_dtor(module->globals_ptr TSRMLS_CC);
@@ -2526,6 +2533,9 @@ ZEND_API int zend_disable_function(char *function_name, uint function_name_lengt
 }
 /* }}} */

+#ifdef ZEND_WIN32
+#pragma optimize("", off)
+#endif
 static zend_object_value display_disabled_class(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
 {
 	zend_object_value retval;
@@ -2534,6 +2544,9 @@ static zend_object_value display_disabled_class(zend_class_entry *class_type TSR
 	zend_error(E_WARNING, "%s() has been disabled for security reasons", class_type->name);
 	return retval;
 }
+#ifdef ZEND_WIN32
+#pragma optimize("", on)
+#endif
 /* }}} */

 static const zend_function_entry disabled_class_new[] = {
@@ -2542,16 +2555,15 @@ static const zend_function_entry disabled_class_new[] = {

 ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_DC) /* {{{ */
 {
-	zend_class_entry disabled_class;
+	zend_class_entry **disabled_class;

 	zend_str_tolower(class_name, class_name_length);
-	if (zend_hash_del(CG(class_table), class_name, class_name_length+1)==FAILURE) {
+	if (zend_hash_find(CG(class_table), class_name, class_name_length+1, (void **)&disabled_class)==FAILURE) {
 		return FAILURE;
 	}
-	INIT_OVERLOADED_CLASS_ENTRY_EX(disabled_class, class_name, class_name_length, disabled_class_new, NULL, NULL, NULL, NULL, NULL);
-	disabled_class.create_object = display_disabled_class;
-	disabled_class.name_length = class_name_length;
-	zend_register_internal_class(&disabled_class TSRMLS_CC);
+	INIT_CLASS_ENTRY_INIT_METHODS((**disabled_class), disabled_class_new, NULL, NULL, NULL, NULL, NULL);
+	(*disabled_class)->create_object = display_disabled_class;
+	zend_hash_clean(&((*disabled_class)->function_table));
 	return SUCCESS;
 }
 /* }}} */
@@ -2625,7 +2637,6 @@ static int zend_is_callable_check_class(const char *name, int name_len, zend_fca
 }
 /* }}} */

-
 static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fcall_info_cache *fcc, int strict_class, char **error TSRMLS_DC) /* {{{ */
 {
 	zend_class_entry *ce_org = fcc->calling_scope;
@@ -2648,11 +2659,9 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
 		/* Skip leading \ */
 		if (Z_STRVAL_P(callable)[0] == '\\') {
 			mlen = Z_STRLEN_P(callable) - 1;
-			mname = Z_STRVAL_P(callable) + 1;
 			lmname = zend_str_tolower_dup(Z_STRVAL_P(callable) + 1, mlen);
 		} else {
 			mlen = Z_STRLEN_P(callable);
-			mname = Z_STRVAL_P(callable);
 			lmname = zend_str_tolower_dup(Z_STRVAL_P(callable), mlen);
 		}
 		/* Check if function with given name exists.
@@ -2804,7 +2813,14 @@ get_function_via_handler:

 	if (retval) {
 		if (fcc->calling_scope && !call_via_handler) {
-			if (!fcc->object_ptr && !(fcc->function_handler->common.fn_flags & ZEND_ACC_STATIC)) {
+			if (!fcc->object_ptr && (fcc->function_handler->common.fn_flags & ZEND_ACC_ABSTRACT)) {
+				if (error) {
+					zend_spprintf(error, 0, "cannot call abstract method %s::%s()", fcc->calling_scope->name, fcc->function_handler->common.function_name);
+					retval = 0;
+				} else {
+					zend_error(E_ERROR, "Cannot call abstract method %s::%s()", fcc->calling_scope->name, fcc->function_handler->common.function_name);
+				}
+			} else if (!fcc->object_ptr && !(fcc->function_handler->common.fn_flags & ZEND_ACC_STATIC)) {
 				int severity;
 				char *verb;
 				if (fcc->function_handler->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
@@ -175,6 +175,11 @@ typedef struct _zend_fcall_info_cache {
 			class_container.name = zend_strndup(cl_name, _len);	\
 		}														\
 		class_container.name_length = _len;						\
+		INIT_CLASS_ENTRY_INIT_METHODS(class_container, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \
+	}
+
+#define INIT_CLASS_ENTRY_INIT_METHODS(class_container, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \
+	{															\
 		class_container.constructor = NULL;						\
 		class_container.destructor = NULL;						\
 		class_container.clone = NULL;							\
@@ -664,7 +664,7 @@ static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_

 static inline unsigned int zend_mm_high_bit(size_t _size)
 {
-#if defined(__GNUC__) && defined(i386)
+#if defined(__GNUC__) && (defined(__native_client__) || defined(i386))
 	unsigned int n;

 	__asm__("bsrl %1,%0\n\t" : "=r" (n) : "rm"  (_size));
@@ -690,7 +690,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size)

 static inline unsigned int zend_mm_low_bit(size_t _size)
 {
-#if defined(__GNUC__) && defined(i386)
+#if defined(__GNUC__) && (defined(__native_client__) || defined(i386))
 	unsigned int n;

 	__asm__("bsfl %1,%0\n\t" : "=r" (n) : "rm"  (_size));
@@ -2454,7 +2454,7 @@ ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_
 	return _zend_mm_block_size(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 }

-#if defined(__GNUC__) && defined(i386)
+#if defined(__GNUC__) && (defined(__native_client__) || defined(i386))

 static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
 {
@@ -78,7 +78,7 @@ ZEND_METHOD(Closure, __invoke) /* {{{ */

 /* {{{ proto Closure Closure::bind(Closure $old, object $to [, mixed $scope = "static" ] )
   Create a closure from another one and bind to another object and scope */
-ZEND_METHOD(Closure, bind) /* {{{ */
+ZEND_METHOD(Closure, bind)
 {
 	zval *newthis, *zclosure, *scope_arg = NULL;
 	zend_closure *closure;
@@ -1685,7 +1685,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
 		zval key;

 		if (CG(current_namespace)) {
-			/* Prefix function name with current namespcae name */
+			/* Prefix function name with current namespace name */
 			znode tmp;

 			tmp.u.constant = *CG(current_namespace);
@@ -2935,6 +2935,11 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c
 		return 1;
 	}

+	/* If both methods are private do not enforce a signature */
+    if ((fe->common.fn_flags & ZEND_ACC_PRIVATE) && (proto->common.fn_flags & ZEND_ACC_PRIVATE)) {
+		return 1;
+	}
+
 	/* check number of arguments */
 	if (proto->common.required_num_args < fe->common.required_num_args
 		|| proto->common.num_args > fe->common.num_args) {
@@ -3260,11 +3265,11 @@ static void do_inheritance_check_on_method(zend_function *child, zend_function *

 	if (child->common.prototype && (child->common.prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
 		if (!zend_do_perform_implementation_check(child, child->common.prototype TSRMLS_CC)) {
-			zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype TSRMLS_CC)); 
+			zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype? child->common.prototype : parent TSRMLS_CC)); 
 		}
 	} else if (EG(error_reporting) & E_STRICT || EG(user_error_handler)) { /* Check E_STRICT (or custom error handler) before the check so that we save some time */
 		if (!zend_do_perform_implementation_check(child, parent TSRMLS_CC)) {
-			char *method_prototype = zend_get_function_declaration(child->common.prototype TSRMLS_CC);
+			char *method_prototype = zend_get_function_declaration(child->common.prototype? child->common.prototype : parent TSRMLS_CC);
 			zend_error(E_STRICT, "Declaration of %s::%s() should be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, method_prototype); 
 			efree(method_prototype);
 		}
@@ -3619,6 +3624,7 @@ ZEND_API void zend_do_implement_trait(zend_class_entry *ce, zend_class_entry *tr
 			}
 		}
 		ce->traits[ce->num_traits++] = trait;
+		trait->refcount++;
 	}
 }
 /* }}} */
@@ -3711,7 +3717,7 @@ static int zend_traits_merge_functions(zend_function *fn TSRMLS_DC, int num_args
 	} else {
 		/* Add it to result function table */
 		if (zend_hash_quick_add(resulting_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, fn, sizeof(zend_function), NULL)==FAILURE) {
-			zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occured during updating resulting trait method table", fn->common.function_name);
+			zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occurred during updating resulting trait method table", fn->common.function_name);
 		}
 	}

@@ -3800,9 +3806,12 @@ static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int
 		if (prototype) {
 			do_inheritance_check_on_method(fn, prototype TSRMLS_CC);
 		}
+
 		/* one more thing: make sure we properly implement an abstract method */
 		if (existing_fn && existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
+			prototype = fn->common.prototype;
 			do_inheritance_check_on_method(fn, existing_fn TSRMLS_CC);
+			fn->common.prototype = prototype;
 		}

 		/* delete inherited fn if the function to be added is not abstract */
@@ -3828,11 +3837,11 @@ static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int
 		function_add_ref(&fn_copy);

 		if (zend_hash_quick_update(&ce->function_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, &fn_copy, sizeof(zend_function), (void**)&fn_copy_p)==FAILURE) {
-			zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occured during updating class method table", hash_key->arKey);
+			zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occurred during updating class method table", hash_key->arKey);
 		}
-   
+
 		zend_add_magic_methods(ce, hash_key->arKey, hash_key->nKeyLength, fn_copy_p TSRMLS_CC);
-   
+
 		zend_function_dtor(fn);
 	} else {
 		zend_function_dtor(fn);
@@ -3869,10 +3878,10 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int num_args,
 				&& (zend_binary_strcasecmp(aliases[i]->trait_method->method_name, aliases[i]->trait_method->mname_len, fn->common.function_name, fnname_len) == 0)) {
 				fn_copy = *fn;
 				function_add_ref(&fn_copy);
-				/* this function_name is never destroyed, because its refcount
-				   greater than 1, classes are always destoyed in reverse order
-				   and trait is declared early than this class */
+				/* this function_name is never destroyed, because ZEND_ACC_ALIAS
+				   flag is set */
 				fn_copy.common.function_name = aliases[i]->alias;
+				fn_copy.common.fn_flags |= ZEND_ACC_ALIAS;
 					
 				/* if it is 0, no modifieres has been changed */
 				if (aliases[i]->modifiers) { 
@@ -3905,6 +3914,7 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int num_args,
 		/* is not in hashtable, thus, function is not to be excluded */
 		fn_copy = *fn;
 		function_add_ref(&fn_copy);
+		fn_copy.common.fn_flags |= ZEND_ACC_ALIAS;

 		/* apply aliases which are not qualified by a class name, or which have not
 		 * alias name, just setting visibility */
@@ -4024,9 +4034,9 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*

 				/** And, ensure that the referenced method is resolvable, too. */
 				lcname = zend_str_tolower_dup(cur_method_ref->method_name,
-                                      cur_method_ref->mname_len);
+						cur_method_ref->mname_len);
 				method_exists = zend_hash_exists(&cur_method_ref->ce->function_table,
-                                         lcname, cur_method_ref->mname_len + 1);
+						lcname, cur_method_ref->mname_len + 1);
 				efree(lcname);

 				if (!method_exists) {
@@ -4076,14 +4086,14 @@ static void zend_do_traits_method_binding(zend_class_entry *ce TSRMLS_DC) /* {{{
 	size_t i;

 	/* prepare copies of trait function tables for combination */
-	function_tables = malloc(sizeof(HashTable*) * ce->num_traits);
-	resulting_table = (HashTable *) malloc(sizeof(HashTable));
+	function_tables = emalloc(sizeof(HashTable*) * ce->num_traits);
+	resulting_table = (HashTable *)emalloc(sizeof(HashTable));
 	
 	/* TODO: revisit this start size, may be its not optimal */
-	zend_hash_init_ex(resulting_table, 10, NULL, NULL, 1, 0);
+	zend_hash_init_ex(resulting_table, 10, NULL, NULL, 0, 0);
  
 	for (i = 0; i < ce->num_traits; i++) {
-		function_tables[i] = (HashTable *) malloc(sizeof(HashTable));
+		function_tables[i] = (HashTable *)emalloc(sizeof(HashTable));
 		zend_hash_init_ex(function_tables[i], ce->traits[i]->function_table.nNumOfElements, NULL, NULL, 1, 0);

 		if (ce->trait_precedences) {
@@ -4116,14 +4126,14 @@ static void zend_do_traits_method_binding(zend_class_entry *ce TSRMLS_DC) /* {{{
 	for (i = 0; i < ce->num_traits; i++) {
 		/* zend_hash_destroy(function_tables[i]); */
 		zend_hash_graceful_destroy(function_tables[i]);
-		free(function_tables[i]);
+		efree(function_tables[i]);
 	}
-	free(function_tables);
+	efree(function_tables);

 	/* free temporary resulting table */
 	/* zend_hash_destroy(resulting_table); */
 	zend_hash_graceful_destroy(resulting_table);
-	free(resulting_table);
+	efree(resulting_table);
 }
 /* }}} */

@@ -5008,11 +5018,11 @@ void zend_do_begin_class_declaration(const znode *class_token, znode *class_name
 	opline->op2_type = IS_CONST;

 	if (doing_inheritance) {
-       /* Make sure a trait does not try to extend a class */
-       if ((new_class_entry->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) {
-           zend_error(E_COMPILE_ERROR, "A trait (%s) cannot extend a class. Traits can only be composed from other traits with the 'use' keyword. Error", new_class_entry->name);
-       }
-    
+		/* Make sure a trait does not try to extend a class */
+		if ((new_class_entry->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) {
+			zend_error(E_COMPILE_ERROR, "A trait (%s) cannot extend a class. Traits can only be composed from other traits with the 'use' keyword. Error", new_class_entry->name);
+		}
+
 		opline->extended_value = parent_class_name->u.op.var;
 		opline->opcode = ZEND_DECLARE_INHERITED_CLASS;
 	} else {
@@ -6957,9 +6967,9 @@ void zend_do_use(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{
 	lcname = zend_str_tolower_dup(Z_STRVAL_P(name), Z_STRLEN_P(name));

 	if (((Z_STRLEN_P(name) == sizeof("self")-1) &&
-          !memcmp(lcname, "self", sizeof("self")-1)) ||
-	    ((Z_STRLEN_P(name) == sizeof("parent")-1) &&
-          !memcmp(lcname, "parent", sizeof("parent")-1))) {
+				!memcmp(lcname, "self", sizeof("self")-1)) ||
+			((Z_STRLEN_P(name) == sizeof("parent")-1) &&
+	   !memcmp(lcname, "parent", sizeof("parent")-1))) {
 		zend_error(E_COMPILE_ERROR, "Cannot use %s as %s because '%s' is a special class name", Z_STRVAL_P(ns), Z_STRVAL_P(name), Z_STRVAL_P(name));
 	}

@@ -207,6 +207,8 @@ typedef struct _zend_try_catch_element {
 #define ZEND_ACC_RETURN_REFERENCE		0x4000000
 #define ZEND_ACC_DONE_PASS_TWO			0x8000000

+#define ZEND_ACC_ALIAS					0x10000000
+
 char *zend_visibility_string(zend_uint fn_flags);


@@ -518,10 +520,6 @@ void zend_prepare_trait_precedence(znode *result, znode *method_reference, znode
 void zend_prepare_reference(znode *result, znode *class_name, znode *method_name TSRMLS_DC);
 void zend_prepare_trait_alias(znode *result, znode *method_reference, znode *modifiers, znode *alias TSRMLS_DC);

-void init_trait_alias_list(znode* result, const znode* trait_alias TSRMLS_DC);
-void add_trait_alias(znode* result, const znode* trait_alias TSRMLS_DC);
-void init_trait_alias(znode* result, const znode* method_name, const znode* alias, const znode* modifiers TSRMLS_DC);
-
 ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce TSRMLS_DC);
 void zend_do_early_binding(TSRMLS_D);
 ZEND_API void zend_do_delayed_early_binding(const zend_op_array *op_array TSRMLS_DC);
@@ -29,8 +29,8 @@
 #include "zend_vm.h"
 #include "zend_dtrace.h"

-zend_class_entry *default_exception_ce;
-zend_class_entry *error_exception_ce;
+static zend_class_entry *default_exception_ce;
+static zend_class_entry *error_exception_ce;
 static zend_object_handlers default_exception_handlers;
 ZEND_API void (*zend_throw_exception_hook)(zval *ex TSRMLS_DC);

@@ -554,11 +554,10 @@ static inline void make_real_object(zval **object_ptr TSRMLS_DC)
 		|| (Z_TYPE_PP(object_ptr) == IS_BOOL && Z_LVAL_PP(object_ptr) == 0)
 		|| (Z_TYPE_PP(object_ptr) == IS_STRING && Z_STRLEN_PP(object_ptr) == 0)
 	) {
-		zend_error(E_WARNING, "Creating default object from empty value");
-
 		SEPARATE_ZVAL_IF_NOT_REF(object_ptr);
 		zval_dtor(*object_ptr);
 		object_init(*object_ptr);
+		zend_error(E_WARNING, "Creating default object from empty value");
 	}
 }

@@ -1162,7 +1161,7 @@ convert_to_array:
 						case IS_DOUBLE:
 						case IS_NULL:
 						case IS_BOOL:
-							zend_error(E_NOTICE, "String offset cast occured");
+							zend_error(E_NOTICE, "String offset cast occurred");
 							break;
 						default:
 							zend_error(E_WARNING, "Illegal offset type");
@@ -1285,7 +1284,7 @@ static void zend_fetch_dimension_address_read(temp_variable *result, zval **cont
 						case IS_NULL:
 						case IS_BOOL:
 							if (type != BP_VAR_IS) {
-								zend_error(E_NOTICE, "String offset cast occured");
+								zend_error(E_NOTICE, "String offset cast occurred");
 							}
 							break;
 						default:
@@ -330,7 +330,7 @@ END_EXTERN_C()
 				if (idx-1 > LONG_MAX) { /* overflow */						\
 					break;													\
 				}															\
-				idx = (ulong)(-(long)idx);									\
+				idx = 0 - idx;               									\
 			} else if (idx > LONG_MAX) { /* overflow */						\
 				break;														\
 			}																\
@@ -347,7 +347,7 @@ DOLLAR_CURLY "${"

 SECTION_RAW_CHARS [^\]\n\r]
 SINGLE_QUOTED_CHARS [^']
-RAW_VALUE_CHARS [^\n\r;\000]
+RAW_VALUE_CHARS [^"\n\r;\000]

 LITERAL_DOLLAR ("$"([^{\000]|("\\"{ANY_CHAR})))
 VALUE_CHARS         ([^$= \t\n\r;&|~()!"'\000]|{LITERAL_DOLLAR})
@@ -445,12 +445,33 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
 	return '=';
 }

-<ST_RAW>{RAW_VALUE_CHARS}+ { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
-	/* Eat leading and trailing double quotes */
-	if (yytext[0] == '"' && yytext[yyleng - 1] == '"') {
-		SCNG(yy_text)++;
-		yyleng = yyleng - 2;
+<ST_RAW>["] {
+	while (YYCURSOR < YYLIMIT) {
+		switch (*YYCURSOR++) {
+			case '\n':
+				SCNG(lineno)++;
+				break;
+			case '\r':
+				if (*YYCURSOR != '\n') {
+					SCNG(lineno)++;
+				}
+				break;
+			case '"':
+				yyleng = YYCURSOR - SCNG(yy_text) - 2;
+				SCNG(yy_text)++;
+				RETURN_TOKEN(TC_RAW, yytext, yyleng);
+			case '\\':
+				if (YYCURSOR < YYLIMIT) {
+					YYCURSOR++;
+				}
+				break;
+		}
 	}
+	yyleng = YYCURSOR - SCNG(yy_text);
+	RETURN_TOKEN(TC_RAW, yytext, yyleng);
+}
+
+<ST_RAW>{RAW_VALUE_CHARS}+ { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }

@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Fri Mar  2 11:49:21 2012 */
+/* Generated by re2c 0.13.5 on Thu Jun  7 17:48:25 2012 */
 #line 3 "Zend/zend_ini_scanner_defs.h"

 enum YYCONDTYPE {
@@ -127,7 +127,7 @@ ZEND_API zval *zend_user_it_new_iterator(zend_class_entry *ce, zval *object TSRM
 }
 /* }}} */

-/* {{{ zend_user_it_dtor */
+/* {{{ zend_user_it_invalidate_current */
 ZEND_API void zend_user_it_invalidate_current(zend_object_iterator *_iter TSRMLS_DC)
 {
 	zend_user_iterator *iter = (zend_user_iterator*)_iter;
@@ -1191,7 +1191,7 @@ static YYSIZE_T zend_yytnamerr(char *yyres, const char *yystr)

 			if (LANG_SCNG(yy_text)[0] == 0 &&
 				LANG_SCNG(yy_leng) == 1 &&
-				memcmp(yystr, ZEND_STRL("\"end of file\"")) == 0) {
+				memcmp(yystr, "\"end of file\"", sizeof("\"end of file\"") - 1) == 0) {
 				yystpcpy(yyres, "end of file");
 				return sizeof("end of file")-1;
 			}
@@ -33,6 +33,9 @@

 #include <errno.h>
 #include "zend.h"
+#ifdef PHP_WIN32
+# include <Winuser.h>
+#endif
 #include "zend_alloc.h"
 #include <zend_language_parser.h>
 #include "zend_compile.h"
@@ -905,7 +908,11 @@ static void zend_scan_escape_string(zval *zendlval, char *str, int len, char quo
 					zendlval->value.str.len--;
 					break;
 				case 'e':
+#ifdef PHP_WIN32
+					*t++ = VK_ESCAPE;
+#else
 					*t++ = '\e';
+#endif
 					zendlval->value.str.len--;
 					break;
 				case '"':
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Thu Mar  1 21:27:30 2012 */
+/* Generated by re2c 0.13.5 on Mon Apr 30 15:55:05 2012 */
 #line 3 "Zend/zend_language_scanner_defs.h"

 enum YYCONDTYPE {
@@ -168,7 +168,7 @@ ZEND_API const zend_encoding *zend_multibyte_get_script_encoding(TSRMLS_D)
 ZEND_API int zend_multibyte_set_script_encoding(const zend_encoding **encoding_list, size_t encoding_list_size TSRMLS_DC)
 {
 	if (CG(script_encoding_list)) {
-		efree(CG(script_encoding_list));
+		free(CG(script_encoding_list));
 	}
 	CG(script_encoding_list) = encoding_list;
 	CG(script_encoding_list_size) = encoding_list_size;
@@ -66,11 +66,11 @@ ZEND_API void rebuild_object_properties(zend_object *zobj) /* {{{ */
 			     zend_hash_get_current_data_ex(&ce->properties_info, (void**)&prop_info, &pos) == SUCCESS;
 			     zend_hash_move_forward_ex(&ce->properties_info, &pos)) {
 				if (/*prop_info->ce == ce &&*/
-				    (prop_info->flags & ZEND_ACC_STATIC) == 0 && 
+				    (prop_info->flags & ZEND_ACC_STATIC) == 0 &&
 				    prop_info->offset >= 0 &&
 				    zobj->properties_table[prop_info->offset]) {
 					zend_hash_quick_add(zobj->properties, prop_info->name, prop_info->name_length+1, prop_info->h, (void**)&zobj->properties_table[prop_info->offset], sizeof(zval*), (void**)&zobj->properties_table[prop_info->offset]);
-				}				
+				}
 			}
 			while (ce->parent && ce->parent->default_properties_count) {
 				ce = ce->parent;
@@ -78,12 +78,12 @@ ZEND_API void rebuild_object_properties(zend_object *zobj) /* {{{ */
 				     zend_hash_get_current_data_ex(&ce->properties_info, (void**)&prop_info, &pos) == SUCCESS;
 				     zend_hash_move_forward_ex(&ce->properties_info, &pos)) {
 					if (prop_info->ce == ce &&
-					    (prop_info->flags & ZEND_ACC_STATIC) == 0 && 
-					    (prop_info->flags & ZEND_ACC_PRIVATE) != 0 && 
+					    (prop_info->flags & ZEND_ACC_STATIC) == 0 &&
+					    (prop_info->flags & ZEND_ACC_PRIVATE) != 0 &&
 					    prop_info->offset >= 0 &&
 						zobj->properties_table[prop_info->offset]) {
 						zend_hash_quick_add(zobj->properties, prop_info->name, prop_info->name_length+1, prop_info->h, (void**)&zobj->properties_table[prop_info->offset], sizeof(zval*), (void**)&zobj->properties_table[prop_info->offset]);
-					}				
+					}
 				}
 			}
 		}
@@ -783,7 +783,7 @@ static void zend_std_unset_property(zval *object, zval *member, const zend_liter
 	property_info = zend_get_property_info_quick(zobj->ce, member, (zobj->ce->__unset != NULL), key TSRMLS_CC);

 	if (EXPECTED(property_info != NULL) &&
-	    EXPECTED((property_info->flags & ZEND_ACC_STATIC) == 0) && 
+	    EXPECTED((property_info->flags & ZEND_ACC_STATIC) == 0) &&
 	    !zobj->properties &&
 	    property_info->offset >= 0 &&
 	    EXPECTED(zobj->properties_table[property_info->offset] != NULL)) {
@@ -815,8 +815,8 @@ static void zend_std_unset_property(zval *object, zval *member, const zend_liter
 				}
 			}
 		}
-	} else if (EXPECTED(property_info != NULL) && 
-	           EXPECTED((property_info->flags & ZEND_ACC_STATIC) == 0) && 
+	} else if (EXPECTED(property_info != NULL) &&
+	           EXPECTED((property_info->flags & ZEND_ACC_STATIC) == 0) &&
 	           property_info->offset >= 0) {
 		zobj->properties_table[property_info->offset] = NULL;
 	}
@@ -960,12 +960,6 @@ ZEND_API int zend_check_protected(zend_class_entry *ce, zend_class_entry *scope)
 }
 /* }}} */

-static inline zend_class_entry * zend_get_function_root_class(zend_function *fbc) /* {{{ */
-{
-	return fbc->common.prototype ? fbc->common.prototype->common.scope : fbc->common.scope;
-}
-/* }}} */
-
 static inline union _zend_function *zend_get_user_call_function(zend_class_entry *ce, const char *method_name, int method_len) /* {{{ */
 {
 	zend_internal_function *call_user_call = emalloc(sizeof(zend_internal_function));
@@ -1143,7 +1137,7 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, const c
 		zend_str_tolower_copy(lc_function_name, function_name_strval, function_name_strlen);
 		hash_value = zend_hash_func(lc_function_name, function_name_strlen+1);
 	}
-	
+
 	if (function_name_strlen == ce->name_length && ce->constructor) {
 		lc_class_name = zend_str_tolower_dup(ce->name, ce->name_length);
 		/* Only change the method to the constructor if the constructor isn't called __construct
@@ -1178,7 +1172,7 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, const c
 	if (UNEXPECTED(!(fbc->common.fn_flags & ZEND_ACC_STATIC))) {
 		zend_error_noreturn(E_ERROR, "Cannot call non static method %s::%s() without object", ZEND_FN_SCOPE_NAME(fbc), fbc->common.function_name);
 	}
-#endif 
+#endif
 	if (fbc->op_array.fn_flags & ZEND_ACC_PUBLIC) {
 		/* No further checks necessary, most common case */
 	} else if (fbc->op_array.fn_flags & ZEND_ACC_PRIVATE) {
@@ -1220,7 +1214,7 @@ ZEND_API zval **zend_std_get_static_property(zend_class_entry *ce, const char *p
 {
 	zend_property_info *property_info;
 	ulong hash_value;
-	
+
 	if (UNEXPECTED(!key) ||
 	    (property_info = CACHED_POLYMORPHIC_PTR(key->cache_slot, ce)) == NULL) {
 		if (EXPECTED(key != NULL)) {
@@ -1496,6 +1490,7 @@ ZEND_API int zend_std_cast_object_tostring(zval *readobj, zval *writeobj, int ty
 					if (retval) {
 						zval_ptr_dtor(&retval);
 					}
+					EG(exception) = NULL;
 					zend_error_noreturn(E_ERROR, "Method %s::__toString() must not throw an exception", ce->name);
 					return FAILURE;
 				}
@@ -146,6 +146,9 @@ struct _zend_object_handlers {

 extern ZEND_API zend_object_handlers std_object_handlers;

+#define zend_get_function_root_class(fbc) \
+	((fbc)->common.prototype ? (fbc)->common.prototype->common.scope : (fbc)->common.scope)
+
 BEGIN_EXTERN_C()
 ZEND_API union _zend_function *zend_std_get_static_method(zend_class_entry *ce, const char *function_name_strval, int function_name_strlen, const struct _zend_literal *key TSRMLS_DC);
 ZEND_API zval **zend_std_get_static_property(zend_class_entry *ce, const char *property_name, int property_name_len, zend_bool silent, const struct _zend_literal *key TSRMLS_DC);
@@ -28,7 +28,7 @@

 ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce TSRMLS_DC)
 {
-	object->ce = ce;	
+	object->ce = ce;
 	object->properties = NULL;
 	object->properties_table = NULL;
 	object->guards = NULL;
@@ -38,7 +38,7 @@ ZEND_API void zend_object_std_dtor(zend_object *object TSRMLS_DC)
 {
 	if (object->guards) {
 		zend_hash_destroy(object->guards);
-		FREE_HASHTABLE(object->guards);		
+		FREE_HASHTABLE(object->guards);
 	}
 	if (object->properties) {
 		zend_hash_destroy(object->properties);
@@ -74,23 +74,23 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
 				if (object->ce != EG(scope)) {
 					zend_class_entry *ce = object->ce;

-					zend_error(EG(in_execution) ? E_ERROR : E_WARNING, 
-						"Call to private %s::__destruct() from context '%s'%s", 
-						ce->name, 
-						EG(scope) ? EG(scope)->name : "", 
+					zend_error(EG(in_execution) ? E_ERROR : E_WARNING,
+						"Call to private %s::__destruct() from context '%s'%s",
+						ce->name,
+						EG(scope) ? EG(scope)->name : "",
 						EG(in_execution) ? "" : " during shutdown ignored");
 					return;
 				}
 			} else {
 				/* Ensure that if we're calling a protected function, we're allowed to do so.
 				 */
-				if (!zend_check_protected(destructor->common.scope, EG(scope))) {
+				if (!zend_check_protected(zend_get_function_root_class(destructor), EG(scope))) {
 					zend_class_entry *ce = object->ce;

-					zend_error(EG(in_execution) ? E_ERROR : E_WARNING, 
-						"Call to protected %s::__destruct() from context '%s'%s", 
-						ce->name, 
-						EG(scope) ? EG(scope)->name : "", 
+					zend_error(EG(in_execution) ? E_ERROR : E_WARNING,
+						"Call to protected %s::__destruct() from context '%s'%s",
+						ce->name,
+						EG(scope) ? EG(scope)->name : "",
 						EG(in_execution) ? "" : " during shutdown ignored");
 					return;
 				}
@@ -139,7 +139,7 @@ ZEND_API void zend_objects_free_object_storage(zend_object *object TSRMLS_DC)
 }

 ZEND_API zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class_type TSRMLS_DC)
-{	
+{
 	zend_object_value retval;

 	*object = emalloc(sizeof(zend_object));
@@ -222,7 +222,7 @@ ZEND_API zend_object_value zend_objects_clone_obj(zval *zobject TSRMLS_DC)
 	zend_object *new_object;
 	zend_object_handle handle = Z_OBJ_HANDLE_P(zobject);

-	/* assume that create isn't overwritten, so when clone depends on the 
+	/* assume that create isn't overwritten, so when clone depends on the
 	 * overwritten one then it must itself be overwritten */
 	old_object = zend_objects_get_address(zobject TSRMLS_CC);
 	new_obj_val = zend_objects_new(&new_object, old_object->ce TSRMLS_CC);
@@ -215,6 +215,12 @@ ZEND_API int zend_cleanup_class_data(zend_class_entry **pce TSRMLS_DC)
 void _destroy_zend_class_traits_info(zend_class_entry *ce)
 {
 	if (ce->num_traits > 0 && ce->traits) {
+		size_t i;
+		for (i = 0; i < ce->num_traits; i++) {
+			if (ce->traits[i]) {
+				destroy_zend_class(&ce->traits[i]);
+			}
+		}
 		efree(ce->traits);
 	}
 	
@@ -261,6 +267,15 @@ void _destroy_zend_class_traits_info(zend_class_entry *ce)
 	}
 }

+static int zend_clear_trait_method_name(zend_op_array *op_array TSRMLS_DC)
+{
+	if (op_array->function_name && (op_array->fn_flags & ZEND_ACC_ALIAS) == 0) {
+		efree(op_array->function_name);
+		op_array->function_name = NULL;
+	}
+	return 0;
+}
+
 ZEND_API void destroy_zend_class(zend_class_entry **pce)
 {
 	zend_class_entry *ce = *pce;
@@ -292,6 +307,10 @@ ZEND_API void destroy_zend_class(zend_class_entry **pce)
 			}
 			zend_hash_destroy(&ce->properties_info);
 			str_efree(ce->name);
+			if ((ce->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) {
+				TSRMLS_FETCH();
+				zend_hash_apply(&ce->function_table, (apply_func_t)zend_clear_trait_method_name TSRMLS_CC);
+			}
 			zend_hash_destroy(&ce->function_table);
 			zend_hash_destroy(&ce->constants_table);
 			if (ce->num_interfaces > 0 && ce->interfaces) {
@@ -381,7 +400,7 @@ ZEND_API void destroy_op_array(zend_op_array *op_array TSRMLS_DC)
 	}
 	efree(op_array->opcodes);

-	if (op_array->function_name) {
+	if (op_array->function_name && (op_array->fn_flags & ZEND_ACC_ALIAS) == 0) {
 		efree((char*)op_array->function_name);
 	}
 	if (op_array->doc_comment) {
@@ -1519,6 +1519,9 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {
 						ret = compare_function(result, op1, op_free TSRMLS_CC);
 						zend_free_obj_get_result(op_free TSRMLS_CC);
 						return ret;
+					} else if (Z_TYPE_P(op1) == IS_OBJECT) {
+						ZVAL_LONG(result, 1);
+						return SUCCESS;
 					}
 				}
 				if (!converted) {
@@ -1605,7 +1608,8 @@ ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 				&& (!memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1))));
 			break;
 		case IS_ARRAY:
-			Z_LVAL_P(result) = zend_hash_compare(Z_ARRVAL_P(op1), Z_ARRVAL_P(op2), (compare_func_t) hash_zval_identical_function, 1 TSRMLS_CC)==0;
+			Z_LVAL_P(result) = (Z_ARRVAL_P(op1) == Z_ARRVAL_P(op2) ||
+				zend_hash_compare(Z_ARRVAL_P(op1), Z_ARRVAL_P(op2), (compare_func_t) hash_zval_identical_function, 1 TSRMLS_CC)==0);
 			break;
 		case IS_OBJECT:
 			if (Z_OBJ_HT_P(op1) == Z_OBJ_HT_P(op2)) {
@@ -2035,15 +2039,36 @@ ZEND_API int zend_binary_zval_strncasecmp(zval *s1, zval *s2, zval *s3) /* {{{ *
 ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2) /* {{{ */
 {
 	int ret1, ret2;
+	int oflow1, oflow2;
 	long lval1, lval2;
 	double dval1, dval2;

-	if ((ret1=is_numeric_string(Z_STRVAL_P(s1), Z_STRLEN_P(s1), &lval1, &dval1, 0)) &&
-		(ret2=is_numeric_string(Z_STRVAL_P(s2), Z_STRLEN_P(s2), &lval2, &dval2, 0))) {
+	if ((ret1=is_numeric_string_ex(Z_STRVAL_P(s1), Z_STRLEN_P(s1), &lval1, &dval1, 0, &oflow1)) &&
+		(ret2=is_numeric_string_ex(Z_STRVAL_P(s2), Z_STRLEN_P(s2), &lval2, &dval2, 0, &oflow2))) {
+#if ULONG_MAX == 0xFFFFFFFF
+		if (oflow1 != 0 && oflow1 == oflow2 && dval1 - dval2 == 0. &&
+			((oflow1 == 1 && dval1 > 9007199254740991. /*0x1FFFFFFFFFFFFF*/)
+			|| (oflow1 == -1 && dval1 < -9007199254740991.))) {
+#else
+		if (oflow1 != 0 && oflow1 == oflow2 && dval1 - dval2 == 0.) {
+#endif
+			/* both values are integers overflown to the same side, and the
+			 * double comparison may have resulted in crucial accuracy lost */
+			goto string_cmp;
+		}
 		if ((ret1==IS_DOUBLE) || (ret2==IS_DOUBLE)) {
 			if (ret1!=IS_DOUBLE) {
+				if (oflow2) {
+					/* 2nd operand is integer > LONG_MAX (oflow2==1) or < LONG_MIN (-1) */
+					ZVAL_LONG(result, -1 * oflow2);
+					return;
+				}
 				dval1 = (double) lval1;
 			} else if (ret2!=IS_DOUBLE) {
+				if (oflow1) {
+					ZVAL_LONG(result, oflow1);
+					return; 
+				}
 				dval2 = (double) lval2;
 			} else if (dval1 == dval2 && !zend_finite(dval1)) {
 				/* Both values overflowed and have the same sign,
@@ -2076,13 +2101,13 @@ static int hash_zval_compare_function(const zval **z1, const zval **z2 TSRMLS_DC

 ZEND_API int zend_compare_symbol_tables_i(HashTable *ht1, HashTable *ht2 TSRMLS_DC) /* {{{ */
 {
-	return zend_hash_compare(ht1, ht2, (compare_func_t) hash_zval_compare_function, 0 TSRMLS_CC);
+	return ht1 == ht2 ? 0 : zend_hash_compare(ht1, ht2, (compare_func_t) hash_zval_compare_function, 0 TSRMLS_CC);
 }
 /* }}} */

 ZEND_API void zend_compare_symbol_tables(zval *result, HashTable *ht1, HashTable *ht2 TSRMLS_DC) /* {{{ */
 {
-	ZVAL_LONG(result, zend_hash_compare(ht1, ht2, (compare_func_t) hash_zval_compare_function, 0 TSRMLS_CC));
+	ZVAL_LONG(result, ht1 == ht2 ? 0 : zend_hash_compare(ht1, ht2, (compare_func_t) hash_zval_compare_function, 0 TSRMLS_CC));
 }
 /* }}} */

@@ -100,9 +100,12 @@ static zend_always_inline long zend_dval_to_lval(double d)
 * if the number was out of long range or contained a decimal point/exponent.
 * The number's value is returned into the respective pointer, *lval or *dval,
 * if that pointer is not NULL.
+ *
+ * This variant also gives information if a string that represents an integer
+ * could not be represented as such due to overflow. It writes 1 to oflow_info
+ * if the integer is larger than LONG_MAX and -1 if it's smaller than LONG_MIN.
 */
-
-static inline zend_uchar is_numeric_string(const char *str, int length, long *lval, double *dval, int allow_errors)
+static inline zend_uchar is_numeric_string_ex(const char *str, int length, long *lval, double *dval, int allow_errors, int *oflow_info)
 {
 	const char *ptr;
 	int base = 10, digits = 0, dp_or_e = 0;
@@ -113,6 +116,10 @@ static inline zend_uchar is_numeric_string(const char *str, int length, long *lv
 		return 0;
 	}

+	if (oflow_info != NULL) {
+		*oflow_info = 0;
+	}
+
 	/* Skip any whitespace
 	 * This is much faster than the isspace() function */
 	while (*str == ' ' || *str == '\t' || *str == '\n' || *str == '\r' || *str == '\v' || *str == '\f') {
@@ -165,6 +172,9 @@ check_digits:

 		if (base == 10) {
 			if (digits >= MAX_LENGTH_OF_LONG) {
+				if (oflow_info != NULL) {
+					*oflow_info = *str == '-' ? -1 : 1;
+				}
 				dp_or_e = -1;
 				goto process_double;
 			}
@@ -172,6 +182,9 @@ check_digits:
 			if (dval) {
 				local_dval = zend_hex_strtod(str, &ptr);
 			}
+			if (oflow_info != NULL) {
+				*oflow_info = 1;
+			}
 			type = IS_DOUBLE;
 		}
 	} else if (*ptr == '.' && ZEND_IS_DIGIT(ptr[1])) {
@@ -207,6 +220,9 @@ process_double:
 				if (dval) {
 					*dval = zend_strtod(str, NULL);
 				}
+				if (oflow_info != NULL) {
+					*oflow_info = *str == '-' ? -1 : 1;
+				}

 				return IS_DOUBLE;
 			}
@@ -226,6 +242,10 @@ process_double:
 	}
 }

+static inline zend_uchar is_numeric_string(const char *str, int length, long *lval, double *dval, int allow_errors) {
+    return is_numeric_string_ex(str, length, lval, dval, allow_errors, NULL);
+}
+
 static inline char *
 zend_memnstr(char *haystack, char *needle, int needle_len, char *end)
 {
@@ -79,7 +79,7 @@ static size_t zend_stream_stdio_fsizer(void *handle TSRMLS_DC) /* {{{ */
 static void zend_stream_unmap(zend_stream *stream TSRMLS_DC) { /* {{{ */
 #if HAVE_MMAP
 	if (stream->mmap.map) {
-		munmap(stream->mmap.map, stream->mmap.len);
+		munmap(stream->mmap.map, stream->mmap.len + ZEND_MMAP_AHEAD);
 	} else
 #endif
 	if (stream->mmap.buf) {
@@ -23,12 +23,14 @@

 #include "zend.h"

+BEGIN_EXTERN_C()
 ZEND_API extern const char *(*zend_new_interned_string)(const char *str, int len, int free_src TSRMLS_DC);
 ZEND_API extern void (*zend_interned_strings_snapshot)(TSRMLS_D);
 ZEND_API extern void (*zend_interned_strings_restore)(TSRMLS_D);

 void zend_interned_strings_init(TSRMLS_D);
 void zend_interned_strings_dtor(TSRMLS_D);
+END_EXTERN_C()

 #ifndef ZTS

@@ -2412,6 +2412,10 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV)
 			zend_hash_index_find(Z_ARRVAL_P(function_name), 0, (void **) &obj);
 			zend_hash_index_find(Z_ARRVAL_P(function_name), 1, (void **) &method);

+			if (!obj || !method) {
+				zend_error_noreturn(E_ERROR, "Array callback has to contain indices 0 and 1");
+			}
+
 			if (Z_TYPE_PP(obj) != IS_STRING && Z_TYPE_PP(obj) != IS_OBJECT) {
 				zend_error_noreturn(E_ERROR, "First array member is not a valid class name or object");
 			}
@@ -2442,7 +2446,7 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV)
 				if (UNEXPECTED(EX(fbc) == NULL)) {
 					zend_error_noreturn(E_ERROR, "Call to undefined method %s::%s()", Z_OBJ_CLASS_NAME_P(EX(object)), Z_STRVAL_PP(method));
 				}
-				
+
 				if ((EX(fbc)->common.fn_flags & ZEND_ACC_STATIC) != 0) {
 					EX(object) = NULL;
 				} else {
@@ -2974,7 +2978,7 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, CV)
 		catch_ce = CACHED_PTR(opline->op1.literal->cache_slot);
 	} else {
 		catch_ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, ZEND_FETCH_CLASS_NO_AUTOLOAD TSRMLS_CC);
-		
+
 		CACHE_PTR(opline->op1.literal->cache_slot, catch_ce);
 	}
 	ce = Z_OBJCE_P(EG(exception));
@@ -3426,7 +3430,7 @@ ZEND_VM_HANDLER(110, ZEND_CLONE, CONST|TMP|VAR|UNUSED|CV, ANY)
 		} else if ((clone->common.fn_flags & ZEND_ACC_PROTECTED)) {
 			/* Ensure that if we're calling a protected function, we're allowed to do so.
 			 */
-			if (UNEXPECTED(!zend_check_protected(clone->common.scope, EG(scope)))) {
+			if (UNEXPECTED(!zend_check_protected(zend_get_function_root_class(clone), EG(scope)))) {
 				zend_error_noreturn(E_ERROR, "Call to protected %s::__clone() from context '%s'", ce->name, EG(scope) ? EG(scope)->name : "");
 			}
 		}
@@ -3947,7 +3951,8 @@ ZEND_VM_HANDLER(75, ZEND_UNSET_DIM, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
 				switch (Z_TYPE_P(offset)) {
 					case IS_DOUBLE:
 						hval = zend_dval_to_lval(Z_DVAL_P(offset));
-						ZEND_VM_C_GOTO(num_index_dim);
+						zend_hash_index_del(ht, hval);
+						break;
 					case IS_RESOURCE:
 					case IS_BOOL:
 					case IS_LONG:
@@ -1256,6 +1256,10 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE
 			zend_hash_index_find(Z_ARRVAL_P(function_name), 0, (void **) &obj);
 			zend_hash_index_find(Z_ARRVAL_P(function_name), 1, (void **) &method);

+			if (!obj || !method) {
+				zend_error_noreturn(E_ERROR, "Array callback has to contain indices 0 and 1");
+			}
+
 			if (Z_TYPE_PP(obj) != IS_STRING && Z_TYPE_PP(obj) != IS_OBJECT) {
 				zend_error_noreturn(E_ERROR, "First array member is not a valid class name or object");
 			}
@@ -1558,6 +1562,10 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_H
 			zend_hash_index_find(Z_ARRVAL_P(function_name), 0, (void **) &obj);
 			zend_hash_index_find(Z_ARRVAL_P(function_name), 1, (void **) &method);

+			if (!obj || !method) {
+				zend_error_noreturn(E_ERROR, "Array callback has to contain indices 0 and 1");
+			}
+
 			if (Z_TYPE_PP(obj) != IS_STRING && Z_TYPE_PP(obj) != IS_OBJECT) {
 				zend_error_noreturn(E_ERROR, "First array member is not a valid class name or object");
 			}
@@ -1722,6 +1730,10 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_H
 			zend_hash_index_find(Z_ARRVAL_P(function_name), 0, (void **) &obj);
 			zend_hash_index_find(Z_ARRVAL_P(function_name), 1, (void **) &method);

+			if (!obj || !method) {
+				zend_error_noreturn(E_ERROR, "Array callback has to contain indices 0 and 1");
+			}
+
 			if (Z_TYPE_PP(obj) != IS_STRING && Z_TYPE_PP(obj) != IS_OBJECT) {
 				zend_error_noreturn(E_ERROR, "First array member is not a valid class name or object");
 			}
@@ -1919,6 +1931,10 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA
 			zend_hash_index_find(Z_ARRVAL_P(function_name), 0, (void **) &obj);
 			zend_hash_index_find(Z_ARRVAL_P(function_name), 1, (void **) &method);

+			if (!obj || !method) {
+				zend_error_noreturn(E_ERROR, "Array callback has to contain indices 0 and 1");
+			}
+
 			if (Z_TYPE_PP(obj) != IS_STRING && Z_TYPE_PP(obj) != IS_OBJECT) {
 				zend_error_noreturn(E_ERROR, "First array member is not a valid class name or object");
 			}
@@ -2436,7 +2452,7 @@ static int ZEND_FASTCALL  ZEND_CLONE_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 		} else if ((clone->common.fn_flags & ZEND_ACC_PROTECTED)) {
 			/* Ensure that if we're calling a protected function, we're allowed to do so.
 			 */
-			if (UNEXPECTED(!zend_check_protected(clone->common.scope, EG(scope)))) {
+			if (UNEXPECTED(!zend_check_protected(zend_get_function_root_class(clone), EG(scope)))) {
 				zend_error_noreturn(E_ERROR, "Call to protected %s::__clone() from context '%s'", ce->name, EG(scope) ? EG(scope)->name : "");
 			}
 		}
@@ -6850,7 +6866,7 @@ static int ZEND_FASTCALL  ZEND_CLONE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 		} else if ((clone->common.fn_flags & ZEND_ACC_PROTECTED)) {
 			/* Ensure that if we're calling a protected function, we're allowed to do so.
 			 */
-			if (UNEXPECTED(!zend_check_protected(clone->common.scope, EG(scope)))) {
+			if (UNEXPECTED(!zend_check_protected(zend_get_function_root_class(clone), EG(scope)))) {
 				zend_error_noreturn(E_ERROR, "Call to protected %s::__clone() from context '%s'", ce->name, EG(scope) ? EG(scope)->name : "");
 			}
 		}
@@ -11278,7 +11294,7 @@ static int ZEND_FASTCALL  ZEND_CLONE_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 		} else if ((clone->common.fn_flags & ZEND_ACC_PROTECTED)) {
 			/* Ensure that if we're calling a protected function, we're allowed to do so.
 			 */
-			if (UNEXPECTED(!zend_check_protected(clone->common.scope, EG(scope)))) {
+			if (UNEXPECTED(!zend_check_protected(zend_get_function_root_class(clone), EG(scope)))) {
 				zend_error_noreturn(E_ERROR, "Call to protected %s::__clone() from context '%s'", ce->name, EG(scope) ? EG(scope)->name : "");
 			}
 		}
@@ -13917,7 +13933,8 @@ static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HAND
 				switch (Z_TYPE_P(offset)) {
 					case IS_DOUBLE:
 						hval = zend_dval_to_lval(Z_DVAL_P(offset));
-						goto num_index_dim;
+						zend_hash_index_del(ht, hval);
+						break;
 					case IS_RESOURCE:
 					case IS_BOOL:
 					case IS_LONG:
@@ -15919,7 +15936,8 @@ static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLE
 				switch (Z_TYPE_P(offset)) {
 					case IS_DOUBLE:
 						hval = zend_dval_to_lval(Z_DVAL_P(offset));
-						goto num_index_dim;
+						zend_hash_index_del(ht, hval);
+						break;
 					case IS_RESOURCE:
 					case IS_BOOL:
 					case IS_LONG:
@@ -18131,7 +18149,8 @@ static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLE
 				switch (Z_TYPE_P(offset)) {
 					case IS_DOUBLE:
 						hval = zend_dval_to_lval(Z_DVAL_P(offset));
-						goto num_index_dim;
+						zend_hash_index_del(ht, hval);
+						break;
 					case IS_RESOURCE:
 					case IS_BOOL:
 					case IS_LONG:
@@ -21166,7 +21185,8 @@ static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER
 				switch (Z_TYPE_P(offset)) {
 					case IS_DOUBLE:
 						hval = zend_dval_to_lval(Z_DVAL_P(offset));
-						goto num_index_dim;
+						zend_hash_index_del(ht, hval);
+						break;
 					case IS_RESOURCE:
 					case IS_BOOL:
 					case IS_LONG:
@@ -21475,7 +21495,7 @@ static int ZEND_FASTCALL  ZEND_CLONE_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARG
 		} else if ((clone->common.fn_flags & ZEND_ACC_PROTECTED)) {
 			/* Ensure that if we're calling a protected function, we're allowed to do so.
 			 */
-			if (UNEXPECTED(!zend_check_protected(clone->common.scope, EG(scope)))) {
+			if (UNEXPECTED(!zend_check_protected(zend_get_function_root_class(clone), EG(scope)))) {
 				zend_error_noreturn(E_ERROR, "Call to protected %s::__clone() from context '%s'", ce->name, EG(scope) ? EG(scope)->name : "");
 			}
 		}
@@ -22504,7 +22524,8 @@ static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_H
 				switch (Z_TYPE_P(offset)) {
 					case IS_DOUBLE:
 						hval = zend_dval_to_lval(Z_DVAL_P(offset));
-						goto num_index_dim;
+						zend_hash_index_del(ht, hval);
+						break;
 					case IS_RESOURCE:
 					case IS_BOOL:
 					case IS_LONG:
@@ -23662,7 +23683,8 @@ static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HAN
 				switch (Z_TYPE_P(offset)) {
 					case IS_DOUBLE:
 						hval = zend_dval_to_lval(Z_DVAL_P(offset));
-						goto num_index_dim;
+						zend_hash_index_del(ht, hval);
+						break;
 					case IS_RESOURCE:
 					case IS_BOOL:
 					case IS_LONG:
@@ -24820,7 +24842,8 @@ static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HAN
 				switch (Z_TYPE_P(offset)) {
 					case IS_DOUBLE:
 						hval = zend_dval_to_lval(Z_DVAL_P(offset));
-						goto num_index_dim;
+						zend_hash_index_del(ht, hval);
+						break;
 					case IS_RESOURCE:
 					case IS_BOOL:
 					case IS_LONG:
@@ -26244,7 +26267,8 @@ static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HAND
 				switch (Z_TYPE_P(offset)) {
 					case IS_DOUBLE:
 						hval = zend_dval_to_lval(Z_DVAL_P(offset));
-						goto num_index_dim;
+						zend_hash_index_del(ht, hval);
+						break;
 					case IS_RESOURCE:
 					case IS_BOOL:
 					case IS_LONG:
@@ -27222,7 +27246,7 @@ static int ZEND_FASTCALL  ZEND_CLONE_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 		} else if ((clone->common.fn_flags & ZEND_ACC_PROTECTED)) {
 			/* Ensure that if we're calling a protected function, we're allowed to do so.
 			 */
-			if (UNEXPECTED(!zend_check_protected(clone->common.scope, EG(scope)))) {
+			if (UNEXPECTED(!zend_check_protected(zend_get_function_root_class(clone), EG(scope)))) {
 				zend_error_noreturn(E_ERROR, "Call to protected %s::__clone() from context '%s'", ce->name, EG(scope) ? EG(scope)->name : "");
 			}
 		}
@@ -29498,7 +29522,8 @@ static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDL
 				switch (Z_TYPE_P(offset)) {
 					case IS_DOUBLE:
 						hval = zend_dval_to_lval(Z_DVAL_P(offset));
-						goto num_index_dim;
+						zend_hash_index_del(ht, hval);
+						break;
 					case IS_RESOURCE:
 					case IS_BOOL:
 					case IS_LONG:
@@ -31371,7 +31396,8 @@ static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER
 				switch (Z_TYPE_P(offset)) {
 					case IS_DOUBLE:
 						hval = zend_dval_to_lval(Z_DVAL_P(offset));
-						goto num_index_dim;
+						zend_hash_index_del(ht, hval);
+						break;
 					case IS_RESOURCE:
 					case IS_BOOL:
 					case IS_LONG:
@@ -33453,7 +33479,8 @@ static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER
 				switch (Z_TYPE_P(offset)) {
 					case IS_DOUBLE:
 						hval = zend_dval_to_lval(Z_DVAL_P(offset));
-						goto num_index_dim;
+						zend_hash_index_del(ht, hval);
+						break;
 					case IS_RESOURCE:
 					case IS_BOOL:
 					case IS_LONG:
@@ -36219,7 +36246,8 @@ static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_
 				switch (Z_TYPE_P(offset)) {
 					case IS_DOUBLE:
 						hval = zend_dval_to_lval(Z_DVAL_P(offset));
-						goto num_index_dim;
+						zend_hash_index_del(ht, hval);
+						break;
 					case IS_RESOURCE:
 					case IS_BOOL:
 					case IS_LONG:
@@ -5,8 +5,8 @@ ZEND_API void {%EXECUTOR_NAME%}(zend_op_array *op_array TSRMLS_DC)
 	DCL_OPLINE
 	zend_execute_data *execute_data;
 	zend_bool nested = 0;
-	zend_bool original_in_execution = EG(in_execution);
 	{%HELPER_VARS%}
+	{%EXECUTION_STATUS%}

 	{%INTERNAL_LABELS%}

@@ -927,6 +927,13 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name,
 						skip_blanks($f, $m[1], $m[3]."\n");
 					}
 					break;
+				case "EXECUTION_STATUS":
+					if ($kind != ZEND_VM_KIND_GOTO) {
+						out($f, $m[1] . "zend_bool original_in_execution = EG(in_execution);\n");
+					} else {
+						out($f, $m[1] . "zend_bool original_in_execution = op_array? EG(in_execution) : 0;\n");
+					}
+					break;
 				case "INTERNAL_LABELS":
 					if ($kind == ZEND_VM_KIND_GOTO) {
 					  // Emit array of labels of opcode handlers and code for
@@ -2449,7 +2449,12 @@ AC_DEFUN([PHP_SETUP_ICONV], [
  dnl
  dnl Check libc first if no path is provided in --with-iconv
  dnl
+
  if test "$PHP_ICONV" = "yes"; then
+    dnl Reset LIBS temporarily as it may have already been included
+    dnl -liconv in.
+    LIBS_save="$LIBS"
+    LIBS=
    AC_CHECK_FUNC(iconv, [
      found_iconv=yes
    ],[
@@ -2459,6 +2464,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
        found_iconv=yes
      ])
    ])
+    LIBS="$LIBS_save"
  fi

  dnl
@@ -9,7 +9,7 @@ dnl Basic autoconf + automake initialization, generation of config.nice.
 dnl -------------------------------------------------------------------------

 AC_PREREQ(2.59)
-AC_INIT(README.SVN-RULES)
+AC_INIT(README.GIT-RULES)
 ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])

 PHP_CONFIG_NICE(config.nice)
@@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...);

 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
-PHP_RELEASE_VERSION=1
-PHP_EXTRA_VERSION="RC1-dev"
+PHP_RELEASE_VERSION=8
+PHP_EXTRA_VERSION=""
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`

@@ -2,9 +2,34 @@
 unixtojd()
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
+--ENV--
+TZ=UTC
 --FILE--
 <?php
+// this line has no impact on test output on Windows
 putenv('TZ=UTC');
+// getenv('TZ') returns 'UTC' here
+// putenv (basic_functions.c) does call tzset() when the env var being put is 'TZ'
+//      -adding a call direct to GetEnvironmentVariableA just before tzset() is called to check the value of 'TZ' returns 'UTC'
+// putting a call to date_default_timezone_set() here doesn't help
+//
+// on Windows, the only thing that gets this test to pass is to put TZ=UTC in --ENV-- section
+// 		-since putenv() is written to call tzset() when env var is TZ, I assume that putenv("TZ=UTC") is intended to work
+//			and should work on all platforms(including Windows).
+// easter_date.phpt passes
+//		-doesn't use --ENV-- section
+//		-uses --INI-- section with date.timezone=UTC
+//		-uses putenv('TZ=UTC')
+// date.timezone=UTC
+//		-if ommitted from easter_date.phpt, outputs DATE_TZ_ERRMSG warning
+//			-easter_date() calls mktime() and localtime()
+//			-whereas unixtojd(1000000000) calls localtime(1000000000)
+//		-if ommitted from unixtojd.phpt, does NOT output DATE_TZ_ERRMSG
+//
+// unixtojd() calls php_localtime_r() which for Pacific timezone systems, returns a time -8 hours
+//		-this incorrect localtime is passed to the julian date conversion (GregorianToSDN) function which works (probably correctly)
+//			but returns -1 day from expected because its input is -1 from expected
+
 echo unixtojd(40000). "\n";
 echo unixtojd(1000000000). "\n";
 echo unixtojd(1152459009). "\n";
@@ -42,7 +42,7 @@ void php_com_throw_exception(HRESULT code, char *message TSRMLS_DC)
 	}
 }

-PHPAPI void php_com_wrap_dispatch(zval *z, IDispatch *disp,
+PHP_COM_DOTNET_API void php_com_wrap_dispatch(zval *z, IDispatch *disp,
 		int codepage TSRMLS_DC)
 {
 	php_com_dotnet_object *obj;
@@ -65,7 +65,7 @@ PHPAPI void php_com_wrap_dispatch(zval *z, IDispatch *disp,
 	z->value.obj.handlers = &php_com_object_handlers;
 }

-PHPAPI void php_com_wrap_variant(zval *z, VARIANT *v,
+PHP_COM_DOTNET_API void php_com_wrap_variant(zval *z, VARIANT *v,
 		int codepage TSRMLS_DC)
 {
 	php_com_dotnet_object *obj;
@@ -92,7 +92,7 @@ PHPAPI void php_com_wrap_variant(zval *z, VARIANT *v,

 /* this is a convenience function for fetching a particular
 * element from a (possibly multi-dimensional) safe array */
-PHPAPI int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1 TSRMLS_DC)
+PHP_COM_DOTNET_API int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1 TSRMLS_DC)
 {
 	UINT dims;
 	LONG lbound, ubound;
@@ -30,7 +30,7 @@
 #include "php_com_dotnet_internal.h"


-PHPAPI OLECHAR *php_com_string_to_olestring(char *string, uint string_len, int codepage TSRMLS_DC)
+PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(char *string, uint string_len, int codepage TSRMLS_DC)
 {
 	OLECHAR *olestring = NULL;
 	DWORD flags = codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED | MB_ERR_INVALID_CHARS;
@@ -65,7 +65,7 @@ PHPAPI OLECHAR *php_com_string_to_olestring(char *string, uint string_len, int c
 	return olestring;
 }

-PHPAPI char *php_com_olestring_to_string(OLECHAR *olestring, uint *string_len, int codepage TSRMLS_DC)
+PHP_COM_DOTNET_API char *php_com_olestring_to_string(OLECHAR *olestring, uint *string_len, int codepage TSRMLS_DC)
 {
 	char *string;
 	uint length = 0;
@@ -268,7 +268,7 @@ static void istream_destructor(php_istream *stm TSRMLS_DC)
 }
 /* }}} */

-PHPAPI IStream *php_com_wrapper_export_stream(php_stream *stream TSRMLS_DC)
+PHP_COM_DOTNET_API IStream *php_com_wrapper_export_stream(php_stream *stream TSRMLS_DC)
 {
 	php_istream *stm = (php_istream*)CoTaskMemAlloc(sizeof(*stm));

@@ -35,7 +35,7 @@
 * b) a CLSID, major, minor e.g. "{00000200-0000-0010-8000-00AA006D2EA4},2,0"
 * c) a Type Library name e.g. "Microsoft OLE DB ActiveX Data Objects 1.0 Library"
 */
-PHPAPI ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_DC)
+PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_DC)
 {
 	ITypeLib *TL = NULL;
 	char *strtok_buf, *major, *minor;
@@ -153,7 +153,7 @@ PHPAPI ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_D
 }

 /* Given a type-library, merge it into the current engine state */
-PHPAPI int php_com_import_typelib(ITypeLib *TL, int mode, int codepage TSRMLS_DC)
+PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode, int codepage TSRMLS_DC)
 {
 	int i, j, interfaces;
 	TYPEKIND pTKind;
@@ -228,7 +228,7 @@ void php_com_typelibrary_dtor(void *pDest)
 	ITypeLib_Release(*Lib);
 }

-PHPAPI ITypeLib *php_com_load_typelib_via_cache(char *search_string,
+PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib_via_cache(char *search_string,
 	int codepage, int *cached TSRMLS_DC)
 {
 	ITypeLib **TLp;
@@ -98,7 +98,7 @@ bogus:
 	}
 }

-PHPAPI void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC)
+PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC)
 {
 	OLECHAR *olestring;
 	php_com_dotnet_object *obj;
@@ -166,7 +166,7 @@ PHPAPI void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_D
 	}
 }

-PHPAPI int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC)
+PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC)
 {
 	OLECHAR *olestring = NULL;
 	int ret = SUCCESS;
@@ -258,7 +258,7 @@ PHPAPI int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC
 }


-PHPAPI int php_com_copy_variant(VARIANT *dstvar, VARIANT *srcvar TSRMLS_DC)
+PHP_COM_DOTNET_API int php_com_copy_variant(VARIANT *dstvar, VARIANT *srcvar TSRMLS_DC)
 {
 	int ret = SUCCESS;
 	
@@ -578,7 +578,7 @@ static void disp_destructor(php_dispatchex *disp TSRMLS_DC)
 	CoTaskMemFree(disp);
 }

-PHPAPI IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid,
+PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid,
 	   HashTable *id_to_name TSRMLS_DC)
 {
 	php_dispatchex *disp = disp_constructor(val TSRMLS_CC);
@@ -617,7 +617,7 @@ PHPAPI IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid,
 	return (IDispatch*)disp;
 }

-PHPAPI IDispatch *php_com_wrapper_export(zval *val TSRMLS_DC)
+PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export(zval *val TSRMLS_DC)
 {
 	php_dispatchex *disp = NULL;

@@ -28,6 +28,14 @@ extern zend_module_entry com_dotnet_module_entry;
 #include "TSRM.h"
 #endif

+#ifdef PHP_WIN32
+# define PHP_COM_DOTNET_API __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+# define PHP_COM_DOTNET_API __attribute__ ((visibility("default")))
+#else
+# define PHP_COM_DOTNET_API
+#endif
+
 PHP_MINIT_FUNCTION(com_dotnet);
 PHP_MSHUTDOWN_FUNCTION(com_dotnet);
 PHP_RINIT_FUNCTION(com_dotnet);
@@ -84,9 +84,9 @@ zend_object_iterator *php_com_saproxy_iter_get(zend_class_entry *ce, zval *objec
 int php_com_saproxy_create(zval *com_object, zval *proxy_out, zval *index TSRMLS_DC);

 /* com_olechar.c */
-PHPAPI char *php_com_olestring_to_string(OLECHAR *olestring,
+PHP_COM_DOTNET_API char *php_com_olestring_to_string(OLECHAR *olestring,
 		uint *string_len, int codepage TSRMLS_DC);
-PHPAPI OLECHAR *php_com_string_to_olestring(char *string,
+PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(char *string,
 		uint string_len, int codepage TSRMLS_DC);


@@ -112,8 +112,8 @@ int php_com_do_invoke_byref(php_com_dotnet_object *obj, char *name, int namelen,

 /* com_wrapper.c */
 int php_com_wrapper_minit(INIT_FUNC_ARGS);
-PHPAPI IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid, HashTable *id_to_name TSRMLS_DC);
-PHPAPI IDispatch *php_com_wrapper_export(zval *val TSRMLS_DC);
+PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid, HashTable *id_to_name TSRMLS_DC);
+PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export(zval *val TSRMLS_DC);

 /* com_persist.c */
 int php_com_persist_minit(INIT_FUNC_ARGS);
@@ -147,10 +147,10 @@ PHP_FUNCTION(variant_get_type);
 PHP_FUNCTION(variant_set_type);
 PHP_FUNCTION(variant_cast);

-PHPAPI void php_com_variant_from_zval_with_type(VARIANT *v, zval *z, VARTYPE type, int codepage TSRMLS_DC);
-PHPAPI void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC);
-PHPAPI int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC);
-PHPAPI int php_com_copy_variant(VARIANT *dst, VARIANT *src TSRMLS_DC);
+PHP_COM_DOTNET_API void php_com_variant_from_zval_with_type(VARIANT *v, zval *z, VARTYPE type, int codepage TSRMLS_DC);
+PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC);
+PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC);
+PHP_COM_DOTNET_API int php_com_copy_variant(VARIANT *dst, VARIANT *src TSRMLS_DC);

 /* com_dotnet.c */
 PHP_FUNCTION(com_dotnet_create_instance);
@@ -159,17 +159,17 @@ void php_com_dotnet_mshutdown(TSRMLS_D);

 /* com_misc.c */
 void php_com_throw_exception(HRESULT code, char *message TSRMLS_DC);
-PHPAPI void php_com_wrap_dispatch(zval *z, IDispatch *disp,
+PHP_COM_DOTNET_API void php_com_wrap_dispatch(zval *z, IDispatch *disp,
 		int codepage TSRMLS_DC);
-PHPAPI void php_com_wrap_variant(zval *z, VARIANT *v,
+PHP_COM_DOTNET_API void php_com_wrap_variant(zval *z, VARIANT *v,
 		int codepage TSRMLS_DC);
-PHPAPI int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1 TSRMLS_DC);
+PHP_COM_DOTNET_API int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1 TSRMLS_DC);

 /* com_typeinfo.c */
-PHPAPI ITypeLib *php_com_load_typelib_via_cache(char *search_string,
+PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib_via_cache(char *search_string,
 		int codepage, int *cached TSRMLS_DC);
-PHPAPI ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_DC);
-PHPAPI int php_com_import_typelib(ITypeLib *TL, int mode,
+PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_DC);
+PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode,
 		int codepage TSRMLS_DC);
 void php_com_typelibrary_dtor(void *pDest);
 ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj, char *dispname, int sink TSRMLS_DC);
@@ -3,9 +3,23 @@ Bug #49192 (PHP crashes when GC invoked on COM object)
 --SKIPIF--
 <?php 
 if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
+--XFAIL--
+1
 --FILE--
 <?php

+// this test fails to load ADO
+//
+// a change in windows longhorn x64(affecting vista, 7, 8, 2008, 2008r2) broke ADO.
+//
+// there is a fix available, but user has to install it.
+// given that ADO was deprecated a long time ago in favor of newer APIs,
+// I don't think its worth the trouble of making the user install the fix to
+// get an accurate test run. its better to just not run the test or expect it to fail.
+//
+// see: http://support.microsoft.com/kb/2517589
+// see: http://www.infoq.com/news/2011/10/ADO-Win7
+
 $dbConnection = new Com('ADODB.Connection');
 var_dump(gc_collect_cycles());
 ?>
@@ -713,6 +713,14 @@ PHP_MINIT_FUNCTION(curl)
 #if LIBCURL_VERSION_NUM >= 0x071202
    REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_URL);
 #endif
+#if LIBCURL_VERSION_NUM >= 0x071300 /* 7.19.0 */
+	REGISTER_CURL_CONSTANT(CURLINFO_PRIMARY_IP);
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071500 /* 7.21.0 */
+	REGISTER_CURL_CONSTANT(CURLINFO_PRIMARY_PORT);
+	REGISTER_CURL_CONSTANT(CURLINFO_LOCAL_IP);
+	REGISTER_CURL_CONSTANT(CURLINFO_LOCAL_PORT);
+#endif


 	/* cURL protocol constants (curl_version) */
@@ -1606,9 +1614,9 @@ PHP_FUNCTION(curl_copy_handle)
 	dupch->uses = 0;
 	ch->uses++;
 	if (ch->handlers->write->stream) {
-		Z_ADDREF_P(dupch->handlers->write->stream);
-		dupch->handlers->write->stream = ch->handlers->write->stream;
+		Z_ADDREF_P(ch->handlers->write->stream);
 	}
+	dupch->handlers->write->stream = ch->handlers->write->stream;
 	dupch->handlers->write->method = ch->handlers->write->method;
 	dupch->handlers->write->type   = ch->handlers->write->type;
 	if (ch->handlers->read->stream) {
@@ -2177,7 +2185,7 @@ string_copy:

 			convert_to_string_ex(zvalue);

-			if (php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC)) {
+			if (Z_STRLEN_PP(zvalue) && php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC)) {
 				RETVAL_FALSE;
 				return 1;
 			}
@@ -2447,6 +2455,8 @@ PHP_FUNCTION(curl_getinfo)
 			create_certinfo(ci, listcode TSRMLS_CC);
 			CAAZ("certinfo", listcode);
 		}
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071300 /* 7.19.0 */
 		if (curl_easy_getinfo(ch->cp, CURLINFO_PRIMARY_IP, &s_code) == CURLE_OK) {
 			CAAS("primary_ip", s_code);
 		}
@@ -2473,10 +2483,10 @@ PHP_FUNCTION(curl_getinfo)
 	} else {
 		switch (option) {
 			/* string variable types */
-#if LIBCURL_VERSION_NUM >= 0x071500
+#if LIBCURL_VERSION_NUM >= 0x071300 /* 7.19.0 */
 			case CURLINFO_PRIMARY_IP:
 #endif
-#if LIBCURL_VERSION_NUM >= 0x071500
+#if LIBCURL_VERSION_NUM >= 0x071500 /* 7.21.0 */
 			case CURLINFO_LOCAL_IP:
 #endif
 			case CURLINFO_PRIVATE:
@@ -2496,7 +2506,7 @@ PHP_FUNCTION(curl_getinfo)
 				break;
 			}
 			/* Long variable types */
-#if LIBCURL_VERSION_NUM >= 0x071500
+#if LIBCURL_VERSION_NUM >= 0x071500 /* 7.21.0 */
 			case CURLINFO_PRIMARY_PORT:
 			case CURLINFO_LOCAL_PORT:
 #endif
@@ -191,6 +191,9 @@ PHP_FUNCTION(curl_multi_select)
 	FD_ZERO(&exceptfds);

 	curl_multi_fdset(mh->multi, &readfds, &writefds, &exceptfds, &maxfd);
+	if (maxfd == -1) {
+		RETURN_LONG(-1);
+	}
 	RETURN_LONG(select(maxfd + 1, &readfds, &writefds, &exceptfds, &to));
 }
 /* }}} */
@@ -162,6 +162,10 @@ static size_t php_curl_stream_read(php_stream *stream, char *buf, size_t count T
 		}
 		
 		do {
+			FD_ZERO(&curlstream->readfds);
+			FD_ZERO(&curlstream->writefds);
+			FD_ZERO(&curlstream->excfds);
+
 			/* get the descriptors from curl */
 			curl_multi_fdset(curlstream->multi, &curlstream->readfds, &curlstream->writefds, &curlstream->excfds, &curlstream->maxfd);

@@ -0,0 +1,25 @@
+--TEST--
+Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
+--SKIPIF--
+<?php if (!extension_loaded("curl")) print "skip"; 
+if(substr(PHP_OS, 0, 3) != 'WIN' )
+  die("skip Not Valid for Linux");
+?>
+--INI--
+open_basedir="c:/tmp"
+--FILE--
+<?php
+  $ch = curl_init();
+  var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
+  var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "c:/tmp/foo"));
+  var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "c:/xxx/bar"));
+  curl_close($ch);
+?>
+--EXPECTF--
+%a
+
+Warning: curl_setopt(): open_basedir restriction in effect. File(c:/tmp/foo) is not within the allowed path(s): (c:/tmp) in %sbug61948-win32.php on line %d
+bool(false)
+
+Warning: curl_setopt(): open_basedir restriction in effect. File(c:/xxx/bar) is not within the allowed path(s): (c:/tmp) in %sbug61948-win32.php on line %d
+bool(false)
@@ -0,0 +1,23 @@
+--TEST--
+Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
+--SKIPIF--
+<?php if (!extension_loaded("curl")) print "skip"; 
+if(substr(PHP_OS, 0, 3) == 'WIN' )
+  die("skip Not Valid for Windows");
+?>
+--INI--
+open_basedir="/tmp"
+--FILE--
+<?php
+  $ch = curl_init();
+  var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
+  var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/tmp/foo"));
+  var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/xxx/bar"));
+  curl_close($ch);
+?>
+--EXPECTF--
+bool(true)
+bool(true)
+
+Warning: curl_setopt(): open_basedir restriction in effect. File(/xxx/bar) is not within the allowed path(s): (/tmp) in %sbug61948.php on line %d
+bool(false)
@@ -0,0 +1,18 @@
+--TEST--
+Bug #62839 (curl_copy_handle segfault with CURLOPT_FILE)
+--SKIPIF--
+<?php if (!extension_loaded("curl")) print "skip"; 
+?>
+--FILE--
+<?php
+$curl = curl_init();
+
+$fd = tmpfile();
+curl_setopt($curl, CURLOPT_FILE, $fd);
+
+curl_copy_handle($curl);
+
+echo 'DONE!';
+?>
+--EXPECTF--
+DONE!
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -1,10 +1,10 @@
-/* Generated by re2c 0.13.5 on Mon Dec  5 22:02:27 2011 */
+/* Generated by re2c 0.13.5 on Sun Sep 30 20:14:42 2012 */
 #line 1 "ext/date/lib/parse_date.re"
 /*
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -995,7 +995,7 @@ std:
 	}
 yy2:
 	YYDEBUG(2, *YYCURSOR);
-#line 1082 "ext/date/lib/parse_date.re"
+#line 1083 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("firstdayof | lastdayof");
 		TIMELIB_INIT;
@@ -1034,7 +1034,7 @@ yy3:
 	}
 yy4:
 	YYDEBUG(4, *YYCURSOR);
-#line 1676 "ext/date/lib/parse_date.re"
+#line 1677 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("tzcorrection | tz");
@@ -1358,7 +1358,7 @@ yy12:
 	if (yych <= '9') goto yy1385;
 yy13:
 	YYDEBUG(13, *YYCURSOR);
-#line 1771 "ext/date/lib/parse_date.re"
+#line 1772 "ext/date/lib/parse_date.re"
 	{
 		add_error(s, "Unexpected character");
 		goto std;
@@ -2420,7 +2420,7 @@ yy49:
 	if (yych <= '9') goto yy55;
 yy50:
 	YYDEBUG(50, *YYCURSOR);
-#line 1760 "ext/date/lib/parse_date.re"
+#line 1761 "ext/date/lib/parse_date.re"
 	{
 		goto std;
 	}
@@ -2433,7 +2433,7 @@ yy52:
 	YYDEBUG(52, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(53, *YYCURSOR);
-#line 1765 "ext/date/lib/parse_date.re"
+#line 1766 "ext/date/lib/parse_date.re"
 	{
 		s->pos = cursor; s->line++;
 		goto std;
@@ -2825,7 +2825,7 @@ yy72:
 	if (yych == 's') goto yy74;
 yy73:
 	YYDEBUG(73, *YYCURSOR);
-#line 1744 "ext/date/lib/parse_date.re"
+#line 1745 "ext/date/lib/parse_date.re"
 	{
 		timelib_ull i;
 		DEBUG_OUTPUT("relative");
@@ -3602,7 +3602,7 @@ yy166:
 	}
 yy167:
 	YYDEBUG(167, *YYCURSOR);
-#line 1607 "ext/date/lib/parse_date.re"
+#line 1608 "ext/date/lib/parse_date.re"
 	{
 		const timelib_relunit* relunit;
 		DEBUG_OUTPUT("daytext");
@@ -4139,7 +4139,7 @@ yy193:
 	}
 yy194:
 	YYDEBUG(194, *YYCURSOR);
-#line 1666 "ext/date/lib/parse_date.re"
+#line 1667 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("monthtext");
 		TIMELIB_INIT;
@@ -4199,7 +4199,7 @@ yy198:
 	}
 yy199:
 	YYDEBUG(199, *YYCURSOR);
-#line 1412 "ext/date/lib/parse_date.re"
+#line 1413 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datetextual | datenoyear");
@@ -4481,7 +4481,7 @@ yy222:
 	}
 yy223:
 	YYDEBUG(223, *YYCURSOR);
-#line 1714 "ext/date/lib/parse_date.re"
+#line 1715 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz");
@@ -5208,7 +5208,7 @@ yy278:
 	YYDEBUG(278, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(279, *YYCURSOR);
-#line 1690 "ext/date/lib/parse_date.re"
+#line 1691 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12");
 		TIMELIB_INIT;
@@ -5409,7 +5409,7 @@ yy294:
 	++YYCURSOR;
 yy295:
 	YYDEBUG(295, *YYCURSOR);
-#line 1384 "ext/date/lib/parse_date.re"
+#line 1385 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datenoday");
@@ -6642,7 +6642,7 @@ yy362:
 	if (yych <= '9') goto yy365;
 yy364:
 	YYDEBUG(364, *YYCURSOR);
-#line 1528 "ext/date/lib/parse_date.re"
+#line 1529 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgtextshort");
@@ -7293,7 +7293,7 @@ yy392:
 	}
 yy393:
 	YYDEBUG(393, *YYCURSOR);
-#line 1586 "ext/date/lib/parse_date.re"
+#line 1587 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("ago");
 		TIMELIB_INIT;
@@ -9063,7 +9063,7 @@ yy454:
 	++YYCURSOR;
 yy455:
 	YYDEBUG(455, *YYCURSOR);
-#line 1289 "ext/date/lib/parse_date.re"
+#line 1290 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash");
 		TIMELIB_INIT;
@@ -9634,7 +9634,7 @@ yy475:
 	}
 yy476:
 	YYDEBUG(476, *YYCURSOR);
-#line 1426 "ext/date/lib/parse_date.re"
+#line 1427 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("datenoyearrev");
 		TIMELIB_INIT;
@@ -9786,7 +9786,7 @@ yy488:
 	YYDEBUG(488, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(489, *YYCURSOR);
-#line 1144 "ext/date/lib/parse_date.re"
+#line 1145 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12");
 		TIMELIB_INIT;
@@ -9815,7 +9815,7 @@ yy490:
 	}
 yy491:
 	YYDEBUG(491, *YYCURSOR);
-#line 1181 "ext/date/lib/parse_date.re"
+#line 1182 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("timeshort24 | timelong24 | iso8601long");
@@ -10150,7 +10150,7 @@ yy523:
 	YYDEBUG(523, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(524, *YYCURSOR);
-#line 1161 "ext/date/lib/parse_date.re"
+#line 1162 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("mssqltime");
 		TIMELIB_INIT;
@@ -10275,7 +10275,7 @@ yy534:
 	if (yych <= '9') goto yy541;
 yy535:
 	YYDEBUG(535, *YYCURSOR);
-#line 1343 "ext/date/lib/parse_date.re"
+#line 1344 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datefull");
@@ -11026,7 +11026,7 @@ yy605:
 	YYDEBUG(606, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(607, *YYCURSOR);
-#line 1358 "ext/date/lib/parse_date.re"
+#line 1359 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("pointed date YYYY");
 		TIMELIB_INIT;
@@ -11073,7 +11073,7 @@ yy611:
 	if (yych <= '9') goto yy605;
 yy612:
 	YYDEBUG(612, *YYCURSOR);
-#line 1370 "ext/date/lib/parse_date.re"
+#line 1371 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pointed date YY");
@@ -11727,7 +11727,7 @@ yy656:
 	}
 yy657:
 	YYDEBUG(657, *YYCURSOR);
-#line 1329 "ext/date/lib/parse_date.re"
+#line 1330 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshort");
@@ -11846,7 +11846,7 @@ yy666:
 	}
 yy667:
 	YYDEBUG(667, *YYCURSOR);
-#line 1273 "ext/date/lib/parse_date.re"
+#line 1274 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("americanshort | american");
@@ -12094,7 +12094,7 @@ yy700:
 	if (yych <= ':') goto yy704;
 yy701:
 	YYDEBUG(701, *YYCURSOR);
-#line 1556 "ext/date/lib/parse_date.re"
+#line 1557 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("clf");
@@ -12666,7 +12666,7 @@ yy763:
 	}
 yy764:
 	YYDEBUG(764, *YYCURSOR);
-#line 1301 "ext/date/lib/parse_date.re"
+#line 1302 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("iso8601date2");
@@ -12718,7 +12718,7 @@ yy771:
 	YYDEBUG(771, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(772, *YYCURSOR);
-#line 1542 "ext/date/lib/parse_date.re"
+#line 1543 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgtextreverse");
@@ -12869,7 +12869,7 @@ yy783:
 	}
 yy784:
 	YYDEBUG(784, *YYCURSOR);
-#line 1577 "ext/date/lib/parse_date.re"
+#line 1578 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("year4");
 		TIMELIB_INIT;
@@ -13028,7 +13028,7 @@ yy793:
 	}
 yy794:
 	YYDEBUG(794, *YYCURSOR);
-#line 1398 "ext/date/lib/parse_date.re"
+#line 1399 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datenodayrev");
@@ -13256,7 +13256,7 @@ yy814:
 	if (yych <= '7') goto yy817;
 yy815:
 	YYDEBUG(815, *YYCURSOR);
-#line 1509 "ext/date/lib/parse_date.re"
+#line 1510 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll w, d;
 		DEBUG_OUTPUT("isoweek");
@@ -13284,7 +13284,7 @@ yy817:
 	YYDEBUG(817, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(818, *YYCURSOR);
-#line 1490 "ext/date/lib/parse_date.re"
+#line 1491 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll w, d;
 		DEBUG_OUTPUT("isoweekday");
@@ -13366,7 +13366,7 @@ yy821:
 	}
 yy822:
 	YYDEBUG(822, *YYCURSOR);
-#line 1476 "ext/date/lib/parse_date.re"
+#line 1477 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgydotd");
@@ -13482,7 +13482,7 @@ yy842:
 	++YYCURSOR;
 yy843:
 	YYDEBUG(843, *YYCURSOR);
-#line 1450 "ext/date/lib/parse_date.re"
+#line 1451 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx | exif");
@@ -13769,7 +13769,7 @@ yy848:
 	}
 yy849:
 	YYDEBUG(849, *YYCURSOR);
-#line 1438 "ext/date/lib/parse_date.re"
+#line 1439 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("datenocolon");
 		TIMELIB_INIT;
@@ -14700,7 +14700,7 @@ yy973:
 	if (yych <= '9') goto yy996;
 yy974:
 	YYDEBUG(974, *YYCURSOR);
-#line 1315 "ext/date/lib/parse_date.re"
+#line 1316 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshorter");
@@ -15722,7 +15722,7 @@ yy1066:
 	}
 yy1068:
 	YYDEBUG(1068, *YYCURSOR);
-#line 1207 "ext/date/lib/parse_date.re"
+#line 1208 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("gnunocolon");
 		TIMELIB_INIT;
@@ -15836,7 +15836,7 @@ yy1075:
 	}
 yy1076:
 	YYDEBUG(1076, *YYCURSOR);
-#line 1253 "ext/date/lib/parse_date.re"
+#line 1254 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("iso8601nocolon");
@@ -16753,7 +16753,7 @@ yy1117:
 	}
 yy1118:
 	YYDEBUG(1118, *YYCURSOR);
-#line 1649 "ext/date/lib/parse_date.re"
+#line 1650 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -16820,7 +16820,7 @@ yy1126:
 	YYDEBUG(1126, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1127, *YYCURSOR);
-#line 1122 "ext/date/lib/parse_date.re"
+#line 1123 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -16949,7 +16949,7 @@ yy1141:
 	}
 yy1142:
 	YYDEBUG(1142, *YYCURSOR);
-#line 1625 "ext/date/lib/parse_date.re"
+#line 1626 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -19649,7 +19649,7 @@ yy1294:
 	goto yy1298;
 yy1295:
 	YYDEBUG(1295, *YYCURSOR);
-#line 1099 "ext/date/lib/parse_date.re"
+#line 1100 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("backof | frontof");
 		TIMELIB_INIT;
@@ -21382,11 +21382,12 @@ yy1387:
 		s->time->is_localtime = 1;
 		s->time->zone_type = TIMELIB_ZONETYPE_OFFSET;
 		s->time->z = 0;
+		s->time->dst = 0;

 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 21390 "ext/date/lib/parse_date.c"
+#line 21391 "ext/date/lib/parse_date.c"
 yy1388:
 	YYDEBUG(1388, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -21833,7 +21834,7 @@ yy1417:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 21837 "ext/date/lib/parse_date.c"
+#line 21838 "ext/date/lib/parse_date.c"
 yy1418:
 	YYDEBUG(1418, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -21877,7 +21878,7 @@ yy1420:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 21881 "ext/date/lib/parse_date.c"
+#line 21882 "ext/date/lib/parse_date.c"
 yy1421:
 	YYDEBUG(1421, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -23897,7 +23898,7 @@ yy1500:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 23901 "ext/date/lib/parse_date.c"
+#line 23902 "ext/date/lib/parse_date.c"
 yy1501:
 	YYDEBUG(1501, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -24047,7 +24048,7 @@ yy1508:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 24051 "ext/date/lib/parse_date.c"
+#line 24052 "ext/date/lib/parse_date.c"
 yy1509:
 	YYDEBUG(1509, *YYCURSOR);
 	yyaccept = 0;
@@ -24591,7 +24592,7 @@ yy1531:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 24595 "ext/date/lib/parse_date.c"
+#line 24596 "ext/date/lib/parse_date.c"
 yy1532:
 	YYDEBUG(1532, *YYCURSOR);
 	yyaccept = 0;
@@ -24764,7 +24765,7 @@ yy1537:
 		goto yy1531;
 	}
 }
-#line 1775 "ext/date/lib/parse_date.re"
+#line 1776 "ext/date/lib/parse_date.re"

 }

@@ -25070,6 +25071,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim
 				s->time->is_localtime = 1;
 				s->time->zone_type = TIMELIB_ZONETYPE_OFFSET;
 				s->time->z = 0;
+				s->time->dst = 0;
 				break;

 			case 'e': /* timezone */
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -1073,6 +1073,7 @@ weekdayof        = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of
 		s->time->is_localtime = 1;
 		s->time->zone_type = TIMELIB_ZONETYPE_OFFSET;
 		s->time->z = 0;
+		s->time->dst = 0;

 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
@@ -2077,6 +2078,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim
 				s->time->is_localtime = 1;
 				s->time->zone_type = TIMELIB_ZONETYPE_OFFSET;
 				s->time->z = 0;
+				s->time->dst = 0;
 				break;

 			case 'e': /* timezone */
@@ -4,7 +4,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2010 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |