Preparing PHP5.5.5RC1

2026-11-11 19:20:50 +00:00 · 2013-10-01 14:03:38 +02:00
384 changed files with 3691 additions and 9294 deletions
@@ -59,8 +59,8 @@ Exceptions:
    you're calling.

 7.  When commenting out code using a #if statement, do NOT use 0 only. Instead
-    use "<git username here>_0". For example, #if FOO_0, where FOO is your
-    git user foo.  This allows easier tracking of why code was commented out,
+    use "<svn username here>_0". For example, #if FOO_0, where FOO is your
+    svn user foo.  This allows easier tracking of why code was commented out,
    especially in bundled libraries.

 8.  Do not define functions that are not available.  For instance, if a
@@ -151,7 +151,7 @@ Naming Conventions

 7.  Classes should be given descriptive names. Avoid using abbreviations where
    possible. Each word in the class name should start with a capital letter,
-    without underscore delimiters (CamelCaps starting with a capital letter).
+    without underscore delimiters (CampelCaps starting with a capital letter).
    The class name should be prefixed with the name of the 'parent set' (e.g.
    the name of the extension)::

@@ -125,6 +125,7 @@ distclean: clean
 	rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
 	rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h
 	rm -f ext/phar/phar.phar ext/phar/phar.php
+	rm -f pear/install-pear-nozlib.phar
 	if test "$(srcdir)" != "$(builddir)"; then \
 	  rm -f ext/phar/phar/phar.inc; \
 	fi
@@ -1,153 +1,17 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-9 Jan 2014, PHP 5.5.8
-
- Core:
-  . Disallowed JMP into a finally block. (Laruence)
-  . Added validation of class names in the autoload process. (Dmitry)
-  . Fixed invalid C code in zend_strtod.c. (Lior Kaplan)
-  . Fixed bug #66041 (list() fails to unpack yielded ArrayAccess object).
-    (Nikita)
-  . Fixed bug #65764 (generators/throw_rethrow FAIL with
-    ZEND_COMPILE_EXTENDED_INFO). (Nikita)
-  . Fixed bug #61645 (fopen and O_NONBLOCK). (Mike)
-  . Fixed bug #66218 (zend_register_functions breaks reflection). (Remi)
-
- Date:
-  . Fixed bug #66060 (Heap buffer over-read in DateInterval). (Remi)
-  . Fixed bug #65768 (DateTimeImmutable::diff does not work). (Nikita Nefedov)
-  
- DOM:
-  . Fixed bug #65196 (Passing DOMDocumentFragment to DOMDocument::saveHTML() 
-    Produces invalid Markup). (Mike)
-
- Exif:
-  . Fixed bug #65873 (Integer overflow in exif_read_data()). (Stas)
-
- Filter:
-  . Fixed bug #66229 (128.0.0.0/16 isn't reserved any longer). (Adam)
-
- GD:
-  . Fixed bug #64405 (Use freetype-config for determining freetype2 dir(s)).
-    (Adam)
-    
- PDO_odbc:
-  . Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries). 
-    (michael at orlitzky dot com)
-
- MySQLi:
-  . Fixed bug #65486 (mysqli_poll() is broken on win x64). (Anatol)
-
- OPCache:
-  . Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
-    (Dmitry)
-  . Fixed Issue #140: "opcache.enable_file_override" doesn't respect
-    "opcache.revalidate_freq". (Dmitry).
-
- SNMP:
-  . Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
-
- SOAP
-  . Fixed bug #66112 (Use after free condition in SOAP extension).
-    (martin dot koegler at brz dot gv dot at)
-
- Sockets:
-  . Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined). (Felipe)
-
- XSL
-  . Fixed bug #49634 (Segfault throwing an exception in a XSL registered
-    function). (Mike)
-
- ZIP:
-  . Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real). (Remi)
-
-12 Dec 2013, PHP 5.5.7
-
- CLI server:
-  . Added some MIME types to the CLI web server (Chris Jones)
-  . Implemented FR #65917 (getallheaders() is not supported by the built-in web
-    server) - also implements apache_response_headers() (Andrea Faulds)
-
- Core:
-  . Fixed bug #66094 (unregister_tick_function tries to cast a Closure to a 
-    string). (Laruence)
-  . Fixed bug #65969 (Chain assignment with T_LIST failure). (Dmitry)
-
- OPCache
-  . Fixed bug #66176 (Invalid constant substitution). (Dmitry)
-  . Fixed bug #65915 (Inconsistent results with require return value). (Dmitry)
-  . Fixed bug #65559 (Opcache: cache not cleared if changes occur while
-    running). (Dmitry)
-
- readline
-  . Fixed Bug #65714 (PHP cli forces the tty to cooked mode). (Remi)
-
- Openssl:
-  . Fixed memory corruption in openssl_x509_parse() (CVE-2013-6420).
-    (Stefan Esser).
-
-14 Nov 2013, PHP 5.5.6
-
- Core:
-  . Fixed bug #65947 (basename is no more working after fgetcsv in certain 
-    situation). (Laruence)
-  . Improved performance of array_merge() and func_get_args() by eliminating
-    useless copying. (Dmitry)
-  . Fixed bug #65939 (Space before ";" breaks php.ini parsing).
-    (brainstorm at nopcode dot org)
-  . Fixed bug #65911 (scope resolution operator - strange behavior with $this).
-    (Bob Weinand)
-  . Fixed bug #65936 (dangling context pointer causes crash). (Tony)
-
- FPM:
-  . Changed default listen() backlog to 65535. (Tony)
-
- JSON
-  . Fixed whitespace part of bug #64874 ("json_decode handles whitespace and
-    case-sensitivity incorrectly"). (Andrea Faulds)
-
- MySQLi:
-  . Fixed bug #66043 (Segfault calling bind_param() on mysqli). (Laruence)
-
- OPcache
-  . Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
-  . Fixed issue #115 (path issue when using phar). (Dmitry)
-  . Fixed issue #149 (Phar mount points not working with OPcache enabled).
-  (Dmitry)
-
- ODBC
-  . Fixed bug #65950 (Field name truncation if the field name is bigger than
-    32 characters). (patch submitted by: michael dot y at zend dot com, Yasuo)
-
- PDO:
-  . Fixed bug #66033 (Segmentation Fault when constructor of PDO statement 
-    throws an exception). (Laruence)
-  . Fixed bug 65946 (sql_parser permanently converts values bound to strings)
-
- Standard:
-  . Fixed bug #64760 (var_export() does not use full precision for floating-point
-    numbers) (Yasuo)
-
-
-17 Oct 2013, PHP 5.5.5
+03 Oct 2013, PHP 5.5.5RC1

 - Core:
  . Fixed bug #64979 (Wrong behavior of static variables in closure generators).
    (Nikita)
-  . Fixed bug #65322 (compile time errors won't trigger auto loading). (Nikita)
-  . Fixed bug #65821 (By-ref foreach on property access of string offset
-    segfaults). (Nikita)

 - CLI server:
  . Fixed bug #65633 (built-in server treat some http headers as
    case-sensitive). (Adam)
-  . Fixed bug #65818 (Segfault with built-in webserver and chunked transfer 
-    encoding). (Felipe)
  . Added application/pdf to PHP CLI Web Server mime types (Chris Jones)

 - Datetime:
-  . Fixed bug #64157 (DateTime::createFromFormat() reports confusing error
-    message). (Boro Sitnikovski)
  . Fixed bug #65502 (DateTimeImmutable::createFromFormat returns DateTime).
    (Boro Sitnikovski)
  . Fixed bug #65548 (Comparison for DateTimeImmutable doesn't work).
@@ -157,14 +21,6 @@ PHP                                                                        NEWS
  . Fixed bug #65708 (dba functions cast $key param to string in-place,
    bypassing copy on write). (Adam)

- Filter:
-  . Add RFC 6598 IPs to reserved addresses. (Sebastian Nohn)
-  . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names).
-    (Syra)
-
- FTP:
-  . Fixed bug #65667 (ftp_nb_continue produces segfault). (Philip Hofstetter)
-
 - GD
  . Ensure that the defined interpolation method is used with the generic
    scaling methods. (Pierre)
@@ -177,37 +33,16 @@ PHP                                                                        NEWS
  . Added support for GNU Hurd. (Svante Signell)
  . Added function opcache_compile_file() to load PHP scripts into cache
    without execution. (Julien)
-  . Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).
-    (Dmitry)
  . Fixed bug #65665 (Exception not properly caught when opcache enabled).
    (Laruence)
  . Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var). (Dmitry)
  . Fixed issue #135 (segfault in interned strings if initial memory is too
    low). (Julien)

- Sockets:
-  . Fixed bug #65808 (the socket_connect() won't work with IPv6 address).
-    (Mike)
-
 - SPL:
  . Fix bug #64782 (SplFileObject constructor make $context optional / give it
    a default value). (Nikita)

- Standard:
-  . Fixed bug #61548 (content-type must appear at the end of headers for 201 
-    Location to work in http). (Mike)
-
- XMLReader:
-  . Fixed bug #51936 (Crash with clone XMLReader). (Mike)
-  . Fixed bug #64230 (XMLReader does not suppress errors). (Mike)
-  
- Build system:
-  . Fixed bug #51076 (race condition in shtool's mkdir -p implementation).
-    (Mike, Raphael Geissert)
-  . Fixed bug #62396 ('make test' crashes starting with 5.3.14 (missing 
-    gzencode())). (Mike)
-
-
 19 Sep 2013, PHP 5.5.4

 - Core:
@@ -218,7 +53,6 @@ PHP                                                                        NEWS
    DTRACE_FUNCTION_*). (Chris Jones)
  . Fixed bug #65483 (quoted-printable encode stream filter incorrectly encoding
    spaces). (Michael M Slusarz)
-  . Fixed bug #65481 (shutdown segfault due to serialize) (Mike)
  . Fixed bug #65470 (Segmentation fault in zend_error() with
    --enable-dtrace). (Chris Jones, Kris Van Hees)
  . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert)
@@ -245,10 +79,6 @@ PHP                                                                        NEWS
  . Fixed bug #64802 (openssl_x509_parse fails to parse subject properly in
    some cases). (Mark Jones)

- PDO:
-  . Fixed bug #64953 (Postgres prepared statement positional parameter 
-    casting). (Mike)
-
 - Session:
  . Fixed bug #65475 (Session ID is not initialized properly when strict session
    is enabled). (Yasuo)
@@ -259,10 +89,6 @@ PHP                                                                        NEWS
  . Fix issue with return types of password API helper functions. Found via
    static analysis by cjones. (Anthony Ferrara) 

- Zlib:
-  . Fixed bug #65391 (Unable to send vary header user-agent when 
-    ob_start('ob_gzhandler') is called) (Mike)
-
 22 Aug 2013, PHP 5.5.3

 - Openssl:
@@ -30,7 +30,7 @@ zend_module_entry foo_module_entry = {
    PHP_RSHUTDOWN(foo),   /* per-request shutdown function */
    PHP_MINFO(foo),       /* information function */
 #if ZEND_MODULE_API_NO >= 20010901
-    PHP_FOO_VERSION,      /* extension version number (string) */
+    FOO_VERSION,          /* extension version number (string) */
 #endif
    STANDARD_MODULE_PROPERTIES
 };
@@ -31,11 +31,6 @@ HOW TO USE IT

    ./buildconf; ./configure --enable-module_name; make

-  The definition of PHP_MODULE_NAME_VERSION will be present in the
-  php_module_name.h and injected into the zend_module_entry definition. This
-  is required by the PECL website for the version string conformity checks
-  against package.xml
-
  But if you already have planned the overall scheme of your module, what
  functions it will contain, their return types and the arguments they take
  (a very good idea) and don't want to bother yourself with creating function
@@ -69,11 +69,9 @@ The next few rules are more of a technical nature::
      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 *any
-      stable release* version with the given change. In other words,
-      news about a bug fix which went into PHP-5.4, PHP-5.5 and master
-      should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but
-      not master, which is not a public released version yet.
+      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
@@ -8,16 +8,15 @@ General notes and tips
 1. Do not release on Fridays, Saturdays or Sundays
 because the sysadmins can not upgrade stuff then.

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

 3. Ensure that Windows builds will work before packaging

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

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

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

-3. Checkout the release branch for this release (e.g., PHP-5.4.2) from the main branch.
+3. Checkout the release branch for this release (e.g., PHP-5.4.2).

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

-5. Compile and make test, with and without ZTS, using the right Bison version
-(for example, for 5.5, Bison 2.4.1 is used)
+5. Commit these changes to the branch with ``git commit -a``.

-6. Check ./sapi/cli/php -v output for version matching.
-
-7. If all is right, commit the changes to the release branch with ``git commit -a``.
-
-8. Tag the repository release branch with the version, e.g.: 
+6. Tag the repository with the version, e.g.: 
 ``git tag -u YOURKEYID php-5.4.2RC2``

-9. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and ``NEWS``
-in the *main* branch (PHP-5.4 for example) to prepare for the **next** version.
-F.e. if the RC is "5.4.1RC1" then the new one should be "5.4.2-dev" - regardless if we get
-a new RC or not. This is to make sure ``version_compare()`` can correctly work.
-Commit the changes to the main branch.
-
-10. Push the changes to the main repo, the tag, the main branch and the release branch :
+7. Push the changes to the main repo:
 ``git push --tags origin HEAD``
-``git push origin {main branch}``
-``git push origin {release branch}``

-11. run: ``PHPROOT=. ./makedist 5.4.2RC2``, this will export the tree, create configure
-and build three tarballs (gz, bz2 and xz).
+8. run: ``./makedist 5.4.2RC2``, this will export the tree, create configure
+and build three tarballs (gz,bz2 and xz). Make sure you use the same GNU Bison
+version as snaps. Recent bison version are known to break ZTS.

-12. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there should be a
+9. Copy those three tarballs to www.php.net, in your homedir there should be a
 directory "downloads/". Copy them into there, so that the system can generate
-MD5 sums. If you do not have this directory, talk to Derick or Dan.
+MD5 sums. If you do not have this directory, talk to Derick.

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

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

+12. Notify the documentation team if documentations for new features are
+not yet available but a stable release is imminent.
+
 Getting the non stable release (alpha/beta/RC) announced
 --------------------------------------------------------

@@ -120,9 +109,9 @@ Derick) run the following commands for you:

   Note: Remember to update the MD5 checksum information.

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

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

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

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

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

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

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

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

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

-5. Compile and make test, with and without ZTS, using the right Bison version
-(for example, for 5.5, Bison 2.4.1 is used)
+6. tag the repository with the version f.e. "``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!!

-6. Check ./sapi/cli/php -v output for version matching.
+7. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and
+possibly ``NEWS`` again, to the **next** version. F.e. if the release candidate
+was "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.

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

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

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

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

-11. Commit and push all the tarballs and signature files to web/php-distributions.git,
-    then update the git submodule reference in web/php.git: 
-    ``git submodule init;
+12. Commit those two tarballs to web/php-distributions.git, then update the git
+    submodule reference in web/php.git: 
+    git submodule init;
    git submodule update;
    cd distributions;
    git pull origin master;
    cd ..;
    git commit distributions;
-    git push;``
-This is to fetch the last commit id from php-distributions.git and commit this
-last commit id to web/php.git, then, mirrors will now sync
+    git push;

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

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

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

- a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php)
-    The release announcement file should list in detail security fixes and
-    changes in behavior (whether due to a bug fix or not).
+ 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
@@ -207,13 +205,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 phpweb/include/releases.php with the old release info
-  (updates the download archives)
-
-4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
-   (prepare for next RC)
-
-5. Update the ChangeLog file for the given major version
+3. Update the ChangeLog file for the given major version
 f.e. ``ChangeLog-5.php`` from the NEWS file

 a. go over the list and put every element on one line
@@ -233,10 +225,19 @@ f.e. ``ChangeLog-5.php`` from the NEWS file
  IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/``

  V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/``
-  
-  e. You may want to try php-web/bin/news2html to automate this task

-6. Add a short notice to phpweb stating that there is a new release, and
+4. ``cp releases/5_4_0.php releases/5_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:
+
+ a. security fixes,
+
+ b. changes in behavior (whether due to a bug fix or not)
+
+7. Add a short notice to phpweb stating that there is a new release, and
 highlight the major important things (security fixes) and when it is important
 to upgrade.

@@ -244,11 +245,7 @@ to upgrade.

 b. Add the content for the news entry

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

 9. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
@@ -153,18 +153,3 @@ ADDING SHARED MODULE SUPPORT TO A MODULE
        #ifdef COMPILE_DL_FOO
        ZEND_GET_MODULE(foo)
        #endif
-
-PECL SITE CONFORMITY
-
-  If you plan to release an extension to the PECL website, there are several
-  points to be regarded.
-
- 1. Add LICENSE or COPYING to the package.xml
-
- 2. The following should be defined in one of the extension header files
-
-        #define PHP_FOO_VERSION "1.2.3"
-
-    This macros has to be used within your foo_module_entry to indicate the
-    extension version.
-
@@ -17,7 +17,7 @@ See https://wiki.php.net/rfc and https://wiki.php.net/rfc/voting for more
 information on the process.

 Bug fixes **do not** require an RFC, but require a bugtracker ticket. Always
-open a ticket at https://bugs.php.net and reference the bug id using #NNNNNN.
+open a ticket at http://bugs.php.net and reference the bug id using #NNNNNN.

    Fix #55371: get_magic_quotes_gpc() throws deprecation warning

@@ -28,12 +28,3 @@ open a ticket at https://bugs.php.net and reference the bug id using #NNNNNN.

 We do not merge pull requests directly on github. All PRs will be
 pulled and pushed through http://git.php.net.
-
-
-Guidelines for contributors
-===========================
- [CODING_STANDARDS](/CODING_STANDARDS)
- [README.GIT-RULES](/README.GIT-RULES)
- [README.MAILINGLIST_RULES](/README.MAILINGLIST_RULES)
- [README.RELEASE_PROCESS](/README.RELEASE_PROCESS)
-
@@ -343,8 +343,6 @@ None

 - Intl:
  - This extension now requires ICU 4.0+.
- Phar:
-  - Added ability of resolving alias created by Phar::map

 ========================================
 9. New Global Constants
@@ -10,7 +10,7 @@ libZend_la_SOURCES=\
 	zend_ini_parser.y zend_ini_scanner.l \
 	zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
 	zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
-	zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
+	zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
 	zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
 	zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
 	zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
@@ -261,10 +261,6 @@ SOURCE=.\zend_ts_hash.c

 SOURCE=.\zend_variables.c
 # End Source File
-# Begin Source File
-
-SOURCE=.\zend_vm_opcodes.c
-# End Source File
 # End Group
 # Begin Group "Header Files"

@@ -291,10 +291,6 @@ SOURCE=.\zend_ts_hash.c

 SOURCE=.\zend_variables.c
 # End Source File
