5.5.19 GA

Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
Fixed wrong entry line in NEWS
2026-11-12 19:50:50 +00:00 · 2014-11-12 10:38:46 +01:00 · 2014-11-12 10:14:46 +01:00 · 2014-11-07 13:09:02 +01:00 · 2014-10-28 15:00:19 +01:00
1406 changed files with 40036 additions and 134924 deletions
@@ -20,9 +20,6 @@
 *.tar.gz
 *.tar.bz2
 *.tar.xz
-*.tar.gz.asc
-*.tar.bz2.asc
-*.tar.xz.asc
 .FBCIndex
 .FBCLockFolder
 .deps
@@ -1,25 +1,12 @@
-language: c
-sudo: false
-addons:
-  apt:
-    packages:
-      - locales
-      - language-pack-de
-      - re2c
-      - libgmp-dev
-      - libicu-dev
-      - libmcrypt-dev
-      - libtidy-dev
+language: php
+
+php:
+    # We only specify one version so we only get one worker
+    - 5.4
+
 notifications:
    email: 
       on_failure: change
-    irc:
-      template:
-        - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} -  Change view : %{compare_url} - Build details : %{build_url}"
-      channels:
-        - "irc.efnet.org#php.pecl"
-      on_success: change
-      on_failure: always

 cache: 
    - apt
@@ -37,6 +24,10 @@ env:
      - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
      - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1

+before_install:
+    - sudo cp ./travis/de /var/lib/locales/supported.d/de
+    - sudo dpkg-reconfigure locales
+
 before_script:
    # Compile PHP
    - ./travis/compile.sh
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                  The PHP License, version 3.01
-Copyright (c) 1999 - 2015 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2014 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 

 Redistribution and use in source and binary forms, with or without
