PHP 5.5.0 RC2

INSTALL

@@ -1819,7 +1819,7 @@ Installation
        set of HTTP headers. The headers it did return are:
    10. Windows:  I've  followed  all the instructions, but still can't get
        PHP and IIS to work together!
-   11. When  running  PHP as CGI with IIS, OmniHTTPD or Xitami, I get
+   11. When  running  PHP as CGI with IIS, PWS, OmniHTTPD or Xitami, I get
        the  following  error:  Security  Alert! PHP CGI cannot be accessed
        directly..
    12. How  do I know if my php.ini is being found and read? It seems like
@@ -2007,7 +2007,7 @@ cgi error:
           And  for  IIS4  you need to tell it that PHP is a script engine.
           Also, you will want to read this faq.
 
-   When running PHP as CGI with IIS, OmniHTTPD or Xitami, I get the
+   When running PHP as CGI with IIS, PWS, OmniHTTPD or Xitami, I get the
           following error: Security Alert! PHP CGI cannot be accessed
           directly..
           You  must set the cgi.force_redirect directive to 0. It defaults

README.GIT-RULES

@@ -45,16 +45,15 @@ Currently we have the following branches in use::
 
   master    The active development branch. 
 
-  PHP-5.5   Is used to release the PHP 5.5.x series. This is a current
+  PHP-5.5   Is used to release the PHP 5.5.x series. It allows for larger
+            enhancements.
+
+  PHP-5.4   Is used to release the PHP 5.4.x series. This is current
             stable version and is open for bugfixes only.
 
-  PHP-5.4   Is used to release the PHP 5.4.x series. This is a current
+  PHP-5.3   Is used to release the PHP 5.3.x series. This is current 
             stable version and is open for bugfixes only.
 
-  PHP-5.3   Is used to release the PHP 5.3.x series. This is currently 
-            in extended support and open forsecurity fixes only. Triaged
-            via security@php.net
-
   PHP-5.2   This branch is closed.
 
   PHP-5.1   This branch is closed.

README.PARAMETER_PARSING_API

@@ -43,7 +43,7 @@ See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse
 Type specifiers
 ---------------
  The following list shows the type specifier, its meaning and the parameter 
- types that need to be passed by address. All passed parameters are set
+ types that need to be passed by address. All passed paramaters are set
  if the PHP parameter is non optional and untouched if optional and the 
  parameter is not present. The only exception is O where the zend_class_entry*
  has to be provided on input and is used to verify the PHP parameter is an 

README.RELEASE_PROCESS