-# Begin Source File
-
-SOURCE=.\zend_vm_opcodes.c
-# End Source File
 # End Group
 # Begin Group "Header Files"

@@ -12,7 +12,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
  bison_version=none
  if test "$YACC"; then
    AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
-      bison_version_vars=`$YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /g' | tr -d a-z`
+      bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
      php_cv_bison_version=invalid
      if test -n "$bison_version_vars"; then
        set $bison_version_vars
@@ -24,6 +24,6 @@ Warning: feof(): wrapper::stream_eof is not implemented! Assuming EOF in %s on l
 Fatal error: Uncaught exception 'Exception' in %s:%d
 Stack trace:
 #0 [internal function]: wrapper->stream_eof()
-#1 %s(%d): feof(Resource id #%d)
+#1 %s(%d): feof(Resource id #6)
 #2 {main}
  thrown in %s on line %d
@@ -1,62 +0,0 @@
--TEST--
-Fixed Bug #65784 (Segfault with finally)
--XFAIL--
-This bug is not fixed in 5.5 due to ABI BC
--FILE--
-<?php
-function foo1() {
-	try {
-		throw new Exception("not catch");
-		return true;
-	} finally {
-		try {
-			throw new Exception("catched");
-		} catch (Exception $e) {
-		}
-	}
-}
-try {
-	$foo = foo1();
-	var_dump($foo);
-} catch (Exception $e) {
-	do {
-		var_dump($e->getMessage());
-	} while ($e = $e->getPrevious());
-}
-
-function foo2() {
-	try  {
-		try {
-			throw new Exception("catched");
-			return true;
-		} finally {
-			try {
-				throw new Exception("catched");
-			} catch (Exception $e) {
-			}
-		}
-	} catch (Exception $e) {
-	}
-}
-
-$foo = foo2();
-var_dump($foo);
-
-function foo3() {
-	try {
-		throw new Exception("not catched");
-		return true;
-	} finally {
-		try {
-			throw new NotExists();
-		} catch (Exception $e) {
-		}
-	}
-}
-
-$bar = foo3();
--EXPECTF--
-string(9) "not catch"
-NULL
-
-Fatal error: Class 'NotExists' not found in %sbug65784.php on line %d
@@ -1,20 +0,0 @@
--TEST--
-Bug #65911 (scope resolution operator - strange behavior with $this)
--FILE--
-<?php
-class A {}
-
-class B
-{
-	public function go()
-	{
-		$this->foo = 'bar';
-		echo A::$this->foo; // should not output 'bar'
-	}
-}
-
-$obj = new B();
-$obj->go();
-?>
--EXPECTF--
-Fatal error: Access to undeclared static property: A::$this in %s on line %d
@@ -1,10 +0,0 @@
--TEST--
-Bug #65969 (Chain assignment with T_LIST failure)
--FILE--
-<?php
-$obj = new stdClass;
-list($a,$b) = $obj->prop = [1,2];
-var_dump($a,$b);
--EXPECT--
-int(1)
-int(2)
@@ -1,21 +0,0 @@
--TEST--
-Bug #66218 zend_register_functions breaks reflection
--SKIPIF--
-<?php
-if (PHP_SAPI != "cli") die("skip CLI only test");
-if (!function_exists("dl")) die("skip need dl");
-?>
--FILE--
-<?php
-$tab = get_extension_funcs("standard");
-$fcts = array("dl");
-foreach ($fcts as $fct) {
-	if (in_array($fct, $tab)) {
-		echo "$fct Ok\n";
-	}
-}
-?>
-Done
--EXPECTF--
-dl Ok
-Done
@@ -1,17 +0,0 @@
--TEST--
-Bug #66041: list() fails to unpack yielded ArrayAccess object
--FILE--
-<?php
-function dumpElement() {
-    list($value) = yield;
-    var_dump($value);
-};
-
-$fixedArray = new SplFixedArray(1);
-$fixedArray[0] = 'the element';
-
-$generator = dumpElement();
-$generator->send($fixedArray);
-?>
--EXPECT--
-string(11) "the element"
@@ -4,7 +4,6 @@ Generator::throw() where the exception is caught in the generator
 <?php

 function gen() {
-    echo "before yield\n";
    try {
        yield;
    } catch (RuntimeException $e) {
@@ -19,7 +18,6 @@ var_dump($gen->throw(new RuntimeException('Test')));

 ?>
 --EXPECTF--
-before yield
 exception 'RuntimeException' with message 'Test' in %s:%d
 Stack trace:
 #0 {main}
@@ -4,7 +4,6 @@ Generator::throw() where the generator throws a different exception
 <?php

 function gen() {
-    echo "before yield\n";
    try {
        yield;
    } catch (RuntimeException $e) {
@@ -19,7 +18,6 @@ var_dump($gen->throw(new RuntimeException('throw')));

 ?>
 --EXPECTF--
-before yield
 Caught: exception 'RuntimeException' with message 'throw' in %s:%d
 Stack trace:
 #0 {main}
@@ -43,6 +43,10 @@
 # define GLOBAL_CONSTANTS_TABLE		EG(zend_constants)
 #endif

+#if defined(ZEND_WIN32) && ZEND_DEBUG
+BOOL WINAPI IsDebuggerPresent(VOID);
+#endif
+
 /* true multithread-shared globals */
 ZEND_API zend_class_entry *zend_standard_class_def = NULL;
 ZEND_API int (*zend_printf)(const char *format, ...);
@@ -2437,49 +2437,36 @@ ZEND_FUNCTION(extension_loaded)
   Returns an array with the names of functions belonging to the named extension */
 ZEND_FUNCTION(get_extension_funcs)
 {
-	char *extension_name, *lcname;
-	int extension_name_len, array;
+	char *extension_name;
+	int extension_name_len;
 	zend_module_entry *module;
-	HashPosition iterator;
-	zend_function *zif;
+	const zend_function_entry *func;
+
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &extension_name, &extension_name_len) == FAILURE) {
 		return;
 	}
+
 	if (strncasecmp(extension_name, "zend", sizeof("zend"))) {
-		lcname = zend_str_tolower_dup(extension_name, extension_name_len);
-	} else {
-		lcname = estrdup("core");
-	}
-	if (zend_hash_find(&module_registry, lcname,
-		extension_name_len+1, (void**)&module) == FAILURE) {
-		efree(lcname);
-		RETURN_FALSE;
-	}
-
-	zend_hash_internal_pointer_reset_ex(CG(function_table), &iterator);
-	if (module->functions) {
-		/* avoid BC break, if functions list is empty, will return an empty array */
-		array_init(return_value);
-		array = 1;
-	} else {
-		array = 0;
-	}
-	while (zend_hash_get_current_data_ex(CG(function_table), (void **) &zif, &iterator) == SUCCESS) {
-		if (zif->common.type==ZEND_INTERNAL_FUNCTION
-			&& zif->internal_function.module == module) {
-			if (!array) {
-				array_init(return_value);
-				array = 1;
-			}
-			add_next_index_string(return_value, zif->common.function_name, 1);
+		char *lcname = zend_str_tolower_dup(extension_name, extension_name_len);
+		if (zend_hash_find(&module_registry, lcname,
+			extension_name_len+1, (void**)&module) == FAILURE) {
+			efree(lcname);
+			RETURN_FALSE;
 		}
-		zend_hash_move_forward_ex(CG(function_table), &iterator);
+		efree(lcname);
+
+		if (!(func = module->functions)) {
+			RETURN_FALSE;
+		}
+	} else {
+		func = builtin_functions;
 	}

-	efree(lcname);
+	array_init(return_value);

-	if (!array) {
-		RETURN_FALSE;
+	while (func->fname) {
+		add_next_index_string(return_value, func->fname, 1);
+		func++;
 	}
 }
 /* }}} */
@@ -908,7 +908,6 @@ static zend_bool opline_is_fetch_this(const zend_op *opline TSRMLS_DC) /* {{{ */
 {
 	if ((opline->opcode == ZEND_FETCH_W) && (opline->op1_type == IS_CONST)
 		&& (Z_TYPE(CONSTANT(opline->op1.constant)) == IS_STRING)
-		&& ((opline->extended_value & ZEND_FETCH_STATIC_MEMBER) != ZEND_FETCH_STATIC_MEMBER)
 		&& (Z_HASH_P(&CONSTANT(opline->op1.constant)) == THIS_HASHVAL)
 		&& (Z_STRLEN(CONSTANT(opline->op1.constant)) == (sizeof("this")-1))
 		&& !memcmp(Z_STRVAL(CONSTANT(opline->op1.constant)), "this", sizeof("this"))) {
@@ -1750,6 +1749,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
 		zend_op dummy_opline;

 		dummy_opline.result_type = IS_UNUSED;
+		dummy_opline.op1_type = IS_UNUSED;

 		zend_stack_push(&CG(foreach_copy_stack), (void *) &dummy_opline, sizeof(zend_op));
 	}
@@ -2662,7 +2662,7 @@ static int generate_free_switch_expr(const zend_switch_entry *switch_entry TSRML
 	opline->opcode = (switch_entry->cond.op_type == IS_TMP_VAR) ? ZEND_FREE : ZEND_SWITCH_FREE;
 	SET_NODE(opline->op1, &switch_entry->cond);
 	SET_UNUSED(opline->op2);
-
+	opline->extended_value = 0;
 	return 0;
 }
 /* }}} */
@@ -2672,7 +2672,7 @@ static int generate_free_foreach_copy(const zend_op *foreach_copy TSRMLS_DC) /*
 	zend_op *opline;

 	/* If we reach the separator then stop applying the stack */
-	if (foreach_copy->result_type == IS_UNUSED) {
+	if (foreach_copy->result_type == IS_UNUSED && foreach_copy->op1_type == IS_UNUSED) {
 		return 1;
 	}

@@ -2681,6 +2681,16 @@ static int generate_free_foreach_copy(const zend_op *foreach_copy TSRMLS_DC) /*
 	opline->opcode = (foreach_copy->result_type == IS_TMP_VAR) ? ZEND_FREE : ZEND_SWITCH_FREE;
 	COPY_NODE(opline->op1, foreach_copy->result);
 	SET_UNUSED(opline->op2);
+	opline->extended_value = 1;
+
+	if (foreach_copy->op1_type != IS_UNUSED) {
+		opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+
+		opline->opcode = (foreach_copy->op1_type == IS_TMP_VAR) ? ZEND_FREE : ZEND_SWITCH_FREE;
+		COPY_NODE(opline->op1, foreach_copy->op1);
+		SET_UNUSED(opline->op2);
+		opline->extended_value = 0;
+	}

 	return 0;
 }
@@ -2782,7 +2792,7 @@ void zend_do_yield(znode *result, znode *value, const znode *key, zend_bool is_v
 		SET_UNUSED(opline->op2);
 	}

-	opline->result_type = IS_VAR;
+	opline->result_type = IS_TMP_VAR;
 	opline->result.var = get_temporary_variable(CG(active_op_array));
 	GET_NODE(result, opline->result);
 }
@@ -6217,6 +6227,7 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, zno
 {
 	zend_op *opline;
 	zend_bool is_variable;
+	zend_bool push_container = 0;
 	zend_op dummy_opline;

 	if (variable) {
@@ -6228,6 +6239,14 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, zno
 		/* save the location of FETCH_W instruction(s) */
 		open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array));
 		zend_do_end_variable_parse(array, BP_VAR_W, 0 TSRMLS_CC);
+		if (CG(active_op_array)->last > 0 &&
+		    CG(active_op_array)->opcodes[CG(active_op_array)->last-1].opcode == ZEND_FETCH_OBJ_W) {
+			/* Only lock the container if we are fetching from a real container and not $this */
+			if (CG(active_op_array)->opcodes[CG(active_op_array)->last-1].op1_type == IS_VAR) {
+				CG(active_op_array)->opcodes[CG(active_op_array)->last-1].extended_value |= ZEND_FETCH_ADD_LOCK;
+				push_container = 1;
+			}
+		}
 	} else {
 		is_variable = 0;
 		open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array));
@@ -6247,6 +6266,11 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, zno
 	opline->extended_value = is_variable ? ZEND_FE_RESET_VARIABLE : 0;

 	COPY_NODE(dummy_opline.result, opline->result);
+	if (push_container) {
+		COPY_NODE(dummy_opline.op1, CG(active_op_array)->opcodes[CG(active_op_array)->last-2].op1);
+	} else {
+		dummy_opline.op1_type = IS_UNUSED;
+	}
 	zend_stack_push(&CG(foreach_copy_stack), (void *) &dummy_opline, sizeof(zend_op));

 	/* save the location of FE_FETCH */
@@ -6303,6 +6327,7 @@ void zend_do_foreach_cont(znode *foreach_token, const znode *open_brackets_token
 		opline->extended_value |= ZEND_FE_FETCH_BYREF;
 		CG(active_op_array)->opcodes[foreach_token->u.op.opline_num].extended_value |= ZEND_FE_RESET_REFERENCE;
 	} else {
+		zend_op *foreach_copy;
 		zend_op *fetch = &CG(active_op_array)->opcodes[foreach_token->u.op.opline_num];
 		zend_op	*end = &CG(active_op_array)->opcodes[open_brackets_token->u.op.opline_num];

@@ -6319,6 +6344,9 @@ void zend_do_foreach_cont(znode *foreach_token, const znode *open_brackets_token
 				fetch->opcode -= 3; /* FETCH_W -> FETCH_R */
 			}
 		}
+		/* prevent double SWITCH_FREE */
+		zend_stack_top(&CG(foreach_copy_stack), (void **) &foreach_copy);
+		foreach_copy->op1_type = IS_UNUSED;
 	}

 	GET_NODE(&value_node, opline->result);
@@ -1247,8 +1247,9 @@ convert_to_array:
 	}
 }

-static void zend_fetch_dimension_address_read(temp_variable *result, zval *container, zval *dim, int dim_type, int type TSRMLS_DC)
+static void zend_fetch_dimension_address_read(temp_variable *result, zval **container_ptr, zval *dim, int dim_type, int type TSRMLS_DC)
 {
+	zval *container = *container_ptr;
 	zval **retval;

 	switch (Z_TYPE_P(container)) {
@@ -1063,14 +1063,6 @@ ZEND_API int zend_lookup_class_ex(const char *name, int name_length, const zend_
 		return FAILURE;
 	}

-	/* Verify class name before passing it to __autoload() */
-	if (strspn(name, "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377\\") != name_length) {
-		if (!key) {
-			free_alloca(lc_free, use_heap);
-		}
-		return FAILURE;
-	}
-	
 	if (EG(in_autoload) == NULL) {
 		ALLOC_HASHTABLE(EG(in_autoload));
 		zend_hash_init(EG(in_autoload), 0, NULL, NULL, 0);
@@ -29,73 +29,6 @@ static zend_object_handlers zend_generator_handlers;

 static zend_object_value zend_generator_create(zend_class_entry *class_type TSRMLS_DC);

-static void zend_generator_cleanup_unfinished_execution(zend_generator *generator TSRMLS_DC) /* {{{ */
-{
-	zend_execute_data *execute_data = generator->execute_data;
-	zend_op_array *op_array = execute_data->op_array;
-
-	if (generator->send_target) {
-		Z_DELREF_PP(generator->send_target);
-		generator->send_target = NULL;
-	}
-
-	/* Manually free loop variables, as execution couldn't reach their
-	 * SWITCH_FREE / FREE opcodes. */
-	{
-		/* -1 required because we want the last run opcode, not the
-		 * next to-be-run one. */
-		zend_uint op_num = execute_data->opline - op_array->opcodes - 1;
-
-		int i;
-		for (i = 0; i < op_array->last_brk_cont; ++i) {
-			zend_brk_cont_element *brk_cont = op_array->brk_cont_array + i;
-
-			if (brk_cont->start < 0) {
-				continue;
-			} else if (brk_cont->start > op_num) {
-				break;
-			} else if (brk_cont->brk > op_num) {
-				zend_op *brk_opline = op_array->opcodes + brk_cont->brk;
-
-				switch (brk_opline->opcode) {
-					case ZEND_SWITCH_FREE:
-						{
-							temp_variable *var = EX_TMP_VAR(execute_data, brk_opline->op1.var);
-							zval_ptr_dtor(&var->var.ptr);
-						}
-						break;
-					case ZEND_FREE:
-						{
-							temp_variable *var = EX_TMP_VAR(execute_data, brk_opline->op1.var);
-							zval_dtor(&var->tmp_var);
-						}
-						break;
-				}
-			}
-		}
-	}
-
-	/* Clear any backed up stack arguments */
-	{
-		void **ptr = generator->stack->top - 1;
-		void **end = zend_vm_stack_frame_base(execute_data);
-
-		for (; ptr >= end; --ptr) {
-			zval_ptr_dtor((zval **) ptr);
-		}
-	}
-
-	/* If yield was used as a function argument there may be active
-	 * method calls those objects need to be freed */
-	while (execute_data->call >= execute_data->call_slots) {
-		if (execute_data->call->object) {
-			zval_ptr_dtor(&execute_data->call->object);
-		}
-		execute_data->call--;
-	}
-}
-/* }}} */
-
 ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished_execution TSRMLS_DC) /* {{{ */
 {
 	if (generator->value) {
@@ -128,6 +61,65 @@ ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished
 			return;
 		}

+		/* If the generator is closed before it can finish execution (reach
+		 * a return statement) we have to free loop variables manually, as
+		 * we don't know whether the SWITCH_FREE / FREE opcodes have run */
+		if (!finished_execution) {
+			/* -1 required because we want the last run opcode, not the
+			 * next to-be-run one. */
+			zend_uint op_num = execute_data->opline - op_array->opcodes - 1;
+
+			int i;
+			for (i = 0; i < op_array->last_brk_cont; ++i) {
+				zend_brk_cont_element *brk_cont = op_array->brk_cont_array + i;
+
+				if (brk_cont->start < 0) {
+					continue;
+				} else if (brk_cont->start > op_num) {
+					break;
+				} else if (brk_cont->brk > op_num) {
+					zend_op *brk_opline = op_array->opcodes + brk_cont->brk;
+
+					switch (brk_opline->opcode) {
+						case ZEND_SWITCH_FREE:
+							{
+								temp_variable *var = EX_TMP_VAR(execute_data, brk_opline->op1.var);
+								zval_ptr_dtor(&var->var.ptr);
+							}
+							break;
+						case ZEND_FREE:
+							{
+								temp_variable *var = EX_TMP_VAR(execute_data, brk_opline->op1.var);
+								zval_dtor(&var->tmp_var);
+							}
+							break;
+					}
+				}
+			}
+		}
+
+		/* Clear any backed up stack arguments */
+		if (generator->stack != EG(argument_stack)) {
+			void **ptr = generator->stack->top - 1;
+			void **end = zend_vm_stack_frame_base(execute_data);
+
+			/* If the top stack element is the argument count, skip it */
+			if (execute_data->function_state.arguments) {
+				ptr--;
+			}
+
+			for (; ptr >= end; --ptr) {
+				zval_ptr_dtor((zval**) ptr);
+			}
+		}
+
+		while (execute_data->call >= execute_data->call_slots) {
+			if (execute_data->call->object) {
+				zval_ptr_dtor(&execute_data->call->object);
+			}
+			execute_data->call--;
+		}
+
 		/* We have added an additional stack frame in prev_execute_data, so we
 		 * have to free it. It also contains the arguments passed to the
 		 * generator (for func_get_args) so those have to be freed too. */
@@ -146,12 +138,6 @@ ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished
 			}
 		}

-		/* Some cleanups are only necessary if the generator was closued
-		 * before it could finish execution (reach a return statement). */
-		if (!finished_execution) {
-			zend_generator_cleanup_unfinished_execution(generator TSRMLS_CC);
-		}
-
 		/* Free a clone of closure */
 		if (op_array->fn_flags & ZEND_ACC_CLOSURE) {
 			destroy_op_array(op_array TSRMLS_CC);
@@ -159,6 +145,10 @@ ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished
 		}

 		efree(generator->stack);
+		if (generator->stack == EG(argument_stack)) {
+			/* abnormal exit for running generator */
+			EG(argument_stack) = NULL;
+		}
 		generator->execute_data = NULL;
 	}
 }