@@ -1,702 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-31 Mar 2016, PHP 5.5.34
-
- Fileinfo:
-  . Fixed bug #71527 (Buffer over-write in finfo_open with malformed magic
-    file). (Anatol)
-
- Mbstring:
-  . Fixed bug #71906 (AddressSanitizer: negative-size-param (-1) in
-    mbfl_strcut). (Stas)
-
- OBBC
-  . Fixed bug #71860 (Invalid memory write in phar on filename with \0 in
-    name). (Stas)
-
- SNMP:
-  . Fixed bug #71704 (php_snmp_error() Format String Vulnerability).
-    (andrew at jmpesp dot org)
-
- Standard
-  . Fixed bug #71798 (Integer Overflow in php_raw_url_encode).
-    (taoguangchen at icloud dot com, Stas)
-
-03 Mar 2016, PHP 5.5.33
-
- Phar:
-  . Fixed bug #71498 (Out-of-Bound Read in phar_parse_zipfile()). (Stas)
-
- WDDX:
-  . Fixed bug #71587 (Use-After-Free / Double-Free in WDDX Deserialize). (Stas)
-
-04 Feb 2016, PHP 5.5.32
-
- Core:
-  . Fixed bug #71039 (exec functions ignore length but look for NULL termination).
-    (Anatol)
-  . Fixed bug #71323 (Output of stream_get_meta_data can be falsified by its 
-    input). (Leo Gaspard)
-  . Fixed bug #71459 (Integer overflow in iptcembed()). (Stas)
-
- GD:
-  . Improved the fix for bug #70976. (Remi)
-
- PCRE:
-  . Upgraded pcrelib to 8.38. 
-
- Phar:
-  . Fixed bug #71354 (Heap corruption in tar/zip/phar parser). (Stas)
-  . Fixed bug #71391 (NULL Pointer Dereference in phar_tar_setupmetadata()).
-    (Stas)
-  . Fixed bug #71488 (Stack overflow when decompressing tar archives). (Stas)
-
- WDDX:
-  . Fixed bug #71335 (Type Confusion in WDDX Packet Deserialization). (Stas)
-  
-07 Jan 2015, PHP 5.5.31
-
- FPM:
-  . Fixed bug #70755 (fpm_log.c memory leak and buffer overflow). (Stas)
-
- GD:
-  . Fixed bug #70976 (Memory Read via gdImageRotateInterpolated Array Index
-    Out of Bounds). (emmanuel dot law at gmail dot com).
-
- WDDX:
-  . Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization).
-    (taoguangchen at icloud dot com)
-  . Fixed bug #70741 (Session WDDX Packet Deserialization Type Confusion
-    Vulnerability). (taoguangchen at icloud dot com)
-
- XMLRPC:
-  . Fixed bug #70728 (Type Confusion Vulnerability in PHP_to_XMLRPC_worker()).
-    (Julien)
-
-01 Oct 2015, PHP 5.5.30
-
- Phar:
-  . Fixed bug #69720 (Null pointer dereference in phar_get_fp_offset()). (Stas)
-  . Fixed bug #70433 (Uninitialized pointer in phar_make_dirstream when zip
-    entry filename is "/"). (Stas)
-
-03 Sep 2015, PHP 5.5.29
-
- Core:
-  . Fixed bug #70172 (Use After Free Vulnerability in unserialize()). (Stas)
-  . Fixed bug #70219 (Use after free vulnerability in session deserializer). 
-    (taoguangchen at icloud dot com)
-
- EXIF:
-  . Fixed bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte
-    value of 32 bytes). (Stas) 
-
- hash:
-  . Fixed bug #70312 (HAVAL gives wrong hashes in specific cases). (letsgolee 
-    at naver dot com)
-
- PCRE:
-  . Fixed bug #70345 (Multiple vulnerabilities related to PCRE functions).
-    (Anatol Belski)
-
- SOAP:
-  . Fixed bug #70388 (SOAP serialize_function_call() type confusion / RCE).
-    (Stas)
-  
- SPL:
-  . Fixed bug #70365 (Use-after-free vulnerability in unserialize() with
-    SplObjectStorage). (taoguangchen at icloud dot com)
-  . Fixed bug #70366 (Use-after-free vulnerability in unserialize() with
-    SplDoublyLinkedList). (taoguangchen at icloud dot com)
-
- XSLT:
-  . Fixed bug #69782 (NULL pointer dereference). (Stas)
-
- ZIP:
-  . Fixed bug #70350 (ZipArchive::extractTo allows for directory traversal when 
-    creating directories). (neal at fb dot com)
-
-06 Aug 2015, PHP 5.5.28
-
- Core:
-  . Fixed bug #69793 (Remotely triggerable stack exhaustion via recursive
-    method calls). (Stas)
-  . Fixed bug #69892 (Different arrays compare indentical due to integer key
-    truncation). (Nikita)
-  . Fixed bug #70002 (TS issues with temporary dir handling). (Anatol)
-  . Fixed bug #70121 (unserialize() could lead to unexpected methods execution
-    / NULL pointer deref). (Stas)
-
- OpenSSL:
-  . Fixed bug #70014 (openssl_random_pseudo_bytes() is not cryptographically
-    secure). (Stas)
-
- Phar:
-  . Improved fix for bug #69441. (Anatol Belski)
-  . Fixed bug #70019 (Files extracted from archive may be placed outside of 
-    destination directory). (Anatol Belski)
-
- SOAP:
-  . Fixed bug #70081 (SoapClient info leak / null pointer dereference via
-     multiple type confusions). (Stas)
-
- SPL:
-  . Fixed bug #70068 (Dangling pointer in the unserialization of ArrayObject
-    items). (sean.heelan)
-  . Fixed bug #70166 (Use After Free Vulnerability in unserialize() with
-    SPLArrayObject). (taoguangchen at icloud dot com)
-  . Fixed bug #70168 (Use After Free Vulnerability in unserialize() with
-    SplObjectStorage). (taoguangchen at icloud dot com)
-  . Fixed bug #70169 (Use After Free Vulnerability in unserialize() with
-    SplDoublyLinkedList). (taoguangchen at icloud dot com)
-
-9 Jul 2015, PHP 5.5.27
-
- Core:
-  . Fixed bug #69768 (escapeshell*() doesn't cater to !). (cmb)
-  . Fixed bug #69703 (Use __builtin_clzl on PowerPC).
-    (dja at axtens dot net, Kalle)
-  . Fixed bug #69732 (can induce segmentation fault with basic php code).
-    (Dmitry)
-  . Fixed bug #69642 (Windows 10 reported as Windows 8).
-    (Christian Wenz, Anatol Belski)
-  . Fixed bug #69551 (parse_ini_file() and parse_ini_string() segmentation
-    fault). (Christoph M. Becker)
-  . Fixed bug #69781 (phpinfo() reports Professional Editions of Windows
-    7/8/8.1/10 as "Business"). (Christian Wenz)
-  . Fixed bug #69835 (phpinfo() does not report many Windows SKUs).
-    (Christian Wenz)
-  . Fixed bug #69892 (Different arrays compare indentical due to integer key
-    truncation). (Nikita)
-  . Fixed bug #69874 (Can't set empty additional_headers for mail()), regression
-    from fix to bug #68776. (Yasuo)
-
- GD:
-  . Fixed bug #61221 (imagegammacorrect function loses alpha channel). (cmb)
-
- Mysqlnd:
-  . Fixed bug #69669 (mysqlnd is vulnerable to BACKRONYM) (CVE-2015-3152).
-    (Andrey)
-
- PCRE:
-  . Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the
-    string). (cmb)
-  . Fixed bug #69864 (Segfault in preg_replace_callback) (cmb, ab)
-
- PDO_pgsql:
-  . Fixed bug #69752 (PDOStatement::execute() leaks memory with DML
-    Statements when closeCuror() is u). (Philip Hofstetter)
-  . Fixed bug #69362 (PDO-pgsql fails to connect if password contains a
-    leading single quote). (Matteo)
-  . Fixed bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps).
-    (Matteo)
-
- Phar:
-  . Fixed bug #69958 (Segfault in Phar::convertToData on invalid file).
-    (CVE-2015-5589) (Stas)
-  . Fixed bug #69923 (Buffer overflow and stack smashing error in 
-    phar_fix_filepath). (CVE-2015-5590) (Stas)
-
- SimpleXML:
-  . Refactored the fix for bug #66084 (simplexml_load_string() mangles empty
-    node name). (Christoph Michael Becker)
-
- SPL:
-  . Fixed bug #69737 (Segfault when SplMinHeap::compare produces fatal error).
-    (Stas)
-  . Fixed bug #67805 (SplFileObject setMaxLineLength). (Willian Gustavo Veiga).
-
-11 Jun 2015, PHP 5.5.26
-
- Core:
-  . Fixed bug #69566 (Conditional jump or move depends on uninitialised value
-    in extension trait). (jbboehr at gmail dot com)
-  . Fixed bug #66048 (temp. directory is cached during multiple requests).
-    (Julien)
-  . Fixed bug #69628 (complex GLOB_BRACE fails on Windows).
-    (Christoph M. Becker)
-  . Improved fix for bug #69545 (Integer overflow in ftp_genlist() resulting in
-    heap overflow). (CVE-2015-4643) (Max Spelsberg)
-  . Fixed bug #69646 (OS command injection vulnerability in escapeshellarg).
-    (CVE-2015-4642) (Anatol Belski)
-  . Fixed bug #69719 (Incorrect handling of paths with NULs). (Stas)
-
- GD:
-  . Fixed bug #69479 (GD fails to build with newer libvpx). (Remi)
-
- Iconv:
-  . Fixed bug #48147 (iconv with //IGNORE cuts the string). (Stas)
-
- Litespeed SAPI:
-  . Fixed bug #68812 (Unchecked return value). (George Wang)
-
- Mail:
-  . Fixed bug #68776 (mail() does not have mail header injection prevention for
-    additional headers). (Yasuo)
-
- MCrypt:
-  . Added file descriptor caching to mcrypt_create_iv() (Leigh)
-
- PCRE:
-  . Upgraded pcrelib to 8.37. (CVE-2015-2325, CVE-2015-2326)
-
- Phar:
-  . Fixed bug #69680 (phar symlink in binary directory broken).
-    (Matteo Bernardini, Remi)
-
- Postgres:
-  . Fixed bug #69667 (segfault in php_pgsql_meta_data). (CVE-2015-4644) (Remi)
-
- Opcache
-  . Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF).
-    (Laruence, Dmitry)
-
- Sqlite3:
-  . Upgrade bundled sqlite to 3.8.10.2. (CVE-2015-3414, CVE-2015-3415,
-    CVE-2015-3416) (Kaplan)
-
-14 May 2015, PHP 5.5.25
-
- Core:
-  . Fixed bug #69364 (PHP Multipart/form-data remote dos Vulnerability).
-    (CVE-2015-4024) (Stas)
-  . Fixed bug #69403 (str_repeat() sign mismatch based memory corruption). 
-    (Stas)
-  . Fixed bug #69418 (CVE-2006-7243 fix regressions in 5.4+). (CVE-2015-4025)
-    (Stas)
-  . Fixed bug #69522 (heap buffer overflow in unpack()). (Stas)
-  . Fixed bug #69467 (Wrong checked for the interface by using Trait). 
-    (Laruence)
-  . Fixed bug #69420 (Invalid read in zend_std_get_method). (Laruence)
-  . Fixed bug #60022 ("use statement [...] has no effect" depends on leading
-    backslash). (Nikita)
-  . Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer).
-    (Dmitry)
-  . Fixed bug #68652 (segmentation fault in destructor). (Dmitry)
-  . Fixed bug #69419 (Returning compatible sub generator produces a warning).
-    (Nikita)
-  . Fixed bug #69472 (php_sys_readlink ignores misc errors from 
-    GetFinalPathNameByHandleA). (Jan Starke)
-
- FTP:
-  . Fixed bug #69545 (Integer overflow in ftp_genlist() resulting in heap
-    overflow). (CVE-2015-4022) (Stas)
-
- ODBC:
-  . Fixed bug #69354 (Incorrect use of SQLColAttributes with ODBC 3.0).
-    (Anatol)
-  . Fixed bug #69474 (ODBC: Query with same field name from two tables returns
-    incorrect result). (Anatol)
-  . Fixed bug #69381 (out of memory with sage odbc driver). (Frederic Marchall,
-    Anatol Belski)
-
- OpenSSL:
-  . Fixed bug #69402 (Reading empty SSL stream hangs until timeout).
-    (Daniel Lowrey)
-
- PCNTL:
-  . Fixed bug #68598 (pcntl_exec() should not allow null char). (CVE-2015-4026)
-    (Stas)
-
- Phar:
-  . Fixed bug #69453 (Memory Corruption in phar_parse_tarfile when entry
-    filename starts with null). (CVE-2015-4021) (Stas)
-
-16 Apr 2015, PHP 5.5.24
-
- Apache2handler:
-  . Fixed bug #69218 (potential remote code execution with apache 2.4
-    apache2handler). (Gerrit Venema)
-
- Core:
-  . Fixed bug #66609 (php crashes with __get() and ++ operator in some cases).
-    (Dmitry, Laruence)
-  . Fixed bug #67626 (User exceptions not properly handled in streams). 
-    (Julian)
-  . Fixed bug #68021 (get_browser() browser_name_regex returns non-utf-8
-    characters). (Tjerk)
-  . Fixed bug #68917 (parse_url fails on some partial urls). (Wei Dai)
-  . Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM
-    configuration options). (Anatol Belski)
-  . Additional fix for bug #69152 (Type confusion vulnerability in
-    exception::getTraceAsString). (Stas)
-  . Fixed bug #69212 (Leaking VIA_HANDLER func when exception thrown in
-    __call/... arg passing). (Nikita)
-  . Fixed bug #69221 (Segmentation fault when using a generator in combination
-    with an Iterator). (Nikita)
-  . Fixed bug #69337 (php_stream_url_wrap_http_ex() type-confusion
-    vulnerability). (Stas)
-  . Fixed bug #69353 (Missing null byte checks for paths in various PHP
-    extensions). (Stas)
-
- cURL:
-  . Implemented FR#69278 (HTTP2 support). (Masaki Kagaya)
-  . Fixed bug #68739 (Missing break / control flow). (Laruence)
-  . Fixed bug #69316 (Use-after-free in php_curl related to
-    CURLOPT_FILE/_INFILE/_WRITEHEADER). (Laruence)
-
- Date:
-  . Export date_get_immutable_ce so that it can be used by extensions. (Derick
-    Rethans)
-  . Fixed bug #69336 (Issues with "last day of <monthname>"). (Derick Rethans)
-
- Enchant:
-  . Fixed bug #65406 (Enchant broker plugins are in the wrong place in windows
-    builds). (Anatol)
-
- Ereg:
-  . Fixed bug #68740 (NULL Pointer Dereference). (Laruence)
-
- Fileinfo:
-  . Fixed bug #68819 (Fileinfo on specific file causes spurious OOM and/or
-    segfault). (Anatol Belski)
-
- Filter:
-  . Fixed bug #69202 (FILTER_FLAG_STRIP_BACKTICK ignored unless other
-    flags are used). (Jeff Welch)
-  . Fixed bug #69203 (FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127). (Jeff
-    Welch)
-
- Mbstring:
-  . Fixed bug #68846 (False detection of CJK Unified Ideographs Extension E).
-    (Masaki Kagaya)
-
- ODBC:
-  . Fixed bug #69354 (Incorrect use of SQLColAttributes with ODBC 3.0).
-    (Anatol)
-
- OPCache:
-  . Fixed bug #69281 (opcache_is_script_cached no longer works). (danack)
-  . Fixed bug #68677 (Use After Free). (CVE-2015-1351) (Laruence)
-
- OpenSSL:
-  . Fixed bug #67403 (Add signatureType to openssl_x509_parse).
-  . Add a check for RAND_egd to allow compiling against LibreSSL (Leigh)
-
- Phar:
-  . Fixed bug #64343 (PharData::extractTo fails for tarball created by BSD tar).
-    (Mike)
-  . Fixed bug #64931 (phar_add_file is too restrictive on filename). (Mike)
-  . Fixed bug #65467 (Call to undefined method cli_arg_typ_string). (Mike)
-  . Fixed bug #67761 (Phar::mapPhar fails for Phars inside a path containing 
-    ".tar"). (Mike)
-  . Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar). (Stas)
-  . Fixed bug #69441 (Buffer Overflow when parsing tar/zip/phar in
-    phar_set_inode). (Stas)
-
- Postgres:
-  . Fixed bug #68741 (Null pointer dereference). (CVE-2015-1352) (Laruence)
-
- SOAP:
-  . Fixed bug #69152 (Type Confusion Infoleak Vulnerability in unserialize()
-    with SoapFault). (Dmitry)
-  . Fixed bug #69293 (NEW segfault when using SoapClient::__setSoapHeader 
-     (bisected, regression)). (thomas at shadowweb dot org, Laruence)
-
- SPL:
-  . Fixed bug #69227 (Use after free in zval_scan caused by
-     spl_object_storage_get_gc). (adam dot scarr at 99designs dot com)
-
- Sqlite3:
-  . Fixed bug #68760 (SQLITE segfaults if custom collator throws an exception).
-     (Dan Ackroyd)
-  . Fixed bug #69287 (Upgrade bundled sqlite to 3.8.8.3). (Anatol)
-  . Fixed bug #66550 (SQLite prepared statement use-after-free). (Sean Heelan)
-
-19 Mar 2015, PHP 5.5.23
-
- Core:
-  . Fixed bug #69174 (leaks when unused inner class use traits precedence).
-    (Laruence)
-  . Fixed bug #69139 (Crash in gc_zval_possible_root on unserialize).
-    (Laruence)
-  . Fixed bug #69121 (Segfault in get_current_user when script owner is not
-    in passwd with ZTS build). (dan at syneto dot net)
-  . Fixed bug #65593 (Segfault when calling ob_start from output buffering 
-    callback). (Mike)
-  . Fixed bug #69017 (Fail to push to the empty array with the constant value
-    defined in class scope). (Laruence)
-  . Fixed bug #68986 (pointer returned by php_stream_fopen_temporary_file
-    not validated in memory.c). (nayana at ddproperty dot com)
-  . Fixed bug #68166 (Exception with invalid character causes segv). (Rasmus)
-  . Fixed bug #69141 (Missing arguments in reflection info for some builtin
-    functions). (kostyantyn dot lysyy at oracle dot com)
-  . Fixed bug #68976 (Use After Free Vulnerability in unserialize()).
-    (CVE-2015-2787) (Stas)
-  . Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM
-    configuration options). (Anatol Belski)
-  . Fixed bug #69207 (move_uploaded_file allows nulls in path). (CVE-2015-2348)
-    (Stas)
-
- CGI:
-  . Fixed bug #69015 (php-cgi's getopt does not see $argv). (Laruence)
-
- CLI:
-  . Fixed bug #67741 (auto_prepend_file messes up __LINE__). (Reeze Xia)
-
- cURL:
-  . Fixed bug #69088 (PHP_MINIT_FUNCTION does not fully initialize cURL on
-    Win32). (Grant Pannell)
-  . Add CURLPROXY_SOCKS4A and CURLPROXY_SOCKS5_HOSTNAME constants if supported
-    by libcurl. (Linus Unneback)
-
- Ereg:
-  . Fixed bug #69248 (heap overflow vulnerability in regcomp.c). (CVE-2015-2305) (Stas)
-
- FPM:
-  . Fixed bug #68822 (request time is reset too early). (honghu069 at 163 dot com)
-
- ODBC:
-  . Fixed bug #68964 (Allowed memory size exhausted with odbc_exec). (Anatol)
-
- Opcache:
-  . Fixed bug #69125 (Array numeric string as key). (Laruence)
-  . Fixed bug #69038 (switch(SOMECONSTANT) misbehaves). (Laruence)
-
- OpenSSL:
-  . Fixed bugs #61285, #68329, #68046, #41631 (encrypted streams don't observe
-    socket timeouts). (Brad Broerman)
-
- pgsql:
-  . Fixed bug #68638 (pg_update() fails to store infinite values).
-    (william dot welter at 4linux dot com dot br, Laruence)
-
- Readline:
-  . Fixed bug #69054 (Null dereference in readline_(read|write)_history() without
-    parameters). (Laruence)
-
- SOAP:
-  . Fixed bug #69085 (SoapClient's __call() type confusion through
-    unserialize()). (CVE-2015-4147, CVE-2015-4148)
-	(andrea dot palazzo at truel dot it, Laruence)
-
- SPL:
-  . Fixed bug #69108 ("Segmentation fault" when (de)serializing
-    SplObjectStorage). (Laruence)
-  . Fixed bug #68557 (RecursiveDirectoryIterator::seek(0) broken after 
-    calling getChildren()). (Julien)
-
- ZIP:
-  . Fixed bug #69253 (ZIP Integer Overflow leads to writing past heap
-    boundary). (CVE-2015-2331) (Stas)
-
-19 Feb 2015, PHP 5.5.22
-
- Core:
-  . Removed support for multi-line headers, as the are deprecated by RFC 7230.
-    (Stas)
-  . Fixed bug #67068 (getClosure returns somethings that's not a closure). 
-    (Danack at basereality dot com)
-  . Fixed bug #68942 (Use after free vulnerability in unserialize() with
-    DateTimeZone). (CVE-2015-0273) (Stas)
-  . Fixed bug #68925 (Mitigation for CVE-2015-0235 – GHOST: glibc gethostbyname
-    buffer overflow). (Stas)
-  . Added NULL byte protection to exec, system and passthru. (Yasuo)
-
- Date:
-  . Fixed bug #45081 (strtotime incorrectly interprets SGT time zone). (Derick)
-
- Dba:
-  . Fixed bug #68711 (useless comparisons). (bugreports at internot dot info)
-
- Enchant: 
-  . Fixed bug #68552 (heap buffer overflow in enchant_broker_request_dict()).
-    (CVE-2014-9705) (Antony)
-
- Fileinfo:
-  . Fixed bug #68827 (Double free with disabled ZMM). (Joshua Rogers)
-
- FPM:
-  . Fixed bug #66479 (Wrong response to FCGI_GET_VALUES). (Frank Stolle)
-  . Fixed bug #68571 (core dump when webserver close the socket).
-    (redfoxli069 at gmail dot com, Laruence)
-
- Libxml:
-  . Fixed bug #64938 (libxml_disable_entity_loader setting is shared
-    between threads). (Martin Jansen)
-
- PDO_mysql:
-  . Fixed bug #68750 (PDOMysql with mysqlnd does not allow the usage of
-    named pipes). (steffenb198 at aol dot com)
-
- Phar:
-  . Fixed bug #68901 (use after free). (CVE-2015-2301)
-    (bugreports at internot dot info)
-
- Pgsql:
-  . Fixed Bug #65199 'pg_copy_from() modifies input array variable). (Yasuo)
-
- Sqlite3:
-  . Fixed bug #68260 (SQLite3Result::fetchArray declares wrong 
-    required_num_args). (Julien)
-
- Mysqli:
-  . Fixed bug #68114 (linker error on some OS X machines with fixed
-    width decimal support) (Keyur Govande)
-  . Fixed bug #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
-    has rounding errors) (Keyur Govande)
-
- Session:
-  . Fixed bug #68941 (mod_files.sh is a bash-script) (bugzilla at ii.nl, Yasuo)
-  . Fixed Bug #66623 (no EINTR check on flock) (Yasuo)
-  . Fixed bug #68063 (Empty session IDs do still start sessions) (Yasuo)
-
- Standard:
-  . Fixed bug #65272 (flock() out parameter not set correctly in windows).
-    (Daniel Lowrey)
-  . Fixed bug #69033 (Request may get env. variables from previous requests
-    if PHP works as FastCGI). (Anatol)
-
- Streams:
-  . Fixed bug which caused call after final close on streams filter. (Bob)
-
-22 Jan 2015, PHP 5.5.21
-
- Core:
-  . Upgraded crypt_blowfish to version 1.3. (Leigh)
-  . Fixed bug #60704 (unlink() bug with some files path). 
-  . Fixed bug #65419 (Inside trait, self::class != __CLASS__). (Julien)
-  . Fixed bug #65576 (Constructor from trait conflicts with inherited
-    constructor). (dunglas at gmail dot com)
-  . Fixed bug #55541 (errors spawn MessageBox, which blocks test automation).
-    (Anatol)
-  . Fixed bug #68297 (Application Popup provides too few information). (Anatol)
-  . Fixed bug #65769 (localeconv() broken in TS builds). (Anatol)
-  . Fixed bug #65230 (setting locale randomly broken). (Anatol)
-  . Fixed bug #66764 (configure doesn't define EXPANDED_DATADIR / PHP_DATADIR
-    correctly). (Ferenc)
-  . Fixed bug #68583 (Crash in timeout thread). (Anatol)
-  . Fixed bug #68676 (Explicit Double Free). (CVE-2014-9425) (Kalle)
-  . Fixed bug #68710 (Use After Free Vulnerability in PHP's unserialize()).
-    (CVE-2015-0231) (Stefan Esser)
-
- CGI:
-  . Fixed bug #68618 (out of bounds read crashes php-cgi). (CVE-2014-9427)
-    (Stas)
-
- CLI server:
-  . Fixed bug #68745 (Invalid HTTP requests make web server segfault). (Adam)
-
- cURL:
-  . Fixed bug #67643 (curl_multi_getcontent returns '' when
-    CURLOPT_RETURNTRANSFER isn't set). (Jille Timmermans)
-
- EXIF:
-  . Fixed bug #68799 (Free called on uninitialized pointer). (CVE-2015-0232)
-    (Stas)
-
- Fileinfo:
-  . Fixed bug #68671 (incorrect expression in libmagic).
-    (Joshua Rogers, Anatol Belski)
-  . Removed readelf.c and related code from libmagic sources
-    (Remi, Anatol)
-  . Fixed bug #68735 (fileinfo out-of-bounds memory access). (CVE-2014-9652)
-    (Anatol)
-
- FPM:
-  . Fixed bug #68751 (listen.allowed_clients is broken). (Remi)
-
- GD:
-  . Fixed bug #68601 (buffer read overflow in gd_gif_in.c). (CVE-2014-9709)
-    (Jan Bee, Remi)
-
- Mbstring:
-  . Fixed bug #68504 (--with-libmbfl configure option not present on Windows).
-    (Ashesh Vashi)
-
- Mcrypt:
-  . Fixed possible read after end of buffer and use after free. (Dmitry)
-
- Opcache:
-  . Fixed bug #67111 (Memory leak when using "continue 2" inside two foreach
-    loops). (Nikita)
-
- OpenSSL:
-  . Fixed bug #55618 (use case-insensitive cert name matching). (Daniel Lowrey)
-
- Pcntl:
-  . Fixed bug #60509 (pcntl_signal doesn't decrease ref-count of old handler
-    when setting SIG_DFL). (Julien)
-
- PCRE:
-  . Fixed bug #66679 (Alignment Bug in PCRE 8.34 upstream).
-    (Rainer Jung, Anatol Belski)
-
- pgsql:
-  . Fixed bug #68697 (lo_export return -1 on failure). (Ondřej Surý)
-
- PDO:
-  . Fixed bug #68371 (PDO#getAttribute() cannot be called with platform-specific
-    attribute names). (Matteo)
-
- PDO_mysql:
-  . Fixed bug #68424 (Add new PDO mysql connection attr to control multi
-    statements option). (peter dot wolanin at acquia dot com)
-
- SPL:
-  . Fixed bug #66405 (RecursiveDirectoryIterator::CURRENT_AS_PATHNAME
-    breaks the RecursiveIterator). (Paul Garvin)
-  . Fixed bug #65213 (cannot cast SplFileInfo to boolean) (Tjerk)
-  . Fixed bug #68479 (Added escape parameter to SplFileObject::fputcsv). (Salathe)
-
- SQLite:
-  . Fixed bug #68120 (Update bundled libsqlite to 3.8.7.2). (Anatol)
-
- Streams:
-  . Fixed bug #68532 (convert.base64-encode omits padding bytes).
-    (blaesius at krumedia dot de)
-
-18 Dec 2014, PHP 5.5.20
-
- Core:
-  . Fixed bug #68091 (Some Zend headers lack appropriate extern "C" blocks).
-    (Adam)
-  . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly 
-    triggered). (Julien)
-  . Fixed bug #68370 ("unset($this)" can make the program crash). (Laruence)
-  . Fixed bug #68545 (NULL pointer dereference in unserialize.c). (Anatol)
-  . Fixed bug #68594 (Use after free vulnerability in unserialize()).
-    (CVE-2014-8142) (Stefan Esser)
-
- Date:
-  . Fixed day_of_week function as it could sometimes return negative values
-    internally. (Derick)
-
- FPM:
-  . Fixed bug #68381 (fpm_unix_init_main ignores log_level).
-    (David Zuelke, Remi)
-  . Fixed bug #68420 (listen=9000 listens to ipv6 localhost instead of all
-    addresses). (Remi)
-  . Fixed bug #68421 (access.format='%R' doesn't log ipv6 address). (Remi)
-  . Fixed bug #68423 (PHP-FPM will no longer load all pools). (Remi)
-  . Fixed bug #68428 (listen.allowed_clients is IPv4 only). (Remi)
-  . Fixed bug #68452 (php-fpm man page is oudated). (Remi)
-  . Fixed request #68458 (Change pm.start_servers default warning to
-    notice). (David Zuelke, Remi)
-  . Fixed bug #68463 (listen.allowed_clients can silently result
-    in no allowed access). (Remi)
-  . Fixed request #68391 (php-fpm conf files loading order).
-    (Florian Margaine, Remi)
-  . Fixed bug #68478 (access.log don't use prefix). (Remi)
-
- Mcrypt:
-  . Fixed possible read after end of buffer and use after free. (Dmitry)
-
- PDO_pgsql:
-  . Fixed bug #66584 (Segmentation fault on statement deallocation) (Matteo)
-  . Fixed bug #67462 (PDO_PGSQL::beginTransaction() wrongly throws exception
-  when not in transaction) (Matteo)
-  . Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
-  (Matteo)
-
- SOAP:
-  . Fixed bug #68361 (Segmentation fault on SoapClient::__getTypes).
-    (Laruence)
-
- zlib:
-  . Fixed bug #53829 (Compiling PHP with large file support will replace
-    function gzopen by gzopen64) (Sascha Kettler, Matteo)
-
 13 Nov 2014, PHP 5.5.19

 - Core:
@@ -705,13 +8,9 @@ PHP                                                                        NEWS
  . Fixed bug #68118 ($a->foo .= 'test'; can leave $a->foo undefined). (Nikita)
  . Fixed bug #68129 (parse_url() - incomplete support for empty usernames
    and passwords) (Tjerk)
-  . Fixed bug #68365 (zend_mm_heap corrupted after memory overflow in
+    Fixed bug #68365 (zend_mm_heap corrupted after memory overflow in
    zend_hash_copy). (Dmitry)

- CURL:
-  . Add CURL_SSLVERSION_TLSv1_0, CURL_SSLVERSION_TLSv1_1, and 
-    CURL_SSLVERSION_TLSv1_2 constants if supported by libcurl (Rasmus)
-
 - Fileinfo:
  . Fixed bug #66242 (libmagic: don't assume char is signed). (ArdB)
  . Fixed bug #68283 (fileinfo: out-of-bounds read in elf note headers).
@@ -739,6 +38,10 @@ PHP                                                                        NEWS
 - SPL:
  . Fixed bug #68128 (Regression in RecursiveRegexIterator) (Tjerk)

+- CURL:
+  . Add CURL_SSLVERSION_TLSv1_0, CURL_SSLVERSION_TLSv1_1, and 
+    CURL_SSLVERSION_TLSv1_2 constants if supported by libcurl (Rasmus)
+
 16 Oct 2014, PHP 5.5.18

 - Core:
@@ -749,33 +52,17 @@ PHP                                                                        NEWS
  . Fixed bug #67633 (A foreach on an array returned from a function not doing
    copy-on-write). (Nikita)
  . Fixed bug #51800 (proc_open on Windows hangs forever). (Anatol)
-  . Fixed bug #68044 (Integer overflow in unserialize() (32-bits only)).
-    (CVE-2014-3669) (Stas)
-
- cURL:
-  . Fixed bug #68089 (NULL byte injection - cURL lib). (Stas)
-
- EXIF:
-  . Fixed bug #68113 (Heap corruption in exif_thumbnail()). (CVE-2014-3670)
-    (Stas)

 - FPM:
  . Fixed bug #65641 (PHP-FPM incorrectly defines the SCRIPT_NAME variable
    when using Apache, mod_proxy-fcgi and ProxyPass). (Remi)