@@ -78,9 +78,6 @@ f.e. http://downloads.php.net/derick/
 (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
 --------------------------------------------------------
 
@@ -177,9 +174,6 @@ those are made, they should be committed to SVN too.
 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
 ------------------------------------
 

README.TESTING

@@ -1,6 +1,6 @@
 [IMPORTANT NOTICE]
 ------------------
- Failed tests usually indicate a problem with your local system setup
+ Failed tests usualy indicate a problem with your local system setup
 and not within PHP itself (at least for official PHP release versions).
 You may decide to automaticaly submit a test summary to our QA workflow
 at the end of a test run.

UPGRADING

@@ -2,16 +2,16 @@ $Id$
 
 PHP 5.5 UPGRADE NOTES
 
-1.  Backward Incompatible Changes
-2.  New Features
-2.  Changes in SAPI modules
-3.  Deprecated Functionality
-4.  Changed Functions
-5.  New Functions
-6.  New Classes and Interfaces
-7.  Removed Extensions
-8.  Other Changes to Extensions
-9.  New Global Constants
+1. Backward Incompatible Changes
+2. New Features
+2. Changes in SAPI modules
+3. Deprecated Functionality
+4. Changed Functions
+5. New Functions
+6. New Classes and Interfaces
+7. Removed Extensions
+8. Other Changes to Extensions
+9. New Global Constants
 10. Changes to INI File Handling
 11. Windows Support
 12. Other Changes
@@ -21,163 +21,122 @@ PHP 5.5 UPGRADE NOTES
 1. Backward Incompatible Changes
 ========================================
 
-- Dropped Windows XP and 2003 support. (Pierre)
-
-- All internal case insensitivity handling for class, function and constant
-  names is done according to ASCII rules.  Current locale settings are ignored.
-
+- Drop Windows XP and 2003 support. (Pierre)
+- All internal case insensitivity handling for class, function and constant 
+  names is done according to ASCII rules, current locale settings are ignored. 
 - self, parent & static keywords now are always case-insensitive (see bug
   #60833).
-
-- Removed Logo GUIDs: php_logo_guid(), php_egg_logo_guid(),
-  php_real_logo_guid() and zend_logo_guid()
+- php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid() and 
+  zend_logo_guid() have been removed
+- Removal of Logo GUIDs
 
 ========================================
 2. New Features
 ========================================
 
 - Support list in foreach. (Laruence)
-  (http://php.net/foreach#control-structures.foreach.list,
-  http://wiki.php.net/rfc/foreachlist)
-
-- Support "finally" keyword. (Laruence)
-  (http://php.net/exceptions, http://wiki.php.net/rfc/finally)
-
+  (wiki.php.net/rfc/foreachlist)
+- Support finally keyword. (Laruence)
+  (wiki.php.net/rfc/finally)
 - Support constant array/string dereferencing. (Laruence)
-  (http://php.net/manual/en/language.types.array.php,
-   https://wiki.php.net/rfc/constdereference)
-
+  (https://wiki.php.net/rfc/constdereference)
 - Add support for using empty() on the result of function calls and
   other expressions. Thus it is now possible to write empty(getArray()),
-  for example. (http://php.net/manual/en/function.empty.php,
-  https://wiki.php.net/rfc/empty_isset_exprs)
-
+  for example. (https://wiki.php.net/rfc/empty_isset_exprs)
 - Added generators.
-  (http://php.net/generators, https://wiki.php.net/rfc/generators)
-
-- ClassName::class syntax returning full class name for a class as a
-  string constant.  (http://php.net/oop5.basic,
-  https://wiki.php.net/rfc/class_name_scalars)
-
+  (https://wiki.php.net/rfc/generators)
+- ClassName::class syntax returning full class name for a class as 
+  a string constant. (https://wiki.php.net/rfc/class_name_scalars)
 - Added support for non-scalar Iterator keys in foreach.
-  (http://php.net/manual/en/control-structures.foreach.php,
-  https://wiki.php.net/rfc/foreach-non-scalar-keys).
-
-- Bundled Zend OPcache extension to improve performance
-  (http://php.net/manual/en/book.opcache.php,
-  https://wiki.php.net/rfc/optimizerplus)
-
-- Added a simplified password hashing API
-  (http://php.net/password, https://wiki.php.net/rfc/password_hash)
+  (https://wiki.php.net/rfc/foreach-non-scalar-keys).
+- Bundled Zend OPcache extension
+ (https://wiki.php.net/rfc/optimizerplus)
 
 ========================================
 2. Changes in SAPI modules
 ========================================
 
-- Support for changing the process's title in CLI/CLI-Server
-  SAPIs. (Keyur)
-  (http://php.net/manual/en/function.cli-set-process-title.php,
-  http://php.net/manual/en/function.cli-get-process-title.php,
-  https://wiki.php.net/rfc/cli_process_title)
-
-- Support for systemd in php-fpm: Add --with-fpm-systemd option to
-  report health to systemd, and add systemd_interval option to
-  configure this. The service can now use Type=notify in the systemd
-  unit file. (Remi)
+- Support for changing the process's title in CLI/CLI-Server SAPIs. (Keyur)
+  (https://wiki.php.net/rfc/cli_process_title)
+- Support for systemd in php-fpm:
+  Add --with-fpm-systemd option to report health to systemd, and
+  systemd_interval option to configure this. The service can now use
+  Type=notify in the systemd unit file. (Remi)
 
 ========================================
 3. Deprecated Functionality
 ========================================
 
-- The original MySQL extension is now deprecated and will generate
-  deprecation warnings when connecting to a database through
-  mysql_connect(), mysql_pconnect() or by establishing an implicit
-  connection. Use MySQLi or PDO instead.
-
+- The original MySQL extension is now deprecated, and will generate deprecation
+  warnings when connecting to a database through mysql_connect(),
+  mysql_pconnect() or by establishing an implicit connection. Use MySQLi or PDO
+  instead.
 - The preg_replace /e modifier is now deprecated.  Use
   preg_replace_callback instead.
   (https://wiki.php.net/rfc/remove_preg_replace_eval_modifier)
-
 - IntlDateFormatter::setTimeZoneID() and datefmt_set_timezone_id() are
-  deprecated. Use IntlDateFormatter::setTimeZone() or
-  datefmt_set_timezone() instead.
-
+  deprecated. Use IntlDateFormatter::setTimeZone() or datefmt_set_timezone()
+  instead.
 - mcrypt_ecb(), mcrypt_cbc(), mcrypt_cfb() and mcrypt_ofb() now throw
-  E_DEPRECATED. Their use was already previously discouraged in the
-  documentation, but that predated the existence of E_DEPRECATED.
+  E_DEPRECATED. Their use was already previously discouraged in the docs,
+  but that predated the existence of E_DEPRECATED.
 
 ========================================
 4. Changed Functions
 ========================================
 
-- pack()/unpack() had the following changes, which bring it more in
-  line with Perl's behavior: - Implemented format character "Z": NULL
-  padded string, with trailing NULL bytes removed.  - Changed format
-  character "a": this no longer removes trailing NULL bytes.  -
-  Changed format character "A": all trailing ASCII whitespace is now
-  removed (defined as spaces, tabs, \r, \n and NULL).
-
-- MessageFormatter::format() and related functions now accepted named
-  arguments and mixed numeric/named arguments in ICU 4.8+.
-
-- MessageFormatter::format() and related functions now don't error out
-  when an insufficient argument count is provided. Instead, the
-  placeholders will remain unsubstituted.
-
-- MessageFormatter::parse() and MessageFormat::format() (and their
-  static equivalents) now don't throw away better than second
-  precision in the arguments.
-
-- IntlDateFormatter::__construct and datefmt_create() now accept for
-  the $timezone argument time zone identifiers, IntlTimeZone objects,
-  DateTimeZone objects and NULL. It used to accept only time zone
-  identifiers and NULL.  Invalid time zone identifiers are no longer
-  accepted. Empty strings are no longer accepted.
-
+- pack()/unpack() had the following changes, which bring it more in line
+  with Perl's behavior:
+  - Implemented format character "Z": NULL padded string, with trailing NULL
+    bytes removed.
+  - Changed format character "a": this no longer removes trailing NULL bytes.
+  - Changed format character "A": all trailing ASCII whitespace is now removed
+    (defined as spaces, tabs, \r, \n and NULL).
+- MessageFormatter::format() and related functions now accepted named arguments
+  and mixed numeric/named arguments in ICU 4.8+.
+- MessageFormatter::format() and related functions now don't error out when
+  an insufficient argument count is provided. Instead, the placeholders will
+  remain unsubstituted.
+- MessageFormatter::parse() and MessageFormat::format() (and their static
+  equivalents) now don't throw away better than second precision in the
+  arguments.
+- IntlDateFormatter::__construct and datefmt_create() now accept for the
+  $timezone argument time zone identifiers, IntlTimeZone objects, DateTimeZone
+  objects and NULL. It used to accept only time zone identifiers and NULL.
+  Invalid time zone identifiers are no longer accepted. Emptry strings are
+  no longer accepted.
 - The default time zone used in IntlDateFormatter::__construct and
-  datefmt_create() (when the corresponding argument is not passed or
-  NULL is passed) is now the one given by date_default_timezone_get(),
-  not the default ICU time zone.
-
-- The time zone passed to the IntlDateFormatter is ignored if it is
-  NULL and if the calendar passed is an IntlCalendar object -- in this
-  case, the IntlCalendar's time zone will be used instead. Otherwise,
-  the time zone specified in the $timezone argument is used
-  instead. This does not affect old code, as IntlCalendar was
-  introduced in this version.
-
-- IntlDateFormatter::__construct and datefmt_create() now accept for
-  the $calendar argument also IntlCalendar objects.
-
-- IntlDateFormatter::getCalendar() and datefmt_get_calendar() return
-  false if the IntlDateFormatter was set up with an IntlCalendar
-  instead of the constants
-  IntlDateFormatter::GREGORIAN/TRADITIONAL. IntlCalendar did not exist
-  before this version.
-
-- IntlDateFormatter::setCalendar() and datefmt_set_calendar() now also
-  accept an IntlCalendar object, in which case its time zone is
-  taken. Passing a constant is still allowed, and still keeps the time
-  zone.
-
+  datefmt_create() (when the corresponding argument is not passed or NULL is
+  passed) is now the one given by date_default_timezone_get(), not the
+  default ICU time zone.
+- The time zone passed to the IntlDateFormatter is ignored if it is NULL and if
+  the calendar passed is an IntlCalendar object -- in this case, the
+  IntlCalendar's time zone will be used instead. Otherwise, the time zone
+  specified in the $timezone argument is used instead. This does not affect
+  old code, as IntlCalendar was introduced in this version.
+- IntlDateFormatter::__construct and datefmt_create() now accept for the
+  $calendar argument also IntlCalendar objects.
+- IntlDateFormatter::getCalendar() and datefmt_get_calendar() return false
+  if the IntlDateFormatter was set up with an IntlCalendar instead of the
+  constants IntlDateFormatter::GREGORIAN/TRADITIONAL. IntlCalendar did not
+  exist before this version.
+- IntlDateFormatter::setCalendar() and datefmt_set_calendar() now also accept
+  an IntlCalendar object, in which case its time zone is taken. Passing a
+  constant is still allowed, and still keeps the time zone.
 - IntlDateFormatter::format() and datefmt_format() now also accept an
   IntlCalendar object for formatting.
-
+- php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid() and 
+  zend_logo_guid() have been removed
 - set_error_handler(NULL) can now be used to reset the error handler.
-  Furthermore both set_error_handler(NULL) and
-  set_exception_handler(NULL) will now return the previously defined
-  error/exception handler. Previously bool(true) was returned.
-
-- setcookie(), setrawcookie() and ext/session now send Max-Age headers
-  alongside Expires headers. (see
-  https://wiki.php.net/rfc/cookie_max-age)
-
-- curl_setopt now accepts new option CURLOPT_SAFE_UPLOAD and CURLFile
-  object for safer file uploads (see
-  https://wiki.php.net/rfc/curl-file-upload)
-
-- Functions in the socket extension now do not emit warnings when the
-  errno is EAGAIN, EWOULDBLOCK or EINPROGRESS.
+  Furthermore both set_error_handler(NULL) and set_exception_handler(NULL) will
+  now return the previously defined error/exception handler. Previously
+  bool(true) was returned.
+- setcookie(), setrawcookie() and ext/session now send Max-Age headers alongside
+  Expires headers. (see https://wiki.php.net/rfc/cookie_max-age)
+- curl_setopt now accepts new option CURLOPT_SAFE_UPLOAD and CURLFile object for
+  safer file uploads (see https://wiki.php.net/rfc/curl-file-upload)
+- Functions in the socket extension now do not emit warnings when the errno is
+  EAGAIN, EWOULDBLOCK or EINPROGRESS.
 
 ========================================
 5. New Functions
@@ -298,7 +257,7 @@ PHP 5.5 UPGRADE NOTES
   - SplFixedArray::__wakeup()
   - SplDoublyLinkedList::add()
 
-- Zend OPcache:
+- Zend OPcache
  - opcache_get_configuration()
  - opcache_get_status()
  - opcache_reset()
@@ -323,7 +282,6 @@ PHP 5.5 UPGRADE NOTES
 7. Removed Extensions
 ========================================
 
-None
 
 ========================================
 8. Other Changes to Extensions
@@ -346,7 +304,7 @@ None
 - GD
   - Added constants for imageflip:
     . IMG_FLIP_HORIZONTAL
-    . IMG_FLIP_VERTICAL
+	. IMG_FLIP_VERTICAL
     . IMG_FLIP_BOTH
   - Added constants for imagecrop
     . IMG_CROP_DEFAULT
@@ -390,20 +348,18 @@ None
 ========================================
 
 - Core:
-  - Added sys_temp_dir INI directive, for specifying temporary
-    directory.
+  - Added sys_temp_dir INI directive, for specifying temp directory.
 
 - Intl:
-  - Added intl.use_exceptions INI directive, which controls what
-    happens when global errors are set together with intl.error_level.
+  - Added intl.use_exceptions INI directive, which controls what happens when
+    global errors are set together with intl.error_level.
 
 - mysqlnd:
-  - Added mysqlnd.sha256_server_public_key INI PERDIR setting that
-    affects all APIs which use(are built) for mysqlnd. This allows
-    ext/mysqli to be used with the new auth protocol, although at
-    coarser level.
+  - Added mysqlnd.sha256_server_public_key INI PERDIR setting that affects all
+    APIs which use(are built) for mysqlnd. This allows ext/mysqli to be used
+	with the new auth protocol, although at coarser level.
 
-- Zend OPcache (See http://php.net/manual/en/book.opcache.php)
+- Zend OPcache (See ext/opcache/README for more details)
   - Added the following directives:
     - opcache.enable (default "1")
     - opcache.memory_consumption (default "64")
@@ -434,30 +390,11 @@ None
 11. Windows Support
 ========================================
 
-- The Apache 2.4 handler is supported as of PHP 5.5.0
+- Apache 2.4 handler is supported as of PHP 5.5.0
 
-- OPcache: Errors like 'unable to reattach to base address' could
-  happen in many common setups.  It is due to some technical and
-  design restriction in the engine and could not be fixed easily
-  before 5.5.0 was released.
-
-  A possible fix is to tweak the opcache.mmap_base INI setting by
-  forcing the first address to be tried.
-
-  For x86 version, the following addreses can be tried:
-        .  0x20000000, 0x21000000, 0x30000000, 0x31000000, 0x50000000
-  and for x64 (still experimental):
-        . 0x0000100000000000, 0x0000200000000000, 0x0000300000000000, 0x0000700000000000
 
 ========================================
 12. Other Changes
 ========================================
 
-- If the APC or WinCache user cache APIs were used before, consider
-   these alternatives for PHP 5.5:
-
-  - APCu
-      - all supported OSes: http://pecl.php.net/package/APCu
-      - Windows: http://windows.php.net/downloads/pecl/releases/apcu/
-
-  - WinCache, Windows only: http://pecl.php.net/package/WinCache
+- Logo GUIDs will no longer work

Zend/README.ZEND_VM

@@ -6,7 +6,7 @@ fields and using different execution methods (call threading, switch threading
 and direct threading). As a result ZE2 got more than 20% speedup on raw PHP
 code execution (with specialized executor and direct threading execution
 method). As in most PHP applications raw execution speed isn't the limiting
-factor but system calls and database calls are, your mileage with this patch
+factor but system calls and database callls are, your mileage with this patch
 will vary.
 
 Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can

Zend/ZEND_CHANGES

@@ -435,7 +435,7 @@ Changes in the Zend Engine 2.0
       that of other object-oriented languages, such as Java: When the
       last reference to an object is destroyed the object's
       destructor, which is a class method name __destruct() that
-      receives no parameters, is called before the object is freed
+      recieves no parameters, is called before the object is freed
       from memory.
 
       Example:
@@ -1136,7 +1136,7 @@ Changes in the Zend Engine 1.0
       (supports breakpoints, expression evaluation, step-in/over,
       function call backtrace, and more).
 
-  The Zend Engine claims 100% compatibility with the engine of PHP
+  The Zend Engine claims 100% compatability with the engine of PHP
   3.0, and is shamelessly lying about it. Here's why:
 
     * Static variable initializers only accept scalar values
@@ -1161,6 +1161,6 @@ Changes in the Zend Engine 1.0
       printed the letter { and the contents of the variable $somevar in
       PHP 3.0), it will result in a parse error with the Zend Engine.
       In this case, you would have to change the code to print
-      "\{$somevar"; This incompatibility is due to the full variable
+      "\{$somevar"; This incompatability is due to the full variable
       reference within quoted strings feature added in the Zend
       Engine.

Zend/tests/019.phpt

@@ -357,7 +357,7 @@ var_dump($global_var);
 test_unset3();
 var_dump($global_var);
 
-//Note: No error conditions relating to passing arguments can be tested
+//Note: No error conditions relating to passing arugments can be tested
 // because these are not functions but statements, it will result in syntax error.
 ?>
 ===DONE===

Zend/tests/bug32428.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #32428 (The @ warning error suppression operator is broken)
+Bug #32428 (The @ warning error supression operator is broken)
 --FILE--
 <?php 
   $data = @$not_exists; 

Zend/tests/bug64960.phpt

@@ -1,40 +0,0 @@
---TEST--
-Bug #64960 (Segfault in gc_zval_possible_root)
---FILE--
-<?php
-// this makes ob_end_clean raise an error
-ob_end_flush();
-
-class ExceptionHandler {
-	public function __invoke (Exception $e)
-	{
-		// this triggers the custom error handler
-		ob_end_clean();
-	}
-}
-
-// this must be a class, closure does not trigger segfault
-set_exception_handler(new ExceptionHandler());
-
-// exception must be throwed from error handler.
-set_error_handler(function()
-{
-	$e = new Exception;
-	$e->_trace = debug_backtrace();
-	
-	throw $e;
-});
-
-// trigger error handler
-$a['waa'];
-?>
---EXPECTF--
-Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush in %sbug64960.php on line 3
-
-Fatal error: Uncaught exception 'Exception' in %sbug64960.php:19
-Stack trace:
-#0 [internal function]: {closure}(8, 'ob_end_clean():...', '%s', 9, Array)
-#1 %sbug64960.php(9): ob_end_clean()
-#2 [internal function]: ExceptionHandler->__invoke(Object(Exception))
-#3 {main}
-  thrown in %sbug64960.php on line 19

Zend/tests/bug64966.phpt

@@ -1,30 +0,0 @@
---TEST--
-Bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
---FILE--
-<?php
-error_reporting(E_ALL);
-set_error_handler(function($error) { throw new Exception(); }, E_RECOVERABLE_ERROR);
-
-function test($func) {
-	$a = $func("");
-	return true;
-}
-class A {
-	public function b() {
-		test("strlen");
-		test("iterator_apply");
-	}
-}
-
-$a = new A();
-$a->b();
-?>
---EXPECTF--
-Fatal error: Uncaught exception 'Exception' in %sbug64966.php:3
-Stack trace:
-#0 [internal function]: {closure}(4096, 'Argument 1 pass...', '%s', 6, Array)
-#1 %sbug64966.php(6): iterator_apply('')
-#2 %sbug64966.php(12): test('iterator_apply')
-#3 %sbug64966.php(17): A->b()
-#4 {main}
-  thrown in %sbug64966.php on line 3

Zend/tests/bug64988.phpt

@@ -1,30 +0,0 @@
---TEST--
-Bug #64988 (Class loading order affects E_STRICT warning)
---FILE--
-<?php
-abstract class Base1 {
-	public function insert(array $data){
-		return array_reverse($data);
-	}
-}
-
-class Noisy1 extends Base1 {
-	public function insert(array $data, $option1 = Null) {
-		if (!empty($option1)) {
-			$data['option1'] = $option1;
-		}
-		return parent::insert($data);
-	}
-}
-class Smooth1 extends Noisy1 {
-	public function insert(array $data) {
-		return parent::insert($data, count($data));
-	}
-}
-
-$o = new Smooth1();
-echo "okey";
-?>
---EXPECTF--
-Strict Standards: Declaration of Smooth1::insert() should be compatible with Noisy1::insert(array $data, $option1 = NULL) in %sbug64988.php on line 20
-okey

Zend/tests/bug65051.phpt

@@ -1,23 +0,0 @@
---TEST--
-Bug #65051: count() off by one inside unset()
---FILE--
-<?php
-
-class Foo {
-    public $array;
-
-    public function __destruct() {
-        var_dump(count($this->array[0]));
-        var_dump($this->array[0]);
-    }
-}
-
-$array = [[new Foo]];
-$array[0][0]->array =& $array;
-unset($array[0][0]);
-
-?>
---EXPECT--
-int(0)
-array(0) {
-}

Zend/tests/bug65108.phpt

@@ -1,27 +0,0 @@
---TEST--
-Bug #65108 (is_callable() triggers Fatal Error)
---FILE--
-<?php
-class C {
-	private function f() {}
-	static function __callStatic($name, $args) {}
-}
-
-class B {
-	public function B() {
-		$isCallable = is_callable(array(new C, 'f'));
-		var_dump($isCallable);
-	}
-}
-
-new B();
-
-Class E {
-   private function f() {}
-   function __call($name, $args) {}
-}
-$isCallable = is_callable(array('E', 'f'));
-var_dump($isCallable);
---EXPECT--
-bool(false)
-bool(false)

Zend/tests/bug65254.phpt

@@ -1,21 +0,0 @@
---TEST--
-Bug #65254 (Exception not catchable when exception thrown in autoload with a namespace)
---FILE--
-<?php
-function __autoload($class)
-{
-    eval("namespace ns_test; class test {}");
-
-    throw new \Exception('abcd');
-}
-
-try
-{
-    \ns_test\test::go();
-}
-catch (Exception $e)
-{
-    echo 'caught';
-}
---EXPECT--
-caught

Zend/tests/closure_044.phpt

@@ -3,7 +3,7 @@ Closure 044: Scope/bounding combination invariants; non static closures
 --FILE--
 <?php
 /* A non-static closure has a bound instance if it has a scope
- * and doesn't have an instance if it has no scope */
+ * and does't have an instance if it has no scope */
 
 $nonstaticUnscoped = function () { var_dump(isset(A::$priv)); var_dump(isset($this)); };
 

Zend/tests/gc_007.phpt

@@ -1,5 +1,5 @@
 --TEST--
-GC 007: Unreferenced array cycle
+GC 007: Unreferensed array cycle
 --INI--
 zend.enable_gc=1
 --FILE--

Zend/tests/gc_008.phpt

@@ -1,5 +1,5 @@
 --TEST--
-GC 008: Unreferenced object cycle
+GC 008: Unreferensed object cycle
 --INI--
 zend.enable_gc=1
 --FILE--

Zend/tests/gc_009.phpt

@@ -1,5 +1,5 @@
 --TEST--
-GC 009: Unreferenced array-object cycle
+GC 009: Unreferensed array-object cycle
 --INI--
 zend.enable_gc=1
 --FILE--

Zend/tests/generators/bug65035.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #65035: yield / exit segfault
---FILE--
-<?php
-
-function gen() {
-    fn();
-    yield;
-}
-
-function fn() {
-    exit('Done');
-}
-
-$gen = gen();
-$gen->current();
-
-?>
---EXPECT--
-Done

Zend/tests/generators/bug65161.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #65161: Generator + autoload + syntax error = segfault
---FILE--
-<?php
-
-function autoload() {
-    foo();
-}
-spl_autoload_register('autoload');
-
-function testGenerator() {
-    new SyntaxError('param');
-    yield;
-}
-
-foreach (testGenerator() as $i);
-
-?>
---EXPECTF--
-Fatal error: Call to undefined function foo() in %s on line %d

Zend/tests/generators/yield_without_value.phpt

@@ -9,13 +9,13 @@ function recv() {
     }
 }
 
-$receiver = recv();
-var_dump($receiver->current());
-$receiver->send(1);
-var_dump($receiver->current());
-$receiver->send(2);
-var_dump($receiver->current());
-$receiver->send(3);
+$reciever = recv();
+var_dump($reciever->current());
+$reciever->send(1);
+var_dump($reciever->current());
+$reciever->send(2);
+var_dump($reciever->current());
+$reciever->send(3);
 
 ?>
 --EXPECT--

Zend/zend.h

@@ -22,7 +22,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "2.5.0"
+#define ZEND_VERSION "2.5.0-dev"
 
 #define ZEND_ENGINE_2
 

Zend/zend_API.c

@@ -1172,7 +1172,7 @@ ZEND_API void object_properties_init(zend_object *object, zend_class_entry *clas
 
 /* This function requires 'properties' to contain all props declared in the
  * class and all props being public. If only a subset is given or the class
- * has protected members then you need to merge the properties separately by
+ * has protected members then you need to merge the properties seperately by
  * calling zend_merge_properties(). */
 ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *class_type, HashTable *properties ZEND_FILE_LINE_DC TSRMLS_DC) /* {{{ */
 {
@@ -2842,8 +2842,8 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
 		}
 		if ((check_flags & IS_CALLABLE_CHECK_NO_ACCESS) == 0 &&
 		    (fcc->calling_scope &&
-		     ((fcc->object_ptr && fcc->calling_scope->__call) ||
-		      (!fcc->object_ptr && fcc->calling_scope->__callstatic)))) {
+		     (fcc->calling_scope->__call ||
+		      fcc->calling_scope->__callstatic))) {
 			if (fcc->function_handler->op_array.fn_flags & ZEND_ACC_PRIVATE) {
 				if (!zend_check_private(fcc->function_handler, fcc->object_ptr ? Z_OBJCE_P(fcc->object_ptr) : EG(scope), lmname, mlen TSRMLS_CC)) {
 					retval = 0;

Zend/zend_API.h

@@ -465,7 +465,7 @@ ZEND_API extern const zend_fcall_info_cache empty_fcall_info_cache;
  */
 ZEND_API int zend_fcall_info_init(zval *callable, uint check_flags, zend_fcall_info *fci, zend_fcall_info_cache *fcc, char **callable_name, char **error TSRMLS_DC);
 
-/** Clear arguments connected with zend_fcall_info *fci
+/** Clear argumens connected with zend_fcall_info *fci
  * If free_mem is not zero then the params array gets free'd as well
  */
 ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, int free_mem);
@@ -503,7 +503,7 @@ ZEND_API int zend_fcall_info_argv(zend_fcall_info *fci TSRMLS_DC, int argc, va_l
 ZEND_API int zend_fcall_info_argn(zend_fcall_info *fci TSRMLS_DC, int argc, ...);
 
 /** Call a function using information created by zend_fcall_info_init()/args().
- * If args is given then those replace the argument info in fci is temporarily.
+ * If args is given then those replace the arguement info in fci is temporarily.
  */
 ZEND_API int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval **retval, zval *args TSRMLS_DC);
 

Zend/zend_alloc.c

@@ -2465,7 +2465,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
 	size_t res = nmemb;
 	unsigned long overflow = 0;
 
-	__asm__ ("mull %3\n\taddl %4,%0\n\tadcl $0,%1"
+	__asm__ ("mull %3\n\taddl %4,%0\n\tadcl %1,%1"
 	     : "=&a"(res), "=&d" (overflow)
 	     : "%0"(res),
 	       "rm"(size),
@@ -2493,7 +2493,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
 
         __asm__ ("mul" LP_SUFF  " %3\n\t"
                  "add %4,%0\n\t"
-                 "adc $0,%1"
+                 "adc %1,%1"
              : "=&a"(res), "=&d" (overflow)
              : "%0"(res),
                "rm"(size),
@@ -2535,7 +2535,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
         size_t res;
         unsigned long overflow;
 
-        __asm__ ("mul %0,%2,%3\n\tumulh %1,%2,%3\n\tadds %0,%0,%4\n\tadc %1,%1,xzr"
+        __asm__ ("mul %0,%2,%3\n\tumulh %1,%2,%3\n\tadds %0,%0,%4\n\tadc %1,%1,%1"
              : "=&r"(res), "=&r"(overflow)
              : "r"(nmemb),
                "r"(size),

Zend/zend_compile.c

@@ -3464,11 +3464,11 @@ static void do_inheritance_check_on_method(zend_function *child, zend_function *
 
 	if (child->common.prototype && (child->common.prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
 		if (!zend_do_perform_implementation_check(child, child->common.prototype TSRMLS_CC)) {
-			zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype TSRMLS_CC));
+			zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype? child->common.prototype : parent TSRMLS_CC));
 		}
 	} else if (EG(error_reporting) & E_STRICT || EG(user_error_handler)) { /* Check E_STRICT (or custom error handler) before the check so that we save some time */
 		if (!zend_do_perform_implementation_check(child, parent TSRMLS_CC)) {
-			char *method_prototype = zend_get_function_declaration(parent TSRMLS_CC);
+			char *method_prototype = zend_get_function_declaration(child->common.prototype? child->common.prototype : parent TSRMLS_CC);
 			zend_error(E_STRICT, "Declaration of %s::%s() should be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, method_prototype);
 			efree(method_prototype);
 		}
@@ -3941,7 +3941,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const
 #endif
 		} else {
 			/* inherited members are overridden by members inserted by traits */
-			/* check whether the trait method fulfills the inheritance requirements */
+			/* check whether the trait method fullfills the inheritance requirements */
 			do_inheritance_check_on_method(fn, existing_fn TSRMLS_CC);
 		}
 	}
@@ -4108,7 +4108,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
 				/** With the other traits, we are more permissive.
 					We do not give errors for those. This allows to be more
 					defensive in such definitions.
-					However, we want to make sure that the insteadof declaration
+					However, we want to make sure that the insteadof declartion
 					is consistent in itself.
 				 */
 				j = 0;
@@ -5687,7 +5687,7 @@ void zend_do_shell_exec(znode *result, const znode *cmd TSRMLS_DC) /* {{{ */
 			break;
 	}
 	SET_NODE(opline->op1, cmd);
-	opline->op2.opline_num = 1;
+	opline->op2.opline_num = 0;
 	opline->extended_value = ZEND_DO_FCALL;
 	SET_UNUSED(opline->op2);
 
@@ -7176,7 +7176,7 @@ ZEND_API size_t zend_dirname(char *path, size_t len)
 	}
 #elif defined(NETWARE)
 	/*
-	 * Find the first occurrence of : from the left
+	 * Find the first occurence of : from the left
 	 * move the path pointer to the position just after :
 	 * increment the len_adjust to the length of path till colon character(inclusive)
 	 * If there is no character beyond : simple return len

Zend/zend_execute_API.c

@@ -254,13 +254,15 @@ void shutdown_executor(TSRMLS_D) /* {{{ */
 		if (EG(user_error_handler)) {
 			zeh = EG(user_error_handler);
 			EG(user_error_handler) = NULL;
-			zval_ptr_dtor(&zeh);
+			zval_dtor(zeh);
+			FREE_ZVAL(zeh);
 		}
 
 		if (EG(user_exception_handler)) {
 			zeh = EG(user_exception_handler);
 			EG(user_exception_handler) = NULL;
-			zval_ptr_dtor(&zeh);
+			zval_dtor(zeh);
+			FREE_ZVAL(zeh);
 		}
 
 		zend_stack_destroy(&EG(user_error_handlers_error_reporting));

Zend/zend_gc.h

@@ -106,7 +106,7 @@ typedef struct _zend_gc_globals {
 	gc_root_buffer   *first_unused;		/* pointer to first unused buffer   */
 	gc_root_buffer   *last_unused;		/* pointer to last unused buffer    */
 
-	zval_gc_info     *zval_to_free;		/* temporary list of zvals to free */
+	zval_gc_info     *zval_to_free;		/* temporaryt list of zvals to free */
 	zval_gc_info     *free_list;
 	zval_gc_info     *next_to_free;
 
@@ -199,7 +199,7 @@ static zend_always_inline void gc_remove_from_buffer(gc_root_buffer *root TSRMLS
 		GC_ZVAL_INIT(z);								\
 	} while (0)
 
-/* The following macros override macros from zend_alloc.h */
+/* The following macroses override macroses from zend_alloc.h */
 #undef  ALLOC_ZVAL
 #define ALLOC_ZVAL(z) 									\
 	do {												\

Zend/zend_generators.c

@@ -55,12 +55,6 @@ ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished
 			zval_ptr_dtor(&execute_data->current_this);
 		}
 
-		/* A fatal error / die occurred during the generator execution. Trying to clean
-		 * up the stack may not be safe in this case. */
-		if (CG(unclean_shutdown)) {
-			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 */

Zend/zend_hash.c

@@ -527,7 +527,6 @@ ZEND_API int zend_hash_del_key_or_index(HashTable *ht, const char *arKey, uint n
 			if (ht->pInternalPointer == p) {
 				ht->pInternalPointer = p->pListNext;
 			}
-			ht->nNumOfElements--;
 			if (ht->pDestructor) {
 				ht->pDestructor(p->pData);
 			}
@@ -536,6 +535,7 @@ ZEND_API int zend_hash_del_key_or_index(HashTable *ht, const char *arKey, uint n
 			}
 			pefree(p, ht->persistent);
 			HANDLE_UNBLOCK_INTERRUPTIONS();
+			ht->nNumOfElements--;
 			return SUCCESS;
 		}
 		p = p->pNext;
@@ -1320,7 +1320,6 @@ ZEND_API int zend_hash_update_current_key_ex(HashTable *ht, int key_type, const
 					if (ht->pInternalPointer == p) {
 						ht->pInternalPointer = p->pListNext;
 					}
-					ht->nNumOfElements--;
 					if (ht->pDestructor) {
 						ht->pDestructor(p->pData);
 					}
@@ -1328,6 +1327,7 @@ ZEND_API int zend_hash_update_current_key_ex(HashTable *ht, int key_type, const
 						pefree(p->pData, ht->persistent);
 					}
 					pefree(p, ht->persistent);
+					ht->nNumOfElements--;
 					HANDLE_UNBLOCK_INTERRUPTIONS();
 					return FAILURE;
 				}
@@ -1355,7 +1355,6 @@ ZEND_API int zend_hash_update_current_key_ex(HashTable *ht, int key_type, const
 			if (ht->pInternalPointer == q) {
 				ht->pInternalPointer = q->pListNext;
 			}
-			ht->nNumOfElements--;
 			if (ht->pDestructor) {
 				ht->pDestructor(q->pData);
 			}
@@ -1363,6 +1362,7 @@ ZEND_API int zend_hash_update_current_key_ex(HashTable *ht, int key_type, const
 				pefree(q->pData, ht->persistent);
 			}
 			pefree(q, ht->persistent);
+			ht->nNumOfElements--;
 		}
 
 		if (p->pNext) {

Zend/zend_language_scanner.l

@@ -258,8 +258,6 @@ ZEND_API void zend_restore_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
 	SCNG(input_filter) = lex_state->input_filter;
 	SCNG(output_filter) = lex_state->output_filter;
 	SCNG(script_encoding) = lex_state->script_encoding;
-
-	RESET_DOC_COMMENT();
 }
 
 ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle TSRMLS_DC)
@@ -543,7 +541,6 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC)
 		CG(zend_lineno) = 1;
 	}
 
-	RESET_DOC_COMMENT();
 	CG(increment_lineno) = 0;
 	return SUCCESS;
 }
@@ -694,7 +691,6 @@ ZEND_API int zend_prepare_string_for_scanning(zval *str, char *filename TSRMLS_D
 	zend_set_compiled_filename(filename TSRMLS_CC);
 	CG(zend_lineno) = 1;
 	CG(increment_lineno) = 0;
-	RESET_DOC_COMMENT();
 	return SUCCESS;
 }
 

Zend/zend_operators.c

@@ -1530,7 +1530,7 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {
 				/* If both are objects sharing the same comparision handler then use is */
 				if (Z_OBJ_HANDLER_P(op1,compare_objects) == Z_OBJ_HANDLER_P(op2,compare_objects)) {
 					if (Z_OBJ_HANDLE_P(op1) == Z_OBJ_HANDLE_P(op2)) {
-						/* object handles are identical, apparently this is the same object */
+						/* object handles are identical, apprently this is the same object */
 						ZVAL_LONG(result, 0);
 						return SUCCESS;
 					}

Zend/zend_vm_def.h

@@ -1996,8 +1996,6 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
 			if (!RETURN_VALUE_USED(opline)) {
 				zval_ptr_dtor(&ret->var.ptr);
 			}
-		} else if (RETURN_VALUE_USED(opline)) {
-			EX_T(opline->result.var).var.ptr = NULL;
 		}
 	} else if (fbc->type == ZEND_USER_FUNCTION) {
 		EX(original_return_value) = EG(return_value_ptr_ptr);
@@ -2517,11 +2515,9 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMP|VAR|UNUS
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-			if (UNEXPECTED(EG(exception) != NULL)) {
-				HANDLE_EXCEPTION();
-			}
 			if (UNEXPECTED(ce == NULL)) {
-				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+				CHECK_EXCEPTION();
+				ZEND_VM_NEXT_OPCODE();
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -3298,6 +3294,7 @@ ZEND_VM_HANDLER(50, ZEND_BRK, ANY, CONST)
 	SAVE_OPLINE();
 	el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
 	                   EX(op_array), execute_data TSRMLS_CC);
+	FREE_OP2();
 	ZEND_VM_JMP(EX(op_array)->opcodes + el->brk);
 }
 
@@ -3309,6 +3306,7 @@ ZEND_VM_HANDLER(51, ZEND_CONT, ANY, CONST)
 	SAVE_OPLINE();
 	el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
 	                   EX(op_array), execute_data TSRMLS_CC);
+	FREE_OP2();
 	ZEND_VM_JMP(EX(op_array)->opcodes + el->cont);
 }
 
@@ -3534,11 +3532,9 @@ ZEND_VM_HANDLER(99, ZEND_FETCH_CONSTANT, VAR|CONST|UNUSED, CONST)
 				ce = CACHED_PTR(opline->op1.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
-					HANDLE_EXCEPTION();
-				}
 				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op1.literal->cache_slot, ce);
 			}
@@ -3916,17 +3912,15 @@ ZEND_VM_HANDLER(74, ZEND_UNSET_VAR, CONST|TMP|VAR|CV, UNUSED|CONST|VAR)
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
+				if (UNEXPECTED(ce == NULL)) {
 					if (OP1_TYPE != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (OP1_TYPE == IS_VAR || OP1_TYPE == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 					FREE_OP1();
-					HANDLE_EXCEPTION();
-				}
-				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}

Zend/zend_vm_execute.h

@@ -548,8 +548,6 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR
 			if (!RETURN_VALUE_USED(opline)) {
 				zval_ptr_dtor(&ret->var.ptr);
 			}
-		} else if (RETURN_VALUE_USED(opline)) {
-			EX_T(opline->result.var).var.ptr = NULL;
 		}
 	} else if (fbc->type == ZEND_USER_FUNCTION) {
 		EX(original_return_value) = EG(return_value_ptr_ptr);
@@ -1423,6 +1421,7 @@ static int ZEND_FASTCALL  ZEND_BRK_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	SAVE_OPLINE();
 	el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
 	                   EX(op_array), execute_data TSRMLS_CC);
+
 	ZEND_VM_JMP(EX(op_array)->opcodes + el->brk);
 }
 
@@ -1434,6 +1433,7 @@ static int ZEND_FASTCALL  ZEND_CONT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	SAVE_OPLINE();
 	el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
 	                   EX(op_array), execute_data TSRMLS_CC);
+
 	ZEND_VM_JMP(EX(op_array)->opcodes + el->cont);
 }
 
@@ -3538,11 +3538,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER(
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-			if (UNEXPECTED(EG(exception) != NULL)) {
-				HANDLE_EXCEPTION();
-			}
 			if (UNEXPECTED(ce == NULL)) {
-				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+				CHECK_EXCEPTION();
+				ZEND_VM_NEXT_OPCODE();
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -3714,11 +3712,9 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_CONST_CONST_HANDLER(ZEND_OPCO
 				ce = CACHED_PTR(opline->op1.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
-					HANDLE_EXCEPTION();
-				}
 				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op1.literal->cache_slot, ce);
 			}
@@ -3903,17 +3899,15 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HA
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
+				if (UNEXPECTED(ce == NULL)) {
 					if (IS_CONST != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_CONST == IS_VAR || IS_CONST == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 
-					HANDLE_EXCEPTION();
-				}
-				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -4537,11 +4531,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMP_HANDLER(ZE
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-			if (UNEXPECTED(EG(exception) != NULL)) {
-				HANDLE_EXCEPTION();
-			}
 			if (UNEXPECTED(ce == NULL)) {
-				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+				CHECK_EXCEPTION();
+				ZEND_VM_NEXT_OPCODE();
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -5401,11 +5393,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_VAR_HANDLER(ZE
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-			if (UNEXPECTED(EG(exception) != NULL)) {
-				HANDLE_EXCEPTION();
-			}
 			if (UNEXPECTED(ce == NULL)) {
-				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+				CHECK_EXCEPTION();
+				ZEND_VM_NEXT_OPCODE();
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -5670,17 +5660,15 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HAND
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
+				if (UNEXPECTED(ce == NULL)) {
 					if (IS_CONST != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_CONST == IS_VAR || IS_CONST == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 
-					HANDLE_EXCEPTION();
-				}
-				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -6123,11 +6111,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-			if (UNEXPECTED(EG(exception) != NULL)) {
-				HANDLE_EXCEPTION();
-			}
 			if (UNEXPECTED(ce == NULL)) {
-				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+				CHECK_EXCEPTION();
+				ZEND_VM_NEXT_OPCODE();
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -6374,17 +6360,15 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_H
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
+				if (UNEXPECTED(ce == NULL)) {
 					if (IS_CONST != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_CONST == IS_VAR || IS_CONST == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 
-					HANDLE_EXCEPTION();
-				}
-				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -6986,11 +6970,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEN
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-			if (UNEXPECTED(EG(exception) != NULL)) {
-				HANDLE_EXCEPTION();
-			}
 			if (UNEXPECTED(ce == NULL)) {
-				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+				CHECK_EXCEPTION();
+				ZEND_VM_NEXT_OPCODE();
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -9186,17 +9168,15 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HAND
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
+				if (UNEXPECTED(ce == NULL)) {
 					if (IS_TMP_VAR != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_TMP_VAR == IS_VAR || IS_TMP_VAR == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 					zval_dtor(free_op1.var);
-					HANDLE_EXCEPTION();
-				}
-				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -10917,17 +10897,15 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLE
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
+				if (UNEXPECTED(ce == NULL)) {
 					if (IS_TMP_VAR != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_TMP_VAR == IS_VAR || IS_TMP_VAR == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 					zval_dtor(free_op1.var);
-					HANDLE_EXCEPTION();
-				}
-				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -11498,17 +11476,15 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HAN
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
+				if (UNEXPECTED(ce == NULL)) {
 					if (IS_TMP_VAR != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_TMP_VAR == IS_VAR || IS_TMP_VAR == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 					zval_dtor(free_op1.var);
-					HANDLE_EXCEPTION();
-				}
-				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -15433,11 +15409,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZE
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-			if (UNEXPECTED(EG(exception) != NULL)) {
-				HANDLE_EXCEPTION();
-			}
 			if (UNEXPECTED(ce == NULL)) {
-				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+				CHECK_EXCEPTION();
+				ZEND_VM_NEXT_OPCODE();
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -15609,11 +15583,9 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE
 				ce = CACHED_PTR(opline->op1.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
-					HANDLE_EXCEPTION();
-				}
 				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op1.literal->cache_slot, ce);
 			}
@@ -15798,17 +15770,15 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HAND
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
+				if (UNEXPECTED(ce == NULL)) {
 					if (IS_VAR != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_VAR == IS_VAR || IS_VAR == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 					if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-					HANDLE_EXCEPTION();
-				}
-				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -17791,11 +17761,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-			if (UNEXPECTED(EG(exception) != NULL)) {
-				HANDLE_EXCEPTION();
-			}
 			if (UNEXPECTED(ce == NULL)) {
-				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+				CHECK_EXCEPTION();
+				ZEND_VM_NEXT_OPCODE();
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -20109,11 +20077,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-			if (UNEXPECTED(EG(exception) != NULL)) {
-				HANDLE_EXCEPTION();
-			}
 			if (UNEXPECTED(ce == NULL)) {
-				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+				CHECK_EXCEPTION();
+				ZEND_VM_NEXT_OPCODE();
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -20378,17 +20344,15 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLE
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
+				if (UNEXPECTED(ce == NULL)) {
 					if (IS_VAR != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_VAR == IS_VAR || IS_VAR == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 					if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-					HANDLE_EXCEPTION();
-				}
-				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -21550,11 +21514,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_UNUSED_HANDLER(Z
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-			if (UNEXPECTED(EG(exception) != NULL)) {
-				HANDLE_EXCEPTION();
-			}
 			if (UNEXPECTED(ce == NULL)) {
-				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+				CHECK_EXCEPTION();
+				ZEND_VM_NEXT_OPCODE();
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -21801,17 +21763,15 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HAN
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
+				if (UNEXPECTED(ce == NULL)) {
 					if (IS_VAR != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_VAR == IS_VAR || IS_VAR == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 					if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-					HANDLE_EXCEPTION();
-				}
-				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -23570,11 +23530,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-			if (UNEXPECTED(EG(exception) != NULL)) {
-				HANDLE_EXCEPTION();
-			}
 			if (UNEXPECTED(ce == NULL)) {
-				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+				CHECK_EXCEPTION();
+				ZEND_VM_NEXT_OPCODE();
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -25246,11 +25204,9 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPC
 				ce = CACHED_PTR(opline->op1.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
-					HANDLE_EXCEPTION();
-				}
 				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op1.literal->cache_slot, ce);
 			}
@@ -33065,17 +33021,15 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDL
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
+				if (UNEXPECTED(ce == NULL)) {
 					if (IS_CV != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_CV == IS_VAR || IS_CV == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 
-					HANDLE_EXCEPTION();
-				}
-				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -37368,17 +37322,15 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
+				if (UNEXPECTED(ce == NULL)) {
 					if (IS_CV != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_CV == IS_VAR || IS_CV == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 
-					HANDLE_EXCEPTION();
-				}
-				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -38660,17 +38612,15 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HAND
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(EG(exception) != NULL)) {
+				if (UNEXPECTED(ce == NULL)) {
 					if (IS_CV != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_CV == IS_VAR || IS_CV == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 
-					HANDLE_EXCEPTION();
-				}
-				if (UNEXPECTED(ce == NULL)) {
-					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
+					CHECK_EXCEPTION();
+					ZEND_VM_NEXT_OPCODE();
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}

Zend/zend_vm_gen.php

@@ -1381,7 +1381,7 @@ for ($i = 1;  $i < $argc; $i++) {
 	  // Disabling code for old-style executor
 		define("ZEND_VM_OLD_EXECUTOR", 1);
 	} else if ($argv[$i] == "--with-lines") {
-		// Enabling debugging using original zend_vm_def.h
+		// Enabling debuging using original zend_vm_def.h
 		define("ZEND_VM_LINES", 1);
 	} else if ($argv[$i] == "--help") {
 		usage();

acinclude.m4

@@ -66,10 +66,10 @@ AC_DEFUN([PHP_EXPAND_PATH],[
     $2=$1
   else
     changequote({,})
-    ep_dir=`echo $1|$SED 's%/*[^/][^/]*/*$%%'`
+    ep_dir="`echo $1|$SED 's%/*[^/][^/]*/*$%%'`"
     changequote([,])
-    ep_realdir=`(cd "$ep_dir" && pwd)`
-    $2="$ep_realdir"/`basename "$1"`
+    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+    $2="$ep_realdir/`basename \"$1\"`"
   fi
 ])
 
@@ -1832,7 +1832,7 @@ AC_TRY_COMPILE([
 ])
 
 dnl -------------------------------------------------------------------------
-dnl Library/function existence and build sanity checks
+dnl Library/function existance and build sanity checks
 dnl -------------------------------------------------------------------------
 
 dnl

build/libtool.m4

@@ -1230,7 +1230,7 @@ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
    test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
    test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 
-  # We can hardcode non-existent directories.
+  # We can hardcode non-existant directories.
   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library

build/shtool

@@ -376,11 +376,11 @@ while [ $# -gt 0 ]; do
             eval "opt_${opt_OPT}=yes"
             ;;
         ':' )
-            #   option with argument (multiple occurrences override)
+            #   option with argument (multiple occurances override)
             eval "opt_${opt_OPT}=\"\$opt_ARG\""
             ;;
         '+' )
-            #   option with argument (multiple occurrences append)
+            #   option with argument (multiple occurances append)
             eval "opt_${opt_OPT}=\"\$opt_${opt_OPT}\${ASC_NL}\$opt_ARG\""
             ;;
         * )

config.guess

@@ -1080,7 +1080,7 @@ EOF
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configure will decide that
+	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;

configure.in

@@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=5
-PHP_RELEASE_VERSION=1
-PHP_EXTRA_VERSION=""
+PHP_RELEASE_VERSION=0
+PHP_EXTRA_VERSION="RC2"
 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`
 

ext/bz2/bz2.c

@@ -518,7 +518,7 @@ static PHP_FUNCTION(bzcompress)
 		efree(dest);
 		RETURN_LONG(error);
 	} else {
-		/* Copy the buffer, we have perhaps allocate a lot more than we need,
+		/* Copy the buffer, we have perhaps allocate alot more than we need,
 		   so we erealloc() the buffer to the proper size */
 		dest = erealloc(dest, dest_len + 1);
 		dest[dest_len] = 0;

ext/bz2/tests/bug51997.phpt

@@ -7,7 +7,7 @@ Bug #51997 (SEEK_CUR with 0 value, returns a warning)
 
 error_reporting(E_ALL);
 
-$filename = "bug51997.bz2";
+$filename = "testfile.bz2";
 $str = "This is a test string.\n";
 $bz = bzopen($filename, "w");
 bzwrite($bz, $str);

ext/bz2/tests/with_files.phpt

@@ -7,7 +7,7 @@ BZ2 with files
 
 error_reporting(E_ALL);
 
-$filename = "with_files.bz2";
+$filename = "testfile.bz2";
 $str = "This is a test string.\n";
 $bz = bzopen($filename, "w");
 bzwrite($bz, $str);

ext/com_dotnet/com_variant.c

@@ -102,9 +102,8 @@ PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codep
 {
 	OLECHAR *olestring;
 	php_com_dotnet_object *obj;
-	zend_uchar ztype = (z == NULL ? IS_NULL : Z_TYPE_P(z));
 	
-	switch (ztype) {
+	switch (Z_TYPE_P(z)) {
 		case IS_NULL:
 			V_VT(v) = VT_NULL;
 			break;
@@ -430,7 +429,7 @@ PHP_FUNCTION(com_variant_create_instance)
 		/* If already an array and VT_ARRAY is passed then:
 			- if only VT_ARRAY passed then do not perform a conversion
 			- if VT_ARRAY plus other type passed then perform conversion 
-			  but will probably fail (original behavior)
+			  but will probably fail (origional behavior)
 		*/
 		if ((vt & VT_ARRAY) && (V_VT(&obj->v) & VT_ARRAY)) {
 			long orig_vt = vt;

ext/curl/interface.c

@@ -958,7 +958,7 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLFTPMETHOD_SINGLECWD);
 #endif
 
-#if LIBCURL_VERSION_NUM >= 0x070f04 /* Available since 7.15.4 */
+#if LIBCURL_VERSION_NUM >- 0x070f04 /* Available since 7.15.4 */
 	REGISTER_CURL_CONSTANT(CURLINFO_FTP_ENTRY_PATH);
 #endif
 

ext/date/lib/timezonedb.h

@@ -766,8 +766,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x1A, 0xB7, 0xA6, 0x00, 0x1E, 0x18, 0x6F, 0xF0, 0x48, 0x41, 0xE6, 0x80, 0x48, 0xBB, 0x22, 0x70, 
 0x4A, 0x23, 0x1A, 0x00, 0x4A, 0x8D, 0xD5, 0x70, 0x4B, 0xDC, 0xC0, 0x80, 0x4C, 0x5D, 0xE5, 0x70, 
 0x4D, 0x97, 0xB8, 0x80, 0x4E, 0x34, 0x8C, 0xF0, 0x4F, 0x9C, 0xA0, 0xA0, 0x50, 0x08, 0xBB, 0xA0, 
-0x50, 0x31, 0x9A, 0x20, 0x50, 0x67, 0xA7, 0xA0, 0x51, 0x7C, 0x82, 0xA0, 0x51, 0xD8, 0xCB, 0xA0, 
-0x52, 0x05, 0x9E, 0xA0, 0x52, 0x47, 0x89, 0xA0, 0x53, 0x5C, 0x64, 0xA0, 0x53, 0xAF, 0x73, 0x20, 
+0x50, 0x31, 0x9A, 0x20, 0x50, 0x67, 0xA7, 0xA0, 0x51, 0x7C, 0x82, 0xA0, 0x51, 0xDB, 0x6E, 0xA0, 
+0x52, 0x02, 0xFB, 0xA0, 0x52, 0x47, 0x89, 0xA0, 0x53, 0x5C, 0x64, 0xA0, 0x53, 0xAF, 0x73, 0x20, 
 0x53, 0xD7, 0x00, 0x20, 0x54, 0x27, 0x6B, 0xA0, 0x55, 0x3C, 0x46, 0xA0, 0x55, 0x82, 0x26, 0x20, 
 0x55, 0xA9, 0xB3, 0x20, 0x56, 0x07, 0x4D, 0xA0, 0x57, 0x1C, 0x28, 0xA0, 0x57, 0x56, 0x2A, 0xA0, 
 0x57, 0x7D, 0xB7, 0xA0, 0x57, 0xE7, 0x2F, 0xA0, 0x59, 0x05, 0x45, 0x20, 0x59, 0x28, 0xDD, 0xA0, 
@@ -7248,7 +7248,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x8C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 
 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x00, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xB0, 
 0x00, 0x08, 0x45, 0x53, 0x54, 0x00, 0x7A, 0x7A, 0x7A, 0x00, 0x4D, 0x49, 0x53, 0x54, 0x00, 0x00, 
-0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x2B, 0x30, 0x02, 
+0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x2B, 0x30, 0x02, 
 0x05, 0x32, 0x58, 0x00, 0x00, 0x00, 0x10, 0x4D, 0x61, 0x63, 0x71, 0x75, 0x61, 0x72, 0x69, 0x65, 
 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 
 
@@ -8441,19 +8441,19 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x46, 0xEC, 0x63, 0xF0, 0x47, 0xEC, 0x35, 0x00, 0x48, 0xE7, 0xF5, 0x70, 0x49, 0xCC, 0x17, 0x00, 
 0x4A, 0xBE, 0x9C, 0xF0, 0x4B, 0xAB, 0xF9, 0x00, 0x4C, 0x8C, 0x09, 0xF0, 0x4D, 0x95, 0x15, 0x80, 
 0x4E, 0x87, 0x9B, 0x70, 0x4F, 0x74, 0xF7, 0x80, 0x50, 0x5E, 0x42, 0xF0, 0x51, 0x54, 0xD9, 0x80, 
-0x52, 0x6C, 0x49, 0x70, 0x53, 0x34, 0xBB, 0x80, 0x54, 0x4C, 0x2B, 0x70, 0x55, 0x14, 0x9D, 0x80, 
-0x56, 0x2C, 0x0D, 0x70, 0x56, 0xF4, 0x7F, 0x80, 0x58, 0x15, 0x29, 0xF0, 0x58, 0xD4, 0x61, 0x80, 
-0x59, 0xF5, 0x0B, 0xF0, 0x5A, 0xB4, 0x43, 0x80, 0x5B, 0xD4, 0xED, 0xF0, 0x5C, 0x9D, 0x60, 0x00, 
-0x5D, 0xB4, 0xCF, 0xF0, 0x5E, 0x7D, 0x42, 0x00, 0x5F, 0x94, 0xB1, 0xF0, 0x60, 0x5D, 0x24, 0x00, 
-0x61, 0x7D, 0xCE, 0x70, 0x62, 0x3D, 0x06, 0x00, 0x63, 0x5D, 0xB0, 0x70, 0x64, 0x1C, 0xE8, 0x00, 
-0x65, 0x3D, 0x92, 0x70, 0x66, 0x06, 0x04, 0x80, 0x67, 0x1D, 0x74, 0x70, 0x67, 0xE5, 0xE6, 0x80, 
-0x68, 0xFD, 0x56, 0x70, 0x69, 0xC5, 0xC8, 0x80, 0x6A, 0xDD, 0x38, 0x70, 0x6B, 0xA5, 0xAA, 0x80, 
-0x6C, 0xC6, 0x54, 0xF0, 0x6D, 0x85, 0x8C, 0x80, 0x6E, 0xA6, 0x36, 0xF0, 0x6F, 0x65, 0x6E, 0x80, 
-0x70, 0x86, 0x18, 0xF0, 0x71, 0x4E, 0x8B, 0x00, 0x72, 0x65, 0xFA, 0xF0, 0x73, 0x2E, 0x6D, 0x00, 
-0x74, 0x45, 0xDC, 0xF0, 0x75, 0x0E, 0x4F, 0x00, 0x76, 0x2E, 0xF9, 0x70, 0x76, 0xEE, 0x31, 0x00, 
-0x78, 0x0E, 0xDB, 0x70, 0x78, 0xCE, 0x13, 0x00, 0x79, 0xEE, 0xBD, 0x70, 0x7A, 0xAD, 0xF5, 0x00, 
-0x7B, 0xCE, 0x9F, 0x70, 0x7C, 0x97, 0x11, 0x80, 0x7D, 0xAE, 0x81, 0x70, 0x7E, 0x76, 0xF3, 0x80, 
-0x7F, 0x8E, 0x63, 0x70, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 
+0x52, 0x50, 0x99, 0xF0, 0x53, 0x34, 0xBB, 0x80, 0x54, 0x30, 0x7B, 0xF0, 0x55, 0x14, 0x9D, 0x80, 
+0x56, 0x10, 0x5D, 0xF0, 0x56, 0xF4, 0x7F, 0x80, 0x57, 0xF0, 0x3F, 0xF0, 0x58, 0xD4, 0x61, 0x80, 
+0x59, 0xD9, 0x5C, 0x70, 0x5A, 0xB4, 0x43, 0x80, 0x5B, 0xB9, 0x3E, 0x70, 0x5C, 0x9D, 0x60, 0x00, 
+0x5D, 0x99, 0x20, 0x70, 0x5E, 0x7D, 0x42, 0x00, 0x5F, 0x79, 0x02, 0x70, 0x60, 0x5D, 0x24, 0x00, 
+0x61, 0x58, 0xE4, 0x70, 0x62, 0x3D, 0x06, 0x00, 0x63, 0x38, 0xC6, 0x70, 0x64, 0x1C, 0xE8, 0x00, 
+0x65, 0x21, 0xE2, 0xF0, 0x66, 0x06, 0x04, 0x80, 0x67, 0x01, 0xC4, 0xF0, 0x67, 0xE5, 0xE6, 0x80, 
+0x68, 0xE1, 0xA6, 0xF0, 0x69, 0xC5, 0xC8, 0x80, 0x6A, 0xC1, 0x88, 0xF0, 0x6B, 0xA5, 0xAA, 0x80, 
+0x6C, 0xA2, 0xBC, 0x70, 0x6D, 0x85, 0x8C, 0x80, 0x6E, 0x8A, 0x87, 0x70, 0x6F, 0x65, 0x6E, 0x80, 
+0x70, 0x6A, 0x69, 0x70, 0x71, 0x4E, 0x8B, 0x00, 0x72, 0x4A, 0x4B, 0x70, 0x73, 0x2E, 0x6D, 0x00, 
+0x74, 0x2A, 0x2D, 0x70, 0x75, 0x0E, 0x4F, 0x00, 0x76, 0x0A, 0x0F, 0x70, 0x76, 0xEE, 0x31, 0x00, 
+0x77, 0xE9, 0xF1, 0x70, 0x78, 0xCE, 0x13, 0x00, 0x79, 0xD3, 0x0D, 0xF0, 0x7A, 0xAD, 0xF5, 0x00, 
+0x7B, 0xB2, 0xEF, 0xF0, 0x7C, 0x97, 0x11, 0x80, 0x7D, 0x92, 0xD1, 0xF0, 0x7E, 0x76, 0xF3, 0x80, 
+0x7F, 0x72, 0xB3, 0xF0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
@@ -8465,7 +8465,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x01, 0x02, 0x00, 0x00, 0x20, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 
 0x1C, 0x20, 0x00, 0x08, 0x00, 0x00, 0x38, 0x40, 0x01, 0x0C, 0x4A, 0x4D, 0x54, 0x00, 0x49, 0x44, 
 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x49, 0x44, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xB9, 0xD2, 0x87, 0x01, 0x48, 0x67, 0xD4, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0xB9, 0xCD, 0x1A, 0x01, 0x48, 0x6B, 0x85, 0x00, 0x00, 0x00, 0x00, 
 
 /* Asia/Kabul */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9310,19 +9310,19 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x46, 0xEC, 0x63, 0xF0, 0x47, 0xEC, 0x35, 0x00, 0x48, 0xE7, 0xF5, 0x70, 0x49, 0xCC, 0x17, 0x00, 
 0x4A, 0xBE, 0x9C, 0xF0, 0x4B, 0xAB, 0xF9, 0x00, 0x4C, 0x8C, 0x09, 0xF0, 0x4D, 0x95, 0x15, 0x80, 
 0x4E, 0x87, 0x9B, 0x70, 0x4F, 0x74, 0xF7, 0x80, 0x50, 0x5E, 0x42, 0xF0, 0x51, 0x54, 0xD9, 0x80, 
-0x52, 0x6C, 0x49, 0x70, 0x53, 0x34, 0xBB, 0x80, 0x54, 0x4C, 0x2B, 0x70, 0x55, 0x14, 0x9D, 0x80, 
-0x56, 0x2C, 0x0D, 0x70, 0x56, 0xF4, 0x7F, 0x80, 0x58, 0x15, 0x29, 0xF0, 0x58, 0xD4, 0x61, 0x80, 
-0x59, 0xF5, 0x0B, 0xF0, 0x5A, 0xB4, 0x43, 0x80, 0x5B, 0xD4, 0xED, 0xF0, 0x5C, 0x9D, 0x60, 0x00, 
-0x5D, 0xB4, 0xCF, 0xF0, 0x5E, 0x7D, 0x42, 0x00, 0x5F, 0x94, 0xB1, 0xF0, 0x60, 0x5D, 0x24, 0x00, 
-0x61, 0x7D, 0xCE, 0x70, 0x62, 0x3D, 0x06, 0x00, 0x63, 0x5D, 0xB0, 0x70, 0x64, 0x1C, 0xE8, 0x00, 
-0x65, 0x3D, 0x92, 0x70, 0x66, 0x06, 0x04, 0x80, 0x67, 0x1D, 0x74, 0x70, 0x67, 0xE5, 0xE6, 0x80, 
-0x68, 0xFD, 0x56, 0x70, 0x69, 0xC5, 0xC8, 0x80, 0x6A, 0xDD, 0x38, 0x70, 0x6B, 0xA5, 0xAA, 0x80, 
-0x6C, 0xC6, 0x54, 0xF0, 0x6D, 0x85, 0x8C, 0x80, 0x6E, 0xA6, 0x36, 0xF0, 0x6F, 0x65, 0x6E, 0x80, 
-0x70, 0x86, 0x18, 0xF0, 0x71, 0x4E, 0x8B, 0x00, 0x72, 0x65, 0xFA, 0xF0, 0x73, 0x2E, 0x6D, 0x00, 
-0x74, 0x45, 0xDC, 0xF0, 0x75, 0x0E, 0x4F, 0x00, 0x76, 0x2E, 0xF9, 0x70, 0x76, 0xEE, 0x31, 0x00, 
-0x78, 0x0E, 0xDB, 0x70, 0x78, 0xCE, 0x13, 0x00, 0x79, 0xEE, 0xBD, 0x70, 0x7A, 0xAD, 0xF5, 0x00, 
-0x7B, 0xCE, 0x9F, 0x70, 0x7C, 0x97, 0x11, 0x80, 0x7D, 0xAE, 0x81, 0x70, 0x7E, 0x76, 0xF3, 0x80, 
-0x7F, 0x8E, 0x63, 0x70, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 
+0x52, 0x50, 0x99, 0xF0, 0x53, 0x34, 0xBB, 0x80, 0x54, 0x30, 0x7B, 0xF0, 0x55, 0x14, 0x9D, 0x80, 
+0x56, 0x10, 0x5D, 0xF0, 0x56, 0xF4, 0x7F, 0x80, 0x57, 0xF0, 0x3F, 0xF0, 0x58, 0xD4, 0x61, 0x80, 
+0x59, 0xD9, 0x5C, 0x70, 0x5A, 0xB4, 0x43, 0x80, 0x5B, 0xB9, 0x3E, 0x70, 0x5C, 0x9D, 0x60, 0x00, 
+0x5D, 0x99, 0x20, 0x70, 0x5E, 0x7D, 0x42, 0x00, 0x5F, 0x79, 0x02, 0x70, 0x60, 0x5D, 0x24, 0x00, 
+0x61, 0x58, 0xE4, 0x70, 0x62, 0x3D, 0x06, 0x00, 0x63, 0x38, 0xC6, 0x70, 0x64, 0x1C, 0xE8, 0x00, 
+0x65, 0x21, 0xE2, 0xF0, 0x66, 0x06, 0x04, 0x80, 0x67, 0x01, 0xC4, 0xF0, 0x67, 0xE5, 0xE6, 0x80, 
+0x68, 0xE1, 0xA6, 0xF0, 0x69, 0xC5, 0xC8, 0x80, 0x6A, 0xC1, 0x88, 0xF0, 0x6B, 0xA5, 0xAA, 0x80, 
+0x6C, 0xA2, 0xBC, 0x70, 0x6D, 0x85, 0x8C, 0x80, 0x6E, 0x8A, 0x87, 0x70, 0x6F, 0x65, 0x6E, 0x80, 
+0x70, 0x6A, 0x69, 0x70, 0x71, 0x4E, 0x8B, 0x00, 0x72, 0x4A, 0x4B, 0x70, 0x73, 0x2E, 0x6D, 0x00, 
+0x74, 0x2A, 0x2D, 0x70, 0x75, 0x0E, 0x4F, 0x00, 0x76, 0x0A, 0x0F, 0x70, 0x76, 0xEE, 0x31, 0x00, 
+0x77, 0xE9, 0xF1, 0x70, 0x78, 0xCE, 0x13, 0x00, 0x79, 0xD3, 0x0D, 0xF0, 0x7A, 0xAD, 0xF5, 0x00, 
+0x7B, 0xB2, 0xEF, 0xF0, 0x7C, 0x97, 0x11, 0x80, 0x7D, 0x92, 0xD1, 0xF0, 0x7E, 0x76, 0xF3, 0x80, 
+0x7F, 0x72, 0xB3, 0xF0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
@@ -16249,19 +16249,19 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x46, 0xEC, 0x63, 0xF0, 0x47, 0xEC, 0x35, 0x00, 0x48, 0xE7, 0xF5, 0x70, 0x49, 0xCC, 0x17, 0x00, 
 0x4A, 0xBE, 0x9C, 0xF0, 0x4B, 0xAB, 0xF9, 0x00, 0x4C, 0x8C, 0x09, 0xF0, 0x4D, 0x95, 0x15, 0x80, 
 0x4E, 0x87, 0x9B, 0x70, 0x4F, 0x74, 0xF7, 0x80, 0x50, 0x5E, 0x42, 0xF0, 0x51, 0x54, 0xD9, 0x80, 
-0x52, 0x6C, 0x49, 0x70, 0x53, 0x34, 0xBB, 0x80, 0x54, 0x4C, 0x2B, 0x70, 0x55, 0x14, 0x9D, 0x80, 
-0x56, 0x2C, 0x0D, 0x70, 0x56, 0xF4, 0x7F, 0x80, 0x58, 0x15, 0x29, 0xF0, 0x58, 0xD4, 0x61, 0x80, 
-0x59, 0xF5, 0x0B, 0xF0, 0x5A, 0xB4, 0x43, 0x80, 0x5B, 0xD4, 0xED, 0xF0, 0x5C, 0x9D, 0x60, 0x00, 
-0x5D, 0xB4, 0xCF, 0xF0, 0x5E, 0x7D, 0x42, 0x00, 0x5F, 0x94, 0xB1, 0xF0, 0x60, 0x5D, 0x24, 0x00, 
-0x61, 0x7D, 0xCE, 0x70, 0x62, 0x3D, 0x06, 0x00, 0x63, 0x5D, 0xB0, 0x70, 0x64, 0x1C, 0xE8, 0x00, 
-0x65, 0x3D, 0x92, 0x70, 0x66, 0x06, 0x04, 0x80, 0x67, 0x1D, 0x74, 0x70, 0x67, 0xE5, 0xE6, 0x80, 
-0x68, 0xFD, 0x56, 0x70, 0x69, 0xC5, 0xC8, 0x80, 0x6A, 0xDD, 0x38, 0x70, 0x6B, 0xA5, 0xAA, 0x80, 
-0x6C, 0xC6, 0x54, 0xF0, 0x6D, 0x85, 0x8C, 0x80, 0x6E, 0xA6, 0x36, 0xF0, 0x6F, 0x65, 0x6E, 0x80, 
-0x70, 0x86, 0x18, 0xF0, 0x71, 0x4E, 0x8B, 0x00, 0x72, 0x65, 0xFA, 0xF0, 0x73, 0x2E, 0x6D, 0x00, 
-0x74, 0x45, 0xDC, 0xF0, 0x75, 0x0E, 0x4F, 0x00, 0x76, 0x2E, 0xF9, 0x70, 0x76, 0xEE, 0x31, 0x00, 
-0x78, 0x0E, 0xDB, 0x70, 0x78, 0xCE, 0x13, 0x00, 0x79, 0xEE, 0xBD, 0x70, 0x7A, 0xAD, 0xF5, 0x00, 
-0x7B, 0xCE, 0x9F, 0x70, 0x7C, 0x97, 0x11, 0x80, 0x7D, 0xAE, 0x81, 0x70, 0x7E, 0x76, 0xF3, 0x80, 
-0x7F, 0x8E, 0x63, 0x70, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 
+0x52, 0x50, 0x99, 0xF0, 0x53, 0x34, 0xBB, 0x80, 0x54, 0x30, 0x7B, 0xF0, 0x55, 0x14, 0x9D, 0x80, 
+0x56, 0x10, 0x5D, 0xF0, 0x56, 0xF4, 0x7F, 0x80, 0x57, 0xF0, 0x3F, 0xF0, 0x58, 0xD4, 0x61, 0x80, 
+0x59, 0xD9, 0x5C, 0x70, 0x5A, 0xB4, 0x43, 0x80, 0x5B, 0xB9, 0x3E, 0x70, 0x5C, 0x9D, 0x60, 0x00, 
+0x5D, 0x99, 0x20, 0x70, 0x5E, 0x7D, 0x42, 0x00, 0x5F, 0x79, 0x02, 0x70, 0x60, 0x5D, 0x24, 0x00, 
+0x61, 0x58, 0xE4, 0x70, 0x62, 0x3D, 0x06, 0x00, 0x63, 0x38, 0xC6, 0x70, 0x64, 0x1C, 0xE8, 0x00, 
+0x65, 0x21, 0xE2, 0xF0, 0x66, 0x06, 0x04, 0x80, 0x67, 0x01, 0xC4, 0xF0, 0x67, 0xE5, 0xE6, 0x80, 
+0x68, 0xE1, 0xA6, 0xF0, 0x69, 0xC5, 0xC8, 0x80, 0x6A, 0xC1, 0x88, 0xF0, 0x6B, 0xA5, 0xAA, 0x80, 
+0x6C, 0xA2, 0xBC, 0x70, 0x6D, 0x85, 0x8C, 0x80, 0x6E, 0x8A, 0x87, 0x70, 0x6F, 0x65, 0x6E, 0x80, 
+0x70, 0x6A, 0x69, 0x70, 0x71, 0x4E, 0x8B, 0x00, 0x72, 0x4A, 0x4B, 0x70, 0x73, 0x2E, 0x6D, 0x00, 
+0x74, 0x2A, 0x2D, 0x70, 0x75, 0x0E, 0x4F, 0x00, 0x76, 0x0A, 0x0F, 0x70, 0x76, 0xEE, 0x31, 0x00, 
+0x77, 0xE9, 0xF1, 0x70, 0x78, 0xCE, 0x13, 0x00, 0x79, 0xD3, 0x0D, 0xF0, 0x7A, 0xAD, 0xF5, 0x00, 
+0x7B, 0xB2, 0xEF, 0xF0, 0x7C, 0x97, 0x11, 0x80, 0x7D, 0x92, 0xD1, 0xF0, 0x7E, 0x76, 0xF3, 0x80, 
+0x7F, 0x72, 0xB3, 0xF0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
@@ -18410,4 +18410,4 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 
 0x00, 0x00, 0x00, 0x00, };
 
-const timelib_tzdb timezonedb_builtin = { "2013.4", 579, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
+const timelib_tzdb timezonedb_builtin = { "2013.3", 579, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };

ext/date/php_date.c

@@ -1678,13 +1678,6 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
 			break;
 		}
 	}
-#if defined(PHP_WIN32) && _MSC_VER >= 1700
-	/* VS2012 strftime() returns number of characters, not bytes.
-		See VC++11 bug id 766205. */
-	if (real_len > 0) {
-		real_len = strlen(buf);
-	}
-#endif
 
 	timelib_time_dtor(ts);
 	if (!gmt) {
@@ -2391,9 +2384,18 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC)
 		return props;
 	}
 
+#define PHP_DATE_INTERVAL_ADD_PROPERTY_I64(n, f) \
+	do { \
+		char i64_buf[DATE_I64_BUF_LEN]; \
+		MAKE_STD_ZVAL(zv); \
+		DATE_I64A(intervalobj->diff->f, i64_buf, DATE_I64_BUF_LEN); \
+		ZVAL_STRING(zv, i64_buf, 1); \
+		zend_hash_update(props, n, strlen(n) + 1, &zv, sizeof(zval), NULL); \
+	} while(0);
+
 #define PHP_DATE_INTERVAL_ADD_PROPERTY(n,f) \
 	MAKE_STD_ZVAL(zv); \
-	ZVAL_LONG(zv, (long)intervalobj->diff->f); \
+	ZVAL_LONG(zv, intervalobj->diff->f); \
 	zend_hash_update(props, n, strlen(n) + 1, &zv, sizeof(zval), NULL);
 
 	PHP_DATE_INTERVAL_ADD_PROPERTY("y", y);
@@ -2407,14 +2409,14 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC)
 	PHP_DATE_INTERVAL_ADD_PROPERTY("first_last_day_of", first_last_day_of);
 	PHP_DATE_INTERVAL_ADD_PROPERTY("invert", invert);
 	if (intervalobj->diff->days != -99999) {
-		PHP_DATE_INTERVAL_ADD_PROPERTY("days", days);
+		PHP_DATE_INTERVAL_ADD_PROPERTY_I64("days", days);
 	} else {
 		MAKE_STD_ZVAL(zv);
 		ZVAL_FALSE(zv);
 		zend_hash_update(props, "days", 5, &zv, sizeof(zval), NULL);
 	}
 	PHP_DATE_INTERVAL_ADD_PROPERTY("special_type", special.type);
-	PHP_DATE_INTERVAL_ADD_PROPERTY("special_amount", special.amount);
+	PHP_DATE_INTERVAL_ADD_PROPERTY_I64("special_amount", special.amount);
 	PHP_DATE_INTERVAL_ADD_PROPERTY("have_weekday_relative", have_weekday_relative);
 	PHP_DATE_INTERVAL_ADD_PROPERTY("have_special_relative", have_special_relative);
 

ext/date/tests/bug45682.phpt

@@ -34,11 +34,11 @@ object(DateInterval)#%d (15) {
   ["invert"]=>
   int(0)
   ["days"]=>
-  int(3)
+  string(1) "3"
   ["special_type"]=>
   int(0)
   ["special_amount"]=>
-  int(0)
+  string(1) "0"
   ["have_weekday_relative"]=>
   int(0)
   ["have_special_relative"]=>

ext/date/tests/bug49778.phpt

@@ -34,7 +34,7 @@ object(DateInterval)#1 (15) {
   ["special_type"]=>
   int(0)
   ["special_amount"]=>
-  int(0)
+  string(1) "0"
   ["have_weekday_relative"]=>
   int(0)
   ["have_special_relative"]=>

ext/date/tests/bug52062.phpt

@@ -4,6 +4,8 @@ Bug #52062 (large timestamps with DateTime::getTimestamp and DateTime::setTimest
 <?php
 if (PHP_INT_SIZE == 8) die('skip 32-bit only');
 ?>
+--XFAIL--
+Waiting for resolution of the 32-bit case.
 --INI--
 date.timezone=UTC
 --FILE--

ext/date/tests/bug52113.phpt

@@ -54,17 +54,17 @@ object(DateInterval)#3 (15) {
   ["invert"]=>
   int(0)
   ["days"]=>
-  int(0)
+  string(1) "0"
   ["special_type"]=>
   int(0)
   ["special_amount"]=>
-  int(0)
+  string(1) "0"
   ["have_weekday_relative"]=>
   int(0)
   ["have_special_relative"]=>
   int(0)
 }
-string(320) "O:12:"DateInterval":15:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:0;s:1:"h";i:4;s:1:"i";i:0;s:1:"s";i:0;s:7:"weekday";i:0;s:16:"weekday_behavior";i:0;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";i:0;s:12:"special_type";i:0;s:14:"special_amount";i:0;s:21:"have_weekday_relative";i:0;s:21:"have_special_relative";i:0;}"
+string(328) "O:12:"DateInterval":15:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:0;s:1:"h";i:4;s:1:"i";i:0;s:1:"s";i:0;s:7:"weekday";i:0;s:16:"weekday_behavior";i:0;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";s:1:"0";s:12:"special_type";i:0;s:14:"special_amount";s:1:"0";s:21:"have_weekday_relative";i:0;s:21:"have_special_relative";i:0;}"
 DateInterval::__set_state(array(
    'y' => 0,
    'm' => 0,
@@ -76,9 +76,9 @@ DateInterval::__set_state(array(
    'weekday_behavior' => 0,
    'first_last_day_of' => 0,
    'invert' => 0,
-   'days' => 0,
+   'days' => '0',
    'special_type' => 0,
-   'special_amount' => 0,
+   'special_amount' => '0',
    'have_weekday_relative' => 0,
    'have_special_relative' => 0,
 ))object(DateInterval)#5 (15) {
@@ -103,11 +103,11 @@ DateInterval::__set_state(array(
   ["invert"]=>
   int(0)
   ["days"]=>
-  int(0)
+  string(1) "0"
   ["special_type"]=>
   int(0)
   ["special_amount"]=>
-  int(0)
+  string(1) "0"
   ["have_weekday_relative"]=>
   int(0)
   ["have_special_relative"]=>
@@ -150,11 +150,11 @@ object(DatePeriod)#6 (6) {
     ["invert"]=>
     int(0)
     ["days"]=>
-    int(0)
+    string(1) "0"
     ["special_type"]=>
     int(0)
     ["special_amount"]=>
-    int(0)
+    string(1) "0"
     ["have_weekday_relative"]=>
     int(0)
     ["have_special_relative"]=>
@@ -187,11 +187,11 @@ object(DateInterval)#8 (15) {
   ["invert"]=>
   int(1)
   ["days"]=>
-  int(2400)
+  string(4) "2400"
   ["special_type"]=>
   int(0)
   ["special_amount"]=>
-  int(-1)
+  string(2) "-1"
   ["have_weekday_relative"]=>
   int(0)
   ["have_special_relative"]=>
@@ -234,11 +234,11 @@ object(DatePeriod)#9 (6) {
     ["invert"]=>
     int(0)
     ["days"]=>
-    int(0)
+    string(1) "0"
     ["special_type"]=>
     int(0)
     ["special_amount"]=>
-    int(0)
+    string(1) "0"
     ["have_weekday_relative"]=>
     int(0)
     ["have_special_relative"]=>

ext/date/tests/bug52808.phpt

@@ -47,11 +47,11 @@ object(DateInterval)#%d (15) {
   ["invert"]=>
   int(1)
   ["days"]=>
-  int(437)
+  string(3) "437"
   ["special_type"]=>
   int(0)
   ["special_amount"]=>
-  int(0)
+  string(1) "0"
   ["have_weekday_relative"]=>
   int(0)
   ["have_special_relative"]=>
@@ -79,11 +79,11 @@ object(DateInterval)#%d (15) {
   ["invert"]=>
   int(0)
   ["days"]=>
-  int(294)
+  string(3) "294"
   ["special_type"]=>
   int(0)
   ["special_amount"]=>
-  int(0)
+  string(1) "0"
   ["have_weekday_relative"]=>
   int(0)
   ["have_special_relative"]=>
@@ -111,11 +111,11 @@ object(DateInterval)#%d (15) {
   ["invert"]=>
   int(0)
   ["days"]=>
-  int(294)
+  string(3) "294"
   ["special_type"]=>
   int(0)
   ["special_amount"]=>
-  int(0)
+  string(1) "0"
   ["have_weekday_relative"]=>
   int(0)
   ["have_special_relative"]=>

ext/date/tests/bug53437.phpt

@@ -77,7 +77,7 @@ object(DatePeriod)#1 (6) {
     ["special_type"]=>
     int(0)
     ["special_amount"]=>
-    int(0)
+    string(1) "0"
     ["have_weekday_relative"]=>
     int(0)
     ["have_special_relative"]=>
@@ -132,11 +132,11 @@ object(DatePeriod)#5 (6) {
     ["invert"]=>
     int(0)
     ["days"]=>
-    int(0)
+    string(1) "0"
     ["special_type"]=>
     int(0)
     ["special_amount"]=>
-    int(0)
+    string(1) "0"
     ["have_weekday_relative"]=>
     int(0)
     ["have_special_relative"]=>

ext/date/tests/bug53437_var2.phpt

@@ -39,7 +39,7 @@ object(DateInterval)#1 (15) {
   ["special_type"]=>
   int(0)
   ["special_amount"]=>
-  int(0)
+  string(1) "0"
   ["have_weekday_relative"]=>
   int(0)
   ["have_special_relative"]=>
@@ -67,11 +67,11 @@ object(DateInterval)#2 (15) {
   ["invert"]=>
   int(0)
   ["days"]=>
-  int(0)
+  string(1) "0"
   ["special_type"]=>
   int(0)
   ["special_amount"]=>
-  int(0)
+  string(1) "0"
   ["have_weekday_relative"]=>
   int(0)
   ["have_special_relative"]=>

ext/date/tests/bug53437_var3.phpt

@@ -1,7 +1,5 @@
 --TEST--
-Bug #53437 DateInterval unserialize bad data, 32 bit
---SKIPIF--
-<?php if (PHP_INT_SIZE != 4) { die('skip 32 bit only'); } ?>
+Bug #53437 DateInterval unserialize bad data
 --FILE--
 <?php
 $s = 'O:12:"DateInterval":15:{s:1:"y";s:1:"2";s:1:"m";s:1:"0";s:1:"d";s:3:"bla";s:1:"h";s:1:"6";s:1:"i";s:1:"8";s:1:"s";s:1:"0";s:7:"weekday";i:10;s:16:"weekday_behavior";i:10;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";s:4:"aoeu";s:12:"special_type";i:0;s:14:"special_amount";s:21:"234523452345234532455";s:21:"have_weekday_relative";i:21474836489;s:21:"have_special_relative";s:3:"bla";}';
@@ -11,8 +9,8 @@ var_dump($di);
 
 ?>
 ==DONE==
---EXPECTF--
-object(DateInterval)#%d (15) {
+--EXPECT--
+object(DateInterval)#1 (15) {
   ["y"]=>
   int(2)
   ["m"]=>
@@ -34,11 +32,11 @@ object(DateInterval)#%d (15) {
   ["invert"]=>
   int(0)
   ["days"]=>
-  int(0)
+  string(1) "0"
   ["special_type"]=>
   int(0)
   ["special_amount"]=>
-  int(-1)
+  string(19) "9223372036854775807"
   ["have_weekday_relative"]=>
   int(9)
   ["have_special_relative"]=>

ext/date/tests/bug53437_var4.phpt

@@ -1,64 +0,0 @@
---TEST--
-Bug #53437 (Check that var_dump out is the same using the whole object or it's single properties), variation 4
---INI--
-date.timezone = Europe/Berlin
---FILE--
-<?php
-$dt = new DateTime('2009-10-11');
-
-$df = $dt->diff(new DateTime('2009-10-13'));
-
-var_dump($df,
-	$df->y,
-	$df->m,
-	$df->d,
-	$df->h,
-	$df->i,
-	$df->s,
-	$df->invert,
-	$df->days);
-
-?>
-==DONE==
---EXPECTF--
-object(DateInterval)#%d (15) {
-  ["y"]=>
-  int(0)
-  ["m"]=>
-  int(0)
-  ["d"]=>
-  int(2)
-  ["h"]=>
-  int(0)
-  ["i"]=>
-  int(0)
-  ["s"]=>
-  int(0)
-  ["weekday"]=>
-  int(0)
-  ["weekday_behavior"]=>
-  int(0)
-  ["first_last_day_of"]=>
-  int(0)
-  ["invert"]=>
-  int(0)
-  ["days"]=>
-  int(2)
-  ["special_type"]=>
-  int(0)
-  ["special_amount"]=>
-  int(0)
-  ["have_weekday_relative"]=>
-  int(0)
-  ["have_special_relative"]=>
-  int(0)
-}
-int(0)
-int(0)
-int(2)
-int(0)
-int(0)
-int(0)
-int(0)
-int(2)
-==DONE==

ext/date/tests/bug53437_var5.phpt

@@ -1,47 +0,0 @@
---TEST--
-Bug #53437 DateInterval unserialize bad data, 64 bit
---SKIPIF--
-<?php if (PHP_INT_SIZE != 8) { die('skip true 64 bit only'); } ?>
---FILE--
-<?php
-$s = 'O:12:"DateInterval":15:{s:1:"y";s:1:"2";s:1:"m";s:1:"0";s:1:"d";s:3:"bla";s:1:"h";s:1:"6";s:1:"i";s:1:"8";s:1:"s";s:1:"0";s:7:"weekday";i:10;s:16:"weekday_behavior";i:10;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";s:4:"aoeu";s:12:"special_type";i:0;s:14:"special_amount";s:21:"234523452345234532455";s:21:"have_weekday_relative";i:21474836489;s:21:"have_special_relative";s:3:"bla";}';
-
-$di = unserialize($s);
-var_dump($di);
-
-?>
-==DONE==
---EXPECTF--
-object(DateInterval)#%d (15) {
-  ["y"]=>
-  int(2)
-  ["m"]=>
-  int(0)
-  ["d"]=>
-  int(0)
-  ["h"]=>
-  int(6)
-  ["i"]=>
-  int(8)
-  ["s"]=>
-  int(0)
-  ["weekday"]=>
-  int(10)
-  ["weekday_behavior"]=>
-  int(10)
-  ["first_last_day_of"]=>
-  int(0)
-  ["invert"]=>
-  int(0)
-  ["days"]=>
-  int(0)
-  ["special_type"]=>
-  int(0)
-  ["special_amount"]=>
-  int(9223372036854775807)
-  ["have_weekday_relative"]=>
-  int(9)
-  ["have_special_relative"]=>
-  int(0)
-}
-==DONE==

ext/date/tests/bug55397.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #55397 (comparison of incomplete DateTime causes SIGSEGV)
+Bug #55397 (comparsion of incomplete DateTime causes SIGSEGV)
 --INI--
 --FILE--
 <?php

ext/date/tests/bug60774.phpt

@@ -34,7 +34,7 @@ object(DateInterval)#1 (%d) {
   ["special_type"]=>
   int(0)
   ["special_amount"]=>
-  int(0)
+  string(1) "0"
   ["have_weekday_relative"]=>
   int(0)
   ["have_special_relative"]=>

ext/date/tests/bug65184.phpt

@@ -1,26 +0,0 @@
---TEST--
-Test bug #65184 strftime() returns insufficient-length string under multibyte locales
---SKIPIF--
-<?php
-if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
-    die("skip Test is valid for Windows");
-}
-?>
---FILE--
-<?php
-	setlocale(LC_ALL, 'Japanese_Japan.932');
-	/* timestamp has to be some wednesday */
-	$s = strftime('%A', 1372884126);
-
-	for ($i = 0; $i < strlen($s); $i++) {
-		printf("%x ", ord($s[$i]));
-	}
-	echo "\n";
-
-	echo strlen(strftime('%A')), "\n";
-?>
-===DONE===
---EXPECT--
-90 85 97 6a 93 fa 
-6
-===DONE===

ext/date/tests/date_diff1.phpt

@@ -50,11 +50,11 @@ object(DateInterval)#3 (15) {
   ["invert"]=>
   int(0)
   ["days"]=>
-  int(33)
+  string(2) "33"
   ["special_type"]=>
   int(0)
   ["special_amount"]=>
-  int(0)
+  string(1) "0"
   ["have_weekday_relative"]=>
   int(0)
   ["have_special_relative"]=>

ext/date/tests/date_sunrise_and_sunset_basic.phpt

@@ -14,7 +14,7 @@ offset: +1 GMT
 
 echo "Basic test for date_sunrise() and date_sunset()\n";
 
-// suppress date() function strict msgs 
+// supress date() function strict msgs 
 error_reporting(E_ALL & ~E_STRICT);
 
 echo date("D M d Y") . ', sunrise time : ' . date_sunrise(time(), SUNFUNCS_RET_STRING, 38.4, -9, 90, 1) . "\n";

ext/dba/dba.c

@@ -888,7 +888,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			RETURN_FALSE;
 		}
 		if (hptr->flags & (DBA_NO_APPEND|DBA_CAST_AS_FD)) {
-			/* Needed because some systems do not allow to write to the original 
+			/* Needed becasue some systems do not allow to write to the original 
 			 * file contents with O_APPEND being set.
 			 */
 			if (SUCCESS != php_stream_cast(info->fp, PHP_STREAM_AS_FD, (void*)&info->fd, 1)) {

ext/dba/tests/bug38698.phpt

@@ -8,18 +8,10 @@ Bug #38698 (Bug #38698 for some keys cdbmake creates corrupted db and cdb can't
 --FILE--
 <?php
 
-function isLittleEndian() {
-    return 0x00FF === current(unpack('v', pack('S',0x00FF)));
-}
-
 $db_file = dirname(__FILE__) .'/129php.cdb';
 
 if (($db_make=dba_open($db_file, "n", 'cdb_make'))!==FALSE) {
-	if (isLittleEndian() === FALSE) {
-        dba_insert(pack('V',129), "Booo!", $db_make);
-	} else{
-		dba_insert(pack('i',129), "Booo!", $db_make);
-	}
+	dba_insert(pack('i',129), "Booo!", $db_make);
 	dba_close($db_make);
 	// write md5 checksum of generated database file
 	var_dump(md5_file($db_file));

ext/dba/tests/dba_cdb_read.phpt

@@ -20,7 +20,7 @@ DBA CDB handler test (read only)
 			$keys .= $a;
 			$count++;
 		}
-		// display number of entries and key existence
+		// display number of entries and key existance
 		echo $count;
 		for ($i=1; $i<8; $i++) {
 			echo dba_exists($i, $db_file) ? "Y" : "N";

ext/dba/tests/dba_gdbm.phpt

@@ -12,7 +12,7 @@ DBA GDBM handler test
 	$lock_flag = ''; // lock in library
 	require_once dirname(__FILE__) .'/dba_handler.inc';
 	
-	// Read during write is system dependent. Important is that there is no deadlock
+	// Read during write is system dependant. Important is that there is no deadlock
 ?>
 ===DONE===
 --EXPECTF--

ext/dom/element.c

@@ -177,7 +177,7 @@ PHP_METHOD(domelement, __construct)
 		RETURN_FALSE;
 	}
 
-	/* Namespace logic is separate and only when uri passed in to insure no BC breakage */
+	/* Namespace logic is seperate and only when uri passed in to insure no BC breakage */
 	if (uri_len > 0) {
 		errorcode = dom_check_qname(name, &localname, &prefix, uri_len, name_len);
 		if (errorcode == 0) {

ext/dom/tests/DOMDocument_loadHTMLfile.phpt

@@ -1,17 +0,0 @@
---TEST--
-Test DOMDocument::loadHTMLFile
---DESCRIPTION--
-Verifies the basic behaviour of the method
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---FILE--
-<?php
-$doc = new DOMDocument();
-$result = $doc->loadHTMLFile(dirname(__FILE__) . "/test.html");
-assert('$result === true');
-?>
---EXPECT--

ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt

@@ -1,18 +0,0 @@
---TEST--
-Test DOMDocument::loadHTMLFile when the file doesn't exist
---DESCRIPTION--
-Verifies that an error message is showed if the file doesn't exist
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---FILE--
-<?php
-$doc = new DOMDocument();
-$result = $doc->loadHTMLFile(dirname(__FILE__) . "/ffff/test.html");
-assert('$result === false');
-?>
---EXPECTF--
-%r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): I/O warning : failed to load external entity %s

ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt

@@ -1,18 +0,0 @@
---TEST--
-Test DOMDocument::loadHTMLFile when an empty string is passed
---DESCRIPTION--
-Verifies that an error message is showed if an empty string is passed as argument
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---FILE--
-<?php
-$doc = new DOMDocument();
-$result = $doc->loadHTMLFile("");
-assert('$result === false');
-?>
---EXPECTF--
-%r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): Empty string supplied as input %s

ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt

@@ -1,18 +0,0 @@
---TEST--
-Test DOMDocument::loadHTMLFile when an empty document is loaded
---DESCRIPTION--
-Verifies that an warning message is showed if an empty document is loaded
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---FILE--
-<?php
-$doc = new DOMDocument();
-$result = $doc->loadHTMLFile(dirname(__FILE__) . "/empty.html");
-assert('$result === true');
-?>
---EXPECTF--
-%r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): Document is empty %s

ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt

@@ -1,17 +0,0 @@
---TEST--
-Test DOMDocument::loadHTMLFile when a not-well formed document is loaded
---DESCRIPTION--
-Verifies the behavior if a not-well formed document is loaded
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---FILE--
-<?php
-$doc = new DOMDocument();
-$result = $doc->loadHTMLFile(dirname(__FILE__) . "/not_well.html");
-assert('$result === true');
-?>
---EXPECT--

ext/dom/tests/DOMDocument_schemaValidate_error5.phpt

@@ -1,5 +1,5 @@
 --TEST--
-DomDocument::schemaValidate() - non-existent schema file
+DomDocument::schemaValidate() - non-existant schema file
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 # TestFest 2009 NYPHP
@@ -12,14 +12,14 @@ $doc = new DOMDocument;
 
 $doc->load(dirname(__FILE__)."/book.xml");
 
-$result = $doc->schemaValidate(dirname(__FILE__)."/non-existent-file");
+$result = $doc->schemaValidate(dirname(__FILE__)."/non-existant-file");
 var_dump($result);
 
 ?>
 --EXPECTF--
-Warning: DOMDocument::schemaValidate(): I/O warning : failed to load external entity "%snon-existent-file" in %s.php on line %d
+Warning: DOMDocument::schemaValidate(): I/O warning : failed to load external entity "%snon-existant-file" in %s.php on line %d
 
-Warning: DOMDocument::schemaValidate(): Failed to locate the main schema resource at '%s/non-existent-file'. in %s.php on line %d
+Warning: DOMDocument::schemaValidate(): Failed to locate the main schema resource at '%s/non-existant-file'. in %s.php on line %d
 
 Warning: DOMDocument::schemaValidate(): Invalid Schema in %s.php on line %d
 bool(false)

ext/dom/tests/DOMNode_removeChild_basic.phpt

@@ -39,7 +39,7 @@ $root = $dom->documentElement;
 
 $children = $root->childNodes;
 $len = $children->length;
-echo "original has $len nodes\n";
+echo "orignal has $len nodes\n";
 for ($index = $children->length - 1; $index >=0; $index--) {
 	echo "node $index\n";
 	$current = $children->item($index);
@@ -58,7 +58,7 @@ for ($index = 0; $index < $children->length; $index++) {
 }
 
 --EXPECTF--
-original has 5 nodes
+orignal has 5 nodes
 node 4
 Course: no title:DOMText
 ~string(1) "

ext/dom/tests/not_well.html

@@ -1,8 +0,0 @@
-<head>
-<title>Hello world</title>
-</head>
-<body>
-This is a not well-formed<br>
-html files with undeclared entities&nbsp;
-</body>
-</html>

ext/enchant/enchant.c

@@ -651,7 +651,7 @@ PHP_FUNCTION(enchant_broker_free_dict)
 /* }}} */
 
 /* {{{ proto bool enchant_broker_dict_exists(resource broker, string tag)
-   Whether a dictionary exists or not. Using non-empty tag */
+   Wether a dictionary exists or not. Using non-empty tag */
 PHP_FUNCTION(enchant_broker_dict_exists)
 {
 	zval *broker;
@@ -674,7 +674,7 @@ PHP_FUNCTION(enchant_broker_dict_exists)
 	described/referred to by 'tag'. The ordering is a comma delimited
 	list of provider names. As a special exception, the "*" tag can
 	be used as a language tag to declare a default ordering for any
-	language that does not explicitly declare an ordering. */
+	language that does not explictly declare an ordering. */
 
 PHP_FUNCTION(enchant_broker_set_ordering)
 {

ext/exif/exif.c

@@ -2595,7 +2595,7 @@ static int exif_process_string_raw(char **result, char *value, size_t byte_count
 
 /* {{{ exif_process_string
  * Copy a string in Exif header to a character string and return length of allocated buffer if any.
- * In contrast to exif_process_string this function does always return a string buffer */
+ * In contrast to exif_process_string this function does allways return a string buffer */
 static int exif_process_string(char **result, char *value, size_t byte_count TSRMLS_DC) {
 	/* we cannot use strlcpy - here the problem is that we cannot use strlen to
 	 * determin length of string and we cannot use strlcpy with len=byte_count+1

ext/exif/tests/exif_tagname_variation1.phpt

@@ -78,7 +78,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of exif_tagname()
-// when $index argument is supplied with different values
+// when $index arugment is supplied with different values
 
 echo "\n--- Testing exif_tagname() by supplying different values for 'index' argument ---\n";
 $counter = 1;

ext/fileinfo/libmagic/softmagic.c

@@ -1630,7 +1630,7 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
 	/* Verify we have enough data to match magic type */
 	switch (m->type) {
 	case FILE_BYTE:
-		if (nbytes < (offset + 1)) /* should always be true */
+		if (nbytes < (offset + 1)) /* should alway be true */
 			return 0;
 		break;
 

ext/fileinfo/tests/finfo_phpinfo_basic.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Test finfo extension : loading into phpinfo()
+Test finfo extention : loading into phpinfo()
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--

ext/fileinfo/tests/magic

@@ -3303,7 +3303,7 @@
 >>>0x44		string	=GLOB		\b.
 >>>>0x60	beshort	x		\b%.4d
 
-# Scripts that run in the embedded Python interpreter
+# Scripts that run in the embeded Python interpreter
 0		string	#!BPY		Blender3D BPython script
 
 #------------------------------------------------------------------------------
@@ -4957,7 +4957,7 @@
 >>>>0	ubelong			=0		\b, next free block index %lu
 >>>>0	ubelong			!0		\b, next free block index %lu
 >>>512	default			x		dBase IV DBT
-# DBF file name without extension 
+# DBF file name without extention 
 >>>>8	string			>\0		\b of %-.8s.DBF
 # size of blocks  ; not reliable 0x2020204C
 #>>>>4	ulelong			=0		\b, blocks size %lu
@@ -13205,7 +13205,7 @@
 # they have their real name at offset 22
 >>>>>22		string			>\0			\b%-.5s
 >4	uleshort&0x8000			0x0000			
-# 32 bit sector addressing ( > 32 MB) for block devices
+# 32 bit sector adressing ( > 32 MB) for block devices
 >>4	uleshort&0x0002			0x0002			\b,32-bit sector-
 # support by driver functions 13h, 17h, 18h
 >4	uleshort&0x0040			0x0040			\b,IOCTL-
@@ -17951,7 +17951,7 @@
 #   00030  00 00 00 00 01 00 00 00  00 00 00 00 00 00 00 00  ................
 #   00040  00 00 00 00 ff ff ff ff  ff ff ff ff 02 00 00 00  ................
 #
-# GRR this test is still too general as it catches example addressen.dbt
+# GRR this test is still too general as it catches example adressen.dbt
 0	belong	0x03000000	
 >8	ubelong	0xec020000	VMS Alpha executable
 >>75264	string	PK\003\004	\b, Info-ZIP SFX archive v5.12 w/decryption

ext/ftp/ftp.c

@@ -182,7 +182,6 @@ ftp_close(ftpbuf_t *ftp)
 #if HAVE_OPENSSL_EXT
 		if (ftp->ssl_active) {
 			SSL_shutdown(ftp->ssl_handle);
-			SSL_free(ftp->ssl_handle);
 		}
 #endif		
 		closesocket(ftp->fd);
@@ -298,7 +297,6 @@ ftp_login(ftpbuf_t *ftp, const char *user, const char *pass TSRMLS_DC)
 		if (SSL_connect(ftp->ssl_handle) <= 0) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSL/TLS handshake failed");
 			SSL_shutdown(ftp->ssl_handle);
-			SSL_free(ftp->ssl_handle);
 			return 0;
 		}
 
@@ -1550,7 +1548,6 @@ data_accepted:
 		if (SSL_connect(data->ssl_handle) <= 0) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "data_accept: SSL/TLS handshake failed");
 			SSL_shutdown(data->ssl_handle);
-			SSL_free(data->ssl_handle);
 			return 0;
 		}
 			
@@ -1568,21 +1565,13 @@ data_accepted:
 databuf_t*
 data_close(ftpbuf_t *ftp, databuf_t *data)
 {
-#if HAVE_OPENSSL_EXT
-	SSL_CTX		*ctx;
-#endif				
 	if (data == NULL) {
 		return NULL;
 	}
 	if (data->listener != -1) {
 #if HAVE_OPENSSL_EXT
 		if (data->ssl_active) {
-		
-			ctx = SSL_get_SSL_CTX(data->ssl_handle);
-			SSL_CTX_free(ctx);
-
 			SSL_shutdown(data->ssl_handle);
-			SSL_free(data->ssl_handle);
 			data->ssl_active = 0;
 		}
 #endif				
@@ -1591,11 +1580,7 @@ data_close(ftpbuf_t *ftp, databuf_t *data)
 	if (data->fd != -1) {
 #if HAVE_OPENSSL_EXT
 		if (data->ssl_active) {
-			ctx = SSL_get_SSL_CTX(data->ssl_handle);
-			SSL_CTX_free(ctx);
-
 			SSL_shutdown(data->ssl_handle);
-			SSL_free(data->ssl_handle);
 			data->ssl_active = 0;
 		}
 #endif				

ext/ftp/tests/ftp_fget_basic.phpt

@@ -27,7 +27,7 @@ var_dump(ftp_fget($ftp, $fp, 'binary data.bin', FTP_BINARY));
 fseek($fp, $postition);
 var_dump(urlencode(fgets($fp)));
 
-//test non-existent file request 
+//test non-existant file request 
 ftp_fget($ftp, $fp ,'a warning.txt', FTP_ASCII);
 
 //remove file

ext/ftp/tests/ftp_get_basic.phpt

@@ -27,7 +27,7 @@ var_dump(ftp_get($ftp, $tmpfname, 'binary data.bin', FTP_BINARY));
 var_dump(urlencode(file_get_contents($tmpfname)));
 unlink($tmpfname);
 
-//test non-existent file request 
+//test non-existant file request 
 ftp_get($ftp, $tmpfname ,'a warning.txt', FTP_ASCII);
 ?>
 --EXPECTF--

ext/gd/gd.c

@@ -96,7 +96,7 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int, int);
 /* IMPORTANT NOTE FOR NEW FILTER
  * Do not forget to update:
  * IMAGE_FILTER_MAX: define the last filter index
- * IMAGE_FILTER_MAX_ARGS: define the biggest amount of arguments
+ * IMAGE_FILTER_MAX_ARGS: define the biggest amout of arguments
  * image_filter array in PHP_FUNCTION(imagefilter)
  * */
 #define IMAGE_FILTER_NEGATE         0
@@ -836,28 +836,28 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecrop, 0)
 	ZEND_ARG_INFO(0, rect)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecropauto, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO(arginfo_imagecropauto, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, mode)
 	ZEND_ARG_INFO(0, threshold)
 	ZEND_ARG_INFO(0, color)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagescale, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO(arginfo_imagescale, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, new_width)
 	ZEND_ARG_INFO(0, new_height)
 	ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imageaffine, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO(arginfo_imageaffine, 0)
 	ZEND_ARG_INFO(0, im)
 	ZEND_ARG_INFO(0, affine)
-	ZEND_ARG_INFO(0, clip)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imageaffinematrixget, 0, 0, 1)
-	ZEND_ARG_INFO(0, type)
+ZEND_BEGIN_ARG_INFO(arginfo_imageaffinematrixget, 0)
+	ZEND_ARG_INFO(0, im)
+	ZEND_ARG_INFO(0, matrox)
 	ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
@@ -2361,12 +2361,30 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 		}
 	}
 
-
 	stream = php_stream_open_wrapper(file, "rb", REPORT_ERRORS|IGNORE_PATH|IGNORE_URL_WIN, NULL);
 	if (stream == NULL)	{
 		RETURN_FALSE;
 	}
 
+	ioctx_func_p = NULL; /* don't allow sockets without IOCtx */
+
+	if (image_type == PHP_GDIMG_TYPE_WEBP) {
+		size_t buff_size;
+		char *buff;
+
+		/* needs to be malloc (persistent) - GD will free() it later */
+		buff_size = php_stream_copy_to_mem(stream, &buff, PHP_STREAM_COPY_ALL, 1);
+		if (!buff_size) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING,"Cannot read image data");
+			goto out_err;
+		}
+		im = (*ioctx_func_p)(buff_size, buff);
+		if (!im) {
+			goto out_err;
+		}
+		goto register_im;
+	}
+
 	/* try and avoid allocating a FILE* if the stream is not naturally a FILE* */
 	if (php_stream_is(stream, PHP_STREAM_IS_STDIO))	{
 		if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_STDIO, (void**)&fp, REPORT_ERRORS)) {
@@ -2401,7 +2419,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 		io_ctx->gd_free(io_ctx);
 		pefree(buff, 1);
 	}
-	else if (php_stream_can_cast(stream, PHP_STREAM_AS_STDIO)) {
+	else {
 		/* try and force the stream to be FILE* */
 		if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_STDIO | PHP_STREAM_CAST_TRY_HARD, (void **) &fp, REPORT_ERRORS)) {
 			goto out_err;
@@ -2478,11 +2496,11 @@ PHP_FUNCTION(imagecreatefrompng)
 #endif /* HAVE_GD_PNG */
 
 #ifdef HAVE_GD_WEBP
-/* {{{ proto resource imagecreatefromwebp(string filename)
-   Create a new image from WEBP file or URL */
+/* {{{ proto resource imagecreatefrompng(string filename)
+   Create a new image from PNG file or URL */
 PHP_FUNCTION(imagecreatefromwebp)
 {
-	_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "WEBP", gdImageCreateFromWebp, gdImageCreateFromWebpCtx);
+	_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "WEBP", gdImageCreateFromWebpPtr, gdImageCreateFromWebpPtr);
 }
 /* }}} */
 #endif /* HAVE_GD_VPX */
@@ -2718,7 +2736,7 @@ PHP_FUNCTION(imagepng)
 
 #ifdef HAVE_GD_WEBP
 /* {{{ proto bool imagewebp(resource im [, string filename[, quality]] )
-   Output WEBP image to browser or file */
+   Output PNG image to browser or file */
 PHP_FUNCTION(imagewebp)
 {
 	_php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "WEBP", gdImageWebpCtx);
@@ -4947,7 +4965,7 @@ PHP_FUNCTION(imagecrop)
 	zval *z_rect;
 	zval **tmp;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ra", &IM, &z_rect) == FAILURE)  {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|a", &IM, &z_rect) == FAILURE)  {
 		return;
 	}
 
@@ -5087,7 +5105,7 @@ finish:
 }
 /* }}} */
 
-/* {{{ proto resource imageaffine(resource src, array affine[, array clip])
+/* {{{ proto resource imageaffine(resource dst, resource src, array affine, array clip)
    Return an image containing the affine tramsformed src image, using an optional clipping area */
 PHP_FUNCTION(imageaffine)
 {
@@ -5194,7 +5212,7 @@ PHP_FUNCTION(imageaffine)
 PHP_FUNCTION(imageaffinematrixget)
 {
 	double affine[6];
-	long type;
+	gdAffineStandardMatrix type;
 	zval *options;
 	zval **tmp;
 	int res = GD_FALSE, i;
@@ -5203,7 +5221,7 @@ PHP_FUNCTION(imageaffinematrixget)
 		return;
 	}
 
-	switch((gdAffineStandardMatrix)type) {
+	switch(type) {
 		case GD_AFFINE_TRANSLATE:
 		case GD_AFFINE_SCALE: {
 			double x, y;
@@ -5253,7 +5271,7 @@ PHP_FUNCTION(imageaffinematrixget)
 		}
 
 		default:
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid type for element %li", type);
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid type for element %i", type);
 			RETURN_FALSE;
 	}
 
@@ -5343,7 +5361,7 @@ PHP_FUNCTION(imagesetinterpolation)
 {
 	zval *IM;
 	gdImagePtr im;
-	long method = GD_BILINEAR_FIXED;
+	gdInterpolationMethod method = GD_BILINEAR_FIXED;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &IM, &method) == FAILURE)  {
 		return;

ext/gd/libgd/gd.c

@@ -3044,7 +3044,7 @@ int gdImagePaletteToTrueColor(gdImagePtr src)
 			for (x = 0; x < sx; x++) {
 				const unsigned char c = *(src_row + x);
 				if (c == src->transparent) {
-					*(dst_row + x) = gdTrueColorAlpha(0, 0, 0, 127);
+					*(dst_row + x) = gdTrueColorAlpha(0, 0, 0, 127);;
 				} else {
 					*(dst_row + x) = gdTrueColorAlpha(src->red[c], src->green[c], src->blue[c], src->alpha[c]);
 				}
@@ -3061,12 +3061,6 @@ int gdImagePaletteToTrueColor(gdImagePtr src)
 	src->pixels = NULL;
 	src->alphaBlendingFlag = 0;
 	src->saveAlphaFlag = 1;
-
-	if (src->transparent >= 0) {
-		const unsigned char c = src->transparent;
-		src->transparent =  gdTrueColorAlpha(src->red[c], src->green[c], src->blue[c], src->alpha[c]);
-	}
-
 	return 1;
 
 clean_on_error:

ext/gd/libgd/gd_crop.c

@@ -69,7 +69,7 @@ printf("rect->x: %i\nrect->y: %i\nrect->width: %i\nrect->height: %i\n", crop->x,
 		if (src->trueColor) {
 			unsigned int dst_y = 0;
 			while (y < (crop->y + (crop->height - 1))) {
-				/* TODO: replace 4 w/byte per channel||pitch once available */
+				/* TODO: replace 4 w/byte per channel||pitch once avaiable */
 				memcpy(dst->tpixels[dst_y++], src->tpixels[y++] + crop->x, crop->width * 4);
 			}
 		} else {

ext/gd/libgd/gd_interpolation.c

@@ -1674,6 +1674,13 @@ gdImagePtr gdImageRotateNearestNeighbour(gdImagePtr src, const float degrees, co
 	unsigned int i;
 	gdImagePtr dst;
 
+	/* impact perf a bit, but not that much. Implementation for palette
+	   images can be done at a later point.
+	*/
+	if (src->trueColor == 0) {
+		gdImagePaletteToTrueColor(src);
+	}
+
 	dst = gdImageCreateTrueColor(new_width, new_height);
 	if (!dst) {
 		return NULL;
@@ -1683,8 +1690,8 @@ gdImagePtr gdImageRotateNearestNeighbour(gdImagePtr src, const float degrees, co
 		unsigned int j;
 		dst_offset_x = 0;
 		for (j = 0; j < new_width; j++) {
-			gdFixed f_i = gd_itofx((int)i - (int)new_height/2);
-			gdFixed f_j = gd_itofx((int)j - (int)new_width/2);
+			gdFixed f_i = gd_itofx(i - new_height/2);
+			gdFixed f_j = gd_itofx(j-new_width/2);
 			gdFixed f_m = gd_mulfx(f_j,f_sin) + gd_mulfx(f_i,f_cos) + f_0_5 + f_H;
 			gdFixed f_n = gd_mulfx(f_j,f_cos) - gd_mulfx(f_i,f_sin) + f_0_5 + f_W;
 			long m = gd_fxtoi(f_m);
@@ -1729,6 +1736,12 @@ gdImagePtr gdImageRotateGeneric(gdImagePtr src, const float degrees, const int b
 							f_slop_x > f_slop_y ? gd_divfx(f_slop_y, f_slop_x) : gd_divfx(f_slop_x, f_slop_y)
 						: 0;
 
+	/* impact perf a bit, but not that much. Implementation for palette
+	   images can be done at a later point.
+	*/
+	if (src->trueColor == 0) {
+		gdImagePaletteToTrueColor(src);
+	}
 
 	dst = gdImageCreateTrueColor(new_width, new_height);
 	if (!dst) {
@@ -1740,8 +1753,8 @@ gdImagePtr gdImageRotateGeneric(gdImagePtr src, const float degrees, const int b
 		unsigned int j;
 		dst_offset_x = 0;
 		for (j = 0; j < new_width; j++) {
-			gdFixed f_i = gd_itofx((int)i - (int)new_height/ 2);
-			gdFixed f_j = gd_itofx((int)j - (int)new_width / 2);
+			gdFixed f_i = gd_itofx(i - new_height/ 2);
+			gdFixed f_j = gd_itofx(j  -new_width / 2);
 			gdFixed f_m = gd_mulfx(f_j,f_sin) + gd_mulfx(f_i,f_cos) + f_0_5 + f_H;
 			gdFixed f_n = gd_mulfx(f_j,f_cos) - gd_mulfx(f_i,f_sin) + f_0_5 + f_W;
 			long m = gd_fxtoi(f_m);
@@ -1783,6 +1796,13 @@ gdImagePtr gdImageRotateBilinear(gdImagePtr src, const float degrees, const int
 	unsigned int src_offset_x, src_offset_y;
 	gdImagePtr dst;
 
+	/* impact perf a bit, but not that much. Implementation for palette
+	   images can be done at a later point.
+	*/
+	if (src->trueColor == 0) {
+		gdImagePaletteToTrueColor(src);
+	}
+
 	dst = gdImageCreateTrueColor(new_width, new_height);
 	if (dst == NULL) {
 		return NULL;
@@ -1794,8 +1814,8 @@ gdImagePtr gdImageRotateBilinear(gdImagePtr src, const float degrees, const int
 		dst_offset_x = 0;
 
 		for (j=0; j < new_width; j++) {
-			const gdFixed f_i = gd_itofx((int)i - (int)new_height/2);
-			const gdFixed f_j = gd_itofx((int)j - (int)new_width/2);
+			const gdFixed f_i = gd_itofx(i-new_height/2);
+			const gdFixed f_j = gd_itofx(j-new_width/2);
 			const gdFixed f_m = gd_mulfx(f_j,f_sin) + gd_mulfx(f_i,f_cos) + f_0_5 + f_H;
 			const gdFixed f_n = gd_mulfx(f_j,f_cos) - gd_mulfx(f_i,f_sin) + f_0_5 + f_W;
 			const unsigned int m = gd_fxtoi(f_m);
@@ -1810,18 +1830,18 @@ gdImagePtr gdImageRotateBilinear(gdImagePtr src, const float degrees, const int
 				const gdFixed f_w4 = gd_mulfx(f_f, f_g);
 
 				if (n < src_w - 1) {
-					src_offset_x = n + 1;
-					src_offset_y = m;
+					src_offset_x = m + 1;
+					src_offset_y = n;
 				}
 
 				if (m < src_h-1) {
-					src_offset_x = n;
-					src_offset_y = m + 1;
+					src_offset_x = m;
+					src_offset_y = n + 1;
 				}
 
 				if (!((n >= src_w-1) || (m >= src_h-1))) {
-					src_offset_x = n + 1;
-					src_offset_y = m + 1;
+					src_offset_x = m + 1;
+					src_offset_y = n + 1;
 				}
 				{
 					const int pixel1 = src->tpixels[src_offset_y][src_offset_x];
@@ -1902,6 +1922,13 @@ gdImagePtr gdImageRotateBicubicFixed(gdImagePtr src, const float degrees, const
 	unsigned int i;
 	gdImagePtr dst;
 
+	/* impact perf a bit, but not that much. Implementation for palette
+	   images can be done at a later point.
+	*/
+	if (src->trueColor == 0) {
+		gdImagePaletteToTrueColor(src);
+	}
+
 	dst = gdImageCreateTrueColor(new_width, new_height);
 
 	if (dst == NULL) {
@@ -1914,8 +1941,8 @@ gdImagePtr gdImageRotateBicubicFixed(gdImagePtr src, const float degrees, const
 		dst_offset_x = 0;
 
 		for (j=0; j < new_width; j++) {
-			const gdFixed f_i = gd_itofx((int)i - (int)new_height/2);
-			const gdFixed f_j = gd_itofx((int)j - (int)new_width/2);
+			const gdFixed f_i = gd_itofx(i-new_height/2);
+			const gdFixed f_j = gd_itofx(j-new_width/2);
 			const gdFixed f_m = gd_mulfx(f_j,f_sin) + gd_mulfx(f_i,f_cos) + f_0_5 + f_H;
 			const gdFixed f_n = gd_mulfx(f_j,f_cos) - gd_mulfx(f_i,f_sin) + f_0_5 + f_W;
 			const int m = gd_fxtoi(f_m);
@@ -2150,21 +2177,11 @@ gdImagePtr gdImageRotateBicubicFixed(gdImagePtr src, const float degrees, const
 gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, int bgcolor)
 {
 	const int angle_rounded = (int)floor(angle * 100);
-
+	
 	if (bgcolor < 0) {
 		return NULL;
 	}
 
-	/* impact perf a bit, but not that much. Implementation for palette
-	   images can be done at a later point.
-	*/
-	if (src->trueColor == 0) {
-		if (bgcolor >= 0) {
-			bgcolor =  gdTrueColorAlpha(src->red[bgcolor], src->green[bgcolor], src->blue[bgcolor], src->alpha[bgcolor]);
-		}
-		gdImagePaletteToTrueColor(src);
-	}
-
 	/* no interpolation needed here */
 	switch (angle_rounded) {
 		case 9000:

ext/gd/libgd/gd_webp.c

@@ -58,13 +58,11 @@ gdImagePtr gdImageCreateFromWebpPtr (int size, void *data)
 	return im;
 }
 
-#define GD_WEBP_ALLOC_STEP (4*1024)
-
 gdImagePtr gdImageCreateFromWebpCtx (gdIOCtx * infile)
 {
 	int    width, height, ret;
-	unsigned char   *filedata = NULL;
-	unsigned char   *read, *temp;
+	unsigned char   *filedata;
+	unsigned char   dummy[1024];
 	unsigned char   *Y = NULL;
 	unsigned char   *U = NULL;
 	unsigned char   *V = NULL;
@@ -72,25 +70,16 @@ gdImagePtr gdImageCreateFromWebpCtx (gdIOCtx * infile)
 	gdImagePtr im;
 
 	do {
-		temp = gdRealloc(filedata, size+GD_WEBP_ALLOC_STEP);
-		if (temp) {
-			filedata = temp;
-			read = temp + size;
-		} else {
-			if (filedata) {
-				gdFree(filedata);
-			}
-			php_gd_error("WebP decode: realloc failed");
-			return NULL;
-		}
-
-		n = gdGetBuf(read, GD_WEBP_ALLOC_STEP, infile);
-		/* differs from upstream where gdGetBuf return 0 instead of EOF */
-		if (n>0 && n!=EOF) {
-			size += n;
-		}
-	} while (n>0 && n!=EOF);
+		n = gdGetBuf(dummy, 1024, infile);
+		size += n;
+	} while (n != EOF);
 
+	filedata = gdMalloc(size);
+	if  (!filedata) {
+		php_gd_error("WebP decode: alloc failed");
+		return NULL;
+	}
+	gdGetBuf(filedata, size, infile);
 	ret = WebPDecode(filedata, size, &Y, &U, &V, &width, &height);
 	gdFree(filedata);
 	if (ret != webp_success) {

ext/gd/libgd/webpimg.h

@@ -84,7 +84,7 @@ WebPResult WebPDecode(const uint8* data,
  *                               height.
  *      6. y_stride: The width (in bytes) of one row of Y data. This may not
  *                   match width if there is end of row padding (e.g., for 32
- *                   bit row alignment).
+ *                   bit row aligment).
  *      7. QP: the quantization parameter. This parameter controls the
  *             compression vs quality tradeoff. Use smaller numbers for better
  *             quality (compression will be lesser) and vice versa. 20 is a

ext/gd/tests/imagecopyresampled_basic.phpt

@@ -35,9 +35,9 @@ imagefilledellipse($image_lge, 200, 150, 300, 200, $col_ellipse);
 imagepng($image_lge, $dest_lge);
 
 // Get new dimensions
-$percent = 0.5; // new image 50% of original
+$percent = 0.5; // new image 50% of orginal
 list($width, $height) = getimagesize($dest_lge);
-echo "Size of original: width=". $width . " height=" . $height . "\n";
+echo "Size of orginal: width=". $width . " height=" . $height . "\n";
 
 $new_width = $width * $percent;
 $new_height = $height * $percent;
@@ -66,6 +66,6 @@ echo "Done\n";
 ?>
 --EXPECT--
 Simple test of imagecopyresampled() function
-Size of original: width=400 height=300
+Size of orginal: width=400 height=300
 Size of copy: width=200 height=150
 Done

ext/gd/tests/imagecrop_auto.phpt

@@ -57,8 +57,6 @@ $im_crop = imagecropauto($im, IMG_CROP_THRESHOLD, 0.1, 0x0);
 imagepng($im_crop, __DIR__ . "/crop_threshold.png");
 var_dump(imagesx($im_crop));
 var_dump(imagesy($im_crop));
-
-@unlink(__DIR__ . "/crop_threshold.png");
 ?> 
 --EXPECT-- 
 TC IMG_CROP_DEFAULT

ext/gmp/gmp.c

@@ -1333,7 +1333,6 @@ ZEND_FUNCTION(gmp_cmp)
 		res = mpz_cmp_si(*gmpnum_a, Z_LVAL_PP(b_arg));
 	} else {
 		res = mpz_cmp(*gmpnum_a, *gmpnum_b);
-		FREE_GMP_TEMP(temp_b);
 	}
 	FREE_GMP_TEMP(temp_a);
 	

ext/hash/hash.c

@@ -659,9 +659,6 @@ PHP_FUNCTION(hash_pbkdf2)
 	/* Setup Main Loop to build a long enough result */
 	if (length == 0) {
 		length = ops->digest_size;
-		if (!raw_output) {
-			length = length * 2;
-		}
 	}
 	digest_length = length;
 	if (!raw_output) {