@@ -529,12 +519,8 @@ ZEND_METHOD(Generator, send)
 		return;
 	}

-	/* Put sent value in the target VAR slot, if it is used */
-	if (generator->send_target) {
-		Z_DELREF_PP(generator->send_target);
-		Z_ADDREF_P(value);
-		*generator->send_target = value;
-	}
+	/* Put sent value into the TMP_VAR slot */
+	MAKE_COPY_ZVAL(&value, &generator->send_target->tmp_var);

 	zend_generator_resume(generator TSRMLS_CC);

@@ -560,8 +546,6 @@ ZEND_METHOD(Generator, throw)

 	generator = (zend_generator *) zend_object_store_get_object(getThis() TSRMLS_CC);

-	zend_generator_ensure_initialized(generator TSRMLS_CC); 
-
 	if (generator->execute_data) {
 		/* Throw the exception in the context of the generator */
 		zend_execute_data *current_execute_data = EG(current_execute_data);
@@ -49,7 +49,7 @@ typedef struct _zend_generator {
 	/* Current key */
 	zval *key;
 	/* Variable to put sent value into */
-	zval **send_target;
+	temp_variable *send_target;
 	/* Largest used integer key for auto-incrementing keys */
 	long largest_used_integer_key;

@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Dec 22 13:03:33 2013 */
+/* Generated by re2c 0.13.5 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
   +----------------------------------------------------------------------+
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Dec 22 13:03:33 2013 */
+/* Generated by re2c 0.13.5 */
 #line 3 "Zend/zend_language_scanner_defs.h"

 enum YYCONDTYPE {
@@ -489,22 +489,17 @@ static void zend_check_finally_breakout(zend_op_array *op_array, zend_uint op_nu
 	zend_uint i;

 	for (i = 0; i < op_array->last_try_catch; i++) {
-		if ((op_num < op_array->try_catch_array[i].finally_op ||
-					op_num >= op_array->try_catch_array[i].finally_end)
-				&& (dst_num >= op_array->try_catch_array[i].finally_op &&
-					 dst_num <= op_array->try_catch_array[i].finally_end)) {
-			CG(in_compilation) = 1;
-			CG(active_op_array) = op_array;
-			CG(zend_lineno) = op_array->opcodes[op_num].lineno;
-			zend_error_noreturn(E_COMPILE_ERROR, "jump into a finally block is disallowed");
-		} else if ((op_num >= op_array->try_catch_array[i].finally_op 
+		if (op_array->try_catch_array[i].try_op > op_num) {
+			break;
+		}
+		if ((op_num >= op_array->try_catch_array[i].finally_op 
 					&& op_num <= op_array->try_catch_array[i].finally_end)
 				&& (dst_num > op_array->try_catch_array[i].finally_end 
 					|| dst_num < op_array->try_catch_array[i].finally_op)) {
 			CG(in_compilation) = 1;
 			CG(active_op_array) = op_array;
 			CG(zend_lineno) = op_array->opcodes[op_num].lineno;
-			zend_error_noreturn(E_COMPILE_ERROR, "jump out of a finally block is disallowed");
+			zend_error(E_COMPILE_ERROR, "jump out of a finally block is disallowed");
 		}
 	} 
 }
@@ -640,18 +640,13 @@ static zend_always_inline int fast_add_function(zval *result, zval *op1, zval *o
 			  "n"(ZVAL_OFFSETOF_TYPE)
 			: "rax","cc");
 #else
-			/*
-			 * 'result' may alias with op1 or op2, so we need to
-			 * ensure that 'result' is not updated until after we
-			 * have read the values of op1 and op2.
-			 */
+			Z_LVAL_P(result) = Z_LVAL_P(op1) + Z_LVAL_P(op2);

 			if (UNEXPECTED((Z_LVAL_P(op1) & LONG_SIGN_MASK) == (Z_LVAL_P(op2) & LONG_SIGN_MASK)
-				&& (Z_LVAL_P(op1) & LONG_SIGN_MASK) != ((Z_LVAL_P(op1) + Z_LVAL_P(op2)) & LONG_SIGN_MASK))) {
+				&& (Z_LVAL_P(op1) & LONG_SIGN_MASK) != (Z_LVAL_P(result) & LONG_SIGN_MASK))) {
 				Z_DVAL_P(result) = (double) Z_LVAL_P(op1) + (double) Z_LVAL_P(op2);
 				Z_TYPE_P(result) = IS_DOUBLE;
 			} else {
-				Z_LVAL_P(result) = Z_LVAL_P(op1) + Z_LVAL_P(op2);
 				Z_TYPE_P(result) = IS_LONG;
 			}
 #endif
@@ -794,7 +789,6 @@ static zend_always_inline int fast_mul_function(zval *result, zval *op1, zval *o

 static zend_always_inline int fast_div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 {
-#if 0
 	if (EXPECTED(Z_TYPE_P(op1) == IS_LONG) && 0) {
 		if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
 			if (UNEXPECTED(Z_LVAL_P(op2) == 0)) {
@@ -849,7 +843,6 @@ static zend_always_inline int fast_div_function(zval *result, zval *op1, zval *o
 			return SUCCESS;
 		}
 	}
-#endif
 	return div_function(result, op1, op2 TSRMLS_CC);
 }

@@ -267,7 +267,8 @@ BEGIN_EXTERN_C()

 #if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) + defined(VAX) + \
 		    defined(IBM) != 1
-#error "Exactly one of IEEE_LITTLE_ENDIAN IEEE_BIG_ENDIAN, VAX, or IBM should be defined."
+	Exactly one of IEEE_LITTLE_ENDIAN IEEE_BIG_ENDIAN, VAX, or
+	IBM should be defined.
 #endif

 	typedef union {
@@ -1166,17 +1166,28 @@ ZEND_VM_HANDLER(81, ZEND_FETCH_DIM_R, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
 {
 	USE_OPLINE
 	zend_free_op free_op1, free_op2;
-	zval *container;
+	zval **container;

 	SAVE_OPLINE();

-	if (OP1_TYPE == IS_VAR && (opline->extended_value & ZEND_FETCH_ADD_LOCK)) {
-		PZVAL_LOCK(EX_T(opline->op1.var).var.ptr);
+	if ((opline->extended_value & ZEND_FETCH_ADD_LOCK) &&
+	    OP1_TYPE != IS_CV &&
+	    EX_T(opline->op1.var).var.ptr_ptr) {
+		PZVAL_LOCK(*EX_T(opline->op1.var).var.ptr_ptr);
 	}
-	container = GET_OP1_ZVAL_PTR(BP_VAR_R);
-	zend_fetch_dimension_address_read(&EX_T(opline->result.var), container, GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_R TSRMLS_CC);
-	FREE_OP2();
-	FREE_OP1();
+
+	if (OP1_TYPE == IS_TMP_VAR || OP1_TYPE == IS_CONST) {
+		zval *container = GET_OP1_ZVAL_PTR(BP_VAR_R);
+		zend_fetch_dimension_address_read(&EX_T(opline->result.var), &container, GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_R TSRMLS_CC);
+		FREE_OP2();
+		FREE_OP1();
+	} else {
+		container = GET_OP1_ZVAL_PTR_PTR(BP_VAR_R);
+		zend_fetch_dimension_address_read(&EX_T(opline->result.var), container, GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_R TSRMLS_CC);
+		FREE_OP2();
+		FREE_OP1_VAR_PTR();
+	}
+
 	CHECK_EXCEPTION();
 	ZEND_VM_NEXT_OPCODE();
 }
@@ -1241,13 +1252,13 @@ ZEND_VM_HANDLER(90, ZEND_FETCH_DIM_IS, VAR|CV, CONST|TMP|VAR|CV)
 {
 	USE_OPLINE
 	zend_free_op free_op1, free_op2;
-	zval *container;
+	zval **container;

 	SAVE_OPLINE();
-	container = GET_OP1_ZVAL_PTR(BP_VAR_IS);
+	container = GET_OP1_ZVAL_PTR_PTR(BP_VAR_IS);
 	zend_fetch_dimension_address_read(&EX_T(opline->result.var), container, GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_IS TSRMLS_CC);
 	FREE_OP2();
-	FREE_OP1();
+	FREE_OP1_VAR_PTR();
 	CHECK_EXCEPTION();
 	ZEND_VM_NEXT_OPCODE();
 }
@@ -1256,12 +1267,12 @@ ZEND_VM_HANDLER(93, ZEND_FETCH_DIM_FUNC_ARG, VAR|CV, CONST|TMP|VAR|UNUSED|CV)
 {
 	USE_OPLINE
 	zend_free_op free_op1, free_op2;
+	zval **container;

 	SAVE_OPLINE();

 	if (ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, (opline->extended_value & ZEND_FETCH_ARG_MASK))) {
-		zval **container = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W);
-
+		container = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W);
 		if (OP1_TYPE == IS_VAR && UNEXPECTED(container == NULL)) {
 			zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
 		}
@@ -1269,19 +1280,15 @@ ZEND_VM_HANDLER(93, ZEND_FETCH_DIM_FUNC_ARG, VAR|CV, CONST|TMP|VAR|UNUSED|CV)
 		if (OP1_TYPE == IS_VAR && OP1_FREE && READY_TO_DESTROY(free_op1.var)) {
 			EXTRACT_ZVAL_PTR(&EX_T(opline->result.var));
 		}
-		FREE_OP2();
-		FREE_OP1_VAR_PTR();
 	} else {
-		zval *container;
-
 		if (OP2_TYPE == IS_UNUSED) {
 			zend_error_noreturn(E_ERROR, "Cannot use [] for reading");
 		}
-		container = GET_OP1_ZVAL_PTR(BP_VAR_R);
+		container = GET_OP1_ZVAL_PTR_PTR(BP_VAR_R);
 		zend_fetch_dimension_address_read(&EX_T(opline->result.var), container, GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_R TSRMLS_CC);
-		FREE_OP2();
-		FREE_OP1();
 	}
+	FREE_OP2();
+	FREE_OP1_VAR_PTR();
 	CHECK_EXCEPTION();
 	ZEND_VM_NEXT_OPCODE();
 }
@@ -1385,6 +1392,11 @@ ZEND_VM_HANDLER(85, ZEND_FETCH_OBJ_W, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
 	SAVE_OPLINE();
 	property = GET_OP2_ZVAL_PTR(BP_VAR_R);

+	if (OP1_TYPE == IS_VAR && (opline->extended_value & ZEND_FETCH_ADD_LOCK)) {
+		PZVAL_LOCK(*EX_T(opline->op1.var).var.ptr_ptr);
+		EX_T(opline->op1.var).var.ptr = *EX_T(opline->op1.var).var.ptr_ptr;
+	}
+
 	if (IS_OP2_TMP_FREE()) {
 		MAKE_REAL_ZVAL_PTR(property);
 	}
@@ -4446,22 +4458,22 @@ ZEND_VM_HELPER_EX(zend_isset_isempty_dim_prop_obj_handler, VAR|UNUSED|CV, CONST|
 {
 	USE_OPLINE
 	zend_free_op free_op1, free_op2;
-	zval *container;
+	zval **container;
 	zval **value = NULL;
 	int result = 0;
 	ulong hval;
 	zval *offset;

 	SAVE_OPLINE();
-	container = GET_OP1_OBJ_ZVAL_PTR(BP_VAR_IS);
+	container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_IS);

 	offset = GET_OP2_ZVAL_PTR(BP_VAR_R);

-	if (Z_TYPE_P(container) == IS_ARRAY && !prop_dim) {
+	if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
 		HashTable *ht;
 		int isset = 0;

-		ht = Z_ARRVAL_P(container);
+		ht = Z_ARRVAL_PP(container);

 		switch (Z_TYPE_P(offset)) {
 			case IS_DOUBLE:
@@ -4480,7 +4492,9 @@ ZEND_VM_C_LABEL(num_index_prop):
 				if (OP2_TYPE == IS_CONST) {
 					hval = Z_HASH_P(offset);
 				} else {
-					ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, ZEND_VM_C_GOTO(num_index_prop));
+					if (!prop_dim) {
+						ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, ZEND_VM_C_GOTO(num_index_prop));
+					}
 					if (IS_INTERNED(Z_STRVAL_P(offset))) {
 						hval = INTERNED_HASH(Z_STRVAL_P(offset));
 					} else {
@@ -4515,20 +4529,20 @@ ZEND_VM_C_LABEL(num_index_prop):
 			}
 		}
 		FREE_OP2();
-	} else if (Z_TYPE_P(container) == IS_OBJECT) {
+	} else if (Z_TYPE_PP(container) == IS_OBJECT) {
 		if (IS_OP2_TMP_FREE()) {
 			MAKE_REAL_ZVAL_PTR(offset);
 		}
 		if (prop_dim) {
-			if (Z_OBJ_HT_P(container)->has_property) {
-				result = Z_OBJ_HT_P(container)->has_property(container, offset, (opline->extended_value & ZEND_ISEMPTY) != 0, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL) TSRMLS_CC);
+			if (Z_OBJ_HT_P(*container)->has_property) {
+				result = Z_OBJ_HT_P(*container)->has_property(*container, offset, (opline->extended_value & ZEND_ISEMPTY) != 0, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL) TSRMLS_CC);
 			} else {
 				zend_error(E_NOTICE, "Trying to check property of non-object");
 				result = 0;
 			}
 		} else {
-			if (Z_OBJ_HT_P(container)->has_dimension) {
-				result = Z_OBJ_HT_P(container)->has_dimension(container, offset, (opline->extended_value & ZEND_ISEMPTY) != 0 TSRMLS_CC);
+			if (Z_OBJ_HT_P(*container)->has_dimension) {
+				result = Z_OBJ_HT_P(*container)->has_dimension(*container, offset, (opline->extended_value & ZEND_ISEMPTY) != 0 TSRMLS_CC);
 			} else {
 				zend_error(E_NOTICE, "Trying to check element of non-array");
 				result = 0;
@@ -4539,7 +4553,7 @@ ZEND_VM_C_LABEL(num_index_prop):
 		} else {
 			FREE_OP2();
 		}
-	} else if (Z_TYPE_P(container) == IS_STRING && !prop_dim) { /* string offsets */
+	} else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
 		zval tmp;

 		if (Z_TYPE_P(offset) != IS_LONG) {
@@ -4557,11 +4571,11 @@ ZEND_VM_C_LABEL(num_index_prop):
 		}
 		if (Z_TYPE_P(offset) == IS_LONG) {
 			if (opline->extended_value & ZEND_ISSET) {
-				if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) {
+				if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_PP(container)) {
 					result = 1;
 				}
 			} else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-				if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') {
+				if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') {
 					result = 1;
 				}
 			}
@@ -5353,15 +5367,11 @@ ZEND_VM_HANDLER(160, ZEND_YIELD, CONST|TMP|VAR|CV|UNUSED, CONST|TMP|VAR|CV|UNUSE
 		ZVAL_LONG(generator->key, generator->largest_used_integer_key);
 	}

-	if (RETURN_VALUE_USED(opline)) {
-		/* If the return value of yield is used set the send
-		 * target and initialize it to NULL */
-		generator->send_target = &EX_T(opline->result.var).var.ptr;
-		Z_ADDREF(EG(uninitialized_zval));
-		EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
-	} else {
-		generator->send_target = NULL;
-	}
+	/* If a value is sent it should go into the result var */
+	generator->send_target = &EX_T(opline->result.var);
+
+	/* Initialize the sent value to NULL */
+	EX_T(opline->result.var).tmp_var = EG(uninitialized_zval);

 	/* We increment to the next op, so we are at the correct position when the
 	 * generator is resumed. */
@@ -884,15 +884,9 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name,
 							out($f,"#undef CHECK_EXCEPTION\n");
 							out($f,"#undef HANDLE_EXCEPTION\n");
 							out($f,"#undef HANDLE_EXCEPTION_LEAVE\n");
-							if (ZEND_VM_SPEC) {
-								out($f,"#define CHECK_EXCEPTION() if (UNEXPECTED(EG(exception) != NULL)) goto ZEND_HANDLE_EXCEPTION_SPEC_HANDLER\n");
-								out($f,"#define HANDLE_EXCEPTION() goto ZEND_HANDLE_EXCEPTION_SPEC_HANDLER\n");
-								out($f,"#define HANDLE_EXCEPTION_LEAVE() goto ZEND_HANDLE_EXCEPTION_SPEC_HANDLER\n");
-							} else {
-								out($f,"#define CHECK_EXCEPTION() if (UNEXPECTED(EG(exception) != NULL)) goto ZEND_HANDLE_EXCEPTION_HANDLER\n");
-								out($f,"#define HANDLE_EXCEPTION() goto ZEND_HANDLE_EXCEPTION_HANDLER\n");
-								out($f,"#define HANDLE_EXCEPTION_LEAVE() goto ZEND_HANDLE_EXCEPTION_HANDLER\n");
-							}
+							out($f,"#define CHECK_EXCEPTION() if (UNEXPECTED(EG(exception) != NULL)) goto ZEND_HANDLE_EXCEPTION_SPEC_HANDLER\n");
+							out($f,"#define HANDLE_EXCEPTION() goto ZEND_HANDLE_EXCEPTION_SPEC_HANDLER\n");
+							out($f,"#define HANDLE_EXCEPTION_LEAVE() goto ZEND_HANDLE_EXCEPTION_SPEC_HANDLER\n");
 							out($f,"#define LOAD_REGS()\n");
 							out($f,"#define ZEND_VM_CONTINUE() goto *(void**)(OPLINE->handler)\n");
 							out($f,"#define ZEND_VM_RETURN()   EG(in_execution) = original_in_execution; return\n");
@@ -1180,40 +1174,14 @@ function gen_vm($def, $skel) {
 	// Insert header
 	out($f, $GLOBALS['header_text']);

-	fputs($f, "#ifndef ZEND_VM_OPCODES_H\n#define ZEND_VM_OPCODES_H\n\n");
-	fputs($f, "ZEND_API const char *zend_get_opcode_name(zend_uchar opcode);\n\n");
-	
 	foreach ($opcodes as $code => $dsc) {
 		$code = str_pad((string)$code,$code_len," ",STR_PAD_LEFT);
 		$op = str_pad($dsc["op"],$max_opcode_len);
 		fputs($f,"#define $op $code\n");
 	}
-
-	fputs($f, "\n#endif");
 	fclose($f);
 	echo "zend_vm_opcodes.h generated successfully.\n";

-	// zend_vm_opcodes.c
-	$f = fopen(__DIR__ . "/zend_vm_opcodes.c", "w+") or die("ERROR: Cannot create zend_vm_opcodes.c\n");
-
-	// Insert header
-	out($f, $GLOBALS['header_text']);
-	fputs($f,"#include <stdio.h>\n");
-	fputs($f,"#include <zend.h>\n\n");
-	
-	fputs($f,"const char *zend_vm_opcodes_map[".($max_opcode + 1)."] = {\n");
-	for ($i = 0; $i <= $max_opcode; $i++) {
-		fputs($f,"\t".(isset($opcodes[$i]["op"])?'"'.$opcodes[$i]["op"].'"':"NULL").",\n");
-	}
-	fputs($f, "};\n\n");
-	
-    fputs($f, "ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) {\n");
-    fputs($f, "\treturn zend_vm_opcodes_map[opcode];\n");
-    fputs($f, "}\n");
-    
-	fclose($f);
-	echo "zend_vm_opcodes.c generated successfully.\n";
-
 	// Generate zend_vm_execute.h
 	$f = fopen(__DIR__ . "/zend_vm_execute.h", "w+") or die("ERROR: Cannot create zend_vm_execute.h\n");
 	$executor_file = realpath(__DIR__ . "/zend_vm_execute.h");
@@ -1,193 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.00 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.zend.com/license/2_00.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   |          Zeev Suraski <zeev@zend.com>                                |
-   |          Dmitry Stogov <dmitry@zend.com>                             |
-   +----------------------------------------------------------------------+
-*/
-
-#include <stdio.h>
-#include <zend.h>
-
-const char *zend_vm_opcodes_map[164] = {
-	"ZEND_NOP",
-	"ZEND_ADD",
-	"ZEND_SUB",
-	"ZEND_MUL",
-	"ZEND_DIV",
-	"ZEND_MOD",
-	"ZEND_SL",
-	"ZEND_SR",
-	"ZEND_CONCAT",
-	"ZEND_BW_OR",
-	"ZEND_BW_AND",
-	"ZEND_BW_XOR",
-	"ZEND_BW_NOT",
-	"ZEND_BOOL_NOT",
-	"ZEND_BOOL_XOR",
-	"ZEND_IS_IDENTICAL",
-	"ZEND_IS_NOT_IDENTICAL",
-	"ZEND_IS_EQUAL",
-	"ZEND_IS_NOT_EQUAL",
-	"ZEND_IS_SMALLER",
-	"ZEND_IS_SMALLER_OR_EQUAL",
-	"ZEND_CAST",
-	"ZEND_QM_ASSIGN",
-	"ZEND_ASSIGN_ADD",
-	"ZEND_ASSIGN_SUB",
-	"ZEND_ASSIGN_MUL",
-	"ZEND_ASSIGN_DIV",
-	"ZEND_ASSIGN_MOD",
-	"ZEND_ASSIGN_SL",
-	"ZEND_ASSIGN_SR",
-	"ZEND_ASSIGN_CONCAT",
-	"ZEND_ASSIGN_BW_OR",
-	"ZEND_ASSIGN_BW_AND",
-	"ZEND_ASSIGN_BW_XOR",
-	"ZEND_PRE_INC",
-	"ZEND_PRE_DEC",
-	"ZEND_POST_INC",
-	"ZEND_POST_DEC",
-	"ZEND_ASSIGN",
-	"ZEND_ASSIGN_REF",
-	"ZEND_ECHO",
-	"ZEND_PRINT",
-	"ZEND_JMP",
-	"ZEND_JMPZ",
-	"ZEND_JMPNZ",
-	"ZEND_JMPZNZ",
-	"ZEND_JMPZ_EX",
-	"ZEND_JMPNZ_EX",
-	"ZEND_CASE",
-	"ZEND_SWITCH_FREE",
-	"ZEND_BRK",
-	"ZEND_CONT",
-	"ZEND_BOOL",
-	"ZEND_INIT_STRING",
-	"ZEND_ADD_CHAR",
-	"ZEND_ADD_STRING",
-	"ZEND_ADD_VAR",
-	"ZEND_BEGIN_SILENCE",
-	"ZEND_END_SILENCE",
-	"ZEND_INIT_FCALL_BY_NAME",
-	"ZEND_DO_FCALL",
-	"ZEND_DO_FCALL_BY_NAME",
-	"ZEND_RETURN",
-	"ZEND_RECV",
-	"ZEND_RECV_INIT",
-	"ZEND_SEND_VAL",
-	"ZEND_SEND_VAR",
-	"ZEND_SEND_REF",
-	"ZEND_NEW",
-	"ZEND_INIT_NS_FCALL_BY_NAME",
-	"ZEND_FREE",
-	"ZEND_INIT_ARRAY",
-	"ZEND_ADD_ARRAY_ELEMENT",
-	"ZEND_INCLUDE_OR_EVAL",
-	"ZEND_UNSET_VAR",
-	"ZEND_UNSET_DIM",
-	"ZEND_UNSET_OBJ",
-	"ZEND_FE_RESET",
-	"ZEND_FE_FETCH",
-	"ZEND_EXIT",
-	"ZEND_FETCH_R",
-	"ZEND_FETCH_DIM_R",
-	"ZEND_FETCH_OBJ_R",
-	"ZEND_FETCH_W",
-	"ZEND_FETCH_DIM_W",
-	"ZEND_FETCH_OBJ_W",
-	"ZEND_FETCH_RW",
-	"ZEND_FETCH_DIM_RW",
-	"ZEND_FETCH_OBJ_RW",
-	"ZEND_FETCH_IS",
-	"ZEND_FETCH_DIM_IS",
-	"ZEND_FETCH_OBJ_IS",
-	"ZEND_FETCH_FUNC_ARG",
-	"ZEND_FETCH_DIM_FUNC_ARG",
-	"ZEND_FETCH_OBJ_FUNC_ARG",
-	"ZEND_FETCH_UNSET",
-	"ZEND_FETCH_DIM_UNSET",
-	"ZEND_FETCH_OBJ_UNSET",
-	"ZEND_FETCH_DIM_TMP_VAR",
-	"ZEND_FETCH_CONSTANT",
-	"ZEND_GOTO",
-	"ZEND_EXT_STMT",
-	"ZEND_EXT_FCALL_BEGIN",
-	"ZEND_EXT_FCALL_END",
-	"ZEND_EXT_NOP",
-	"ZEND_TICKS",
-	"ZEND_SEND_VAR_NO_REF",
-	"ZEND_CATCH",
-	"ZEND_THROW",
-	"ZEND_FETCH_CLASS",
-	"ZEND_CLONE",
-	"ZEND_RETURN_BY_REF",
-	"ZEND_INIT_METHOD_CALL",
-	"ZEND_INIT_STATIC_METHOD_CALL",
-	"ZEND_ISSET_ISEMPTY_VAR",
-	"ZEND_ISSET_ISEMPTY_DIM_OBJ",
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	"ZEND_PRE_INC_OBJ",
-	"ZEND_PRE_DEC_OBJ",
-	"ZEND_POST_INC_OBJ",
-	"ZEND_POST_DEC_OBJ",
-	"ZEND_ASSIGN_OBJ",
-	NULL,
-	"ZEND_INSTANCEOF",
-	"ZEND_DECLARE_CLASS",
-	"ZEND_DECLARE_INHERITED_CLASS",
-	"ZEND_DECLARE_FUNCTION",
-	"ZEND_RAISE_ABSTRACT_ERROR",
-	"ZEND_DECLARE_CONST",
-	"ZEND_ADD_INTERFACE",
-	"ZEND_DECLARE_INHERITED_CLASS_DELAYED",
-	"ZEND_VERIFY_ABSTRACT_CLASS",
-	"ZEND_ASSIGN_DIM",
-	"ZEND_ISSET_ISEMPTY_PROP_OBJ",
-	"ZEND_HANDLE_EXCEPTION",
-	"ZEND_USER_OPCODE",
-	NULL,
-	"ZEND_JMP_SET",
-	"ZEND_DECLARE_LAMBDA_FUNCTION",
-	"ZEND_ADD_TRAIT",
-	"ZEND_BIND_TRAITS",
-	"ZEND_SEPARATE",
-	"ZEND_QM_ASSIGN_VAR",
-	"ZEND_JMP_SET_VAR",
-	"ZEND_DISCARD_EXCEPTION",
-	"ZEND_YIELD",
-	"ZEND_GENERATOR_RETURN",
-	"ZEND_FAST_CALL",
-	"ZEND_FAST_RET",
-};
-
-ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) {
-	return zend_vm_opcodes_map[opcode];
-}
@@ -18,11 +18,6 @@
   +----------------------------------------------------------------------+
 */

-#ifndef ZEND_VM_OPCODES_H
-#define ZEND_VM_OPCODES_H
-
-ZEND_API const char *zend_get_opcode_name(zend_uchar opcode);
-
 #define ZEND_NOP                               0
 #define ZEND_ADD                               1
 #define ZEND_SUB                               2
@@ -169,5 +164,3 @@ ZEND_API const char *zend_get_opcode_name(zend_uchar opcode);
 #define ZEND_GENERATOR_RETURN                161
 #define ZEND_FAST_CALL                       162
 #define ZEND_FAST_RET                        163
-
-#endif
@@ -1003,14 +1003,7 @@ mkdir )
                    if [ ".$opt_t" = .yes ]; then
                        echo "mkdir $pathcomp" 1>&2
                    fi
-					# See https://bugs.php.net/51076
-					# The fix is from Debian who have sent it
-					# upstream, too; but upstream seems dead.
-                    mkdir $pathcomp || {
-                        _errstatus=$?
-                        [ -d "$pathcomp" ] || errstatus=${_errstatus}
-                        unset _errstatus
-                    }
+                    mkdir $pathcomp || errstatus=$?
                    if [ ".$opt_o" != . ]; then
                        if [ ".$opt_t" = .yes ]; then
                            echo "chown $opt_o $pathcomp" 1>&2
@@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...);

 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=5
-PHP_RELEASE_VERSION=8
-PHP_EXTRA_VERSION=""
+PHP_RELEASE_VERSION=5
+PHP_EXTRA_VERSION="RC1"
 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`

@@ -1467,7 +1467,7 @@ PHP_ADD_SOURCES(Zend, \
    zend_ini_parser.c zend_ini_scanner.c \
    zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c zend_dtrace.c \
    zend_execute_API.c zend_highlight.c zend_llist.c \
-    zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
+    zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
    zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
    zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
    zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
@@ -183,6 +183,7 @@ _bc_rec_mul (bc_num u, int ulen, bc_num v, int vlen, bc_num *prod,
 	     int full_scale TSRMLS_DC)
 { 
  bc_num u0, u1, v0, v1;
+  int u0len, v0len;
  bc_num m1, m2, m3, d1, d2;
  int n, prodlen, m1zero;
  int d1len, d2len;
@@ -215,8 +216,10 @@ _bc_rec_mul (bc_num u, int ulen, bc_num v, int vlen, bc_num *prod,
    }
  _bc_rm_leading_zeros (u1);
  _bc_rm_leading_zeros (u0);
+  u0len = u0->n_len;
  _bc_rm_leading_zeros (v1);
  _bc_rm_leading_zeros (v0);
+  v0len = v0->n_len;

  m1zero = bc_is_zero(u1 TSRMLS_CC) || bc_is_zero(v1 TSRMLS_CC);

@@ -97,7 +97,6 @@ static php_stream_filter_status_t php_bz2_decompress_filter(
 				status = BZ2_bzDecompressInit(streamp, 0, data->small_footprint);

 				if (BZ_OK != status) {
-					php_stream_bucket_delref(bucket TSRMLS_CC);
 					return PSFS_ERR_FATAL;
 				}

@@ -25,7 +25,10 @@ static int m_table_leap[13] =   { -1, 6, 2, 3, 6, 1, 4, 6, 2, 5, 0, 3, 5 }; /* 1

 static timelib_sll century_value(timelib_sll j)
 {
-	return 6 - (j % 4) * 2;
+	timelib_sll i = j - 17;
+	timelib_sll c = (4 - i * 2 + (i + 1) / 4) % 7;
+
+	return c < 0 ? c + 7 : c;
 }

 static timelib_sll timelib_day_of_week_ex(timelib_sll y, timelib_sll m, timelib_sll d, int iso)
@@ -33,8 +36,11 @@ static timelib_sll timelib_day_of_week_ex(timelib_sll y, timelib_sll m, timelib_
 	timelib_sll c1, y1, m1, dow;

 	/* Only valid for Gregorian calendar, commented out as we don't handle
-	 * Julian calendar. We just return the 'wrong' day of week to be
-	 * consistent. */
+	 * julian calendar. We just return the 'wrong' day of week to be
+	 * consistent.
+	if (y < 1753) {
+		return -1;
+	} */
 	c1 = century_value(y / 100);
 	y1 = (y % 100);
 	m1 = timelib_is_leap(y) ? m_table_leap[m] : m_table_common[m];
@@ -25,7 +25,7 @@ timelib_rel_time *timelib_diff(timelib_time *one, timelib_time *two)
 {
 	timelib_rel_time *rt;
 	timelib_time *swp;
-	timelib_sll dst_corr = 0 ,dst_h_corr = 0, dst_m_corr = 0;
+	timelib_sll dst_h_corr = 0, dst_m_corr = 0;
 	timelib_time one_backup, two_backup;

 	rt = timelib_rel_time_ctor();
@@ -43,9 +43,8 @@ timelib_rel_time *timelib_diff(timelib_time *one, timelib_time *two)
 		&& (strcmp(one->tz_info->name, two->tz_info->name) == 0)
 		&& (one->z != two->z))
 	{
-		dst_corr = two->z - one->z;
-		dst_h_corr = dst_corr / 3600;
-		dst_m_corr = (dst_corr % 3600) / 60;
+		dst_h_corr = (two->z - one->z) / 3600;
+		dst_m_corr = ((two->z - one->z) % 3600) / 60;
 	}

 	/* Save old TZ info */
@@ -58,108 +57,16 @@ timelib_rel_time *timelib_diff(timelib_time *one, timelib_time *two)
 	rt->y = two->y - one->y;
 	rt->m = two->m - one->m;
 	rt->d = two->d - one->d;
-	rt->h = two->h - one->h;
-	rt->i = two->i - one->i;
+	rt->h = two->h - one->h + dst_h_corr;
+	rt->i = two->i - one->i + dst_m_corr;
 	rt->s = two->s - one->s;
-	if (one_backup.dst == 0 && two_backup.dst == 1 && two->sse >= one->sse + 86400 - dst_corr) {
-		rt->h += dst_h_corr;
-		rt->i += dst_m_corr;
-	}
-
 	rt->days = abs(floor((one->sse - two->sse - (dst_h_corr * 3600) - (dst_m_corr * 60)) / 86400));

 	timelib_do_rel_normalize(rt->invert ? one : two, rt);

-	/* We need to do this after normalisation otherwise we can't get "24H" */
-	if (one_backup.dst == 1 && two_backup.dst == 0 && two->sse >= one->sse + 86400) {
-		if (two->sse < one->sse + 86400 - dst_corr) {
-			rt->d--;
-			rt->h = 24;
-		} else {
-			rt->h += dst_h_corr;
-			rt->i += dst_m_corr;
-		}
-	}
-
 	/* Restore old TZ info */
 	memcpy(one, &one_backup, sizeof(one_backup));
 	memcpy(two, &two_backup, sizeof(two_backup));

 	return rt;
 }
-
-timelib_time *timelib_add(timelib_time *old_time, timelib_rel_time *interval)
-{
-	int bias = 1;
-	timelib_time *t = timelib_time_clone(old_time);
-
-	if (interval->have_weekday_relative || interval->have_special_relative) {
-		memcpy(&t->relative, interval, sizeof(struct timelib_rel_time));
-	} else {
-		if (interval->invert) {
-			bias = -1;
-		}
-		memset(&t->relative, 0, sizeof(struct timelib_rel_time));
-		t->relative.y = interval->y * bias;
-		t->relative.m = interval->m * bias;
-		t->relative.d = interval->d * bias;
-		t->relative.h = interval->h * bias;
-		t->relative.i = interval->i * bias;
-		t->relative.s = interval->s * bias;
-	}
-	t->have_relative = 1;
-	t->sse_uptodate = 0;
-
-	timelib_update_ts(t, NULL);
-
-//	printf("%lld %lld %d\n", old_time->dst, t->dst, (t->sse - old_time->sse));
-	/* Adjust for backwards DST changeover */
-	if (old_time->dst == 1 && t->dst == 0 && !interval->y && !interval->m && !interval->d) {
-		t->sse -= old_time->z;
-		t->sse += t->z;
-	}
-
-	timelib_update_from_sse(t);
-	t->have_relative = 0;
-
-	return t;
-}
-
-timelib_time *timelib_sub(timelib_time *old_time, timelib_rel_time *interval)
-{
-	int bias = 1;
-	timelib_time *t = timelib_time_clone(old_time);
-
-	if (interval->invert) {
-		bias = -1;
-	}
-
-	memset(&t->relative, 0, sizeof(struct timelib_rel_time));
-	t->relative.y = 0 - (interval->y * bias);
-	t->relative.m = 0 - (interval->m * bias);
-	t->relative.d = 0 - (interval->d * bias);
-	t->relative.h = 0 - (interval->h * bias);
-	t->relative.i = 0 - (interval->i * bias);
-	t->relative.s = 0 - (interval->s * bias);
-	t->have_relative = 1;
-	t->sse_uptodate = 0;
-
-	timelib_update_ts(t, NULL);
-
-	/* Adjust for backwards DST changeover */
-	if (old_time->dst == 1 && t->dst == 0 && !interval->y && !interval->m && !interval->d) {
-		t->sse -= old_time->z;
-		t->sse += t->z;
-	}
-	/* Adjust for forwards DST changeover */
-	if (old_time->dst == 0 && t->dst == 1 && !interval->y && !interval->m && !interval->d ) {
-		t->sse -= old_time->z;
-		t->sse += t->z;
-	}
-
-	timelib_update_from_sse(t);
-
-	t->have_relative = 0;
-
-	return t;
-}
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Nov 27 11:14:23 2013 */
+/* Generated by re2c 0.13.5 on Sun Mar 31 10:48:17 2013 */
 #line 1 "ext/date/lib/parse_iso_intervals.re"
 /*
   +----------------------------------------------------------------------+
@@ -380,7 +380,7 @@ yy6:
 					break;
 			}
 			ptr++;
-		} while (!s->errors->error_count && *ptr);
+		} while (*ptr);
 		s->have_period = 1;
 		TIMELIB_DEINIT;
 		return TIMELIB_PERIOD;
@@ -348,7 +348,7 @@ isoweek          = year4 "-"? "W" weekofyear;
 					break;
 			}
 			ptr++;
-		} while (!s->errors->error_count && *ptr);
+		} while (*ptr);
 		s->have_period = 1;
 		TIMELIB_DEINIT;
 		return TIMELIB_PERIOD;
@@ -138,7 +138,5 @@ int timelib_astro_rise_set_altitude(timelib_time *time, double lon, double lat,

 /* from interval.c */
 timelib_rel_time *timelib_diff(timelib_time *one, timelib_time *two);
-timelib_time *timelib_add(timelib_time *t, timelib_rel_time *interval);
-timelib_time *timelib_sub(timelib_time *t, timelib_rel_time *interval);

 #endif
@@ -137,16 +137,19 @@ void timelib_unixtime2gmt(timelib_time* tm, timelib_sll ts)
 void timelib_update_from_sse(timelib_time *tm)
 {
 	timelib_sll sse;
-	int z = tm->z;
-	signed int dst = tm->dst;

 	sse = tm->sse;
 	
 	switch (tm->zone_type) {
 		case TIMELIB_ZONETYPE_ABBR:
 		case TIMELIB_ZONETYPE_OFFSET: {
+			int z = tm->z;
+			signed int dst = tm->dst;
+			
 			timelib_unixtime2gmt(tm, tm->sse - (tm->z * 60) + (tm->dst * 3600));

+			tm->z = z;
+			tm->dst = dst;
 			goto cleanup;
 		}

@@ -168,8 +171,6 @@ cleanup:
 	tm->sse = sse;
 	tm->is_localtime = 1;
 	tm->have_zone = 1;
-	tm->z = z;
-	tm->dst = dst;
 }

 void timelib_unixtime2local(timelib_time *tm, timelib_sll ts)
@@ -797,14 +797,6 @@ PHP_RSHUTDOWN_FUNCTION(date)

 #define DATE_FORMAT_ISO8601  "Y-m-d\\TH:i:sO"

-/*
- * This comes from various sources that like to contradict. I'm going with the
- * format here because of:
- * http://msdn.microsoft.com/en-us/library/windows/desktop/aa384321%28v=vs.85%29.aspx
- * and http://curl.haxx.se/rfc/cookie_spec.html
- */
-#define DATE_FORMAT_COOKIE   "l, d-M-Y H:i:s T"
-
 #define DATE_TZ_ERRMSG \
 	"It is not safe to rely on the system's timezone settings. You are " \
 	"*required* to use the date.timezone setting or the " \
@@ -835,7 +827,7 @@ PHP_MINIT_FUNCTION(date)
 *   with the variations that the only legal time zone is GMT
 *   and the separators between the elements of the date must be dashes."
 */
-	REGISTER_STRING_CONSTANT("DATE_COOKIE",  DATE_FORMAT_COOKIE,  CONST_CS | CONST_PERSISTENT);
+	REGISTER_STRING_CONSTANT("DATE_COOKIE",  DATE_FORMAT_RFC850,  CONST_CS | CONST_PERSISTENT);
 	REGISTER_STRING_CONSTANT("DATE_ISO8601", DATE_FORMAT_ISO8601, CONST_CS | CONST_PERSISTENT);
 	REGISTER_STRING_CONSTANT("DATE_RFC822",  DATE_FORMAT_RFC822,  CONST_CS | CONST_PERSISTENT);
 	REGISTER_STRING_CONSTANT("DATE_RFC850",  DATE_FORMAT_RFC850,  CONST_CS | CONST_PERSISTENT);
@@ -1414,7 +1406,6 @@ PHPAPI signed long php_parse_date(char *string, signed long *now)

 	parsed_time = timelib_strtotime(string, strlen(string), &error, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
 	if (error->error_count) {
-		timelib_time_dtor(parsed_time);
 		timelib_error_container_dtor(error);
 		return -1;
 	}
@@ -1989,25 +1980,12 @@ zend_object_iterator *date_object_period_get_iterator(zend_class_entry *ce, zval
 	return (zend_object_iterator*)iterator;
 }

-static int implement_date_interface_handler(zend_class_entry *interface, zend_class_entry *implementor TSRMLS_DC)
-{
-	if (implementor->type == ZEND_USER_CLASS &&
-		!instanceof_function(implementor, date_ce_date TSRMLS_CC) &&
-		!instanceof_function(implementor, date_ce_immutable TSRMLS_CC)
-	) {
-		zend_error(E_ERROR, "DateTimeInterface can't be implemented by user classes");
-	}
-
-	return SUCCESS;
-}
-
 static void date_register_classes(TSRMLS_D)
 {
 	zend_class_entry ce_date, ce_immutable, ce_timezone, ce_interval, ce_period, ce_interface;

 	INIT_CLASS_ENTRY(ce_interface, "DateTimeInterface", date_funcs_interface);
 	date_ce_interface = zend_register_internal_interface(&ce_interface TSRMLS_CC);
-	date_ce_interface->interface_gets_implemented = implement_date_interface_handler;

 	INIT_CLASS_ENTRY(ce_date, "DateTime", date_funcs_date);
 	ce_date.create_object = date_object_new_date;
@@ -2023,7 +2001,7 @@ static void date_register_classes(TSRMLS_D)
 	zend_declare_class_constant_stringl(date_ce_date, const_name, sizeof(const_name)-1, value, sizeof(value)-1 TSRMLS_CC);

 	REGISTER_DATE_CLASS_CONST_STRING("ATOM",    DATE_FORMAT_RFC3339);
-	REGISTER_DATE_CLASS_CONST_STRING("COOKIE",  DATE_FORMAT_COOKIE);
+	REGISTER_DATE_CLASS_CONST_STRING("COOKIE",  DATE_FORMAT_RFC850);
 	REGISTER_DATE_CLASS_CONST_STRING("ISO8601", DATE_FORMAT_ISO8601);
 	REGISTER_DATE_CLASS_CONST_STRING("RFC822",  DATE_FORMAT_RFC822);
 	REGISTER_DATE_CLASS_CONST_STRING("RFC850",  DATE_FORMAT_RFC850);
@@ -2623,7 +2601,6 @@ PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str,

 	timelib_fill_holes(dateobj->time, now, TIMELIB_NO_CLONE);
 	timelib_update_ts(dateobj->time, tzi);
-	timelib_update_from_sse(dateobj->time);

 	dateobj->time->have_relative = 0;

@@ -3137,16 +3114,33 @@ static void php_date_add(zval *object, zval *interval, zval *return_value TSRMLS
 {
 	php_date_obj     *dateobj;
 	php_interval_obj *intobj;
-	timelib_time     *new_time;
+	int               bias = 1;

 	dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC);
 	DATE_CHECK_INITIALIZED(dateobj->time, DateTime);
 	intobj = (php_interval_obj *) zend_object_store_get_object(interval TSRMLS_CC);
 	DATE_CHECK_INITIALIZED(intobj->initialized, DateInterval);

-	new_time = timelib_add(dateobj->time, intobj->diff);
-	timelib_time_dtor(dateobj->time);
-	dateobj->time = new_time;
+	if (intobj->diff->have_weekday_relative || intobj->diff->have_special_relative) {
+		memcpy(&dateobj->time->relative, intobj->diff, sizeof(struct timelib_rel_time));
+	} else {
+		if (intobj->diff->invert) {
+			bias = -1;
+		}
+		memset(&dateobj->time->relative, 0, sizeof(struct timelib_rel_time));
+		dateobj->time->relative.y = intobj->diff->y * bias;
+		dateobj->time->relative.m = intobj->diff->m * bias;
+		dateobj->time->relative.d = intobj->diff->d * bias;
+		dateobj->time->relative.h = intobj->diff->h * bias;
+		dateobj->time->relative.i = intobj->diff->i * bias;
+		dateobj->time->relative.s = intobj->diff->s * bias;
+	}
+	dateobj->time->have_relative = 1;
+	dateobj->time->sse_uptodate = 0;
+
+	timelib_update_ts(dateobj->time, NULL);
+	timelib_update_from_sse(dateobj->time);
+	dateobj->time->have_relative = 0;
 }

 /* {{{ proto DateTime date_add(DateTime object, DateInterval interval)
@@ -3187,7 +3181,7 @@ static void php_date_sub(zval *object, zval *interval, zval *return_value TSRMLS
 {
 	php_date_obj     *dateobj;
 	php_interval_obj *intobj;
-	timelib_time     *new_time;
+	int               bias = 1;

 	dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC);
 	DATE_CHECK_INITIALIZED(dateobj->time, DateTime);
@@ -3199,9 +3193,24 @@ static void php_date_sub(zval *object, zval *interval, zval *return_value TSRMLS
 		return;
 	}

-	new_time = timelib_sub(dateobj->time, intobj->diff);
-	timelib_time_dtor(dateobj->time);
-	dateobj->time = new_time;
+	if (intobj->diff->invert) {
+		bias = -1;
+	}
+
+	memset(&dateobj->time->relative, 0, sizeof(struct timelib_rel_time));
+	dateobj->time->relative.y = 0 - (intobj->diff->y * bias);
+	dateobj->time->relative.m = 0 - (intobj->diff->m * bias);
+	dateobj->time->relative.d = 0 - (intobj->diff->d * bias);
+	dateobj->time->relative.h = 0 - (intobj->diff->h * bias);
+	dateobj->time->relative.i = 0 - (intobj->diff->i * bias);
+	dateobj->time->relative.s = 0 - (intobj->diff->s * bias);
+	dateobj->time->have_relative = 1;
+	dateobj->time->sse_uptodate = 0;
+
+	timelib_update_ts(dateobj->time, NULL);
+	timelib_update_from_sse(dateobj->time);
+
+	dateobj->time->have_relative = 0;
 }

 /* {{{ proto DateTime date_sub(DateTime object, DateInterval interval)
@@ -3593,13 +3602,13 @@ PHP_FUNCTION(date_diff)
 	php_interval_obj *interval;
 	long          absolute = 0;

-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO|l", &object1, date_ce_interface, &object2, date_ce_interface, &absolute) == FAILURE) {
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO|l", &object1, date_ce_date, &object2, date_ce_date, &absolute) == FAILURE) {
 		RETURN_FALSE;
 	}
 	dateobj1 = (php_date_obj *) zend_object_store_get_object(object1 TSRMLS_CC);
 	dateobj2 = (php_date_obj *) zend_object_store_get_object(object2 TSRMLS_CC);
-	DATE_CHECK_INITIALIZED(dateobj1->time, DateTimeInterface);
-	DATE_CHECK_INITIALIZED(dateobj2->time, DateTimeInterface);
+	DATE_CHECK_INITIALIZED(dateobj1->time, DateTime);
+	DATE_CHECK_INITIALIZED(dateobj2->time, DateTime);
 	timelib_update_ts(dateobj1->time, NULL);
 	timelib_update_ts(dateobj2->time, NULL);

@@ -4377,7 +4386,7 @@ PHP_METHOD(DatePeriod, __construct)
 	
 	zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
 	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "OOl|l", &start, date_ce_interface, &interval, date_ce_interval, &recurrences, &options) == FAILURE) {
-		if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "OOO|l", &start, date_ce_interface, &interval, date_ce_interval, &end, date_ce_interface, &options) == FAILURE) {
+		if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "OOO|l", &start, date_ce_interface, &interval, date_ce_interval, &end, date_ce_date, &options) == FAILURE) {
 			if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &isostr, &isostr_len, &options) == FAILURE) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "This constructor accepts either (DateTimeInterface, DateInterval, int) OR (DateTimeInterface, DateInterval, DateTime) OR (string) as arguments.");
 				zend_restore_error_handling(&error_handling TSRMLS_CC);
@@ -31,7 +31,7 @@ var_dump( $date->format( DateTime::W3C) ) ;
 --EXPECT--
 *** Testing date_format() : basic functionality - formatting coinstants ***
 string(25) "2005-07-14T22:30:41+01:00"
-string(34) "Thursday, 14-Jul-2005 22:30:41 BST"
+string(32) "Thursday, 14-Jul-05 22:30:41 BST"
 string(24) "2005-07-14T22:30:41+0100"
 string(29) "Thu, 14 Jul 05 22:30:41 +0100"
 string(32) "Thursday, 14-Jul-05 22:30:41 BST"
@@ -160,7 +160,7 @@ array(11) {
  ["ATOM"]=>
  string(13) "Y-m-d\TH:i:sP"
  ["COOKIE"]=>
-  string(16) "l, d-M-Y H:i:s T"
+  string(16) "l, d-M-y H:i:s T"
  ["ISO8601"]=>
  string(13) "Y-m-d\TH:i:sO"
  ["RFC822"]=>
@@ -180,4 +180,4 @@ array(11) {
  ["W3C"]=>
  string(13) "Y-m-d\TH:i:sP"
 }
-===DONE===
+===DONE===
@@ -11,5 +11,5 @@ echo $a->format(DateTime::COOKIE);
 echo "\n";
 ?>
 --EXPECTF--
-Thursday, 01-Jan-2009 00:00:00 WET
-Thursday, 01-Jan-2009 00:00:00 WET
+Thursday, 01-Jan-09 00:00:00 WET
+Thursday, 01-Jan-09 00:00:00 WET
@@ -1,16 +0,0 @@
--TEST--
-Bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
--INI--
-date.timezone=UTC
--FILE--
-<?php
-$date = DateTime::createFromFormat(DateTime::COOKIE, "Mon, 21-Jan-2041 15:24:52 GMT");
-print_r($date);
-?>
--EXPECTF--
-DateTime Object
-(
-    [date] => 2041-01-21 15:24:52
-    [timezone_type] => 2
-    [timezone] => GMT
-)
@@ -1,20 +0,0 @@
--TEST--
-Test for #63391 (Incorrect/inconsistent day of week prior to the year 1600)
--FILE--
-<?php
-ini_set('date.timezone', 'UTC');
-
-print "Date         PHP\n";
-print "----------   ---\n";
-$dates = array('1599-12-30', '1599-12-31', '1600-01-01', '1600-01-02');
-foreach ($dates as $date) {
-	echo date_create($date)->format('Y-m-d   D'), "\n";
-}
-?>
--EXPECT--
-Date         PHP
----------   ---
-1599-12-30   Thu
-1599-12-31   Fri
-1600-01-01   Sat
-1600-01-02   Sun
@@ -41,8 +41,8 @@ Date constants
 --EXPECT--
 string(25) "2006-07-01T14:27:30+02:00"
 string(25) "2006-05-30T14:32:13+02:00"
-string(35) "Saturday, 01-Jul-2006 14:27:30 CEST"
-string(34) "Tuesday, 30-May-2006 14:32:13 CEST"
+string(33) "Saturday, 01-Jul-06 14:27:30 CEST"
+string(32) "Tuesday, 30-May-06 14:32:13 CEST"
 string(24) "2006-07-01T14:27:30+0200"
 string(24) "2006-05-30T14:32:13+0200"
 string(29) "Sat, 01 Jul 06 14:27:30 +0200"
@@ -1,27 +0,0 @@
--TEST--
-Test for Date/Time construction during a forward DST transition
--FILE--
-<?php
-date_default_timezone_set('America/New_York');
-
-$date = new DateTime('2010-03-14 01:30:00');
-echo $date->format('Y-m-d H:i:s T/e - U') . "\n";
-
-$date = new DateTime('2010-03-14 02:00:00');
-echo $date->format('Y-m-d H:i:s T/e - U') . "\n";
-
-$date = new DateTime('2010-03-14 02:30:00');
-echo $date->format('Y-m-d H:i:s T/e - U') . "\n";
-
-$date = new DateTime('2010-03-14 03:00:00');
-echo $date->format('Y-m-d H:i:s T/e - U') . "\n";
-
-$date = new DateTime('2010-03-14 03:30:00');
-echo $date->format('Y-m-d H:i:s T/e - U') . "\n";
-?>
--EXPECT--
-2010-03-14 01:30:00 EST/America/New_York - 1268548200
-2010-03-14 03:00:00 EDT/America/New_York - 1268550000
-2010-03-14 03:30:00 EDT/America/New_York - 1268551800
-2010-03-14 03:00:00 EDT/America/New_York - 1268550000
-2010-03-14 03:30:00 EDT/America/New_York - 1268551800
@@ -45,7 +45,7 @@ string(25) "2008-08-08T08:08:08+00:00"
 string(%d) "%s"

 --DATE_COOKIE Constant--
-string(32) "Friday, 08-Aug-2008 08:08:08 GMT"
+string(30) "Friday, 08-Aug-08 08:08:08 GMT"
 string(%d) "%s"

 --DATE_RFC822 Constant--
@@ -79,4 +79,4 @@ string(%d) "%s"
 --DATE_W3C Constant--
 string(25) "2008-08-08T08:08:08+00:00"
 string(%d) "%s"
-===DONE===
+===DONE===
@@ -1,96 +0,0 @@
--TEST--
-RFC: DateTime and Daylight Saving Time Transitions (zone type 3, ba)
--CREDITS--
-Daniel Convissor <danielc@php.net>
--FILE--
-<?php
-
-date_default_timezone_set('America/New_York');
-$date_format = 'Y-m-d H:i:s T e';
-$interval_format = 'P%dDT%hH';
-
-/*
- * Backward Transitions, add().
- */
-
-$start = new DateTime('2010-11-07 01:59:59');
-$interval_spec = 'PT1S';
-$interval = new DateInterval($interval_spec);
-echo 'ba1 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-11-06 04:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'ba2 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-11-06 04:30:00');
-$interval_spec = 'PT24H';
-$interval = new DateInterval($interval_spec);
-echo 'ba3 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-11-06 04:30:00');
-$interval_spec = 'PT23H';
-$interval = new DateInterval($interval_spec);
-echo 'ba4 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-11-06 04:30:00');
-$interval_spec = 'PT22H';
-$interval = new DateInterval($interval_spec);
-echo 'ba5 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-11-06 04:30:00');
-$interval_spec = 'PT21H';
-$interval = new DateInterval($interval_spec);
-echo 'ba6 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-11-06 01:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'ba7 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-11-06 01:30:00');
-$interval_spec = 'P1DT1H';
-$interval = new DateInterval($interval_spec);
-echo 'ba8 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-11-06 04:30:00');
-$interval_spec = 'PT25H';
-$interval = new DateInterval($interval_spec);
-echo 'ba9 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-11-06 03:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'ba10 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-11-06 02:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'ba11 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-echo "\n";
-
-?>
--EXPECT--
-ba1 2010-11-07 01:59:59 EDT America/New_York + PT1S = 2010-11-07 01:00:00 EST America/New_York
-ba2 2010-11-06 04:30:00 EDT America/New_York + P1D = 2010-11-07 04:30:00 EST America/New_York
-ba3 2010-11-06 04:30:00 EDT America/New_York + PT24H = 2010-11-07 03:30:00 EST America/New_York
-ba4 2010-11-06 04:30:00 EDT America/New_York + PT23H = 2010-11-07 02:30:00 EST America/New_York
-ba5 2010-11-06 04:30:00 EDT America/New_York + PT22H = 2010-11-07 01:30:00 EST America/New_York
-ba6 2010-11-06 04:30:00 EDT America/New_York + PT21H = 2010-11-07 01:30:00 EDT America/New_York
-ba7 2010-11-06 01:30:00 EDT America/New_York + P1D = 2010-11-07 01:30:00 EDT America/New_York
-ba8 2010-11-06 01:30:00 EDT America/New_York + P1DT1H = 2010-11-07 02:30:00 EST America/New_York
-ba9 2010-11-06 04:30:00 EDT America/New_York + PT25H = 2010-11-07 04:30:00 EST America/New_York
-ba10 2010-11-06 03:30:00 EDT America/New_York + P1D = 2010-11-07 03:30:00 EST America/New_York
-ba11 2010-11-06 02:30:00 EDT America/New_York + P1D = 2010-11-07 02:30:00 EST America/New_York
@@ -1,48 +0,0 @@
--TEST--
-RFC: DateTime and Daylight Saving Time Transitions (zone type 3, bd1)
--CREDITS--
-Daniel Convissor <danielc@php.net>
--FILE--
-<?php
-
-date_default_timezone_set('America/New_York');
-$date_format = 'Y-m-d H:i:s T e';
-$interval_format = 'P%dDT%hH';
-
-/*
- * Backward Transitions, diff().
- */
-
-$end   = new DateTime('2010-11-07 05:30:00');
-$start = new DateTime('2010-11-06 04:30:00');
-echo 'bd1 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
-
-$end   = new DateTime('2010-11-07 04:30:00');
-$start = new DateTime('2010-11-06 04:30:00');
-echo 'bd2 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
-
-$end   = new DateTime('2010-11-07 03:30:00');
-$start = new DateTime('2010-11-06 04:30:00');
-echo 'bd3 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
-
-$end   = new DateTime('2010-11-07 02:30:00');
-$start = new DateTime('2010-11-06 04:30:00');
-echo 'bd4 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
-
-$end   = new DateTime('2010-11-07 01:30:00');
-$start = new DateTime('2010-11-06 01:30:00');
-echo 'bd7 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
-
-echo "\n";
-?>
--EXPECT--
-bd1 2010-11-07 05:30:00 EST America/New_York - 2010-11-06 04:30:00 EDT America/New_York = P1DT1H
-bd2 2010-11-07 04:30:00 EST America/New_York - 2010-11-06 04:30:00 EDT America/New_York = P1DT0H
-bd3 2010-11-07 03:30:00 EST America/New_York - 2010-11-06 04:30:00 EDT America/New_York = P0DT24H
-bd4 2010-11-07 02:30:00 EST America/New_York - 2010-11-06 04:30:00 EDT America/New_York = P0DT23H
-bd7 2010-11-07 01:30:00 EDT America/New_York - 2010-11-06 01:30:00 EDT America/New_York = P1DT0H
@@ -1,56 +0,0 @@
--TEST--
-RFC: DateTime and Daylight Saving Time Transitions (zone type 3, bd2)
--CREDITS--
-Daniel Convissor <danielc@php.net>
--XFAIL--
-Still not quite right
--FILE--
-<?php
-
-date_default_timezone_set('America/New_York');
-$date_format = 'Y-m-d H:i:s T e';
-$interval_format = 'P%dDT%hH';
-
-/*
- * For backward transitions, must create objects with zone type 2
- * where specifying Daylight or Standard time is required
- * then converting them to zone type 3.
- */
-
-$tz = new DateTimeZone('America/New_York');
-
-/*
- * Backward Transitions, diff().
- */
-
-$end   = new DateTime('2010-11-07 05:30:00');
-$end->setTimeZone($tz);
-$start = new DateTime('2010-11-06 04:30:59');
-echo 'bd0 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format('P%dDT%hH%iM%sS') . "\n";
-
-$end   = new DateTime('2010-11-07 01:30:00 EST');
-$end->setTimeZone($tz);
-$start = new DateTime('2010-11-06 04:30:00');
-echo 'bd5 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
-
-$end   = new DateTime('2010-11-07 01:30:00 EDT');
-$end->setTimeZone($tz);
-$start = new DateTime('2010-11-06 04:30:00');
-echo 'bd6 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
-
-$end   = new DateTime('2010-11-07 01:30:00 EST');
-$end->setTimeZone($tz);
-$start = new DateTime('2010-11-06 01:30:00');
-echo 'bd8 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
-
-echo "\n";
-?>
--EXPECT--
-bd0 2010-11-07 01:00:00 EST America/New_York - 2010-11-07 01:59:59 EDT America/New_York = PT0H0M1S
-bd5 2010-11-07 01:30:00 EST America/New_York - 2010-11-06 04:30:00 EDT America/New_York = P0DT22H
-bd6 2010-11-07 01:30:00 EDT America/New_York - 2010-11-06 04:30:00 EDT America/New_York = P0DT21H
-bd8 2010-11-07 01:30:00 EST America/New_York - 2010-11-06 01:30:00 EDT America/New_York = P1DT1H
@@ -1,92 +0,0 @@
--TEST--
-RFC: DateTime and Daylight Saving Time Transitions (zone type 3, bs)
--CREDITS--
-Daniel Convissor <danielc@php.net>
--FILE--
-<?php
-
-date_default_timezone_set('America/New_York');
-$tz = new DateTimeZone('America/New_York');
-$date_format = 'Y-m-d H:i:s T e';
-$interval_format = 'P%dDT%hH';
-
-/*
- * Backward Transitions, sub().
- */
-
-$end   = new DateTime('2010-11-07 01:00:00 EST');
-$end->setTimeZone($tz);
-$interval_spec = 'PT1S';
-$interval = new DateInterval($interval_spec);
-echo 'bs1 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-11-07 04:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'bs2 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-11-07 03:30:00');
-$interval_spec = 'PT24H';
-$interval = new DateInterval($interval_spec);
-echo 'bs3 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-11-07 02:30:00');
-$interval_spec = 'PT23H';
-$interval = new DateInterval($interval_spec);
-echo 'bs4 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-11-07 01:30:00 EST');
-$end->setTimeZone($tz);
-$interval_spec = 'PT22H';
-$interval = new DateInterval($interval_spec);
-echo 'bs5 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-11-07 01:30:00 EDT');
-$end->setTimeZone($tz);
-$interval_spec = 'PT21H';
-$interval = new DateInterval($interval_spec);
-echo 'bs6 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-11-07 01:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'bs7 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-11-07 01:30:00 EST');
-$end->setTimeZone($tz);
-$interval_spec = 'P1DT1H';
-$interval = new DateInterval($interval_spec);
-echo 'bs8 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-11-07 03:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'bs9 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-11-07 02:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'bs10 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-?>
--EXPECT--
-bs1 2010-11-07 01:00:00 EST America/New_York - PT1S = 2010-11-07 01:59:59 EDT America/New_York
-bs2 2010-11-07 04:30:00 EST America/New_York - P1D = 2010-11-06 04:30:00 EDT America/New_York
-bs3 2010-11-07 03:30:00 EST America/New_York - PT24H = 2010-11-06 04:30:00 EDT America/New_York
-bs4 2010-11-07 02:30:00 EST America/New_York - PT23H = 2010-11-06 04:30:00 EDT America/New_York
-bs5 2010-11-07 01:30:00 EST America/New_York - PT22H = 2010-11-06 04:30:00 EDT America/New_York
-bs6 2010-11-07 01:30:00 EDT America/New_York - PT21H = 2010-11-06 04:30:00 EDT America/New_York
-bs7 2010-11-07 01:30:00 EDT America/New_York - P1D = 2010-11-06 01:30:00 EDT America/New_York
-bs8 2010-11-07 01:30:00 EST America/New_York - P1DT1H = 2010-11-06 00:30:00 EDT America/New_York
-bs9 2010-11-07 03:30:00 EST America/New_York - P1D = 2010-11-06 03:30:00 EDT America/New_York
-bs10 2010-11-07 02:30:00 EST America/New_York - P1D = 2010-11-06 02:30:00 EDT America/New_York
@@ -1,58 +0,0 @@
--TEST--
-RFC: DateTime and Daylight Saving Time Transitions (zone type 3, fa)
--CREDITS--
-Daniel Convissor <danielc@php.net>
--FILE--
-<?php
-
-date_default_timezone_set('America/New_York');
-$date_format = 'Y-m-d H:i:s T e';
-$interval_format = 'P%dDT%hH';
-
-/*
- * Forward Transitions, add().
- */
-
-$start = new DateTime('2010-03-14 01:59:59');
-$interval_spec = 'PT1S';
-$interval = new DateInterval($interval_spec);
-echo 'fa1 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-03-13 04:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'fa2 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-03-13 04:30:00');
-$interval_spec = 'PT22H';
-$interval = new DateInterval($interval_spec);
-echo 'fa3 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-03-13 04:30:00');
-$interval_spec = 'PT21H';
-$interval = new DateInterval($interval_spec);
-echo 'fa4 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-03-13 01:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'fa5 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-
-$start = new DateTime('2010-03-13 02:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'fa6 ' . $start->format($date_format) . " + $interval_spec = "
-	. $start->add($interval)->format($date_format) . "\n";
-?>
--EXPECT--
-fa1 2010-03-14 01:59:59 EST America/New_York + PT1S = 2010-03-14 03:00:00 EDT America/New_York
-fa2 2010-03-13 04:30:00 EST America/New_York + P1D = 2010-03-14 04:30:00 EDT America/New_York
-fa3 2010-03-13 04:30:00 EST America/New_York + PT22H = 2010-03-14 03:30:00 EDT America/New_York
-fa4 2010-03-13 04:30:00 EST America/New_York + PT21H = 2010-03-14 01:30:00 EST America/New_York
-fa5 2010-03-13 01:30:00 EST America/New_York + P1D = 2010-03-14 01:30:00 EST America/New_York
-fa6 2010-03-13 02:30:00 EST America/New_York + P1D = 2010-03-14 03:30:00 EDT America/New_York
@@ -1,58 +0,0 @@
--TEST--
-RFC: DateTime and Daylight Saving Time Transitions (zone type 3, fd)
--CREDITS--
-Daniel Convissor <danielc@php.net>
--FILE--
-<?php
-
-date_default_timezone_set('America/New_York');
-$date_format = 'Y-m-d H:i:s T e';
-$interval_format = 'P%dDT%hH';
-
-/*
- * Forward Transitions, diff().
- */
-
-$end   = new DateTime('2010-03-14 03:00:00');
-$start = new DateTime('2010-03-14 01:59:59');
-echo 'fd1 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format('PT%hH%iM%sS') . "\n";
-
-$end   = new DateTime('2010-03-14 04:30:00');
-$start = new DateTime('2010-03-13 04:30:00');
-echo 'fd2 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
-
-$end   = new DateTime('2010-03-14 03:30:00');
-$start = new DateTime('2010-03-13 04:30:00');
-echo 'fd3 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
-
-$end   = new DateTime('2010-03-14 01:30:00');
-$start = new DateTime('2010-03-13 04:30:00');
-echo 'fd4 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
-
-$end   = new DateTime('2010-03-14 01:30:00');
-$start = new DateTime('2010-03-13 01:30:00');
-echo 'fd5 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
-
-$end   = new DateTime('2010-03-14 03:30:00');
-$start = new DateTime('2010-03-13 03:30:00');
-echo 'fd6 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
-
-$end   = new DateTime('2010-03-14 03:30:00');
-$start = new DateTime('2010-03-13 02:30:00');
-echo 'fd7 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
-	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
-?>
--EXPECT--
-fd1 2010-03-14 03:00:00 EDT America/New_York - 2010-03-14 01:59:59 EST America/New_York = PT0H0M1S
-fd2 2010-03-14 04:30:00 EDT America/New_York - 2010-03-13 04:30:00 EST America/New_York = P1DT0H
-fd3 2010-03-14 03:30:00 EDT America/New_York - 2010-03-13 04:30:00 EST America/New_York = P0DT22H
-fd4 2010-03-14 01:30:00 EST America/New_York - 2010-03-13 04:30:00 EST America/New_York = P0DT21H
-fd5 2010-03-14 01:30:00 EST America/New_York - 2010-03-13 01:30:00 EST America/New_York = P1DT0H
-fd6 2010-03-14 03:30:00 EDT America/New_York - 2010-03-13 03:30:00 EST America/New_York = P1DT0H
-fd7 2010-03-14 03:30:00 EDT America/New_York - 2010-03-13 02:30:00 EST America/New_York = P1DT1H
@@ -1,67 +0,0 @@
--TEST--
-RFC: DateTime and Daylight Saving Time Transitions (zone type 3, fs)
--CREDITS--
-Daniel Convissor <danielc@php.net>
--XFAIL--
-Still not quite right
--FILE--
-<?php
-
-date_default_timezone_set('America/New_York');
-$date_format = 'Y-m-d H:i:s T e';
-$interval_format = 'P%dDT%hH';
-
-/*
- * Forward Transitions, sub().
- */
-
-$end   = new DateTime('2010-03-14 03:00:00');
-$interval_spec = 'PT1S';
-$interval = new DateInterval($interval_spec);
-echo 'fs1 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-03-14 04:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'fs2 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-03-14 03:30:00');
-$interval_spec = 'PT22H';
-$interval = new DateInterval($interval_spec);
-echo 'fs3 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-03-14 01:30:00');
-$interval_spec = 'PT21H';
-$interval = new DateInterval($interval_spec);
-echo 'fs4 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-03-14 01:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'fs5 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-03-15 03:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'fs6 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-
-$end   = new DateTime('2010-03-15 02:30:00');
-$interval_spec = 'P1D';
-$interval = new DateInterval($interval_spec);
-echo 'fs7 ' . $end->format($date_format) . " - $interval_spec = "
-	. $end->sub($interval)->format($date_format) . "\n";
-?>
--EXPECT--
-fs1 2010-03-14 03:00:00 EDT America/New_York - PT1S = 2010-03-14 01:59:59 EST America/New_York
-fs2 2010-03-14 04:30:00 EDT America/New_York - P1D = 2010-03-13 04:30:00 EST America/New_York
-fs3 2010-03-14 03:30:00 EDT America/New_York - PT22H = 2010-03-13 04:30:00 EST America/New_York
-fs4 2010-03-14 01:30:00 EST America/New_York - PT21H = 2010-03-13 04:30:00 EST America/New_York
-fs5 2010-03-14 01:30:00 EST America/New_York - P1D = 2010-03-13 01:30:00 EST America/New_York
-fs6 2010-03-15 03:30:00 EDT America/New_York - P1D = 2010-03-14 03:30:00 EDT America/New_York
-fs7 2010-03-15 02:30:00 EDT America/New_York - P1D = 2010-03-14 03:30:00 EDT America/New_York
@@ -0,0 +1,399 @@
+--TEST--
+RFC: DateTime and Daylight Saving Time Transitions (zone type 3)
+--CREDITS--
+Daniel Convissor <danielc@php.net>
+--XFAIL--
+RFC not implemented yet
+--FILE--
+<?php
+
+date_default_timezone_set('America/New_York');
+$date_format = 'Y-m-d H:i:s T e';
+$interval_format = 'P%dDT%hH';
+
+/*
+ * Forward Transitions, diff().
+ */
+
+$end   = new DateTime('2010-03-14 03:00:00');
+$start = new DateTime('2010-03-14 01:59:59');
+echo 'fd1 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format('PT%hH%iM%sS') . "\n";
+
+$end   = new DateTime('2010-03-14 04:30:00');
+$start = new DateTime('2010-03-13 04:30:00');
+echo 'fd2 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
+
+$end   = new DateTime('2010-03-14 03:30:00');
+$start = new DateTime('2010-03-13 04:30:00');
+echo 'fd3 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
+
+$end   = new DateTime('2010-03-14 01:30:00');
+$start = new DateTime('2010-03-13 04:30:00');
+echo 'fd4 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
+
+$end   = new DateTime('2010-03-14 01:30:00');
+$start = new DateTime('2010-03-13 01:30:00');
+echo 'fd5 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
+
+$end   = new DateTime('2010-03-14 03:30:00');
+$start = new DateTime('2010-03-13 03:30:00');
+echo 'fd6 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
+
+$end   = new DateTime('2010-03-14 03:30:00');
+$start = new DateTime('2010-03-13 02:30:00');
+echo 'fd7 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
+
+echo "\n";
+
+/*
+ * Forward Transitions, add().
+ */
+
+$start = new DateTime('2010-03-14 01:59:59');
+$interval_spec = 'PT1S';
+$interval = new DateInterval($interval_spec);
+echo 'fa1 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-03-13 04:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'fa2 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-03-13 04:30:00');
+$interval_spec = 'PT22H';
+$interval = new DateInterval($interval_spec);
+echo 'fa3 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-03-13 04:30:00');
+$interval_spec = 'PT21H';
+$interval = new DateInterval($interval_spec);
+echo 'fa4 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-03-13 01:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'fa5 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-03-13 02:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'fa6 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+echo "\n";
+
+/*
+ * Forward Transitions, sub().
+ */
+
+$end   = new DateTime('2010-03-14 03:00:00');
+$interval_spec = 'PT1S';
+$interval = new DateInterval($interval_spec);
+echo 'fs1 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-03-14 04:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'fs2 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-03-14 03:30:00');
+$interval_spec = 'PT22H';
+$interval = new DateInterval($interval_spec);
+echo 'fs3 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-03-14 01:30:00');
+$interval_spec = 'PT21H';
+$interval = new DateInterval($interval_spec);
+echo 'fs4 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-03-14 01:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'fs5 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-03-15 03:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'fs6 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-03-15 02:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'fs7 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+echo "\n";
+
+
+/*
+ * For backward transitions, must create objects with zone type 2
+ * where specifying Daylight or Standard time is required
+ * then converting them to zone type 3.
+ */
+
+$tz = new DateTimeZone('America/New_York');
+
+/*
+ * Backward Transitions, diff().
+ */
+
+$end   = new DateTime('2010-11-07 01:00:00 EST');
+$end->setTimeZone($tz);
+$start = new DateTime('2010-11-07 01:59:59');
+echo 'bd1 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format('PT%hH%iM%sS') . "\n";
+
+$end   = new DateTime('2010-11-07 04:30:00');
+$start = new DateTime('2010-11-06 04:30:00');
+echo 'bd2 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
+
+$end   = new DateTime('2010-11-07 03:30:00');
+$start = new DateTime('2010-11-06 04:30:00');
+echo 'bd3 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
+
+$end   = new DateTime('2010-11-07 02:30:00');
+$start = new DateTime('2010-11-06 04:30:00');
+echo 'bd4 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
+
+$end   = new DateTime('2010-11-07 01:30:00 EST');
+$end->setTimeZone($tz);
+$start = new DateTime('2010-11-06 04:30:00');
+echo 'bd5 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
+
+$end   = new DateTime('2010-11-07 01:30:00 EDT');
+$end->setTimeZone($tz);
+$start = new DateTime('2010-11-06 04:30:00');
+echo 'bd6 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
+
+$end   = new DateTime('2010-11-07 01:30:00');
+$start = new DateTime('2010-11-06 01:30:00');
+echo 'bd7 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
+
+$end   = new DateTime('2010-11-07 01:30:00 EST');
+$end->setTimeZone($tz);
+$start = new DateTime('2010-11-06 01:30:00');
+echo 'bd8 ' . $end->format($date_format) . ' - ' . $start->format($date_format)
+	. ' = ' . $start->diff($end)->format($interval_format) . "\n";
+
+echo "\n";
+
+/*
+ * Backward Transitions, add().
+ */
+
+$start = new DateTime('2010-11-07 01:59:59');
+$interval_spec = 'PT1S';
+$interval = new DateInterval($interval_spec);
+echo 'ba1 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-11-06 04:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'ba2 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-11-06 04:30:00');
+$interval_spec = 'PT24H';
+$interval = new DateInterval($interval_spec);
+echo 'ba3 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-11-06 04:30:00');
+$interval_spec = 'PT23H';
+$interval = new DateInterval($interval_spec);
+echo 'ba4 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-11-06 04:30:00');
+$interval_spec = 'PT22H';
+$interval = new DateInterval($interval_spec);
+echo 'ba5 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-11-06 04:30:00');
+$interval_spec = 'PT21H';
+$interval = new DateInterval($interval_spec);
+echo 'ba6 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-11-06 01:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'ba7 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-11-06 01:30:00');
+$interval_spec = 'P1DT1H';
+$interval = new DateInterval($interval_spec);
+echo 'ba8 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-11-06 04:30:00');
+$interval_spec = 'PT25H';
+$interval = new DateInterval($interval_spec);
+echo 'ba9 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-11-06 03:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'ba10 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-11-06 02:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'ba11 ' . $start->format($date_format) . " + $interval_spec = "
+	. $start->add($interval)->format($date_format) . "\n";
+
+echo "\n";
+
+/*
+ * Backward Transitions, sub().
+ */
+
+$end   = new DateTime('2010-11-07 01:00:00 EST');
+$end->setTimeZone($tz);
+$interval_spec = 'PT1S';
+$interval = new DateInterval($interval_spec);
+echo 'bs1 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-11-07 04:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'bs2 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-11-07 03:30:00');
+$interval_spec = 'PT24H';
+$interval = new DateInterval($interval_spec);
+echo 'bs3 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-11-07 02:30:00');
+$interval_spec = 'PT23H';
+$interval = new DateInterval($interval_spec);
+echo 'bs4 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-11-07 01:30:00 EST');
+$end->setTimeZone($tz);
+$interval_spec = 'PT22H';
+$interval = new DateInterval($interval_spec);
+echo 'bs5 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-11-07 01:30:00 EDT');
+$end->setTimeZone($tz);
+$interval_spec = 'PT21H';
+$interval = new DateInterval($interval_spec);
+echo 'bs6 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-11-07 01:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'bs7 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-11-07 01:30:00 EST');
+$end->setTimeZone($tz);
+$interval_spec = 'P1DT1H';
+$interval = new DateInterval($interval_spec);
+echo 'bs8 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-11-07 03:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'bs9 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+$end   = new DateTime('2010-11-07 02:30:00');
+$interval_spec = 'P1D';
+$interval = new DateInterval($interval_spec);
+echo 'bs10 ' . $end->format($date_format) . " - $interval_spec = "
+	. $end->sub($interval)->format($date_format) . "\n";
+
+?>
+--EXPECT--
+fd1 2010-03-14 03:00:00 EDT America/New_York - 2010-03-14 01:59:59 EST America/New_York = PT0H0M1S
+fd2 2010-03-14 04:30:00 EDT America/New_York - 2010-03-13 04:30:00 EST America/New_York = P1DT0H
+fd3 2010-03-14 03:30:00 EDT America/New_York - 2010-03-13 04:30:00 EST America/New_York = P0DT22H
+fd4 2010-03-14 01:30:00 EST America/New_York - 2010-03-13 04:30:00 EST America/New_York = P0DT21H
+fd5 2010-03-14 01:30:00 EST America/New_York - 2010-03-13 01:30:00 EST America/New_York = P1DT0H
+fd6 2010-03-14 03:30:00 EDT America/New_York - 2010-03-13 03:30:00 EST America/New_York = P1DT0H
+fd7 2010-03-14 03:30:00 EDT America/New_York - 2010-03-13 02:30:00 EST America/New_York = P1DT1H
+
+fa1 2010-03-14 01:59:59 EST America/New_York + PT1S = 2010-03-14 03:00:00 EDT America/New_York
+fa2 2010-03-13 04:30:00 EST America/New_York + P1D = 2010-03-14 04:30:00 EDT America/New_York
+fa3 2010-03-13 04:30:00 EST America/New_York + PT22H = 2010-03-14 03:30:00 EDT America/New_York
+fa4 2010-03-13 04:30:00 EST America/New_York + PT21H = 2010-03-14 01:30:00 EST America/New_York
+fa5 2010-03-13 01:30:00 EST America/New_York + P1D = 2010-03-14 01:30:00 EST America/New_York
+fa6 2010-03-13 02:30:00 EST America/New_York + P1D = 2010-03-14 03:30:00 EDT America/New_York
+
+fs1 2010-03-14 03:00:00 EDT America/New_York - PT1S = 2010-03-14 01:59:59 EST America/New_York
+fs2 2010-03-14 04:30:00 EDT America/New_York - P1D = 2010-03-13 04:30:00 EST America/New_York
+fs3 2010-03-14 03:30:00 EDT America/New_York - PT22H = 2010-03-13 04:30:00 EST America/New_York
+fs4 2010-03-14 01:30:00 EST America/New_York - PT21H = 2010-03-13 04:30:00 EST America/New_York
+fs5 2010-03-14 01:30:00 EST America/New_York - P1D = 2010-03-13 01:30:00 EST America/New_York
+fs6 2010-03-15 03:30:00 EDT America/New_York - P1D = 2010-03-14 03:30:00 EDT America/New_York
+fs7 2010-03-15 03:30:00 EDT America/New_York - P1D = 2010-03-14 03:30:00 EDT America/New_York
+
+bd1 2010-11-07 01:00:00 EST America/New_York - 2010-11-07 01:59:59 EDT America/New_York = PT0H0M1S
+bd2 2010-11-07 04:30:00 EST America/New_York - 2010-11-06 04:30:00 EDT America/New_York = P1DT0H
+bd3 2010-11-07 03:30:00 EST America/New_York - 2010-11-06 04:30:00 EDT America/New_York = P0DT24H
+bd4 2010-11-07 02:30:00 EST America/New_York - 2010-11-06 04:30:00 EDT America/New_York = P0DT23H
+bd5 2010-11-07 01:30:00 EST America/New_York - 2010-11-06 04:30:00 EDT America/New_York = P0DT22H
+bd6 2010-11-07 01:30:00 EDT America/New_York - 2010-11-06 04:30:00 EDT America/New_York = P0DT21H
+bd7 2010-11-07 01:30:00 EDT America/New_York - 2010-11-06 01:30:00 EDT America/New_York = P1DT0H
+bd8 2010-11-07 01:30:00 EST America/New_York - 2010-11-06 01:30:00 EDT America/New_York = P1DT1H
+
+ba1 2010-11-07 01:59:59 EDT America/New_York + PT1S = 2010-11-07 01:00:00 EST America/New_York
+ba2 2010-11-06 04:30:00 EDT America/New_York + P1D = 2010-11-07 04:30:00 EST America/New_York
+ba3 2010-11-06 04:30:00 EDT America/New_York + PT24H = 2010-11-07 03:30:00 EST America/New_York
+ba4 2010-11-06 04:30:00 EDT America/New_York + PT23H = 2010-11-07 02:30:00 EST America/New_York
+ba5 2010-11-06 04:30:00 EDT America/New_York + PT22H = 2010-11-07 01:30:00 EST America/New_York
+ba6 2010-11-06 04:30:00 EDT America/New_York + PT21H = 2010-11-07 01:30:00 EDT America/New_York
+ba7 2010-11-06 01:30:00 EDT America/New_York + P1D = 2010-11-07 01:30:00 EDT America/New_York
+ba8 2010-11-06 01:30:00 EDT America/New_York + P1DT1H = 2010-11-07 01:30:00 EST America/New_York
+ba9 2010-11-06 04:30:00 EDT America/New_York + PT25H = 2010-11-07 04:30:00 EST America/New_York
+ba10 2010-11-06 03:30:00 EDT America/New_York + P1D = 2010-11-07 03:30:00 EST America/New_York
+ba11 2010-11-06 02:30:00 EDT America/New_York + P1D = 2010-11-07 02:30:00 EST America/New_York
+
+bs1 2010-11-07 01:00:00 EST America/New_York - PT1S = 2010-11-07 01:59:59 EDT America/New_York
+bs2 2010-11-07 04:30:00 EST America/New_York - P1D = 2010-11-06 04:30:00 EDT America/New_York
+bs3 2010-11-07 03:30:00 EST America/New_York - PT24H = 2010-11-06 04:30:00 EDT America/New_York
+bs4 2010-11-07 02:30:00 EST America/New_York - PT23H = 2010-11-06 04:30:00 EDT America/New_York
+bs5 2010-11-07 01:30:00 EST America/New_York - PT22H = 2010-11-06 04:30:00 EDT America/New_York
+bs6 2010-11-07 01:30:00 EDT America/New_York - PT21H = 2010-11-06 04:30:00 EDT America/New_York
+bs7 2010-11-07 01:30:00 EDT America/New_York - P1D = 2010-11-06 01:30:00 EDT America/New_York
+bs8 2010-11-07 01:30:00 EST America/New_York - P1DT1H = 2010-11-06 00:30:00 EDT America/New_York
+bs9 2010-11-07 03:30:00 EST America/New_York - P1D = 2010-11-06 03:30:00 EDT America/New_York
+bs10 2010-11-07 02:30:00 EST America/New_York - P1D = 2010-11-06 02:30:00 EDT America/New_York
@@ -53,7 +53,7 @@ bool(false)
 string(31) "Fri, 16 Jun 2006 23:49:12 +0100"
 bool(false)
 string(31) "Fri, 16 Jun 2006 02:22:00 +0100"
-string(31) "Sun, 16 Jun 0222 02:22:00 -0036"
+string(31) "Mon, 16 Jun 0222 02:22:00 -0036"
 string(31) "Fri, 16 Jun 2006 02:22:33 +0100"
 bool(false)
 string(31) "Tue, 02 Mar 2004 00:00:00 +0000"
@@ -32,8 +32,8 @@ object(DateTime)#2 (3) {
  string(6) "+02:00"
 }

-string(16) "l, d-M-Y H:i:s T"
-string(38) "Tuesday, 08-Jul-2008 22:14:12 GMT+0200"
+string(16) "l, d-M-y H:i:s T"
+string(36) "Tuesday, 08-Jul-08 22:14:12 GMT+0200"
 object(DateTime)#1 (3) {
  ["date"]=>
  string(19) "2008-07-08 22:14:12"
@@ -625,8 +625,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 	char *file_mode;
 	char mode[4], *pmode, *lock_file_mode = NULL;
 	int persistent_flag = persistent ? STREAM_OPEN_PERSISTENT : 0;
-	char *opened_path = NULL;
-	char *lock_name;
+	char *opened_path, *lock_name;
 	
 	if(ac < 2) {
 		WRONG_PARAM_COUNT;
@@ -849,10 +848,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 				if (!persistent) {
 					info->lock.name = opened_path;
 				} else {
-					if (opened_path) {
-						info->lock.name = pestrdup(opened_path, persistent);
-						efree(opened_path);
-					}
+					info->lock.name = pestrdup(opened_path, persistent);
+					efree(opened_path);
 				}
 			}
 		}
@@ -2304,7 +2304,7 @@ PHP_FUNCTION(dom_document_save_html)
 	xmlBufferPtr buf;
 	dom_object *intern, *nodeobj;
 	xmlChar *mem = NULL;
-	int size = 0, format;
+	int size, format;
 	dom_doc_propsptr doc_props;

 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
@@ -2332,22 +2332,7 @@ PHP_FUNCTION(dom_document_save_html)
 			RETURN_FALSE;
 		}
 		
-		if (node->type == XML_DOCUMENT_FRAG_NODE) {
-			int one_size;
-
-			for (node = node->children; node; node = node->next) {
-				one_size = htmlNodeDump(buf, docp, node);
-
-				if (one_size >= 0) {
-					size += one_size;
-				} else {
-					size = -1;
-					break;
-				}
-			}
-		} else {
-			size = htmlNodeDump(buf, docp, node);
-		}
+		size = htmlNodeDump(buf, docp, node);
 		if (size >= 0) {
 			mem = (xmlChar*) xmlBufferContent(buf);
 			if (!mem) {
@@ -1,26 +0,0 @@
--TEST--
-bug #65196 (Passing DOMDocumentFragment to DOMDocument::saveHTML() Produces invalid Markup)
--SKIPIF--
-<?php
-extension_loaded("dom") or die("skip need ext/dom");
-?>
--FILE--
-<?php
-$dom = new DOMDocument();
-
-$frag1 = $dom->createDocumentFragment();
-var_dump($dom->saveHTML($frag1));
-
-$frag2 = $dom->createDocumentFragment();
-$div = $dom->createElement('div');
-$div->appendChild($dom->createElement('span'));
-$frag2->appendChild($div);
-$frag2->appendChild($dom->createElement('div'));
-$frag2->appendChild($dom->createElement('div'));
-var_dump($dom->saveHTML($frag2));
-?>
-===DONE===
--EXPECT--
-string(0) ""
-string(46) "<div><span></span></div><div></div><div></div>"
-===DONE===
@@ -2643,7 +2643,6 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP
 			} else {
 				decode = ImageInfo->decode_unicode_le;
 			}
-			/* XXX this will fail again if encoding_converter returns on error something different than SIZE_MAX   */
 			if (zend_multibyte_encoding_converter(
 					(unsigned char**)pszInfoPtr, 
 					&len, 
@@ -2651,7 +2650,7 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP
 					ByteCount,
 					zend_multibyte_fetch_encoding(ImageInfo->encode_unicode TSRMLS_CC),
 					zend_multibyte_fetch_encoding(decode TSRMLS_CC)
-					TSRMLS_CC) == (size_t)-1) {
+					TSRMLS_CC) < 0) {
 				len = exif_process_string_raw(pszInfoPtr, szValuePtr, ByteCount);
 			}
 			return len;
@@ -2664,7 +2663,6 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP
 			*pszEncoding = estrdup((const char*)szValuePtr);
 			szValuePtr = szValuePtr+8;
 			ByteCount -= 8;
-			/* XXX this will fail again if encoding_converter returns on error something different than SIZE_MAX   */
 			if (zend_multibyte_encoding_converter(
 					(unsigned char**)pszInfoPtr, 
 					&len, 
@@ -2672,7 +2670,7 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP
 					ByteCount,
 					zend_multibyte_fetch_encoding(ImageInfo->encode_jis TSRMLS_CC),
 					zend_multibyte_fetch_encoding(ImageInfo->motorola_intel ? ImageInfo->decode_jis_be : ImageInfo->decode_jis_le TSRMLS_CC)
-					TSRMLS_CC) == (size_t)-1) {
+					TSRMLS_CC) < 0) {
 				len = exif_process_string_raw(pszInfoPtr, szValuePtr, ByteCount);
 			}
 			return len;
@@ -2702,8 +2700,8 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP
 static int exif_process_unicode(image_info_type *ImageInfo, xp_field_type *xp_field, int tag, char *szValuePtr, int ByteCount TSRMLS_DC)
 {
 	xp_field->tag = tag;	
-	
-	/* XXX this will fail again if encoding_converter returns on error something different than SIZE_MAX   */
+
+	/* Copy the comment */
 	if (zend_multibyte_encoding_converter(
 			(unsigned char**)&xp_field->value, 
 			&xp_field->size, 
@@ -2711,7 +2709,7 @@ static int exif_process_unicode(image_info_type *ImageInfo, xp_field_type *xp_fi
 			ByteCount,
 			zend_multibyte_fetch_encoding(ImageInfo->encode_unicode TSRMLS_CC),
 			zend_multibyte_fetch_encoding(ImageInfo->motorola_intel ? ImageInfo->decode_unicode_be : ImageInfo->decode_unicode_le TSRMLS_CC)
-			TSRMLS_CC) == (size_t)-1) {
+			TSRMLS_CC) < 0) {
 		xp_field->size = exif_process_string_raw(&xp_field->value, szValuePtr, ByteCount);
 	}
 	return xp_field->size;
@@ -2852,12 +2850,7 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 		offset_val = php_ifd_get32u(dir_entry+8, ImageInfo->motorola_intel);
 		/* If its bigger than 4 bytes, the dir entry contains an offset. */
 		value_ptr = offset_base+offset_val;
-        /* 
-            dir_entry is ImageInfo->file.list[sn].data+2+i*12
-            offset_base is ImageInfo->file.list[sn].data-dir_offset 
-            dir_entry - offset_base is dir_offset+2+i*12
-        */
-		if (byte_count > IFDlength || offset_val > IFDlength-byte_count || value_ptr < dir_entry || offset_val < (size_t)(dir_entry-offset_base)) {
+		if (byte_count > IFDlength || offset_val > IFDlength-byte_count || value_ptr < dir_entry) {
 			/* It is important to check for IMAGE_FILETYPE_TIFF
 			 * JPEG does not use absolute pointers instead its pointers are
 			 * relative to the start of the TIFF header in APP1 section. */
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<html><head>
-<title>301 Moved Permanently</title>
-</head><body>
-<h1>Moved Permanently</h1>
-<p>The document has moved <a href="http://www.getid3.org/temp/62523.jpg">here</a>.</p>
-<hr>
-<address>Apache Server at getid3.org Port 80</address>
-</body></html>
@@ -1,18 +0,0 @@
--TEST--
-Bug 62523 (php crashes with segfault when exif_read_data called)
--SKIPIF--
-<?php
-extension_loaded("exif") or die("skip need exif");
-?>
--FILE--
-<?php
-echo "Test\n";
-var_dump(count(exif_read_data(__DIR__."/bug62523_1.jpg")));
-?>
-Done
--EXPECTF--
-Test
-
-Warning: exif_read_data(bug62523_1.jpg): File not supported in %sbug62523_1.php on line %d
-int(1)
-Done
@@ -1,16 +0,0 @@
--TEST--
-Bug 62523 (php crashes with segfault when exif_read_data called)
--SKIPIF--
-<?php
-extension_loaded("exif") or die("skip need exif");
-?>
--FILE--
-<?php
-echo "Test\n";
-var_dump(count(exif_read_data(__DIR__."/bug62523_2.jpg")));
-?>
-Done
--EXPECT--
-Test
-int(76)
-Done
@@ -1,12 +0,0 @@
-<html>
-  <head><title>Found</title></head>
-  <body>
-    <h1>Found</h1>
-    <p>The resource was found at <a href="http://dl.dropboxusercontent.com/u/7562584/Bugs/Php/bad_exif.jpeg">http://dl.dropboxusercontent.com/u/7562584/Bugs/Php/bad_exif.jpeg</a>;
-you should be redirected automatically.
-
-<!--  --></p>
-    <hr noshade>
-    <div align="right">WSGI Server</div>
-  </body>
-</html>
@@ -1,18 +0,0 @@
--TEST--
-Bug 62523 (php crashes with segfault when exif_read_data called)
--SKIPIF--
-<?php
-extension_loaded("exif") or die("skip need exif");
-?>
--FILE--
-<?php
-echo "Test\n";
-var_dump(count(exif_read_data(__DIR__."/bug62523_3.jpg")));
-?>
-Done
--EXPECTF--
-Test
-
-Warning: exif_read_data(bug62523_3.jpg): File not supported in %sbug62523_3.php on line %d
-int(1)
-Done
@@ -1,14 +0,0 @@
--TEST--
-PHP crash when zend_multibyte_encoding_converter returns (size_t)-1)
--SKIPIF--
-<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--FILE--
-<?php
-$infile = dirname(__FILE__).'/exif_encoding_crash.jpg';
-$exif_data = exif_read_data($infile);
-echo "*** no core dump ***\n";
-?>
-===DONE===
--EXPECT--
-*** no core dump ***
-===DONE===
@@ -714,7 +714,9 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 			if (flags & FILTER_FLAG_NO_RES_RANGE) {
 				if (
 					(ip[0] == 0) ||
-					(ip[0] == 100 && (ip[1] >= 64 && ip[1] <= 127)) ||
+					(ip[0] == 100 && (ip[1] >= 64 || ip[1] <= 127)) ||
+					(ip[0] == 128 && ip[1] == 0) ||
+					(ip[0] == 191 && ip[1] == 255) ||
 					(ip[0] == 169 && ip[1] == 254) ||
 					(ip[0] == 192 && ip[1] == 0 && ip[2] == 2) ||
 					(ip[0] == 127 && ip[1] == 0 && ip[2] == 0 && ip[3] == 1) ||
@@ -15,7 +15,7 @@ var_dump(filter_var("192.168.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE
 var_dump(filter_var("192.0.34.166", FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE));
 var_dump(filter_var("127.0.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
 var_dump(filter_var("192.0.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
-var_dump(filter_var("100.64.0.0", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
+var_dump(filter_var("100.0.0.0", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
 var_dump(filter_var("100.127.255.255", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
 var_dump(filter_var("192.0.34.166", FILTER_VALIDATE_IP));
 var_dump(filter_var("256.1237.123.1", FILTER_VALIDATE_IP));
@@ -23,6 +23,6 @@ string(3) "::1"
 bool(false)
 bool(false)
 string(9) "128.0.0.1"
-string(9) "128.0.0.1"
-string(11) "191.255.0.0"
+bool(false)
 string(11) "191.255.0.0"
+bool(false)
@@ -630,7 +630,7 @@ ftp_alloc(ftpbuf_t *ftp, const long size, char **response)
 		return 0;
 	}

-	if (response) {
+	if (response && ftp->inbuf) {
 		*response = estrdup(ftp->inbuf);
 	}

@@ -1638,7 +1638,7 @@ ftp_genlist(ftpbuf_t *ftp, const char *cmd, const char *path TSRMLS_DC)
 	if (ftp->resp == 226) {
 		ftp->data = data_close(ftp, data);
 		php_stream_close(tmpstream);
-		return ecalloc(1, sizeof(char*));
+		return ecalloc(1, sizeof(char**));
 	}

 	/* pull data buffer into tmpfile */
@@ -1666,11 +1666,11 @@ ftp_genlist(ftpbuf_t *ftp, const char *cmd, const char *path TSRMLS_DC)
 		}
 	}

-	ftp->data = data_close(ftp, data);
+	ftp->data = data = data_close(ftp, data);

 	php_stream_rewind(tmpstream);

-	ret = safe_emalloc((lines + 1), sizeof(char*), size);
+	ret = safe_emalloc((lines + 1), sizeof(char**), size * sizeof(char*));

 	entry = ret;
 	text = (char*) (ret + lines + 1);
@@ -968,9 +968,7 @@ PHP_FUNCTION(ftp_nb_get)
 		RETURN_LONG(PHP_FTP_FAILED);
 	}

-	if (ret == PHP_FTP_FINISHED){
-		php_stream_close(outstream);
-	}
+        php_stream_close(outstream);

 	RETURN_LONG(ret);
 }
@@ -16,7 +16,7 @@ ftp_login($ftp, 'user', 'pass');
 if (!$ftp) die("Couldn't connect to the server");
 ftp_set_option($ftp, FTP_AUTOSEEK, false);

-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic1.txt";
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
 $handle = fopen($local_file, 'w');

 var_dump(ftp_fget($ftp, $handle, 'fget.txt', FTP_ASCII, FTP_AUTORESUME));
@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
 ?>
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic1.txt");
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
 ?>
 --EXPECT--
 bool(true)
@@ -15,7 +15,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
 ftp_login($ftp, 'user', 'pass');
 if (!$ftp) die("Couldn't connect to the server");

-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic2.txt";
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
 file_put_contents($local_file, 'ASCIIFoo');
 $handle = fopen($local_file, 'a');

@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
 ?>
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic2.txt");
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
 ?>
 --EXPECT--
 bool(true)
@@ -15,7 +15,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
 ftp_login($ftp, 'user', 'pass');
 if (!$ftp) die("Couldn't connect to the server");

-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic3.txt";
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
 file_put_contents($local_file, 'ASCIIFoo');
 $handle = fopen($local_file, 'a');

@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
 ?>
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic3.txt");
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
 ?>
 --EXPECT--
 bool(true)
@@ -1,182 +0,0 @@
--TEST--
-Testing whether ftp_nb_continue() fetches more data
--SKIPIF--
-<?php
-require 'skipif.inc';
-?>
--FILE--
-<?php
-require 'server.inc';
-
-$file = "mediumfile.txt";
-
-$ftp = ftp_connect('127.0.0.1', $port);
-ftp_login($ftp, 'user', 'pass');
-if (!$ftp) die("Couldn't connect to the server");
-
-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . $file;
-touch($local_file);
-
-$r = ftp_nb_get($ftp, $local_file, $file, FTP_BINARY);
-while ($r == FTP_MOREDATA) {
-    $r = ftp_nb_continue($ftp);
-}
-ftp_close($ftp);
-
-echo file_get_contents($local_file);
-?>
--CLEAN--
-<?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "mediumfile.txt");
-?>
--EXPECT--
-This is line 0 of the test data.
-This is line 1 of the test data.
-This is line 2 of the test data.
-This is line 3 of the test data.
-This is line 4 of the test data.
-This is line 5 of the test data.
-This is line 6 of the test data.
-This is line 7 of the test data.
-This is line 8 of the test data.
-This is line 9 of the test data.
-This is line 10 of the test data.
-This is line 11 of the test data.
-This is line 12 of the test data.
-This is line 13 of the test data.
-This is line 14 of the test data.
-This is line 15 of the test data.
-This is line 16 of the test data.
-This is line 17 of the test data.
-This is line 18 of the test data.
-This is line 19 of the test data.
-This is line 20 of the test data.
-This is line 21 of the test data.
-This is line 22 of the test data.
-This is line 23 of the test data.
-This is line 24 of the test data.
-This is line 25 of the test data.
-This is line 26 of the test data.
-This is line 27 of the test data.
-This is line 28 of the test data.
-This is line 29 of the test data.
-This is line 30 of the test data.
-This is line 31 of the test data.
-This is line 32 of the test data.
-This is line 33 of the test data.
-This is line 34 of the test data.
-This is line 35 of the test data.
-This is line 36 of the test data.
-This is line 37 of the test data.
-This is line 38 of the test data.
-This is line 39 of the test data.
-This is line 40 of the test data.
-This is line 41 of the test data.
-This is line 42 of the test data.
-This is line 43 of the test data.
-This is line 44 of the test data.
-This is line 45 of the test data.
-This is line 46 of the test data.
-This is line 47 of the test data.
-This is line 48 of the test data.
-This is line 49 of the test data.
-This is line 50 of the test data.
-This is line 51 of the test data.
-This is line 52 of the test data.
-This is line 53 of the test data.
-This is line 54 of the test data.
-This is line 55 of the test data.
-This is line 56 of the test data.
-This is line 57 of the test data.
-This is line 58 of the test data.
-This is line 59 of the test data.
-This is line 60 of the test data.
-This is line 61 of the test data.
-This is line 62 of the test data.
-This is line 63 of the test data.
-This is line 64 of the test data.
-This is line 65 of the test data.
-This is line 66 of the test data.
-This is line 67 of the test data.
-This is line 68 of the test data.
-This is line 69 of the test data.
-This is line 70 of the test data.
-This is line 71 of the test data.
-This is line 72 of the test data.
-This is line 73 of the test data.
-This is line 74 of the test data.
-This is line 75 of the test data.
-This is line 76 of the test data.
-This is line 77 of the test data.
-This is line 78 of the test data.
-This is line 79 of the test data.
-This is line 80 of the test data.
-This is line 81 of the test data.
-This is line 82 of the test data.
-This is line 83 of the test data.
-This is line 84 of the test data.
-This is line 85 of the test data.
-This is line 86 of the test data.
-This is line 87 of the test data.
-This is line 88 of the test data.
-This is line 89 of the test data.
-This is line 90 of the test data.
-This is line 91 of the test data.
-This is line 92 of the test data.
-This is line 93 of the test data.
-This is line 94 of the test data.
-This is line 95 of the test data.
-This is line 96 of the test data.
-This is line 97 of the test data.
-This is line 98 of the test data.
-This is line 99 of the test data.
-This is line 100 of the test data.
-This is line 101 of the test data.
-This is line 102 of the test data.
-This is line 103 of the test data.
-This is line 104 of the test data.
-This is line 105 of the test data.
-This is line 106 of the test data.
-This is line 107 of the test data.
-This is line 108 of the test data.
-This is line 109 of the test data.
-This is line 110 of the test data.
-This is line 111 of the test data.
-This is line 112 of the test data.
-This is line 113 of the test data.
-This is line 114 of the test data.
-This is line 115 of the test data.
-This is line 116 of the test data.
-This is line 117 of the test data.
-This is line 118 of the test data.
-This is line 119 of the test data.
-This is line 120 of the test data.
-This is line 121 of the test data.
-This is line 122 of the test data.
-This is line 123 of the test data.
-This is line 124 of the test data.
-This is line 125 of the test data.
-This is line 126 of the test data.
-This is line 127 of the test data.
-This is line 128 of the test data.
-This is line 129 of the test data.
-This is line 130 of the test data.
-This is line 131 of the test data.
-This is line 132 of the test data.
-This is line 133 of the test data.
-This is line 134 of the test data.
-This is line 135 of the test data.
-This is line 136 of the test data.
-This is line 137 of the test data.
-This is line 138 of the test data.
-This is line 139 of the test data.
-This is line 140 of the test data.
-This is line 141 of the test data.
-This is line 142 of the test data.
-This is line 143 of the test data.
-This is line 144 of the test data.
-This is line 145 of the test data.
-This is line 146 of the test data.
-This is line 147 of the test data.
-This is line 148 of the test data.
-This is line 149 of the test data.
@@ -16,7 +16,7 @@ ftp_login($ftp, 'user', 'pass');
 if (!$ftp) die("Couldn't connect to the server");
 ftp_set_option($ftp, FTP_AUTOSEEK, false);

-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic1.txt";
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
 $handle = fopen($local_file, 'w');

 var_dump(ftp_nb_fget($ftp, $handle, 'fget.txt', FTP_ASCII, FTP_AUTORESUME));
@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
 ?>
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic1.txt");
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
 ?>
 --EXPECT--
 int(2)
@@ -15,7 +15,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
 ftp_login($ftp, 'user', 'pass');
 if (!$ftp) die("Couldn't connect to the server");

-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic2.txt";
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
 file_put_contents($local_file, 'ASCIIFoo');
 $handle = fopen($local_file, 'a');

@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
 ?>
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic2.txt");
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
 ?>
 --EXPECT--
 int(2)
@@ -15,7 +15,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
 ftp_login($ftp, 'user', 'pass');
 if (!$ftp) die("Couldn't connect to the server");

-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic3.txt";
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
 file_put_contents($local_file, 'ASCIIFoo');
 $handle = fopen($local_file, 'a');

@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
 ?>
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic3.txt");
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
 ?>
 --EXPECT--
 int(2)
@@ -18,7 +18,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
 ftp_login($ftp, 'user', 'pass');
 if (!$ftp) die("Couldn't connect to the server");

-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_get_large.txt";
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
 touch($local_file);
 ftp_nb_get($ftp, $local_file, 'fget_large.txt', FTP_BINARY, 5368709119);
 $fp = fopen($local_file, 'r');
@@ -29,7 +29,7 @@ fclose($fp);
 ?>
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_get_large.txt");
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
 ?>
 --EXPECT--
 string(1) "X"
@@ -368,13 +368,6 @@ if ($pid) {
                                        }
 					fputs($s, "226 Closing data Connection.\r\n");
                                        break;
-                case "mediumfile":
-					fputs($s, "150 File status okay; about to open data connection.\r\n");
-					for($i = 0; $i < 150; $i++){
-						fputs($fs, "This is line $i of the test data.\n");
-					}
-					fputs($s, "226 Closing data Connection.\r\n");
-
 				default:
 					fputs($s, "550 {$matches[1]}: No such file or directory \r\n");
 					break;
@@ -185,25 +185,30 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
  if test "$PHP_FREETYPE_DIR" != "no"; then

    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
-      if test -f "$i/bin/freetype-config"; then
+      if test -f "$i/include/freetype2/freetype/freetype.h"; then
        FREETYPE2_DIR=$i
-        FREETYPE2_CONFIG="$i/bin/freetype-config"
+        FREETYPE2_INC_DIR=$i/include/freetype2
        break
      fi
    done

    if test -z "$FREETYPE2_DIR"; then
-      AC_MSG_ERROR([freetype-config not found.])
+      AC_MSG_ERROR([freetype.h not found.])
    fi

-    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
-    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-
-    PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
-    PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
-    AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
-    AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
-    AC_DEFINE(ENABLE_GD_TTF,1,[ ])
+    PHP_CHECK_LIBRARY(freetype, FT_New_Face,
+    [
+      PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+      PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
+      PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
+      AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
+      AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
+      AC_DEFINE(ENABLE_GD_TTF,1,[ ])
+    ],[
+      AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for more information.])
+    ],[
+      -L$FREETYPE2_DIR/$PHP_LIBDIR
+    ])
  else
    AC_MSG_RESULT([If configure fails try --with-freetype-dir=<DIR>])
  fi
@@ -59,7 +59,7 @@

 PHPAPI extern const char php_sig_gif[3];
 PHPAPI extern const char php_sig_jpg[3];
-PHPAPI extern const char php_sig_png[8];
+PHPAPI extern const char php_sig_png[3];

 extern zend_module_entry gd_module_entry;
 #define phpext_gd_ptr &gd_module_entry
@@ -27,7 +27,7 @@
 /* {{{ */
 static void collator_ctor(INTERNAL_FUNCTION_PARAMETERS)
 {
-	const char*      locale;
+	char*            locale;
 	int              locale_len = 0;
 	zval*            object;
 	Collator_object* co;
@@ -62,7 +62,7 @@ static void internal_parse_to_timestamp(IntlDateFormatter_object *dfo, char* tex
 }
 /* }}} */

-static void add_to_localtime_arr( IntlDateFormatter_object *dfo, zval* return_value, const UCalendar *parsed_calendar, long calendar_field, char* key_name TSRMLS_DC)
+static void add_to_localtime_arr( IntlDateFormatter_object *dfo, zval* return_value, UCalendar parsed_calendar, long calendar_field, char* key_name TSRMLS_DC)
 {
 	long calendar_field_val = ucal_get( parsed_calendar, calendar_field, &INTL_DATA_ERROR_CODE(dfo));	
 	INTL_METHOD_CHECK_STATUS( dfo, "Date parsing - localtime failed : could not get a field from calendar" );
@@ -83,7 +83,7 @@ static void add_to_localtime_arr( IntlDateFormatter_object *dfo, zval* return_va
 */
 static void internal_parse_to_localtime(IntlDateFormatter_object *dfo, char* text_to_parse, int32_t text_len, int32_t *parse_pos, zval *return_value TSRMLS_DC)
 {
-	UCalendar      *parsed_calendar = NULL;
+	UCalendar* 	parsed_calendar = NULL;
 	UChar*  	text_utf16  = NULL;
 	int32_t 	text_utf16_len = 0;
 	long 		isInDST = 0;
@@ -92,7 +92,7 @@ static void internal_parse_to_localtime(IntlDateFormatter_object *dfo, char* tex
 	intl_convert_utf8_to_utf16(&text_utf16, &text_utf16_len, text_to_parse, text_len, &INTL_DATA_ERROR_CODE(dfo));
 	INTL_METHOD_CHECK_STATUS(dfo, "Error converting timezone to UTF-16" );

-	parsed_calendar = (UCalendar *)udat_getCalendar(DATE_FORMAT_OBJECT(dfo));
+	parsed_calendar = udat_getCalendar(DATE_FORMAT_OBJECT(dfo));
 	udat_parseCalendar( DATE_FORMAT_OBJECT(dfo), parsed_calendar, text_utf16, text_utf16_len, parse_pos, &INTL_DATA_ERROR_CODE(dfo));
 	
 	if (text_utf16) {
@@ -27,7 +27,7 @@
 /* {{{ */
 static void numfmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
 {
-	const char* locale;
+	char*       locale;
 	char*       pattern = NULL;
 	int         locale_len = 0, pattern_len = 0;
 	long        style;