- OpenSSL:
-  . Revert regression introduced by fix of bug #41631
-
 - Reflection:
  . Fixed bug #68103 (Duplicate entry in Reflection for class alias). (Remi)

 - Session:
  . Fixed bug #67972 (SessionHandler Invalid memory read create_sid()). (Adam)

- XMLRPC:
-  . Fixed bug #68027 (Global buffer overflow in mkgmtime() function).
-    (CVE-2014-3668) (Stas)
-
 18 Sep 2014, PHP 5.5.17

 - Core:
@@ -831,7 +118,7 @@ PHP                                                                        NEWS

 - FPM:
  . Fixed bug #67635 (php links to systemd libraries without using pkg-config).
-    (pacho at gentoo dot org, Remi)
+    (pacho@gentoo.org, Remi)

 - GD:
  . Fixed bug #66901 (php-gd 'c_color' NULL pointer dereference).
@@ -953,9 +240,6 @@ PHP                                                                        NEWS
  . Fixed bug #67413 (fileinfo: cdf_read_property_info insufficient boundary
    check). (Francisco Alonso, Jan Kaluza, Remi)

- LiteSpeed:
-  . Updated LiteSpeed SAPI code from V5.5 to V6.6 (George Wang)
-
 - Network:
  . Fixed bug #67432 (Fix potential segfault in dns_get_record()).
    (CVE-2014-4049). (Sara)
@@ -1069,8 +353,6 @@ PHP                                                                        NEWS
 - JSON:
  . Fixed bug #66021 (Blank line inside empty array/object when
    JSON_PRETTY_PRINT is set). (Kevin Israel)
-  . Fixed bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are 
-    numbers plus the letter e). (Jakub Zelenka)

 - LDAP:
  . Fixed issue with null bytes in LDAP bindings. (Matthew Daley)
@@ -12,7 +12,7 @@ Collaboration is a Good Thing(tm), and Git lets us do this. Thus, following
 some basic rules with regards to Git usage will::

   a. Make everybody happier, especially those responsible for maintaining
-      PHP itself.
+      Git itself.

   b. Keep the changes consistently well documented and easily trackable.

@@ -48,11 +48,11 @@ Currently we have the following branches in use::
  PHP-5.6   Is used to release the PHP 5.6.x series. This is a current
            stable version and is open for bugfixes only.

-  PHP-5.5   Is used to release the PHP 5.5.x series. This is an old
-            stable version and is open for security fixes only.
+  PHP-5.5   Is used to release the PHP 5.5.x series. This is a current
+            stable version and is open for bugfixes only.

-  PHP-5.4   Is used to release the PHP 5.4.x series. This is an old
-            stable version and is open for security fixes only.
+  PHP-5.4   Is used to release the PHP 5.4.x series. This is a current
+            stable version and is open for bugfixes only.

  PHP-5.3   This branch is closed.

@@ -67,7 +67,7 @@ Currently we have the following branches in use::

 The next few rules are more of a technical nature::

-   1. All changes should first go to the lowest branch (i.e. 5.6) and then
+   1. All changes should first go to the lowest branch (i.e. 5.4) and then
      get merged up to all other branches. If a change is not needed for
      later branches (i.e. fixes for features which where dropped from later
      branches) an empty merge should be done.
@@ -196,11 +196,11 @@ last commit id to web/php.git, then, mirrors will now sync
 Getting the stable release announced
 ------------------------------------

-1. Update phpweb/include/releases.inc with the old release info
-  (updates the download archives)
+1. Run the bumpRelease script for phpweb on your local checkout

- a. You can run ``php bin/bumpRelease 5`` if you are making a release for the
-    highest branch, otherwise you have to do this manually, see point 1.b
+ a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php)
+    The release announcement file should list in detail security fixes and
+    changes in behavior (whether due to a bug fix or not).

 b. In case multiple PHP minor versions are in active development you have
    to manually copy the old information to include/releases.inc
@@ -213,18 +213,15 @@ Getting the stable release announced

 c. ``$PHP_X_MD5`` array and update all the md5 sums

- d. ``$PHP_X_SHA256`` array and update all the SHA256 sums
+ d. set ``$PHP_X_RC`` to false!

- e. set ``$PHP_X_RC`` to false!
-
- f. Make sure there are no outdated "notes" or edited "date" keys in the
+ e. Make sure there are no outdated "notes" or edited "date" keys in the
 ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array

- g. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")
+ f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")

-3. Create the release file (releases/x_y_z.php)
-   Usually we use the same content as for point 6, but included in php template
-   instead of the release xml.
+3. Update phpweb/include/releases.php with the old release info
+  (updates the download archives)

 4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
   (prepare for next RC)
@@ -269,9 +266,6 @@ to upgrade.
 9. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 http://news.php.net/php.internals/17222.
-Please make sure that the mail to php-announce@ is its own completely seperate email.
-This is to make sure that repiles to the announcement on php-general@ or internals@
-will not accidentally hit the php-announce@ mailinglist.

 Re-releasing the same version (or -pl)
 --------------------------------------
@@ -288,9 +282,7 @@ Re-releasing the same version (or -pl)

 d. ``$PHP_X_MD5`` array and update all the md5 sums

- e. ``$PHP_X_SHA256`` array and update all the SHA256 sums
-
- f. Make sure there are no outdated "notes" or edited "date" keys in the
+ e. Make sure there are no outdated "notes" or edited "date" keys in the
 ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array

 3. Add a short notice to phpweb stating that there is a new release, and
@@ -307,6 +299,3 @@ to upgrade.
 5. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 the news entry.
-Please make sure that the mail to php-announce@ is its own completely seperate email.
-This is to make sure that repiles to the announcement on php-general@ or internals@
-will not accidentally hit the php-announce@ mailinglist.
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -251,7 +251,7 @@ CWD_API int php_sys_readlink(const char *link, char *target, size_t target_len){
 	}

 	dwRet = pGetFinalPathNameByHandle(hFile, target, MAXPATHLEN, VOLUME_NAME_DOS);
-	if(dwRet >= MAXPATHLEN || dwRet == 0) {
+	if(dwRet >= MAXPATHLEN) {
 		return -1;
 	}

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -408,7 +408,6 @@ None
 - cURL:
  - Added CURLOPT_SAFE_UPLOAD to be used with curl_setopt().
  - Added CURL_WRAPPERS_ENABLED to reflect --with-curlwrappers.
-  - Added CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2 in 5.5.24+.

 - GD
  - Added constants for imageflip:
@@ -1,5 +1,5 @@
 --TEST--
-Bug #43201 (Crash on using uninitialized vals and __get/__set)
+Bug #43201 (Crash on using unitialized vals and __get/__set)
 --FILE--
 <?php
 class Foo {
@@ -1,5 +1,7 @@
 --TEST--
 Bug #63336 (invalid E_NOTICE error occur)
+--XFAIL--
+Bug is not fixed yet
 --FILE--
 <?php
 error_reporting(E_ALL | E_NOTICE );
@@ -16,7 +18,7 @@ class Child extends Base {
    public function bar($var, $more=self::DUMMY) { return true; }
 }
 ?>
--EXPECTF--
-Strict Standards: Declaration of Child::foo() should be compatible with Base::foo($var = TEST, $more = NULL) in %sbug63336.php on line %d
+--EXPECT--
+Strict Standards: Declaration of Child::foo() should be compatible with Base::foo($var = '123', $more = NULL) in %sbug63336.php on line %d

-Strict Standards: Declaration of Child::bar() should be compatible with Base::bar($more = self::DUMMY) in %sbug63336.php on line %d
+Strict Standards: Declaration of Child::bar() should be compatible with Base::bar($var, $more = 'XXX') in %sbug63336.php on line %d
@@ -1,23 +0,0 @@
--TEST--
-Bug #65419 (Inside trait, self::class != __CLASS__)
--FILE--
-<?php
-trait abc
-{
-  static function def()
-  {
-    echo self::class, "\n";
-    echo __CLASS__, "\n";
-  }
-}
-
-class ghi
-{
-  use abc;
-}
-
-ghi::def();
-?>
--EXPECTF--
-ghi
-ghi
@@ -1,28 +0,0 @@
--TEST--
-Bug #66609 (php crashes with __get() and ++ operator in some cases)
--FILE--
-<?php
-$bar = new Bar;
-$foo = new Foo;
-class Bar {
-	public function __get($x) {
-		global $foo;
-		return $foo->foo;
-	}
-}
-class Foo {
-	public function __get($x) {
-		global $bar;
-		return $bar->bar;
-	}
-}
-$foo->blah += 1; //crash
-++$foo->blah;    //crash
-$foo->blah++;    //crash
-$foo->blah--;    //crash
--$foo->blah;    //crash
-echo "okey";
-?>
--EXPECTF--
-Notice: Undefined property: Bar::$bar in %sbug66609.php on line %d
-okey
@@ -1,20 +0,0 @@
--TEST--
-Bug #67111: Memory leak when using "continue 2" inside two foreach loops
--FILE--
-<?php
-
-$array1 = [1, 2, 3];
-$array2 = [1, 2, 3];
-
-foreach ($array1 as $x) {
-    foreach ($array2 as $y) {
-        echo "$x.$y\n";
-        continue 2;
-    }
-}
-
-?>
--EXPECT--
-1.1
-2.1
-3.1
@@ -1,22 +0,0 @@
--TEST--
-Bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)
--FILE--
-<?php
-function crash()
-{
-    $notDefined[$i] = 'test';
-}
-
-function error_handler() { return false; }
-
-set_error_handler('error_handler');
-crash();
-echo "made it once\n";
-crash();
-echo "ok\n";
--EXPECTF--
-Notice: Undefined variable: i in %sbug67314.php on line 4
-made it once
-
-Notice: Undefined variable: i in %sbug67314.php on line 4
-ok
@@ -2,14 +2,14 @@
 bug67436: Autoloader isn't called if user defined error handler is present

 --INI--
-error_reporting=-1
+error_reporting=

 --FILE--
 <?php

 spl_autoload_register(function($classname) {
 	if (in_array($classname, array('a','b','c'))) {
-		require_once __DIR__ . "/{$classname}.php";
+		require_once ($classname . '.php');
 	}
 });

@@ -9,7 +9,7 @@ error_reporting=-1

 spl_autoload_register(function($classname) {
 	if (in_array($classname, array('a','b','c'))) {
-		require_once __DIR__ . "/{$classname}.php";
+		require_once ($classname . '.php');
 	}
 });

@@ -1,18 +0,0 @@
--TEST--
-Bug #68370 "unset($this)" can make the program crash
--FILE--
-<?php
-class C {
-	public function test() {
-		unset($this);
-		return get_defined_vars();
-	}
-}
-$c = new C();
-$x = $c->test();
-print_r($x);
-unset($c, $x);
--EXPECTF--
-Array
-(
-)
@@ -1,40 +0,0 @@
--TEST--
-Bug #68652 (segmentation fault in destructor)
--FILE--
-<?php
-class Foo {
-
-    private static $instance;
-    public static function getInstance() {
-        if (isset(self::$instance)) {
-            return self::$instance;
-        }
-        return self::$instance = new self();
-    }
-
-    public function __destruct() {
-        Bar::getInstance();
-    }
-}
-
-class Bar {
-
-    private static $instance;
-    public static function getInstance() {
-        if (isset(self::$instance)) {
-            return self::$instance;
-        }
-        return self::$instance = new self();
-    }
-
-    public function __destruct() {
-        Foo::getInstance();
-    }
-}
-
-
-$foo = new Foo();
-?>
--EXPECTF--
-Fatal error: Access to undeclared static property: Bar::$instance in %sbug68652.php on line %d
-
@@ -1,42 +0,0 @@
--TEST--
-#69017 (Fail to push to the empty array with the constant value defined in class scope)
--FILE--
-<?php
-
-class c1
-{
-	const ZERO = 0;
-	const ONE = 1;
-	const MAX = PHP_INT_MAX;
-	public static $a1 = array(self::ONE => 'one');
-	public static $a2 = array(self::ZERO => 'zero');
-	public static $a3 = array(self::MAX => 'zero');
-}
-
-
-c1::$a1[] = 1;
-c1::$a2[] = 1;
-c1::$a3[] = 1;
-
-var_dump(c1::$a1);
-var_dump(c1::$a2);
-var_dump(c1::$a3);
-?>
--EXPECTF--
-Warning: Cannot add element to the array as the next element is already occupied in %sbug69017.php on line %d
-array(2) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  int(1)
-}
-array(2) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  int(1)
-}
-array(1) {
-  [%d]=>
-  string(4) "zero"
-}
@@ -1,16 +0,0 @@
--TEST--
-Bug #69174 (leaks when unused inner class use traits precedence)
--FILE--
-<?php
-function test() {
-	class C1 {
-		use T1, T2 {
-			T1::foo insteadof T2;
-			T1::bar insteadof T2;
-		}
-	}
-}
-?>
-==DONE==
--EXPECT--
-==DONE==
@@ -1,43 +0,0 @@
--TEST--
-Bug #69212: Leaking VIA_HANDLER func when exception thrown in __call/... arg passing
--FILE--
-<?php
-
-class Test {
-    public static function __callStatic($method, $args) {}
-    public function __call($method, $args) {}
-}
-
-function do_throw() { throw new Exception; }
-
-try {
-    Test::foo(do_throw());
-} catch (Exception $e) {
-    echo "Caught!\n";
-}
-try {
-    (new Test)->bar(do_throw());
-} catch (Exception $e) {
-    echo "Caught!\n";
-}
-
-try {
-	$f = function () {};
-	$f->__invoke(do_throw());
-} catch (Exception $e) {
-	echo "Caught!\n";
-}
-
-try {
-	$t = new Test;
-	$f->__invoke($t->bar(Test::foo(do_throw())));
-} catch (Exception $e) {
-	echo "Caught!\n";
-}
-
-?>
--EXPECT--
-Caught!
-Caught!
-Caught!
-Caught!
@@ -1,24 +0,0 @@
--TEST--
-Bug #69221: Segmentation fault when using a generator in combination with an Iterator
--FILE--
-<?php
-
-function gen() {
-	yield 1;
-};
-
-$gen1 = gen();
-$gen2 = (object) $gen1;
-
-foreach ($gen1 as $v1) {
-    foreach ($gen2 as $v2) {
-        break 2;
-    }
-}
-
-unset($gen1);
-foreach ($gen2 as $v) { var_dump($v); }
-
-?>
--EXPECTF--
-int(1)
@@ -1,20 +0,0 @@
--TEST--
-Bug #69221: Segmentation fault when using a generator in combination with an Iterator (2)
--FILE--
-<?php
-
-$gen = function() {
-    yield 1;
-};
-
-$iter = new IteratorIterator($gen());
-$ngen = $iter->getInnerIterator();
-
-var_dump(iterator_to_array($ngen, false));
-
-?>
--EXPECT--
-array(1) {
-  [0]=>
-  int(1)
-}
@@ -1,30 +0,0 @@
--TEST--
-Bug #69420 (Invalid read in zend_std_get_method)
--FILE--
-<?php
-
-trait T {
-	protected function test() {
-		echo "okey";
-	}
-}
-
-
-class A {
-	protected function test() {
-	}
-}
-
-class B extends A {
-	use T;
-	public function foo() {
-		$this->test();
-	}
-}
-
-
-$b = new B();
-$b->foo();
-?>
--EXPECT--
-okey
@@ -1,21 +0,0 @@
--TEST--
-Bug #69467 (Wrong checked for the interface by using Trait)
--FILE--
-<?php
-interface Baz {
-    public function bad();
-}
-
-trait Bar{
-    protected function bad(){}
-}
-
-class Foo implements Baz{
-    use Bar;
-}
-
-$test = new Foo();
-var_dump($test instanceof Baz);
-?>
--EXPECTF--
-Fatal error: Access level to Bar::bad() must be public (as in class Baz) in %sbug69467.php on line %d
@@ -1,16 +0,0 @@
--TEST--
-Bug #69551 - parse_ini_file() and parse_ini_string() segmentation fault
--FILE--
-<?php
-$ini = <<<INI
-[Network.eth0]
-SubnetMask = "
-"
-INI;
-$settings = parse_ini_string($ini, false, INI_SCANNER_RAW);
-var_dump($settings);
-?>
--EXPECTF--
-Warning: syntax error, unexpected '"' in Unknown on line %d
- in %s on line %d
-bool(false)
@@ -1,30 +0,0 @@
--TEST--
-Bug #69732 (can induce segmentation fault with basic php code)
--FILE--
-<?php
-class wpq {
-    private $unreferenced;
- 
-    public function __get($name) {
-        return $this->$name . "XXX";
-    }
-}
- 
-function ret_assoc() {
-	$x = "XXX";
-    return array('foo' => 'bar', $x);
-}
- 
-$wpq = new wpq;
-$wpq->interesting =& ret_assoc();
-$x = $wpq->interesting;
-printf("%s\n", $x);
--EXPECTF--
-Notice: Undefined property: wpq::$interesting in %sbug69732.php on line 6
-
-Notice: Indirect modification of overloaded property wpq::$interesting has no effect in %sbug69732.php on line 16
-
-Strict Standards: Only variables should be assigned by reference in %sbug69732.php on line 16
-
-Notice: Undefined property: wpq::$interesting in %sbug69732.php on line 6
-XXX
@@ -1,10 +0,0 @@
--TEST--
-Bug #69892: Different arrays compare indentical due to integer key truncation
--SKIPIF--
-<?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only"); ?>
--FILE--
-<?php
-var_dump([0 => 0] === [0x100000000 => 0]);
-?>
--EXPECT--
-bool(false)
@@ -1,9 +0,0 @@
--TEST--
-Bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
--FILE--
-<?php
-unserialize('O:12:"DateInterval":1:{s:4:"days";O:9:"Exception":7:{s:10:"'."\0".'*'."\0".'message";s:1:"x";s:17:"'."\0".'Exception'."\0".'string";s:1:"A";s:7:"'."\0".'*'."\0".'code";i:0;s:7:"'."\0".'*'."\0".'file";s:1:"a";s:7:"'."\0".'*'."\0".'line";i:1337;s:16:"'."\0".'Exception'."\0".'trace";a:0:{}s:19:"'."\0".'Exception'."\0".'previous";O:8:"stdClass":0:{}}}');
-?>
-OK
--EXPECT--
-OK
@@ -1,22 +0,0 @@
--TEST--
-Bug #69419: Returning compatible sub generator produces a warning
--FILE--
-<?php
-
-function & genRefInner() {
-    $var = 1;
-    yield $var;
-}
-
-function & genRefOuter() {
-    return genRefInner();
-}
-
-foreach(genRefOuter() as $i) {
-    var_dump($i);
-}
-
-?>
--EXPECTF--
-Notice: Only variable references should be returned by reference in %s on line %d
-int(1)
@@ -3,8 +3,6 @@
 --FILE--
 <?php
 use A;
-use \B;
 --EXPECTF--
 Warning: The use statement with non-compound name 'A' has no effect in %sns_033.php on line 2

-Warning: The use statement with non-compound name 'B' has no effect in %sns_033.php on line 3
@@ -1,31 +0,0 @@
--TEST--
-Bug #65576 (Constructor from trait conflicts with inherited constructor)
--FILE--
-<?php
-
-trait T
-{
-  public function __construct()
-  {
-    echo "Trait contructor\n";
-  }
-}
-
-class A
-{
-  public function __construct()
-  {
-    echo "Parent constructor\n";
-  }
-}
-
-class B extends A
-{
-  use T;
-}
-
-new B();
-
--EXPECT--
-Trait contructor
-
@@ -1,33 +0,0 @@
--TEST--
-Bug #65576 (Constructor from trait conflicts with inherited constructor)
--FILE--
-<?php
-
-trait T
-{
-  public function __construct()
-  {
-    parent::__construct();
-    echo "Trait contructor\n";
-  }
-}
-
-class A
-{
-  public function __construct()
-  {
-    echo "Parent constructor\n";
-  }
-}
-
-class B extends A
-{
-  use T;
-}
-
-new B();
-
--EXPECT--
-Parent constructor
-Trait contructor
-
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -127,7 +127,7 @@ ZEND_API zval zval_used_for_init; /* True global variable */
 /* version information */
 static char *zend_version_info;
 static uint zend_version_info_length;
-#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2015 Zend Technologies\n"
+#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2014 Zend Technologies\n"
 #define PRINT_ZVAL_INDENT 4

 static void print_hash(zend_write_func_t write_func, HashTable *ht, int indent, zend_bool is_object TSRMLS_DC) /* {{{ */
@@ -809,6 +809,9 @@ void zend_shutdown(TSRMLS_D) /* {{{ */
 {
 #ifdef ZEND_SIGNALS
 	zend_signal_shutdown(TSRMLS_C);
+#endif
+#ifdef ZEND_WIN32
+	zend_shutdown_timeout_thread();
 #endif
 	zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -678,7 +678,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size)
 	__asm {
 		bsr eax, _size
 	}
-#elif defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__))
+#elif defined(__GNUC__) && (defined(__arm__) ||  defined(__aarch64__))
 	return (8 * SIZEOF_SIZE_T - 1) - __builtin_clzl(_size);
 #else
 	unsigned int n = 0;
@@ -706,7 +706,7 @@ static inline unsigned int zend_mm_low_bit(size_t _size)
 	__asm {
 		bsf eax, _size
   }
-#elif defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__))
+#elif defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__))
 	return __builtin_ctzl(_size);
 #else
 	static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0};
@@ -984,7 +984,7 @@ static void zend_mm_random(unsigned char *buf, size_t size) /* {{{ */
 	int has_context = 0;

 	if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) {
-		/* Could mean that the key container does not exist, let try
+		/* Could mean that the key container does not exist, let try 
 		   again by asking for a new one */
 		if (GetLastError() == NTE_BAD_KEYSET) {
 			if (CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET)) {
@@ -1348,7 +1348,7 @@ static int zend_mm_check_ptr(zend_mm_heap *heap, void *ptr, int silent ZEND_FILE
 	}
 	if (!silent) {
 		TSRMLS_FETCH();
-
+		
 		zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL TSRMLS_CC);
 		zend_debug_alloc_output("---------------------------------------\n");
 		zend_debug_alloc_output("%s(%d) : Block "PTR_FMT" status:\n" ZEND_FILE_LINE_RELAY_CC, ptr);
@@ -2175,7 +2175,7 @@ static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_
 #if ZEND_MM_CACHE
 	if (ZEND_MM_SMALL_SIZE(true_size)) {
 		size_t index = ZEND_MM_BUCKET_INDEX(true_size);
-
+		
 		if (heap->cache[index] != NULL) {
 			zend_mm_free_block *best_fit;
 			zend_mm_free_block **cache;
@@ -2188,7 +2188,7 @@ static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_
 			heap->cache[index] = best_fit->prev_free_block;
 			ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
 			ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
-
+	
 			ptr = ZEND_MM_DATA_OF(best_fit);

 #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
@@ -2470,7 +2470,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
 	     : "%0"(res),
 	       "rm"(size),
 	       "rm"(offset));
-
+	
 	if (UNEXPECTED(overflow)) {
 		zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);
 		return 0;
@@ -2619,7 +2619,7 @@ ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LI

 ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
-	size_t length;
+	int length;
 	char *p;
 #ifdef ZEND_SIGNALS
 	TSRMLS_FETCH();
@@ -2627,13 +2627,13 @@ ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)

 	HANDLE_BLOCK_INTERRUPTIONS();

-	length = strlen(s);
-	p = (char *) _emalloc(safe_address(length, 1, 1) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+	length = strlen(s)+1;
+	p = (char *) _emalloc(length ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 	if (UNEXPECTED(p == NULL)) {
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return p;
 	}
-	memcpy(p, s, length+1);
+	memcpy(p, s, length);
 	HANDLE_UNBLOCK_INTERRUPTIONS();
 	return p;
 }
@@ -2647,7 +2647,7 @@ ZEND_API char *_estrndup(const char *s, uint length ZEND_FILE_LINE_DC ZEND_FILE_

 	HANDLE_BLOCK_INTERRUPTIONS();

-	p = (char *) _emalloc(safe_address(length, 1, 1) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+	p = (char *) _emalloc(length+1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 	if (UNEXPECTED(p == NULL)) {
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return p;
@@ -2668,7 +2668,7 @@ ZEND_API char *zend_strndup(const char *s, uint length)

 	HANDLE_BLOCK_INTERRUPTIONS();

-	p = (char *) malloc(safe_address(length, 1, 1));
+	p = (char *) malloc(length+1);
 	if (UNEXPECTED(p == NULL)) {
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return p;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -449,7 +449,6 @@ ZEND_API void zend_create_closure(zval *res, zend_function *func, zend_class_ent

 	closure->func = *func;
 	closure->func.common.prototype = NULL;
-	closure->func.common.fn_flags |= ZEND_ACC_CLOSURE;

 	if ((scope == NULL) && (this_ptr != NULL)) {
 		/* use dummy scope if we're binding an object without specifying a scope */
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2140,12 +2140,6 @@ void zend_do_resolve_class_name(znode *result, znode *class_name, int is_static
 			if (!CG(active_class_entry)) {
 				zend_error(E_COMPILE_ERROR, "Cannot access self::class when no class scope is active");
 			}
-			if (CG(active_class_entry)->ce_flags & ZEND_ACC_TRAIT) {
-				constant_name.op_type = IS_CONST;
-				ZVAL_STRINGL(&constant_name.u.constant, "class", sizeof("class")-1, 1);
-				zend_do_fetch_constant(result, class_name, &constant_name, ZEND_RT, 1 TSRMLS_CC);
-				break;
-			}
 			zval_dtor(&class_name->u.constant);
 			class_name->op_type = IS_CONST;
 			ZVAL_STRINGL(&class_name->u.constant, CG(active_class_entry)->name, CG(active_class_entry)->name_length, 1);
@@ -3842,7 +3836,7 @@ static void zend_add_magic_methods(zend_class_entry* ce, const char* mname, uint
 	if (!strncmp(mname, ZEND_CLONE_FUNC_NAME, mname_len)) {
 		ce->clone = fe; fe->common.fn_flags |= ZEND_ACC_CLONE;
 	} else if (!strncmp(mname, ZEND_CONSTRUCTOR_FUNC_NAME, mname_len)) {
-		if (ce->constructor && (!ce->parent || ce->constructor != ce->parent->constructor)) {
+		if (ce->constructor) {
 			zend_error(E_COMPILE_ERROR, "%s has colliding constructor definitions coming from traits", ce->name);
 		}
 		ce->constructor = fe; fe->common.fn_flags |= ZEND_ACC_CTOR;
@@ -3867,7 +3861,7 @@ static void zend_add_magic_methods(zend_class_entry* ce, const char* mname, uint
 		zend_str_tolower_copy(lowercase_name, ce->name, ce->name_length);
 		lowercase_name = (char*)zend_new_interned_string(lowercase_name, ce->name_length + 1, 1 TSRMLS_CC);
 		if (!memcmp(mname, lowercase_name, mname_len)) {
-			if (ce->constructor && (!ce->parent || ce->constructor != ce->parent->constructor)) {
+			if (ce->constructor) {
 				zend_error(E_COMPILE_ERROR, "%s has colliding constructor definitions coming from traits", ce->name);
 			}
 			ce->constructor = fe;
@@ -3912,8 +3906,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const
 			}
 			zend_hash_quick_update(*overriden, arKey, nKeyLength, h, fn, sizeof(zend_function), (void**)&fn);
 			return;
-		} else if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT &&
-				(existing_fn->common.scope->ce_flags & ZEND_ACC_INTERFACE) == 0) {
+		} else if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
 			/* Make sure the trait method is compatible with previosly declared abstract method */
 			if (!zend_traits_method_compatibility_check(fn, existing_fn TSRMLS_CC)) {
 				zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s",
@@ -3943,7 +3936,6 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const
 			/* inherited members are overridden by members inserted by traits */
 			/* check whether the trait method fulfills the inheritance requirements */
 			do_inheritance_check_on_method(fn, existing_fn TSRMLS_CC);
-			fn->common.prototype = NULL;
 		}
 	}

@@ -3962,7 +3954,7 @@ static int zend_fixup_trait_method(zend_function *fn, zend_class_entry *ce TSRML
 		if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
 			ce->ce_flags |= ZEND_ACC_IMPLICIT_ABSTRACT_CLASS;
 		}
-		if (fn->type == ZEND_USER_FUNCTION && fn->op_array.static_variables) {
+		if (fn->op_array.static_variables) {
 			ce->ce_flags |= ZEND_HAS_STATIC_IN_METHODS;
 		}
 	}
@@ -4074,7 +4066,6 @@ static void zend_check_trait_usage(zend_class_entry *ce, zend_class_entry *trait
 static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /* {{{ */
 {
 	size_t i, j = 0;
-	zend_trait_precedence **precedences;
 	zend_trait_precedence *cur_precedence;
 	zend_trait_method_reference *cur_method_ref;
 	char *lcname;
@@ -4083,9 +4074,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
 	/* resolve class references */
 	if (ce->trait_precedences) {
 		i = 0;
-		precedences = ce->trait_precedences;
-		ce->trait_precedences = NULL;
-		while ((cur_precedence = precedences[i])) {
+		while ((cur_precedence = ce->trait_precedences[i])) {
 			/** Resolve classes for all precedence operations. */
 			if (cur_precedence->exclude_from_classes) {
 				cur_method_ref = cur_precedence->trait_method;
@@ -4127,7 +4116,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*

 					/* make sure that the trait method is not from a class mentioned in
 					 exclude_from_classes, for consistency */
-					if (cur_precedence->trait_method->ce == cur_precedence->exclude_from_classes[j]) {
+					if (cur_precedence->trait_method->ce == cur_precedence->exclude_from_classes[i]) {
 						zend_error(E_COMPILE_ERROR,
 								   "Inconsistent insteadof definition. "
 								   "The method %s is to be used from %s, but %s is also on the exclude list",
@@ -4142,7 +4131,6 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
 			}
 			i++;
 		}
-		ce->trait_precedences = precedences;
 	}

 	if (ce->trait_aliases) {
@@ -4210,20 +4198,16 @@ static void zend_do_traits_method_binding(zend_class_entry *ce TSRMLS_DC) /* {{{
 	for (i = 0; i < ce->num_traits; i++) {
 		if (ce->trait_precedences) {
 			HashTable exclude_table;
-			zend_trait_precedence **precedences;

 			/* TODO: revisit this start size, may be its not optimal */
 			zend_hash_init_ex(&exclude_table, 2, NULL, NULL, 0, 0);

-			precedences = ce->trait_precedences;
-			ce->trait_precedences = NULL;
-			zend_traits_compile_exclude_table(&exclude_table, precedences, ce->traits[i]);
+			zend_traits_compile_exclude_table(&exclude_table, ce->trait_precedences, ce->traits[i]);

 			/* copies functions, applies defined aliasing, and excludes unused trait methods */
 			zend_hash_apply_with_arguments(&ce->traits[i]->function_table TSRMLS_CC, (apply_func_args_t)zend_traits_copy_functions, 3, ce, &overriden, &exclude_table);

 			zend_hash_destroy(&exclude_table);
-			ce->trait_precedences = precedences;
 		} else {
 			zend_hash_apply_with_arguments(&ce->traits[i]->function_table TSRMLS_CC, (apply_func_args_t)zend_traits_copy_functions, 3, ce, &overriden, NULL);
 		}
@@ -4231,17 +4215,6 @@ static void zend_do_traits_method_binding(zend_class_entry *ce TSRMLS_DC) /* {{{

    zend_hash_apply_with_argument(&ce->function_table, (apply_func_arg_t)zend_fixup_trait_method, ce TSRMLS_CC);

-	if (ce->trait_precedences) {
-		i = 0;
-		while (ce->trait_precedences[i]) {
-			if (ce->trait_precedences[i]->exclude_from_classes) {
-				efree(ce->trait_precedences[i]->exclude_from_classes);
-				ce->trait_precedences[i]->exclude_from_classes = NULL;
-			}
-			i++;
-		}
-	}
-
 	if (overriden) {
 		zend_hash_destroy(overriden);
 		FREE_HASHTABLE(overriden);
@@ -7016,7 +6989,7 @@ void zend_do_begin_namespace(const znode *name, zend_bool with_bracket TSRMLS_DC
 }
 /* }}} */

-void zend_do_use(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
+void zend_do_use(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{{ */
 {
 	char *lcname;
 	zval *name, *ns, tmp;
@@ -7044,7 +7017,7 @@ void zend_do_use(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
 		} else {
 			*name = *ns;
 			zval_copy_ctor(name);
-			warn = !CG(current_namespace);
+			warn = !is_global && !CG(current_namespace);
 		}
 	}

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -635,7 +635,7 @@ void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRM
 void zend_do_begin_namespace(const znode *name, zend_bool with_brackets TSRMLS_DC);
 void zend_do_end_namespace(TSRMLS_D);
 void zend_verify_namespace(TSRMLS_D);
-void zend_do_use(znode *name, znode *new_name TSRMLS_DC);
+void zend_do_use(znode *name, znode *new_name, int is_global TSRMLS_DC);
 void zend_do_end_compilation(TSRMLS_D);

 void zend_do_resolve_class_name(znode *result, znode *class_name, int is_static TSRMLS_DC);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -41,7 +41,7 @@ void zend_exception_set_previous(zval *exception, zval *add_previous TSRMLS_DC)
 	if (exception == add_previous || !add_previous || !exception) {
 		return;
 	}
-	if (Z_TYPE_P(add_previous) != IS_OBJECT || !instanceof_function(Z_OBJCE_P(add_previous), default_exception_ce TSRMLS_CC)) {
+	if (Z_TYPE_P(add_previous) != IS_OBJECT && !instanceof_function(Z_OBJCE_P(add_previous), default_exception_ce TSRMLS_CC)) {
 		zend_error(E_ERROR, "Cannot set non exception as previous exception");
 		return;
 	}
@@ -218,33 +218,6 @@ ZEND_METHOD(exception, __construct)
 }
 /* }}} */

-/* {{{ proto Exception::__wakeup()
-   Exception unserialize checks */
-#define CHECK_EXC_TYPE(name, type) \
-	value = zend_read_property(default_exception_ce, object, name, sizeof(name)-1, 0 TSRMLS_CC); \
-	if(value && Z_TYPE_P(value) != type) { \
-		zval *tmp; \
-		MAKE_STD_ZVAL(tmp); \
-		ZVAL_STRINGL(tmp, name, sizeof(name)-1, 1); \
-		Z_OBJ_HANDLER_P(object, unset_property)(object, tmp, 0 TSRMLS_CC); \
-		zval_ptr_dtor(&tmp); \
-	}
-
-ZEND_METHOD(exception, __wakeup)
-{
-	zval *value;
-	zval *object = getThis();
-	HashTable *intern_ht = zend_std_get_properties(getThis() TSRMLS_CC);
-	CHECK_EXC_TYPE("message", IS_STRING);
-	CHECK_EXC_TYPE("string", IS_STRING);
-	CHECK_EXC_TYPE("code", IS_LONG);
-	CHECK_EXC_TYPE("file", IS_STRING);
-	CHECK_EXC_TYPE("line", IS_LONG);
-	CHECK_EXC_TYPE("trace", IS_ARRAY);
-	CHECK_EXC_TYPE("previous", IS_OBJECT);
-}
-/* }}} */
-
 /* {{{ proto ErrorException::__construct(string message, int code, int severity [, string filename [, int lineno [, Exception previous]]])
   ErrorException constructor */
 ZEND_METHOD(error_exception, __construct)
@@ -613,15 +586,11 @@ ZEND_METHOD(exception, getTraceAsString)
 	int res_len = 0, *len = &res_len, num = 0;

 	DEFAULT_0_PARAMS;
-
-	trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
-	if (Z_TYPE_P(trace) != IS_ARRAY) {
-		RETURN_FALSE;
-	}
-
+	
 	res = estrdup("");
 	str = &res;

+	trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
 	zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC, (apply_func_args_t)_build_trace_string, 3, str, len, &num);

 	s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 7 + 1);
@@ -629,8 +598,8 @@ ZEND_METHOD(exception, getTraceAsString)
 	TRACE_APPEND_STRL(s_tmp, strlen(s_tmp));
 	efree(s_tmp);

-	res[res_len] = '\0';
-	RETURN_STRINGL(res, res_len, 0);
+	res[res_len] = '\0';	
+	RETURN_STRINGL(res, res_len, 0); 
 }
 /* }}} */

@@ -667,15 +636,15 @@ ZEND_METHOD(exception, __toString)
 	int len = 0;
 	zend_fcall_info fci;
 	zval fname;
-
+	
 	DEFAULT_0_PARAMS;
-
+	
 	str = estrndup("", 0);

 	exception = getThis();
 	ZVAL_STRINGL(&fname, "gettraceasstring", sizeof("gettraceasstring")-1, 1);

-	while (exception && Z_TYPE_P(exception) == IS_OBJECT && instanceof_function(Z_OBJCE_P(exception), default_exception_ce TSRMLS_CC)) {
+	while (exception && Z_TYPE_P(exception) == IS_OBJECT) {
 		prev_str = str;
 		_default_exception_get_entry(exception, "message", sizeof("message")-1, &message TSRMLS_CC);
 		_default_exception_get_entry(exception, "file", sizeof("file")-1, &file TSRMLS_CC);
@@ -685,7 +654,6 @@ ZEND_METHOD(exception, __toString)
 		convert_to_string(&file);
 		convert_to_long(&line);

-		trace = NULL;
 		fci.size = sizeof(fci);
 		fci.function_table = &Z_OBJCE_P(exception)->function_table;
 		fci.function_name = &fname;
@@ -698,7 +666,7 @@ ZEND_METHOD(exception, __toString)

 		zend_call_function(&fci, NULL TSRMLS_CC);

-		if (trace && Z_TYPE_P(trace) != IS_STRING) {
+		if (Z_TYPE_P(trace) != IS_STRING) {
 			zval_ptr_dtor(&trace);
 			trace = NULL;
 		}
@@ -755,7 +723,6 @@ ZEND_END_ARG_INFO()
 const static zend_function_entry default_exception_functions[] = {
 	ZEND_ME(exception, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
 	ZEND_ME(exception, __construct, arginfo_exception___construct, ZEND_ACC_PUBLIC)
-	ZEND_ME(exception, __wakeup, NULL, ZEND_ACC_PUBLIC)
 	ZEND_ME(exception, getMessage, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	ZEND_ME(exception, getCode, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	ZEND_ME(exception, getFile, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -352,6 +352,13 @@ ZEND_API zend_class_entry *zend_fetch_class(const char *class_name, uint class_n
 ZEND_API zend_class_entry *zend_fetch_class_by_name(const char *class_name, uint class_name_len, const zend_literal *key, int fetch_type TSRMLS_DC);
 void zend_verify_abstract_class(zend_class_entry *ce TSRMLS_DC);

+#ifdef ZEND_WIN32
+void zend_init_timeout_thread(void);
+void zend_shutdown_timeout_thread(void);
+#define WM_REGISTER_ZEND_TIMEOUT		(WM_USER+1)
+#define WM_UNREGISTER_ZEND_TIMEOUT		(WM_USER+2)
+#endif
+
 #define zendi_zval_copy_ctor(p) zval_copy_ctor(&(p))
 #define zendi_zval_dtor(p) zval_dtor(&(p))

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -46,10 +46,13 @@ ZEND_API const zend_fcall_info empty_fcall_info = { 0, NULL, NULL, NULL, NULL, 0
 ZEND_API const zend_fcall_info_cache empty_fcall_info_cache = { 0, NULL, NULL, NULL, NULL };

 #ifdef ZEND_WIN32
-#ifdef ZTS
-__declspec(thread)
-#endif
-HANDLE tq_timer = NULL;
+#include <process.h>
+static WNDCLASS wc;
+static HWND timeout_window;
+static HANDLE timeout_thread_event;
+static HANDLE timeout_thread_handle;
+static DWORD timeout_thread_id;
+static int timeout_thread_initialized=0;
 #endif

 #if 0&&ZEND_DEBUG
@@ -1336,19 +1339,111 @@ ZEND_API void zend_timeout(int dummy) /* {{{ */
 /* }}} */

 #ifdef ZEND_WIN32
-VOID CALLBACK tq_timer_cb(PVOID arg, BOOLEAN timed_out)
+static LRESULT CALLBACK zend_timeout_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) /* {{{ */
 {
-	zend_bool *php_timed_out;
+	switch (message) {
+		case WM_DESTROY:
+			PostQuitMessage(0);
+			break;
+		case WM_REGISTER_ZEND_TIMEOUT:
+			/* wParam is the thread id pointer, lParam is the timeout amount in seconds */
+			if (lParam == 0) {
+				KillTimer(timeout_window, wParam);
+			} else {
+#ifdef ZTS
+				void ***tsrm_ls;
+#endif
+				SetTimer(timeout_window, wParam, lParam*1000, NULL);
+#ifdef ZTS
+				tsrm_ls = ts_resource_ex(0, &wParam);
+				if (!tsrm_ls) {
+					/* shouldn't normally happen */
+					break;
+				}
+#endif
+				EG(timed_out) = 0;
+			}
+			break;
+		case WM_UNREGISTER_ZEND_TIMEOUT:
+			/* wParam is the thread id pointer */
+			KillTimer(timeout_window, wParam);
+			break;
+		case WM_TIMER: {
+#ifdef ZTS
+				void ***tsrm_ls;

-	/* The doc states it'll be always true, however it theoretically
-		could be FALSE when the thread was signaled. */
-	if (!timed_out) {
+				tsrm_ls = ts_resource_ex(0, &wParam);
+				if (!tsrm_ls) {
+					/* Thread died before receiving its timeout? */
+					break;
+				}
+#endif
+				KillTimer(timeout_window, wParam);
+				EG(timed_out) = 1;
+			}
+			break;
+		default:
+			return DefWindowProc(hWnd, message, wParam, lParam);
+	}
+	return 0;
+}
+/* }}} */
+
+static unsigned __stdcall timeout_thread_proc(void *pArgs) /* {{{ */
+{
+	MSG message;
+
+	wc.style=0;
+	wc.lpfnWndProc = zend_timeout_WndProc;
+	wc.cbClsExtra=0;
+	wc.cbWndExtra=0;
+	wc.hInstance=NULL;
+	wc.hIcon=NULL;
+	wc.hCursor=NULL;
+	wc.hbrBackground=(HBRUSH)(COLOR_BACKGROUND + 5);
+	wc.lpszMenuName=NULL;
+	wc.lpszClassName = "Zend Timeout Window";
+	if (!RegisterClass(&wc)) {
+		return -1;
+	}
+	timeout_window = CreateWindow(wc.lpszClassName, wc.lpszClassName, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL);
+	SetEvent(timeout_thread_event);
+	while (GetMessage(&message, NULL, 0, 0)) {
+		SendMessage(timeout_window, message.message, message.wParam, message.lParam);
+		if (message.message == WM_QUIT) {
+			break;
+		}
+	}
+	DestroyWindow(timeout_window);
+	UnregisterClass(wc.lpszClassName, NULL);
+	SetEvent(timeout_thread_handle);
+	return 0;
+}
+/* }}} */
+
+void zend_init_timeout_thread(void) /* {{{ */
+{
+	timeout_thread_event = CreateEvent(NULL, FALSE, FALSE, NULL);
+	timeout_thread_handle = CreateEvent(NULL, FALSE, FALSE, NULL);
+	_beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);
+	WaitForSingleObject(timeout_thread_event, INFINITE);
+}
+/* }}} */
+
+void zend_shutdown_timeout_thread(void) /* {{{ */
+{
+	if (!timeout_thread_initialized) {
 		return;
 	}
+	PostThreadMessage(timeout_thread_id, WM_QUIT, 0, 0);

-	php_timed_out = (zend_bool *)arg;
-	*php_timed_out = 1;
+	/* Wait for thread termination */
+	WaitForSingleObject(timeout_thread_handle, 5000);
+	CloseHandle(timeout_thread_handle);
+	timeout_thread_initialized = 0;
 }
+/* }}} */
+
 #endif

 /* This one doesn't exists on QNX */
@@ -1366,28 +1461,13 @@ void zend_set_timeout(long seconds, int reset_signals) /* {{{ */
 	if(!seconds) {
 		return;
 	}
-
-        /* Don't use ChangeTimerQueueTimer() as it will not restart an expired
-		timer, so we could end up with just an ignored timeout. Instead
-		delete and recreate. */
-	if (NULL != tq_timer) {
-		if (!DeleteTimerQueueTimer(NULL, tq_timer, NULL)) {
-			EG(timed_out) = 0;
-			tq_timer = NULL;
-			zend_error(E_ERROR, "Could not delete queued timer");
-			return;
-		}
-		tq_timer = NULL;
+	if (timeout_thread_initialized == 0 && InterlockedIncrement(&timeout_thread_initialized) == 1) {
+		/* We start up this process-wide thread here and not in zend_startup(), because if Zend
+		 * is initialized inside a DllMain(), you're not supposed to start threads from it.
+		 */
+		zend_init_timeout_thread();
 	}
-
-	/* XXX passing NULL means the default timer queue provided by the system is used */
-	if (!CreateTimerQueueTimer(&tq_timer, NULL, (WAITORTIMERCALLBACK)tq_timer_cb, (VOID*)&EG(timed_out), seconds*1000, 0, WT_EXECUTEONLYONCE)) {
-		EG(timed_out) = 0;
-		tq_timer = NULL;
-		zend_error(E_ERROR, "Could not queue new timer");
-		return;
-	}
-	EG(timed_out) = 0;
+	PostThreadMessage(timeout_thread_id, WM_REGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) seconds);
 #else
 #	ifdef HAVE_SETITIMER
 	{
@@ -1429,16 +1509,9 @@ void zend_set_timeout(long seconds, int reset_signals) /* {{{ */
 void zend_unset_timeout(TSRMLS_D) /* {{{ */
 {
 #ifdef ZEND_WIN32
-	if (NULL != tq_timer) {
-		if (!DeleteTimerQueueTimer(NULL, tq_timer, NULL)) {
-			EG(timed_out) = 0;
-			tq_timer = NULL;
-			zend_error(E_ERROR, "Could not delete queued timer");
-			return;
-		}
-		tq_timer = NULL;
+	if(timeout_thread_initialized) {
+		PostThreadMessage(timeout_thread_id, WM_UNREGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) 0);
 	}
-	EG(timed_out) = 0;
 #else
 #	ifdef HAVE_SETITIMER
 	if (EG(timeout_seconds)) {
@@ -1688,12 +1761,15 @@ ZEND_API void zend_rebuild_symbol_table(TSRMLS_D) /* {{{ */
 				/*printf("Cache miss!  Initialized %x\n", EG(active_symbol_table));*/
 			}
 			ex->symbol_table = EG(active_symbol_table);
+
+			if (ex->op_array->this_var != -1 &&
+			    !*EX_CV_NUM(ex, ex->op_array->this_var) &&
+			    EG(This)) {
+			    *EX_CV_NUM(ex, ex->op_array->this_var) = (zval**)EX_CV_NUM(ex, ex->op_array->last_var + ex->op_array->this_var);
+				**EX_CV_NUM(ex, ex->op_array->this_var) = EG(This);
+ 			}
 			for (i = 0; i < ex->op_array->last_var; i++) {
 				if (*EX_CV_NUM(ex, i)) {
-					if (UNEXPECTED(**EX_CV_NUM(ex, i) == &EG(uninitialized_zval))) {
-						Z_DELREF(EG(uninitialized_zval));
-						ALLOC_INIT_ZVAL(**EX_CV_NUM(ex, i));
-					}
 					zend_hash_quick_update(EG(active_symbol_table),
 						ex->op_array->vars[i].name,
 						ex->op_array->vars[i].name_len + 1,
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -21,8 +21,6 @@
 #ifndef ZEND_FLOAT_H
 #define ZEND_FLOAT_H

-BEGIN_EXTERN_C()
-
 /*
  Define functions for FP initialization and de-initialization.
 */
@@ -30,8 +28,6 @@ extern ZEND_API void zend_init_fpu(TSRMLS_D);
 extern ZEND_API void zend_shutdown_fpu(TSRMLS_D);
 extern ZEND_API void zend_ensure_fpu_mode(TSRMLS_D);

-END_EXTERN_C()
-
 /* Copy of the contents of xpfpa.h (which is under public domain)
   See http://wiki.php.net/rfc/rounding for details.

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -147,6 +147,8 @@ ZEND_API void gc_zval_possible_root(zval *zv TSRMLS_DC)
 	GC_BENCH_INC(zval_possible_root);

 	if (GC_ZVAL_GET_COLOR(zv) != GC_PURPLE) {
+		GC_ZVAL_SET_PURPLE(zv);
+
 		if (!GC_ZVAL_ADDRESS(zv)) {
 			gc_root_buffer *newRoot = GC_G(unused);

@@ -157,6 +159,7 @@ ZEND_API void gc_zval_possible_root(zval *zv TSRMLS_DC)
 				GC_G(first_unused)++;
 			} else {
 				if (!GC_G(gc_enabled)) {
+					GC_ZVAL_SET_BLACK(zv);
 					return;
 				}
 				zv->refcount__gc++;
@@ -166,10 +169,10 @@ ZEND_API void gc_zval_possible_root(zval *zv TSRMLS_DC)
 				if (!newRoot) {
 					return;
 				}
+				GC_ZVAL_SET_PURPLE(zv);
 				GC_G(unused) = newRoot->prev;
 			}

-			GC_ZVAL_SET_PURPLE(zv);
 			newRoot->next = GC_G(roots).next;
 			newRoot->prev = &GC_G(roots);
 			GC_G(roots).next->prev = newRoot;
@@ -200,6 +203,7 @@ ZEND_API void gc_zobj_possible_root(zval *zv TSRMLS_DC)

 	obj = &EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(zv)].bucket.obj;
 	if (GC_GET_COLOR(obj->buffered) != GC_PURPLE) {
+		GC_SET_PURPLE(obj->buffered);
 		if (!GC_ADDRESS(obj->buffered)) {
 			gc_root_buffer *newRoot = GC_G(unused);

@@ -210,6 +214,7 @@ ZEND_API void gc_zobj_possible_root(zval *zv TSRMLS_DC)
 				GC_G(first_unused)++;
 			} else {
 				if (!GC_G(gc_enabled)) {
+					GC_ZVAL_SET_BLACK(zv);
 					return;
 				}
 				zv->refcount__gc++;
@@ -220,10 +225,10 @@ ZEND_API void gc_zobj_possible_root(zval *zv TSRMLS_DC)
 					return;
 				}
 				obj = &EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(zv)].bucket.obj;
+				GC_SET_PURPLE(obj->buffered);
 				GC_G(unused) = newRoot->prev;
 			}

-			GC_SET_PURPLE(obj->buffered);
 			newRoot->next = GC_G(roots).next;
 			newRoot->prev = &GC_G(roots);
 			GC_G(roots).next->prev = newRoot;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -605,9 +605,9 @@ ZEND_METHOD(Generator, __wakeup)

 static void zend_generator_iterator_dtor(zend_object_iterator *iterator TSRMLS_DC) /* {{{ */
 {
-	zend_generator_iterator *iter = (zend_generator_iterator *) iterator;
+	zval *object = ((zend_generator_iterator *) iterator)->object;

-	zend_objects_store_del_ref_by_handle(iter->handle TSRMLS_CC);
+	zval_ptr_dtor(&object);
 }
 /* }}} */

@@ -699,8 +699,8 @@ zend_object_iterator *zend_generator_get_iterator(zend_class_entry *ce, zval *ob

 	/* We have to keep a reference to the generator object zval around,
 	 * otherwise the generator may be destroyed during iteration. */
-	iterator->handle = Z_OBJ_HANDLE_P(object);
-	zend_objects_store_add_ref_by_handle(iterator->handle TSRMLS_CC);
+	Z_ADDREF_P(object);
+	iterator->object = object;

 	return (zend_object_iterator *) iterator;
 }
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -28,9 +28,9 @@ extern ZEND_API zend_class_entry *zend_ce_generator;
 typedef struct _zend_generator_iterator {
 	zend_object_iterator intern;

-	/* The generator object handle has to be stored, because the
-	 * iterator is holding a ref to it, which has to be dtored. */
-	zend_object_handle handle;
+	/* The generator object zval has to be stored, because the iterator is
+	 * holding a ref to it, which has to be dtored. */
+	zval *object;
 } zend_generator_iterator;

 typedef struct _zend_generator {
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -1415,9 +1415,6 @@ ZEND_API int zend_hash_update_current_key_ex(HashTable *ht, int key_type, const

 		if (key_type == HASH_KEY_IS_LONG) {
 			p->h = num_index;
-			if ((long)num_index >= (long)ht->nNextFreeElement) {
-				ht->nNextFreeElement = num_index < LONG_MAX ? num_index + 1 : LONG_MAX;
-			}
 		} else {
 			p->h = h;
 			p->nKeyLength = str_length;
@@ -1534,10 +1531,11 @@ ZEND_API int zend_hash_compare(HashTable *ht1, HashTable *ht2, compare_func_t co
 		}
 		if (ordered) {
 			if (p1->nKeyLength==0 && p2->nKeyLength==0) { /* numeric indices */
-				if (p1->h != p2->h) {
+				result = p1->h - p2->h;
+				if (result!=0) {
 					HASH_UNPROTECT_RECURSION(ht1); 
 					HASH_UNPROTECT_RECURSION(ht2); 
-					return p1->h > p2->h ? 1 : -1;
+					return result;
 				}
 			} else { /* string indices */
 				result = p1->nKeyLength - p2->nKeyLength;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -3,7 +3,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -29,10 +29,6 @@
 #include "zend_ini_scanner.h"
 #include "zend_extensions.h"

-#ifdef PHP_WIN32
-#include "win32/syslog.h"
-#endif
-
 #define YYERROR_VERBOSE
 #define YYSTYPE zval

@@ -183,9 +179,10 @@ static void ini_error(char *msg)

 	if (CG(ini_parser_unbuffered_errors)) {
 #ifdef PHP_WIN32
-		syslog(LOG_ALERT, "PHP: %s (%s)", error_buf, GetCommandLine());
-#endif
+		MessageBox(NULL, error_buf, "PHP Error", MB_OK|MB_TOPMOST|0x00200000L);
+#else
 		fprintf(stderr, "PHP:  %s", error_buf);
+#endif
 	} else {
 		zend_error(E_WARNING, "%s", error_buf);
 	}
@@ -4,7 +4,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -1926,7 +1926,7 @@ end_raw_value_chars:
 	}

 	/* Eat leading and trailing double quotes */
-	if (yyleng > 1 && yytext[0] == '"' && yytext[yyleng - 1] == '"') {
+	if (yytext[0] == '"' && yytext[yyleng - 1] == '"') {
 		SCNG(yy_text)++;
 		yyleng = yyleng - 2;
 	} else if (sc) {
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -472,7 +472,7 @@ end_raw_value_chars:
 	}

 	/* Eat leading and trailing double quotes */
-	if (yyleng > 1 && yytext[0] == '"' && yytext[yyleng - 1] == '"') {
+	if (yytext[0] == '"' && yytext[yyleng - 1] == '"') {
 		SCNG(yy_text)++;
 		yyleng = yyleng - 2;
 	} else if (sc) {
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -3,7 +3,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -249,10 +249,10 @@ use_declarations:
 ;

 use_declaration:
-		namespace_name 			{ zend_do_use(&$1, NULL TSRMLS_CC); }
-	|	namespace_name T_AS T_STRING	{ zend_do_use(&$1, &$3 TSRMLS_CC); }
-	|	T_NS_SEPARATOR namespace_name { zend_do_use(&$2, NULL TSRMLS_CC); }
-	|	T_NS_SEPARATOR namespace_name T_AS T_STRING { zend_do_use(&$2, &$4 TSRMLS_CC); }
+		namespace_name 			{ zend_do_use(&$1, NULL, 0 TSRMLS_CC); }
+	|	namespace_name T_AS T_STRING	{ zend_do_use(&$1, &$3, 0 TSRMLS_CC); }
+	|	T_NS_SEPARATOR namespace_name { zend_do_use(&$2, NULL, 1 TSRMLS_CC); }
+	|	T_NS_SEPARATOR namespace_name T_AS T_STRING { zend_do_use(&$2, &$4, 1 TSRMLS_CC); }
 ;

 constant_declaration:
@@ -4,7 +4,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
Author	SHA1	Message	Date
Julien Pauli	8eb2a1067c	5.5.19 GA	2014-11-12 10:38:46 +01:00
Dmitry Stogov	ae106ba62f	Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)	2014-11-12 10:14:46 +01:00
Julien Pauli	8736632499	Fixed wrong entry line in NEWS	2014-11-07 13:09:02 +01:00
Julien Pauli	64af3c21e6	5.5.19RC1	2014-10-28 15:00:19 +01:00