reorder entries and fix typo

set version and update NEWS
2026-11-11 11:10:49 +00:00 · 2016-05-25 11:31:05 +02:00 · 2016-05-25 10:22:53 +02:00
420 changed files with 17985 additions and 66508 deletions
@@ -132,7 +132,7 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_oci
-PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net>
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
@@ -1,465 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-01 Sep 2016 PHP 7.0.11RC1
-
- Core:
-  . Fixed bug #72944 (Null pointer deref in zval_delref_p). (Dmitry)
-  . Fixed bug #72943 (assign_dim on string doesn't reset hval). (Laruence)
-  . Fixed bug #72911 (Memleak in zend_binary_assign_op_obj_helper). (Laruence)
-  . Fixed bug #72813 (Segfault with __get returned by ref). (Laruence)
-  . Fixed bug #72767 (PHP Segfaults when trying to expand an infinite operator).
-    (Nikita)
-  . Fixed bug #72854 (PHP Crashes on duplicate destructor call). (Nikita)
-  . Fixed bug #72857 (stream_socket_recvfrom read access violation). (Anatol)
-  . Fixed bug #72703 (Out of bounds global memory read in BF_crypt triggered by
-    password_verify). (Anatol)
-
- COM:
-  . Fixed bug #72922 (COM called from PHP does not return out parameters).
-    (Anatol)
-
- Dba:
-  . Fixed bug #70825 (Cannot fetch multiple values with group in ini file).
-    (cmb)
-
- FTP:
-  . Fixed bug #70195 (Cannot upload file using ftp_put to FTPES with
-    require_ssl_reuse). (Benedict Singer)
-
- GD:
-  . Fixed bug #72709 (imagesetstyle() causes OOB read for empty $styles). (cmb)
-  . Fixed bug #66005 (imagecopy does not support 1bit transparency on truecolor
-    images). (cmb)
-  . Fixed bug #72913 (imagecopy() loses single-color transparency on palette
-    images). (cmb)
-  . Fixed bug #68716 (possible resource leaks in _php_image_convert()). (cmb)
-
- iconv:
-  . Fixed bug #72320 (iconv_substr returns false for empty strings). (cmb)
-
- IMAP:
-  . Fixed bug #72852 (imap_mail null dereference). (Anatol)
-
- Intl:
-  . Fixed bug #65732 (grapheme_*() is not Unicode compliant on CR LF
-    sequence). (cmb)
-
- OCI8
-  . Fixed invalid handle error with Implicit Result Sets. (Chris Jones)
-  . Fixed bug #72524 (Binding null values triggers ORA-24816 error). (Chris Jones)
-
- Opcache:
-  . Fixed bug #72949 (Typo in opcache error message). (cmb)
-
- PDO:
-  . Fixed bug #72788 (Invalid memory access when using persistent PDO
-    connection). (Keyur)
-  . Fixed bug #72791 (Memory leak in PDO persistent connection handling). (Keyur)
-  . Fixed bug #60665 (call to empty() on NULL result using PDO::FETCH_LAZY
-    returns false). (cmb)
-
- PDO_DBlib:
-  . Implemented stringify 'uniqueidentifier' fields.
-    (Alexander Zhuravlev, Adam Baratz)
-
- PDO_pgsql:
-  . Implemented FR #72633 (Postgres PDO lastInsertId() should work without
-    specifying a sequence). (Pablo Santiago Sánchez, Matteo)
-  . Fixed bug #72759 (Regression in pgo_pgsql). (Anatol)
-
- Reflection:
-  . Fixed bug #72846 (getConstant for a array constant with constant values
-    returns NULL/NFC/UKNOWN). (Laruence)
-
- Session:
-  . Fixed bug #72724 (PHP7: session-uploadprogress kills httpd). (Nikita)
-  . Fixed bug #72940 (SID always return "name=ID", even if session
-    cookie exist). (Yasuo)
-
- SimpleXML:
-  . Fixed bug #72971 (SimpleXML isset/unset do not respect namespace). (Nikita)
-  . Fixed bug #72957 (Null coalescing operator doesn't behave as expected with
-    SimpleXMLElement). (Nikita)
-
- Standard:
-  . Fixed bug #55451 (substr_compare NULL length interpreted as 0). (Lauri
-    Kenttä)
-  . Fixed bug #72278 (getimagesize returning FALSE on valid jpg). (cmb)
-  . Fixed bug #65550 (get_browser() incorrectly parses entries with "+" sign).
-    (cmb)
-
- Streams:
-  . Fixed bug #72853 (stream_set_blocking doesn't work). (Laruence)
-  . Fixed bug #72764 (ftps:// opendir wrapper data channel encryption fails
-    with IIS FTP 7.5, 8.5). (vhuk)
-
- Sysvshm:
-  . Fixed bug #72858 (shm_attach null dereference). (Anatol)
-
- XML:
-  . Fixed bug #72085 (SEGV on unknown address zif_xml_parse). (cmb)
-  . Fixed bug #72714 (_xml_startElementHandler() segmentation fault). (cmb)
-
- ZIP:
-  . Fixed bug #68302 (impossible to compile php with zip support). (cmb)
-
-18 Aug 2016 PHP 7.0.10
-
- Core:
-  . Fixed bug #72629 (Caught exception assignment to variables ignores
-    references). (Laruence)
-  . Fixed bug #72594 (Calling an earlier instance of an included anonymous
-    class fatals). (Laruence)
-  . Fixed bug #72581 (previous property undefined in Exception after
-    deserialization). (Laruence)
-  . Fixed bug #72496 (Cannot declare public method with signature incompatible
-    with parent private method). (Pedro Magalhães)
-  . Fixed bug #72024 (microtime() leaks memory). (maroszek at gmx dot net)
-  . Fixed bug #71911 (Unable to set --enable-debug on building extensions by
-    phpize on Windows). (Yuji Uchiyama)
-  . Fixed bug causing ClosedGeneratorException being thrown into the calling
-    code instead of the Generator yielding from. (Bob)
-  . Implemented FR #72614 (Support "nmake test" on building extensions by
-    phpize). (Yuji Uchiyama)
-  . Fixed bug #72641 (phpize (on Windows) ignores PHP_PREFIX).
-    (Yuji Uchiyama)
-  . Fixed potential segfault in object storage freeing in shutdown sequence.
-    (Bob)
-  . Fixed bug #72663 (Create an Unexpected Object and Don't Invoke
-   __wakeup() in Deserialization). (Stas)
-  . Fixed bug #72681 (PHP Session Data Injection Vulnerability). (Stas)
-  . Fixed bug #72683 (getmxrr broken). (Anatol)
-  . Fixed bug #72742 (memory allocator fails to realloc small block to large
-    one). (Stas)
-
- Bz2:
-  . Fixed bug #72837 (integer overflow in bzdecompress caused heap
-    corruption). (Stas)
-
- Calendar:
-  . Fixed bug #67976 (cal_days_month() fails for final month of the French
-    calendar). (cmb)
-  . Fixed bug #71894 (AddressSanitizer: global-buffer-overflow in
-    zif_cal_from_jd). (cmb)
-
- COM:
-  . Fixed bug #72569 (DOTNET/COM array parameters broke in PHP7). (Anatol)
-
- CURL:
-  . Fixed bug #71709 (curl_setopt segfault with empty CURLOPT_HTTPHEADER).
-    (Pierrick)
-  . Fixed bug #71929 (CURLINFO_CERTINFO data parsing error). (Pierrick)
-  . Fixed bug #72674 (Heap overflow in curl_escape). (Stas)
-
- DOM:
-  . Fixed bug #66502 (DOM document dangling reference). (Sean Heelan, cmb)
-
- EXIF:
-  . Fixed bug #72735 (Samsung picture thumb not read (zero size)). (Kalle, Remi)
-  . Fixed bug #72627 (Memory Leakage In exif_process_IFD_in_TIFF). (Stas)
-
- Filter:
-  . Fixed bug #71745 (FILTER_FLAG_NO_RES_RANGE does not cover whole 127.0.0.0/8
-    range). (bugs dot php dot net at majkl578 dot cz)
-
- FPM:
-  . Fixed bug #72575 (using --allow-to-run-as-root should ignore missing user).
-    (gooh)
-
- GD:
-  . Fixed bug #72596 (imagetypes function won't advertise WEBP support). (cmb)
-  . Fixed bug #72604 (imagearc() ignores thickness for full arcs). (cmb)
-  . Fixed bug #70315 (500 Server Error but page is fully rendered). (cmb)
-  . Fixed bug #43828 (broken transparency of imagearc for truecolor in
-    blendingmode). (cmb)
-  . Fixed bug #66555 (Always false condition in ext/gd/libgd/gdkanji.c). (cmb)
-  . Fixed bug #68712 (suspicious if-else statements). (cmb)
-  . Fixed bug #72697 (select_colors write out-of-bounds). (Stas)
-  . Fixed bug #72730 (imagegammacorrect allows arbitrary write access). (Stas)
-
- Intl:
-  . Fixed bug #72639 (Segfault when instantiating class that extends
-    IntlCalendar and adds a property). (Laruence)
-  . Partially fixed #72506 (idn_to_ascii for UTS #46 incorrect for long domain
-    names). (cmb)
-
- mbstring:
-  . Fixed bug #72691 (mb_ereg_search raises a warning if a match zero-width).
-    (cmb)
-  . Fixed bug #72693 (mb_ereg_search increments search position when a match
-    zero-width). (cmb)
-  . Fixed bug #72694 (mb_ereg_search_setpos does not accept a string's last
-    position). (cmb)
-  . Fixed bug #72710 (`mb_ereg` causes buffer overflow on regexp compile error).
-    (ju1ius)
-
- Mcrypt:
-  . Fixed bug #72782 (Heap Overflow due to integer overflows). (Stas)
-
- Opcache:
-  . Fixed bug #72590 (Opcache restart with kill_all_lockers does not work).
-    (Keyur)
-
- PCRE:
-  . Fixed bug #72688 (preg_match missing group names in matches). (cmb)
-
- PDO_pgsql:
-  . Fixed bug #70313 (PDO statement fails to throw exception). (Matteo)
-
- Reflection:
-  . Fixed bug #72222 (ReflectionClass::export doesn't handle array constants).
-    (Nikita Nefedov)
-
- SimpleXML:
-  . Fixed bug #72588 (Using global var doesn't work while accessing SimpleXML
-    element). (Laruence)
-
- SNMP:
-  . Fixed bug #72708 (php_snmp_parse_oid integer overflow in memory
-    allocation). (djodjo at gmail dot com)
-
- SPL:
-  . Fixed bug #55701 (GlobIterator throws LogicException). (Valentin VĂLCIU)
-  . Fixed bug #72646 (SplFileObject::getCsvControl does not return the escape
-    character). (cmb)
-  . Fixed bug #72684 (AppendIterator segfault with closed generator). (Pierrick)
-
- SQLite3:
-  . Fixed bug #72668 (Spurious warning when exception is thrown in user defined
-    function). (Laruence)
-  . Fixed bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash). (Laruence)
-  . Implemented FR #72653 (SQLite should allow opening with empty filename).
-    (cmb)
-  . Updated to SQLite3 3.13.0. (cmb)
-
- Standard:
-  . Fixed bug #72622 (array_walk + array_replace_recursive create references
-    from nothing). (Laruence)
-  . Fixed bug #72152 (base64_decode $strict fails to detect null byte).
-    (Lauri Kenttä)
-  . Fixed bug #72263 (base64_decode skips a character after padding in strict
-    mode). (Lauri Kenttä)
-  . Fixed bug #72264 (base64_decode $strict fails with whitespace between
-    padding). (Lauri Kenttä)
-  . Fixed bug #72330 (CSV fields incorrectly split if escape char followed by
-    UTF chars). (cmb)
-
- Streams:
-  . Fixed bug #41021 (Problems with the ftps wrapper). (vhuk)
-  . Fixed bug #54431 (opendir() does not work with ftps:// wrapper). (vhuk)
-  . Fixed bug #72667 (opendir() with ftp:// attempts to open data stream for
-    non-existent directories). (vhuk)
-  . Fixed bug #72771 (ftps:// wrapper is vulnerable to protocol downgrade
-    attack). (Stas)
-
- XMLRPC:
-  . Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing
-    array elements). (Laruence)
-
- Wddx:
-  . Fixed bug #72564 (boolean always deserialized as "true") (Remi)
-  . Fixed bug #72142 (WDDX Packet Injection Vulnerability in
-    wddx_serialize_value()). (Taoguang Chen)
-  . Fixed bug #72749 (wddx_deserialize allows illegal memory access) (Stas)
-  . Fixed bug #72750 (wddx_deserialize null dereference). (Stas)
-  . Fixed bug #72790 (wddx_deserialize null dereference with invalid xml).
-    (Stas)
-  . Fixed bug #72799 (wddx_deserialize null dereference in
-    php_wddx_pop_element). (Stas)
-
- Zip:
-  . Fixed bug #72660 (NULL Pointer dereference in zend_virtual_cwd).
-    (Laruence)
-
-21 Jul 2016 PHP 7.0.9
-
- Core:
-  . Fixed bug #72508 (strange references after recursive function call and
-    "switch" statement). (Laruence)
-  . Fixed bug #72513 (Stack-based buffer overflow vulnerability in
-    virtual_file_ex). (Stas)
-  . Fixed bug #72573 (HTTP_PROXY is improperly trusted by some PHP libraries
-    and applications). (Stas)
-
- bz2:
-  . Fixed bug #72613 (Inadequate error handling in bzread()). (Stas)
-
- CLI:
-  . Fixed bug #72484 (SCRIPT_FILENAME shows wrong path if the user specify
-    router.php). (Laruence)
-
- COM:
-  . Fixed bug #72498 (variant_date_from_timestamp null dereference). (Anatol)
-
- Curl:
-  . Fixed bug #72541 (size_t overflow lead to heap corruption). (Stas)
-
- Date:
-  . Fixed bug #66836 (DateTime::createFromFormat 'U' with pre 1970 dates fails
-    parsing). (derick)
-
- Exif:
-  . Fixed bug #72603 (Out of bound read in exif_process_IFD_in_MAKERNOTE).
-    (Stas)
-  . Fixed bug #72618 (NULL Pointer Dereference in exif_process_user_comment).
-    (Stas)
-
- GD:
-  . Fixed bug #43475 (Thick styled lines have scrambled patterns). (cmb)
-  . Fixed bug #53640 (XBM images require width to be multiple of 8). (cmb)
-  . Fixed bug #64641 (imagefilledpolygon doesn't draw horizontal line). (cmb)
-  . Fixed bug #72512 (gdImageTrueColorToPaletteBody allows arbitrary write/read
-    access). (Pierre)
-  . Fixed bug #72519 (imagegif/output out-of-bounds access). (Pierre)
-  . Fixed bug #72558 (Integer overflow error within _gdContributionsAlloc()).
-    (Pierre)
-  . Fixed bug #72482 (Ilegal write/read access caused by gdImageAALine
-    overflow). (Pierre)
-  . Fixed bug #72494 (imagecropauto out-of-bounds access). (Pierre)
-
- Intl:
-  . Fixed bug #72533 (locale_accept_from_http out-of-bounds access). (Stas)
-
- Mbstring:
-  . Fixed bug #72405 (mb_ereg_replace - mbc_to_code (oniguruma) -
-    oob read access). (Laruence)
-  . Fixed bug #72399 (Use-After-Free in MBString (search_re)). (Laruence)
-
- mcrypt:
-  . Fixed bug #72551, bug #72552 (In correct casting from size_t to int lead to
-    heap overflow in mdecrypt_generic). (Stas)
-
- PDO_pgsql:
-  . Fixed bug #72570 (Segmentation fault when binding parameters on a query
-    without placeholders). (Matteo)
-
- PCRE:
-  . Fixed bug #72476 (Memleak in jit_stack). (Laruence)
-  . Fixed bug #72463 (mail fails with invalid argument). (Anatol)
-
- Readline:
-  . Fixed bug #72538 (readline_redisplay crashes php). (Laruence)
-
- Standard:
-  . Fixed bug #72505 (readfile() mangles files larger than 2G). (Cschneid)
-  . Fixed bug #72306 (Heap overflow through proc_open and $env parameter).
-    (Laruence)
-
- Session:
-  . Fixed bug #72531 (ps_files_cleanup_dir Buffer overflow). (Laruence)
-  . Fixed bug #72562 (Use After Free in unserialize() with Unexpected Session
-    Deserialization). (Stas)
-
- SNMP:
-  . Fixed bug #72479 (Use After Free Vulnerability in SNMP with GC and
-    unserialize()). (Stas)
-
- Streams:
-  . Fixed bug #72439 (Stream socket with remote address leads to a segmentation
-    fault). (Laruence)
-
- XMLRPC:
-  . Fixed bug #72606 (heap-buffer-overflow (write) simplestring_addn
-    simplestring.c). (Stas)
-
- Zip:
-  . Fixed bug #72520 (Stack-based buffer overflow vulnerability in
-    php_stream_zip_opener). (Stas)
-
-23 Jun 2016 PHP 7.0.8
-
- Core:
-  . Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes). 
-    (Esminis at esminis dot lt)
-  . Fixed bug #72221 (segfault, past-the-end access). (Lauri Kenttä)
-  . Fixed bug #72268 (Integer Overflow in nl2br()). (Stas)
-  . Fixed bug #72275 (Integer Overflow in json_encode()/json_decode()/
-    json_utf8_to_utf16()). (Stas)
-  . Fixed bug #72400 (Integer Overflow in addcslashes/addslashes). (Stas)
-  . Fixed bug #72403 (Integer Overflow in Length of String-typed ZVAL). (Stas)
-
- Date:
-  . Fixed bug #63740 (strtotime seems to use both sunday and monday as start of
-    week). (Derick)
-
- FPM:
-  . Fixed bug #72308 (fastcgi_finish_request and logging environment
-    variables). (Laruence)
-
- GD:
-  . Fixed bug #66387 (Stack overflow with imagefilltoborder). (CVE-2015-8874)
-    (cmb)
-  . Fixed bug #72298 (pass2_no_dither out-of-bounds access). (Stas)
-  . Fixed bug #72337 (invalid dimensions can lead to crash). (Pierre)
-  . Fixed bug #72339 (Integer Overflow in _gd2GetHeader() resulting in heap 
-    overflow). (CVE-2016-5766) (Pierre)
-  . Fixed bug #72407 (NULL Pointer Dereference at _gdScaleVert). (Stas)
-  . Fixed bug #72446 (Integer Overflow in gdImagePaletteToTrueColor() resulting
-    in heap overflow). (CVE-2016-5767) (Pierre)
-
- Intl:
-  . Fixed bug #70484 (selectordinal doesn't work with named parameters).
-    (Anatol)
-
- mbstring:
-   . Fixed bug #72402 (_php_mb_regex_ereg_replace_exec - double free).
-     (CVE-2016-5768) (Stas)
-
- mcrypt:
-   . Fixed bug #72455 (Heap Overflow due to integer overflows). (CVE-2016-5769)
-     (Stas)
-
- OpenSSL:
-  . Fixed bug #72140 (segfault after calling ERR_free_strings()).
-    (Jakub Zelenka)
-
- PCRE:
-  . Fixed bug #72143 (preg_replace uses int instead of size_t). (Joe)
-
- PDO_pgsql:
-  . Fixed bug #71573 (Segfault (core dumped) if paramno beyond bound).
-    (Laruence)
-  . Fixed bug #72294 (Segmentation fault/invalid pointer in connection
-    with pgsql_stmt_dtor). (Anatol)
-
- Phar:
-  . Fixed bug #72321 (invalid free in phar_extract_file()).
-    (hji at dyntopia dot com)
-
- Phpdbg:
-  . Fixed bug #72284 (phpdbg fatal errors with coverage). (Bob)
-
- Postgres:
-  . Fixed bug #72195 (pg_pconnect/pg_connect cause use-after-free). (Laruence)
-  . Fixed bug #72197 (pg_lo_create arbitrary read). (Anatol)
-
- Standard:
-  . Fixed bug #72369 (array_merge() produces references in PHP7). (Dmitry)
-  . Fixed bug #72300 (ignore_user_abort(false) has no effect). (Laruence)
-  . Fixed bug #72229 (Wrong reference when serialize/unserialize an object).
-    (Laruence)
-  . Fixed bug #72193 (dns_get_record returns array containing elements of
-    type 'unknown'). (Laruence)
-  . Fixed bug #72017 (range() with float step produces unexpected result).
-    (Thomas Punt)
-
- WDDX:
-  . Fixed bug #72340 (Double Free Courruption in wddx_deserialize).
-    (CVE-2016-5772) (Stas)
-
- XML:
-  . Fixed bug #72206 (xml_parser_create/xml_parser_free leaks mem). (Joe)
-
- XMLRPC:
-  . Fixed bug #72155 (use-after-free caused by get_zval_xmlrpc_type).
-    (Joe, Laruence)
-
- Zip:
-  . Fixed ug #72258 (ZipArchive converts filenames to unrecoverable form).
-    (Anatol)
-  . Fixed bug #72434 (ZipArchive class Use After Free Vulnerability in PHP's GC
-    algorithm and unserialize). (CVE-2016-5773) (Dmitry)
-
 26 May 2016 PHP 7.0.7

 - Core:
@@ -487,8 +27,7 @@ PHP                                                                        NEWS
  . Fixed bug #72227 (imagescale out-of-bounds read). (Stas)

 - Intl:
-  . Fixed bug #64524 (Add intl.use_exceptions to php.ini-*). (Anatol)
-  . Fixed bug #72241 (get_icu_value_internal out-of-bounds read). (Stas)
+  . Fixed #72241 (get_icu_value_internal out-of-bounds read). (Stas)

 - JSON:
  . Fixed bug #72069 (Behavior \JsonSerializable different from json_encode).
@@ -1412,8 +951,7 @@ PHP                                                                        NEWS

 - GD:
  . Fixed bug #53156 (imagerectangle problem with point ordering). (cmb)
-  . Fixed bug #66387 (Stack overflow with imagefilltoborder). (CVE-2015-8874)
-    (cmb)
+  . Fixed bug #66387 (Stack overflow with imagefilltoborder). (cmb)
  . Fixed bug #70102 (imagecreatefromwebm() shifts colors). (cmb)
  . Fixed bug #66590 (imagewebp() doesn't pad to even length). (cmb)
  . Fixed bug #66882 (imagerotate by -90 degrees truncates image by 1px). (cmb)
@@ -1499,7 +1037,7 @@ PHP                                                                        NEWS

 - ODBC:
  . Fixed bug #69975 (PHP segfaults when accessing nvarchar(max) defined
-    columns). (CVE-2015-8879) (cmb)
+    columns). (cmb)

 - Opcache:
  . Fixed bug #70656 (require() statement broken after opcache_reset() or a
@@ -622,12 +622,6 @@ TSRM_API int shmget(int key, int size, int flags)
 		}
 	} else {
 		if (flags & IPC_EXCL) {
-			if (shm_handle) {
-				CloseHandle(shm_handle);
-			}
-			if (info_handle) {
-				CloseHandle(info_handle);
-			}
 			return -1;
 		}
 	}
@@ -671,27 +665,17 @@ TSRM_API int shmget(int key, int size, int flags)
 TSRM_API void *shmat(int key, const void *shmaddr, int flags)
 {
 	shm_pair *shm = shm_get(key, NULL);
-	int err;

 	if (!shm->segment) {
 		return (void*)-1;
 	}

-	shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
-
-	err = GetLastError();
-	if (err) {
-		/* Catch more errors */
-		if (ERROR_NOT_ENOUGH_MEMORY == err) {
-			_set_errno(ENOMEM);
-		}
-		return (void*)-1;
-	}
-
 	shm->descriptor->shm_atime = time(NULL);
 	shm->descriptor->shm_lpid  = getpid();
 	shm->descriptor->shm_nattch++;

+	shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
+
 	return shm->addr;
 }

@@ -442,8 +442,6 @@ Other
 - Curl:
  . Removed support for disabling the CURLOPT_SAFE_UPLOAD option. All curl file
    uploads must use the curl_file / CURLFile APIs.
-  . curl_getinfo($ch, CURLINFO_CERTINFO) returns certificate Subject and Issuer
-    as a string (PHP >= 5.6.25)

 - Date:
  . Removed $is_dst parameter from mktime() and gmmktime().
@@ -517,10 +515,6 @@ Other
 - Stream:
  . Removed set_socket_blocking() in favor of its alias stream_set_blocking().

- XML:
-  . xml_set_object() now requires to manually unset the $parser when finished,
-    to avoid memory leaks.
-
 - XSL:
  . Removed xsl.security_prefs ini option. Use XsltProcessor::setSecurityPrefs()
    instead.
@@ -647,10 +641,6 @@ Other
 - debug_zval_dump
  It prints now "int" instead of "long", and "float" instead of "double".

- getenv()
-  Since 7.0.9, getenv() has optional second parameter, making it only
-  consider local environment and not SAPI environment if true.
-
 ========================================
 6. New Functions
 ========================================
@@ -750,8 +740,6 @@ out, that the corresponding SDK isn't available anymore.
  . ZLIB_FINISH

 - GD
-  . IMG_WEBP (>= 7.0.10)
-
  . T1Lib support removed, thus lifting the optional dependency on T1Lib, the
    following is therefore not available anymore:

@@ -768,14 +756,6 @@ out, that the corresponding SDK isn't available anymore.
      - 'gd PS font'
      - 'gd PS encoding'

- Zip
-  . Filename encoding flags, as of 7.0.8
-    - ZipArchive::FL_ENC_GUESS
-    - ZipArchive::FL_ENC_RAW
-    - ZipArchive::FL_ENC_STRICT
-    - ZipArchive::FL_ENC_UTF_8
-    - ZipArchive::FL_ENC_CP437
-
 ========================================
 11. Changes to INI File Handling
 ========================================
@@ -827,7 +807,3 @@ out, that the corresponding SDK isn't available anymore.
    of aditional information with internal functions. In PHP-5 it was possible
    to use zend_function.op_array.reserved[] even for internal functions, but
    now we don't allocate extra space.
-
- CURL
-  . curl_getinfo($ch, CURLINFO_CERTINFO) returns certificate Subject and Issuer
-    as a string (PHP >= 7.0.10)
@@ -1,11 +0,0 @@
--TEST--
-Serialization of backtick literal is incorrect
--INI--
-zend.assertions=1
--FILE--
-<?php
-
-assert_options(ASSERT_WARNING);
-assert(false && `echo -n ""`);
--EXPECTF--
-Warning: assert(): assert(false && `echo -n ""`) failed in %s%east_serialize_backtick_literal.php on line %d
@@ -1,43 +0,0 @@
--TEST--
-Bug #72496 (declare public method with signature incompatible with parent private method should not throw a warning)
--FILE--
-<?php
-class Foo
-{
-    private function getFoo()
-    {
-        return 'Foo';
-    }
-
-    private function getBar()
-    {
-        return 'Bar';
-    }
-
-    private function getBaz()
-    {
-        return 'Baz';
-    }
-}
-
-class Bar extends Foo
-{
-    public function getFoo($extraArgument)
-    {
-        return $extraArgument;
-    }
-
-    protected function getBar($extraArgument)
-    {
-        return $extraArgument;
-    }
-
-    private function getBaz($extraArgument)
-    {
-        return $extraArgument;
-    }
-}
-
-echo "OK\n";
--EXPECT--
-OK
@@ -1,28 +0,0 @@
--TEST--
-Bug #72508 (strange references after recursive function call and "switch" statement)
--FILE--
-<?php
-function a ($option) {
-	b($option['bla']);
-	c($option);
-	var_dump($option);
-}
-function b (&$string) {
-	$string = 'changed';
-}
-function c ($option) {
-	switch ($option['bla']) {
-	default:
-		$copy = $option;
-		$copy['bla'] = 'copy';
-		break;
-	}
-}
-a(array('bla' => 'fasel'));
-
-?>
--EXPECT--
-array(1) {
-  ["bla"]=>
-  string(7) "changed"
-}
@@ -1,17 +0,0 @@
--TEST--
-Bug #72581 (previous property undefined in Exception after deserialization)
--FILE--
-<?php
-
-$e = new Exception('aaa', 200);
-
-$a = serialize($e);
-
-$b = unserialize($a);
-
-var_dump($b->__toString());
-?>
--EXPECTF--
-string(%s) "Exception: aaa in %sbug72581.php:%d
-Stack trace:
-#0 {main}"
@@ -1,33 +0,0 @@
--TEST--
-Bug #72594 (Calling an earlier instance of an included anonymous class fatals)
--INI--
-opcache.enable=0
--FILE--
-<?php
-if (isset($runtime)) {
-	return new class {
-		public $bar;
-		public function bing($foo = null) {
-			if ($foo) $foo->bing();
-		}
-	};
-}
-
-$runtime = 1;
-$oldFoo = require(__FILE__);
-$newFoo = require(__FILE__);
-
-var_dump(get_class_methods($oldFoo));
-var_dump(get_object_vars($oldFoo));
-
-$newFoo->bing($oldFoo);
-?>
--EXPECTF--
-array(1) {
-  [0]=>
-  string(4) "bing"
-}
-array(1) {
-  ["bar"]=>
-  NULL
-}
@@ -1,16 +0,0 @@
--TEST--
-Bug #72767: PHP Segfaults when trying to expand an infinite operator
--FILE--
-<?php
-
-function test() {}
-$iterator = new LimitIterator(
-    new InfiniteIterator(new ArrayIterator([42])),
-    0, 17000
-);
-test(...$iterator);
-
-?>
-===DONE===
--EXPECT--
-===DONE===
@@ -1,43 +0,0 @@
--TEST--
-Bug #72813 (Segfault with __get returned by ref)
--FILE--
-<?php
-class Test
-{
-    private $props = ['a' => 'text', 'b' => 1];
-
-    public function &__get($prop)
-    {
-        return $this->props[$prop];
-    }
-    
-    public function __set($prop, $value)
-    {
-        if ($prop === 'b') $value = [$value];
-        $this->props[$prop] = $value;
-    }
-    
-    public function getProperties()
-    {
-        return [$this->props];
-    }
-}
-
-$obj = new Test;
-$obj->b = $obj->b;
-print_r($obj->getProperties());
-?>
--EXPECT--
-Array
-(
-    [0] => Array
-        (
-            [a] => text
-            [b] => Array
-                (
-                    [0] => 1
-                )
-
-        )
-
-)
@@ -1,18 +0,0 @@
--TEST--
-Bug #72854: PHP Crashes on duplicate destructor call
--FILE--
-<?php
-
-function get() {
-    $t = new stdClass;
-    $t->prop = $t;
-    return $t;
-}
-
-$i = 42;
-get()->prop =& $i;
-
-?>
-===DONE===
--EXPECT--
-===DONE===
@@ -1,17 +0,0 @@
--TEST--
-Bug #72911 (Memleak in zend_binary_assign_op_obj_helper)
--FILE--
-<?php
-
-$a = 0;
-
-$b = $a->b->i -= 0;
-
-var_dump($b);
-
-?>
--EXPECTF--
-Warning: Attempt to modify property of non-object in %sbug72911.php on line %d
-
-Warning: Attempt to assign property of non-object in %sbug72911.php on line %d
-NULL
@@ -1,20 +0,0 @@
--TEST--
-Bug #72943 (assign_dim on string doesn't reset hval)
--FILE--
-<?php
-$array = array("test" => 1);
-
-$a = "lest";
-var_dump($array[$a]);
-$a[0] = "f";
-var_dump($array[$a]);
-$a[0] = "t";
-var_dump($array[$a]);
-?>
--EXPECTF--
-Notice: Undefined index: lest in %sbug72943.php on line %d
-NULL
-
-Notice: Undefined index: fest in %sbug72943.php on line %d
-NULL
-int(1)
@@ -1,12 +0,0 @@
--TEST--
-Bug #72944 (Null pointer deref in zval_delref_p).
--FILE--
-<?php
-"a"== e & $A = $A? 0 : 0 ?:0;
-echo "OK\n";
-?>
--EXPECTF--
-Notice: Use of undefined constant e - assumed 'e' in %sbug72944.php on line 2
-
-Notice: Undefined variable: A in %sbug72944.php on line 2
-OK
@@ -1,18 +0,0 @@
--TEST--
-call_user_func() should not use FUNC_ARG fetches
--FILE--
-<?php
-
-function foo(&$ref) { $ref = 24; }
-
-$a = [];
-call_user_func('foo', $a[0][0]);
-var_dump($a);
-
-?>
--EXPECTF--
-Notice: Undefined offset: 0 in %s on line %d
-
-Warning: Parameter 1 to foo() expected to be a reference, value given in %s on line %d
-array(0) {
-}
@@ -40,10 +40,11 @@ Stack trace:
 #2 %s(%d): Generator->next()
 #3 {main}
 Generator 1
-Caught exception!
-ClosedGeneratorException: Generator yielded from aborted, no return value available in %s:%d
+
+Fatal error: Uncaught ClosedGeneratorException: Generator yielded from aborted, no return value available in %s:%d
 Stack trace:
 #0 [internal function]: gen(Object(Generator))
 #1 %s(%d): Generator->current()
 #2 {main}
-NULL
+  thrown in %s on line %d
+
@@ -1,37 +0,0 @@
--TEST--
-Cannot "yield from" from force closed generator
--FILE--
-<?php
-
-function gen1() {
-    echo "gen1\n";
-    yield 1;
-}
-
-function gen2() {
-    try {
-        echo "try\n";
-        yield from gen1();
-    } finally {
-        echo "finally\n";
-        yield from gen1();
-    }
-}
-
-try {
-    $gen = gen2();
-    $gen->rewind();
-    unset($gen);
-} catch (Error $e) {
-    echo $e, "\n";
-}
-
-?>
--EXPECTF--
-try
-gen1
-finally
-Error: Cannot use "yield from" in a force-closed generator in %s:%d
-Stack trace:
-#0 %s(%d): gen2()
-#1 {main}
@@ -1,16 +0,0 @@
--TEST--
-Bug #72629 (Caught exception assignment to variables ignores references)
--FILE--
-<?php
-
-$var = null;
-$e = &$var;
-
-try {
-	throw new Exception;
-} catch (Exception $e) { }
-
-var_dump($var === $e);
-
--EXPECT--
-bool(true)
@@ -3100,13 +3100,13 @@ get_function_via_handler:

 	if (retval) {
 		if (fcc->calling_scope && !call_via_handler) {
-			if (fcc->function_handler->common.fn_flags & ZEND_ACC_ABSTRACT) {
+			if (!fcc->object && (fcc->function_handler->common.fn_flags & ZEND_ACC_ABSTRACT)) {
 				if (error) {
 					zend_spprintf(error, 0, "cannot call abstract method %s::%s()", ZSTR_VAL(fcc->calling_scope->name), ZSTR_VAL(fcc->function_handler->common.function_name));
 					retval = 0;
 				} else {
 					zend_throw_error(NULL, "Cannot call abstract method %s::%s()", ZSTR_VAL(fcc->calling_scope->name), ZSTR_VAL(fcc->function_handler->common.function_name));
-					retval = 0;
+					return 0;
 				}
 			} else if (!fcc->object && !(fcc->function_handler->common.fn_flags & ZEND_ACC_STATIC)) {
 				int severity;
@@ -1548,21 +1548,21 @@ static void *zend_mm_realloc_heap(zend_mm_heap *heap, void *ptr, size_t size, si

 		ZEND_MM_CHECK(chunk->heap == heap, "zend_mm_heap corrupted");
 		if (info & ZEND_MM_IS_SRUN) {
-			int old_bin_num = ZEND_MM_SRUN_BIN_NUM(info);
+			int old_bin_num, bin_num;
+
+			old_bin_num = ZEND_MM_SRUN_BIN_NUM(info);
 			old_size = bin_data_size[old_bin_num];
-			if (size <= ZEND_MM_MAX_SMALL_SIZE) {
-				int bin_num = ZEND_MM_SMALL_SIZE_TO_BIN(size);
-				if (old_bin_num == bin_num) {
+			bin_num = ZEND_MM_SMALL_SIZE_TO_BIN(size);
+			if (old_bin_num == bin_num) {
 #if ZEND_DEBUG
-					dbg = zend_mm_get_debug_info(heap, ptr);
-					dbg->size = real_size;
-					dbg->filename = __zend_filename;
-					dbg->orig_filename = __zend_orig_filename;
-					dbg->lineno = __zend_lineno;
-					dbg->orig_lineno = __zend_orig_lineno;
+				dbg = zend_mm_get_debug_info(heap, ptr);
+				dbg->size = real_size;
+				dbg->filename = __zend_filename;
+				dbg->orig_filename = __zend_orig_filename;
+				dbg->lineno = __zend_lineno;
+				dbg->orig_lineno = __zend_orig_lineno;
 #endif
-					return ptr;
-				}
+				return ptr;
 			}
 		} else /* if (info & ZEND_MM_IS_LARGE_RUN) */ {
 			ZEND_MM_CHECK(ZEND_MM_ALIGNED_OFFSET(page_offset, ZEND_MM_PAGE_SIZE) == 0, "zend_mm_heap corrupted");
@@ -1217,11 +1217,7 @@ simple_list:
 			if (ast->child[0]->kind == ZEND_AST_ENCAPS_LIST) {
 				zend_ast_export_encaps_list(str, '`', (zend_ast_list*)ast->child[0], indent);
 			} else {
-				zval *zv;
-				ZEND_ASSERT(ast->child[0]->kind == ZEND_AST_ZVAL);
-				zv = zend_ast_get_zval(ast->child[0]);
-				ZEND_ASSERT(Z_TYPE_P(zv) == IS_STRING);
-				zend_ast_export_qstr(str, '`', Z_STR_P(zv));
+				zend_ast_export_ex(str, ast->child[0], 0, indent);
 			}
 			smart_str_appendc(str, '`');
 			break;
@@ -2388,10 +2388,8 @@ ZEND_FUNCTION(debug_print_backtrace)
 			if (object) {
 				if (func->common.scope) {
 					class_name = func->common.scope->name;
-				} else if (object->handlers->get_class_name == std_object_handlers.get_class_name) {
-					class_name = object->ce->name;
 				} else {
-					class_name = object->handlers->get_class_name(object);
+					class_name = object->ce->name;
 				}

 				call_type = "->";
@@ -2451,11 +2449,6 @@ ZEND_FUNCTION(debug_print_backtrace)
 		if (class_name) {
 			ZEND_PUTS(ZSTR_VAL(class_name));
 			ZEND_PUTS(call_type);
-			if (object
-			  && !func->common.scope
-			  && object->handlers->get_class_name != std_object_handlers.get_class_name) {
-				zend_string_release(class_name);
-			}
 		}
 		zend_printf("%s(", function_name);
 		if (Z_TYPE(arg_array) != IS_UNDEF) {
@@ -2615,11 +2608,9 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
 			if (object) {
 				if (func->common.scope) {
 					add_assoc_str_ex(&stack_frame, "class", sizeof("class")-1, zend_string_copy(func->common.scope->name));
-				} else if (object->handlers->get_class_name == std_object_handlers.get_class_name) {
-					add_assoc_str_ex(&stack_frame, "class", sizeof("class")-1, zend_string_copy(object->ce->name));
 				} else {
-					zend_string *class_name = object->handlers->get_class_name(object);
-					add_assoc_str_ex(&stack_frame, "class", sizeof("class")-1, class_name);
+					add_assoc_str_ex(&stack_frame, "class", sizeof("class")-1, zend_string_copy(object->ce->name));
+
 				}
 				if ((options & DEBUG_BACKTRACE_PROVIDE_OBJECT) != 0) {
 					zval zv;
@@ -1944,42 +1944,10 @@ static inline uint32_t zend_emit_jump(uint32_t opnum_target) /* {{{ */
 }
 /* }}} */

-ZEND_API int zend_is_smart_branch(zend_op *opline) /* {{{ */
-{
-	switch (opline->opcode) {
-		case ZEND_IS_IDENTICAL:
-		case ZEND_IS_NOT_IDENTICAL:
-		case ZEND_IS_EQUAL:
-		case ZEND_IS_NOT_EQUAL:
-		case ZEND_IS_SMALLER:
-		case ZEND_IS_SMALLER_OR_EQUAL:
-		case ZEND_CASE:
-		case ZEND_ISSET_ISEMPTY_VAR:
-		case ZEND_ISSET_ISEMPTY_DIM_OBJ:
-		case ZEND_ISSET_ISEMPTY_PROP_OBJ:
-		case ZEND_INSTANCEOF:
-		case ZEND_TYPE_CHECK:
-		case ZEND_DEFINED:
-			return 1;
-		default:
-			return 0;
-	}
-}
-/* }}} */
-
 static inline uint32_t zend_emit_cond_jump(zend_uchar opcode, znode *cond, uint32_t opnum_target) /* {{{ */
 {
 	uint32_t opnum = get_next_op_number(CG(active_op_array));
-	zend_op *opline;
-
-	if ((cond->op_type & (IS_CV|IS_CONST))
-	 && opnum > 0
-	 && zend_is_smart_branch(CG(active_op_array)->opcodes + opnum - 1)) {
-		/* emit extra NOP to avoid incorrect SMART_BRANCH in very rare cases */
-		zend_emit_op(NULL, ZEND_NOP, NULL, NULL);
-		opnum = get_next_op_number(CG(active_op_array));
-	}
-	opline = zend_emit_op(NULL, opcode, cond, NULL);
+	zend_op *opline = zend_emit_op(NULL, opcode, cond, NULL);
 	opline->op2.opline_num = opnum_target;
 	return opnum;
 }
@@ -3102,9 +3070,19 @@ int zend_compile_func_cuf(znode *result, zend_ast_list *args, zend_string *lcnam
 		zend_ast *arg_ast = args->child[i];
 		znode arg_node;
 		zend_op *opline;
+		zend_bool send_user = 0;

-		zend_compile_expr(&arg_node, arg_ast);
-		if (arg_node.op_type & (IS_VAR|IS_CV)) {
+		if (zend_is_variable(arg_ast) && !zend_is_call(arg_ast)) {
+			zend_compile_var(&arg_node, arg_ast, BP_VAR_FUNC_ARG | (i << BP_VAR_SHIFT));
+			send_user = 1;
+		} else {
+			zend_compile_expr(&arg_node, arg_ast);
+			if (arg_node.op_type & (IS_VAR|IS_CV)) {
+				send_user = 1;
+			}
+		}
+
+		if (send_user) {
 			opline = zend_emit_op(NULL, ZEND_SEND_USER, &arg_node, NULL);
 		} else {
 			opline = zend_emit_op(NULL, ZEND_SEND_VAL, &arg_node, NULL);
@@ -4057,32 +4035,16 @@ void zend_compile_switch(zend_ast *ast) /* {{{ */

 	znode expr_node, case_node;
 	zend_op *opline;
-	uint32_t *jmpnz_opnums, opnum_default_jmp;
+	uint32_t *jmpnz_opnums = safe_emalloc(sizeof(uint32_t), cases->children, 0);
+	uint32_t opnum_default_jmp;

 	zend_compile_expr(&expr_node, expr_ast);

-	if (cases->children == 1 && cases->child[0]->child[0] == NULL) {
-		/* we have to take care about the case that only have one default branch,
-		 * expr result will not be unrefed in this case, but it should be like in ZEND_CASE */
-		zend_ast *stmt_ast = cases->child[0]->child[1];
-		if (expr_node.op_type == IS_VAR || expr_node.op_type == IS_TMP_VAR) {
-			zend_emit_op(NULL, ZEND_FREE, &expr_node, NULL);
-		} else if (expr_node.op_type == IS_CONST) {
-			zval_dtor(&expr_node.u.constant);
-		}
-
-		zend_begin_loop(ZEND_NOP, NULL);
-		zend_compile_stmt(stmt_ast);
-		zend_end_loop(get_next_op_number(CG(active_op_array)));
-		return;
-	}
-
 	zend_begin_loop(ZEND_FREE, &expr_node);

 	case_node.op_type = IS_TMP_VAR;
 	case_node.u.op.var = get_temporary_variable(CG(active_op_array));

-	jmpnz_opnums = safe_emalloc(sizeof(uint32_t), cases->children, 0);
 	for (i = 0; i < cases->children; ++i) {
 		zend_ast *case_ast = cases->child[i];
 		zend_ast *cond_ast = case_ast->child[0];
@@ -5315,7 +5277,7 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */
 	opline = get_next_op(CG(active_op_array));
 	zend_make_var_result(&declare_node, opline);

-	/* TODO.AST drop this */
+	// TODO.AST drop this
 	GET_NODE(&FC(implementing_class), opline->result);

 	opline->op2_type = IS_CONST;
@@ -5331,15 +5293,7 @@ void zend_compile_class_decl(zend_ast *ast) /* {{{ */

 		opline->op1_type = IS_UNUSED;

-		if (!zend_hash_exists(CG(class_table), lcname)) {
-			zend_hash_add_ptr(CG(class_table), lcname, ce);
-		} else {
-			/* this anonymous class has been included */
-			zval zv;
-			ZVAL_PTR(&zv, ce);
-			destroy_zend_class(&zv);
-			return;
-		}
+		zend_hash_update_ptr(CG(class_table), lcname, ce);
 	} else {
 		zend_string *key;

@@ -5626,6 +5580,7 @@ void zend_compile_group_use(zend_ast *ast) /* {{{ */
 }
 /* }}} */

+
 void zend_compile_const_decl(zend_ast *ast) /* {{{ */
 {
 	zend_ast_list *list = zend_ast_get_list(ast);
@@ -761,7 +761,6 @@ ZEND_API char *zend_make_compiled_string_description(const char *name);
 ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify_handlers);
 uint32_t zend_get_class_fetch_type(zend_string *name);
 ZEND_API zend_uchar zend_get_call_op(zend_uchar init_op, zend_function *fbc);
-ZEND_API int zend_is_smart_branch(zend_op *opline);

 typedef zend_bool (*zend_auto_global_callback)(zend_string *name);
 typedef struct _zend_auto_global {
@@ -291,8 +291,9 @@ ZEND_METHOD(exception, __construct)
 /* {{{ proto Exception::__wakeup()
   Exception unserialize checks */
 #define CHECK_EXC_TYPE(name, type) \
+	ZVAL_UNDEF(&value); \
 	pvalue = zend_read_property(i_get_exception_base(object), (object), name, sizeof(name) - 1, 1, &value); \
-	if (Z_TYPE_P(pvalue) != IS_NULL && Z_TYPE_P(pvalue) != type) { \
+	if(Z_TYPE_P(pvalue) != IS_UNDEF && Z_TYPE_P(pvalue) != type) { \
 		zval tmp; \
 		ZVAL_STRINGL(&tmp, name, sizeof(name) - 1); \
 		Z_OBJ_HANDLER_P(object, unset_property)(object, &tmp, NULL); \
@@ -562,14 +563,11 @@ static void _build_trace_args(zval *arg, smart_str *str) /* {{{ */
 		case IS_ARRAY:
 			smart_str_appends(str, "Array, ");
 			break;
-		case IS_OBJECT: {
-			zend_string *class_name = Z_OBJ_HANDLER_P(arg, get_class_name)(Z_OBJ_P(arg));
+		case IS_OBJECT:
 			smart_str_appends(str, "Object(");
-			smart_str_appends(str, ZSTR_VAL(class_name));
+			smart_str_appends(str, ZSTR_VAL(Z_OBJCE_P(arg)->name));
 			smart_str_appends(str, "), ");
-			zend_string_release(class_name);
 			break;
-		}
 	}
 }
 /* }}} */
@@ -1071,7 +1069,6 @@ ZEND_API ZEND_COLD void zend_throw_exception_object(zval *exception) /* {{{ */

 	if (!exception_ce || !instanceof_function(exception_ce, zend_ce_throwable)) {
 		zend_throw_error(NULL, "Cannot throw objects that do not implement Throwable");
-		zval_ptr_dtor(exception);
 		return;
 	}
 	zend_throw_exception_internal(exception);
@@ -145,8 +145,7 @@ static const zend_internal_function zend_pass_function = {
 	((ZEND_VM_STACK_PAGE_SLOTS(gen) - ZEND_VM_STACK_HEADER_SLOTS) * sizeof(zval))

 #define ZEND_VM_STACK_PAGE_ALIGNED_SIZE(gen, size) \
-	(((size) + ZEND_VM_STACK_HEADER_SLOTS * sizeof(zval) \
-	  + (ZEND_VM_STACK_PAGE_SIZE(gen) - 1)) & ~(ZEND_VM_STACK_PAGE_SIZE(gen) - 1))
+	(((size) + (ZEND_VM_STACK_FREE_PAGE_SIZE(gen) - 1)) & ~(ZEND_VM_STACK_PAGE_SIZE(gen) - 1))

 static zend_always_inline zend_vm_stack zend_vm_stack_new_page(size_t size, zend_vm_stack prev) {
 	zend_vm_stack page = (zend_vm_stack)emalloc(size);
@@ -576,7 +575,6 @@ static inline zval *_get_obj_zval_ptr_ptr(int op_type, znode_op node, zend_execu
 static inline void zend_assign_to_variable_reference(zval *variable_ptr, zval *value_ptr)
 {
 	zend_reference *ref;
-	zval garbage;

 	if (EXPECTED(!Z_ISREF_P(value_ptr))) {
 		ZVAL_NEW_REF(value_ptr, value_ptr);
@@ -586,18 +584,15 @@ static inline void zend_assign_to_variable_reference(zval *variable_ptr, zval *v

 	ref = Z_REF_P(value_ptr);
 	GC_REFCOUNT(ref)++;
-	ZVAL_COPY_VALUE(&garbage, variable_ptr);
+	zval_ptr_dtor(variable_ptr);
 	ZVAL_REF(variable_ptr, ref);
-	zval_ptr_dtor(&garbage);
 }

 /* this should modify object only if it's empty */
 static inline int make_real_object(zval *object)
 {
 	if (UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
-		if (UNEXPECTED(object == &EG(error_zval))) {
-			return 0;
-		} else if (EXPECTED(Z_TYPE_P(object) <= IS_FALSE)) {
+		if (EXPECTED(Z_TYPE_P(object) <= IS_FALSE)) {
 			/* nothing to destroy */
 		} else if (EXPECTED((Z_TYPE_P(object) == IS_STRING && Z_STRLEN_P(object) == 0))) {
 			zval_ptr_dtor_nogc(object);
@@ -827,8 +822,11 @@ static zend_always_inline int zend_verify_arg_type(zend_function *zf, uint32_t a
 				} else {
 					ce = zend_verify_arg_class_kind(cur_arg_info);
 					if (UNEXPECTED(!ce)) {
-						ZEND_ASSERT(Z_TYPE_P(arg) != IS_OBJECT);
-						zend_verify_arg_error(zf, arg_num, "be an instance of ", ZSTR_VAL(cur_arg_info->class_name), "", zend_zval_type_name(arg), arg);
+						if (Z_TYPE_P(arg) == IS_OBJECT) {
+							zend_verify_arg_error(zf, arg_num, "be an instance of ", ZSTR_VAL(cur_arg_info->class_name), "instance of ", ZSTR_VAL(Z_OBJCE_P(arg)->name), arg);
+						} else {
+							zend_verify_arg_error(zf, arg_num, "be an instance of ", ZSTR_VAL(cur_arg_info->class_name), "", zend_zval_type_name(arg), arg);
+						}
 						return 0;
 					}
 					*cache_slot = (void*)ce;
@@ -1335,7 +1333,6 @@ static void zend_assign_to_string_offset(zval *str, zend_long offset, zval *valu
 		zend_string_release(tmp);
 	} else {
 		Z_STRVAL_P(str)[offset] = Z_STRVAL_P(value)[0];
-		zend_string_forget_hash_val(Z_STR_P(str));
 	}
 	/*
 	 * the value of an assignment to a string offset is undefined
@@ -2447,12 +2444,9 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t o
 		
 		if (UNEXPECTED(opline->opcode == ZEND_INIT_FCALL ||
 			opline->opcode == ZEND_INIT_FCALL_BY_NAME ||
-			opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME ||
 			opline->opcode == ZEND_INIT_DYNAMIC_CALL ||
-			opline->opcode == ZEND_INIT_USER_CALL ||
 			opline->opcode == ZEND_INIT_METHOD_CALL ||
-			opline->opcode == ZEND_INIT_STATIC_METHOD_CALL ||
-			opline->opcode == ZEND_NEW)) {
+			opline->opcode == ZEND_INIT_STATIC_METHOD_CALL)) {
 			ZEND_ASSERT(op_num);
 			opline--;
 		}
@@ -1097,7 +1097,6 @@ ZEND_API int zend_gc_collect_cycles(void)

 				if (EG(objects_store).object_buckets &&
 				    IS_OBJ_VALID(EG(objects_store).object_buckets[obj->handle])) {
-					EG(objects_store).object_buckets[obj->handle] = SET_OBJ_INVALID(obj);
 					GC_TYPE(obj) = IS_NULL;
 					if (!(GC_FLAGS(obj) & IS_OBJ_FREE_CALLED)) {
 						GC_FLAGS(obj) |= IS_OBJ_FREE_CALLED;
@@ -297,8 +297,6 @@ ZEND_API zend_execute_data *zend_generator_check_placeholder_frame(zend_execute_

 static void zend_generator_throw_exception(zend_generator *generator, zval *exception)
 {
-	zend_execute_data *original_execute_data = EG(current_execute_data);
-
 	/* if we don't stop an array/iterator yield from, the exception will only reach the generator after the values were all iterated over */
 	if (UNEXPECTED(Z_TYPE(generator->values) != IS_UNDEF)) {
 		zval_ptr_dtor(&generator->values);
@@ -307,6 +305,7 @@ static void zend_generator_throw_exception(zend_generator *generator, zval *exce

 	/* Throw the exception in the context of the generator. Decrementing the opline
 	 * to pretend the exception happened during the YIELD opcode. */
+	zend_execute_data *original_execute_data = EG(current_execute_data);
 	EG(current_execute_data) = generator->execute_data;
 	generator->execute_data->opline--;
 	if (exception) {
@@ -522,16 +521,6 @@ ZEND_API zend_generator *zend_generator_update_current(zend_generator *generator
 						zend_throw_exception(zend_ce_ClosedGeneratorException, "Generator yielded from aborted, no return value available", 0);

 						EG(current_execute_data) = original_execute_data;
-
-						if (!((old_root ? old_root : generator)->flags & ZEND_GENERATOR_CURRENTLY_RUNNING)) {
-							leaf->node.ptr.root = root;
-							root->node.parent = NULL;
-							if (old_root) {
-								OBJ_RELEASE(&old_root->std);
-							}
-							zend_generator_resume(leaf);
-							return leaf->node.ptr.root; /* this may be updated during zend_generator_resume! */
-						}
 					} else {
 						zval_ptr_dtor(&root->value);
 						ZVAL_COPY(&root->value, &root->node.parent->value);
@@ -2465,6 +2465,7 @@ ZEND_API int ZEND_FASTCALL _zend_handle_numeric_str_ex(const char *key, size_t l
 	register const char *tmp = key;

 	const char *end = key + length;
+	ZEND_ASSERT(*end == '\0');

 	if (*tmp == '-') {
 		tmp++;
@@ -268,8 +268,8 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c
 		return 1;
 	}

-	/* If the prototype method is private do not enforce a signature */
-	if (proto->common.fn_flags & ZEND_ACC_PRIVATE) {
+	/* If both methods are private do not enforce a signature */
+    if ((fe->common.fn_flags & ZEND_ACC_PRIVATE) && (proto->common.fn_flags & ZEND_ACC_PRIVATE)) {
 		return 1;
 	}

@@ -197,7 +197,11 @@ static void zend_std_call_getter(zval *object, zval *member, zval *retval) /* {{

 	   it should return whether the call was successful or not
 	*/
+	if (Z_REFCOUNTED_P(member)) Z_ADDREF_P(member);
+
 	zend_call_method_with_1_params(object, ce, &ce->__get, ZEND_GET_FUNC_NAME, retval, member);
+
+	zval_ptr_dtor(member);
 }
 /* }}} */

@@ -207,6 +211,9 @@ static int zend_std_call_setter(zval *object, zval *member, zval *value) /* {{{
 	int result;
 	zend_class_entry *ce = Z_OBJCE_P(object);

+	if (Z_REFCOUNTED_P(member)) Z_ADDREF_P(member);
+	if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value);
+
 	/* __set handler is called with two arguments:
 	     property name
 	     value to be set
@@ -215,6 +222,9 @@ static int zend_std_call_setter(zval *object, zval *member, zval *value) /* {{{
 	*/
 	zend_call_method_with_2_params(object, ce, &ce->__set, ZEND_SET_FUNC_NAME, &retval, member, value);

+	zval_ptr_dtor(member);
+	zval_ptr_dtor(value);
+
 	if (Z_TYPE(retval) != IS_UNDEF) {
 		result = i_zend_is_true(&retval) ? SUCCESS : FAILURE;
 		zval_ptr_dtor(&retval);
@@ -2927,9 +2927,6 @@ ZEND_API const char* ZEND_FASTCALL zend_memnstr_ex(const char *haystack, const c
 		if (i == needle_len) {
 			return p;
 		}
-		if (UNEXPECTED(p == end)) {
-			return NULL;
-		}
 		p += td[(unsigned char)(p[needle_len])];
 	}

@@ -915,7 +915,6 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i

 			pbuffer = (REPARSE_DATA_BUFFER *)do_alloca(MAXIMUM_REPARSE_DATA_BUFFER_SIZE, use_heap_large);
 			if (pbuffer == NULL) {
-				CloseHandle(hLink);
 				return -1;
 			}
 			if(!DeviceIoControl(hLink, FSCTL_GET_REPARSE_POINT, NULL, 0, pbuffer,  MAXIMUM_REPARSE_DATA_BUFFER_SIZE, &retlength, NULL)) {
@@ -1187,7 +1186,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 	int add_slash;
 	void *tmp;

-	if (path_length <= 0 || path_length >= MAXPATHLEN-1) {
+	if (path_length == 0 || path_length >= MAXPATHLEN-1) {
 #ifdef ZEND_WIN32
 		_set_errno(EINVAL);
 #else
@@ -2312,7 +2312,6 @@ ZEND_VM_HANDLER(39, ZEND_ASSIGN_REF, VAR|CV, VAR|CV)
 	    UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) &&
 	    UNEXPECTED(!Z_ISREF_P(EX_VAR(opline->op1.var)))) {
 		zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
-		FREE_UNFETCHED_OP1();
 		FREE_OP2_VAR_PTR();
 		HANDLE_EXCEPTION();
 	}
@@ -4154,7 +4153,6 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, CV)
 	USE_OPLINE
 	zend_class_entry *ce, *catch_ce;
 	zend_object *exception;
-	zval *ex;

 	SAVE_OPLINE();
 	/* Check whether an exception has been thrown, if not, jump over code */
@@ -4189,12 +4187,8 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, CV)
 	}

 	exception = EG(exception);
-	ex = EX_VAR(opline->op2.var);
-	if (UNEXPECTED(Z_ISREF_P(ex))) {
-		ex = Z_REFVAL_P(ex);
-	}
-	zval_ptr_dtor(ex);
-	ZVAL_OBJ(ex, EG(exception));
+	zval_ptr_dtor(EX_VAR(opline->op2.var));
+	ZVAL_OBJ(EX_VAR(opline->op2.var), EG(exception));
 	if (UNEXPECTED(EG(exception) != exception)) {
 		GC_REFCOUNT(EG(exception))++;
 		HANDLE_EXCEPTION();
@@ -5455,10 +5449,6 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMPVAR|CV, ANY)
 	}
 	FREE_OP1();
 	if (UNEXPECTED(EG(exception) != NULL)) {
-		if (new_op_array != NULL) {
-			destroy_op_array(new_op_array);
-			efree_size(new_op_array, sizeof(zend_op_array));
-		}
 		HANDLE_EXCEPTION();
 	} else if (EXPECTED(new_op_array != NULL)) {
 		zval *return_value = NULL;
@@ -7452,12 +7442,6 @@ ZEND_VM_HANDLER(142, ZEND_YIELD_FROM, CONST|TMP|VAR|CV, ANY)
 	SAVE_OPLINE();
 	val = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);

-	if (UNEXPECTED(generator->flags & ZEND_GENERATOR_FORCED_CLOSE)) {
-		zend_throw_error(NULL, "Cannot use \"yield from\" in a force-closed generator");
-		FREE_OP1();
-		HANDLE_EXCEPTION();
-	}
-
 	if (Z_TYPE_P(val) == IS_ARRAY) {
 		ZVAL_COPY_VALUE(&generator->values, val);
 		if (OP1_TYPE != IS_TMP_VAR && Z_OPT_REFCOUNTED_P(val)) {
@@ -7479,14 +7463,12 @@ ZEND_VM_HANDLER(142, ZEND_YIELD_FROM, CONST|TMP|VAR|CV, ANY)
 			if (Z_ISUNDEF(new_gen->retval)) {
 				if (UNEXPECTED(zend_generator_get_current(new_gen) == generator)) {
 					zend_throw_error(NULL, "Impossible to yield from the Generator being currently run");
-					zval_ptr_dtor(val);
 					HANDLE_EXCEPTION();
 				} else {
 					zend_generator_yield_from(generator, new_gen);
 				}
 			} else if (UNEXPECTED(new_gen->execute_data == NULL)) {
 				zend_throw_error(NULL, "Generator passed to yield from was aborted without proper return and is unable to continue");
-				zval_ptr_dtor(val);
 				HANDLE_EXCEPTION();
 			} else {
 				if (RETURN_VALUE_USED(opline)) {
@@ -3637,10 +3637,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HAN
 	}

 	if (UNEXPECTED(EG(exception) != NULL)) {
-		if (new_op_array != NULL) {
-			destroy_op_array(new_op_array);
-			efree_size(new_op_array, sizeof(zend_op_array));
-		}
 		HANDLE_EXCEPTION();
 	} else if (EXPECTED(new_op_array != NULL)) {
 		zval *return_value = NULL;
@@ -4110,12 +4106,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_YIELD_FROM_SPEC_CONST_HANDLER(
 	SAVE_OPLINE();
 	val = EX_CONSTANT(opline->op1);

-	if (UNEXPECTED(generator->flags & ZEND_GENERATOR_FORCED_CLOSE)) {
-		zend_throw_error(NULL, "Cannot use \"yield from\" in a force-closed generator");
-
-		HANDLE_EXCEPTION();
-	}
-
 	if (Z_TYPE_P(val) == IS_ARRAY) {
 		ZVAL_COPY_VALUE(&generator->values, val);
 		if (IS_CONST != IS_TMP_VAR && Z_OPT_REFCOUNTED_P(val)) {
@@ -4135,14 +4125,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_YIELD_FROM_SPEC_CONST_HANDLER(
 			if (Z_ISUNDEF(new_gen->retval)) {
 				if (UNEXPECTED(zend_generator_get_current(new_gen) == generator)) {
 					zend_throw_error(NULL, "Impossible to yield from the Generator being currently run");
-					zval_ptr_dtor(val);
 					HANDLE_EXCEPTION();
 				} else {
 					zend_generator_yield_from(generator, new_gen);
 				}
 			} else if (UNEXPECTED(new_gen->execute_data == NULL)) {
 				zend_throw_error(NULL, "Generator passed to yield from was aborted without proper return and is unable to continue");
-				zval_ptr_dtor(val);
 				HANDLE_EXCEPTION();
 			} else {
 				if (RETURN_VALUE_USED(opline)) {
@@ -9553,7 +9541,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CATCH_SPEC_CONST_CV_HANDLER(ZE
 	USE_OPLINE
 	zend_class_entry *ce, *catch_ce;
 	zend_object *exception;
-	zval *ex;

 	SAVE_OPLINE();
 	/* Check whether an exception has been thrown, if not, jump over code */
@@ -9588,12 +9575,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CATCH_SPEC_CONST_CV_HANDLER(ZE
 	}

 	exception = EG(exception);
-	ex = EX_VAR(opline->op2.var);
-	if (UNEXPECTED(Z_ISREF_P(ex))) {
-		ex = Z_REFVAL_P(ex);
-	}
-	zval_ptr_dtor(ex);
-	ZVAL_OBJ(ex, EG(exception));
+	zval_ptr_dtor(EX_VAR(opline->op2.var));
+	ZVAL_OBJ(EX_VAR(opline->op2.var), EG(exception));
 	if (UNEXPECTED(EG(exception) != exception)) {
 		GC_REFCOUNT(EG(exception))++;
 		HANDLE_EXCEPTION();
@@ -12519,12 +12502,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_YIELD_FROM_SPEC_TMP_HANDLER(ZE
 	SAVE_OPLINE();
 	val = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1);

-	if (UNEXPECTED(generator->flags & ZEND_GENERATOR_FORCED_CLOSE)) {
-		zend_throw_error(NULL, "Cannot use \"yield from\" in a force-closed generator");
-		zval_ptr_dtor_nogc(free_op1);
-		HANDLE_EXCEPTION();
-	}
-
 	if (Z_TYPE_P(val) == IS_ARRAY) {
 		ZVAL_COPY_VALUE(&generator->values, val);
 		if (IS_TMP_VAR != IS_TMP_VAR && Z_OPT_REFCOUNTED_P(val)) {
@@ -12544,14 +12521,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_YIELD_FROM_SPEC_TMP_HANDLER(ZE
 			if (Z_ISUNDEF(new_gen->retval)) {
 				if (UNEXPECTED(zend_generator_get_current(new_gen) == generator)) {
 					zend_throw_error(NULL, "Impossible to yield from the Generator being currently run");
-					zval_ptr_dtor(val);
 					HANDLE_EXCEPTION();
 				} else {
 					zend_generator_yield_from(generator, new_gen);
 				}
 			} else if (UNEXPECTED(new_gen->execute_data == NULL)) {
 				zend_throw_error(NULL, "Generator passed to yield from was aborted without proper return and is unable to continue");
-				zval_ptr_dtor(val);
 				HANDLE_EXCEPTION();
 			} else {
 				if (RETURN_VALUE_USED(opline)) {
@@ -16345,12 +16320,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_YIELD_FROM_SPEC_VAR_HANDLER(ZE
 	SAVE_OPLINE();
 	val = _get_zval_ptr_var_deref(opline->op1.var, execute_data, &free_op1);

-	if (UNEXPECTED(generator->flags & ZEND_GENERATOR_FORCED_CLOSE)) {
-		zend_throw_error(NULL, "Cannot use \"yield from\" in a force-closed generator");
-		zval_ptr_dtor_nogc(free_op1);
-		HANDLE_EXCEPTION();
-	}
-
 	if (Z_TYPE_P(val) == IS_ARRAY) {
 		ZVAL_COPY_VALUE(&generator->values, val);
 		if (IS_VAR != IS_TMP_VAR && Z_OPT_REFCOUNTED_P(val)) {
@@ -16372,14 +16341,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_YIELD_FROM_SPEC_VAR_HANDLER(ZE
 			if (Z_ISUNDEF(new_gen->retval)) {
 				if (UNEXPECTED(zend_generator_get_current(new_gen) == generator)) {
 					zend_throw_error(NULL, "Impossible to yield from the Generator being currently run");
-					zval_ptr_dtor(val);
 					HANDLE_EXCEPTION();
 				} else {
 					zend_generator_yield_from(generator, new_gen);
 				}
 			} else if (UNEXPECTED(new_gen->execute_data == NULL)) {
 				zend_throw_error(NULL, "Generator passed to yield from was aborted without proper return and is unable to continue");
-				zval_ptr_dtor(val);
 				HANDLE_EXCEPTION();
 			} else {
 				if (RETURN_VALUE_USED(opline)) {
@@ -18514,7 +18481,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_VAR_HANDLE
 	    UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) &&
 	    UNEXPECTED(!Z_ISREF_P(EX_VAR(opline->op1.var)))) {
 		zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
-		zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
 		if (UNEXPECTED(free_op2)) {zval_ptr_dtor_nogc(free_op2);};
 		HANDLE_EXCEPTION();
 	}
@@ -20801,7 +20767,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_CV_HANDLER
 	    UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) &&
 	    UNEXPECTED(!Z_ISREF_P(EX_VAR(opline->op1.var)))) {
 		zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
-		zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));

 		HANDLE_EXCEPTION();
 	}
@@ -29325,10 +29290,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLE
 	}

 	if (UNEXPECTED(EG(exception) != NULL)) {
-		if (new_op_array != NULL) {
-			destroy_op_array(new_op_array);
-			efree_size(new_op_array, sizeof(zend_op_array));
-		}
 		HANDLE_EXCEPTION();
 	} else if (EXPECTED(new_op_array != NULL)) {
 		zval *return_value = NULL;
@@ -29798,12 +29759,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_YIELD_FROM_SPEC_CV_HANDLER(ZEN
 	SAVE_OPLINE();
 	val = _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op1.var);

-	if (UNEXPECTED(generator->flags & ZEND_GENERATOR_FORCED_CLOSE)) {
-		zend_throw_error(NULL, "Cannot use \"yield from\" in a force-closed generator");
-
-		HANDLE_EXCEPTION();
-	}
-
 	if (Z_TYPE_P(val) == IS_ARRAY) {
 		ZVAL_COPY_VALUE(&generator->values, val);
 		if (IS_CV != IS_TMP_VAR && Z_OPT_REFCOUNTED_P(val)) {
@@ -29823,14 +29778,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_YIELD_FROM_SPEC_CV_HANDLER(ZEN
 			if (Z_ISUNDEF(new_gen->retval)) {
 				if (UNEXPECTED(zend_generator_get_current(new_gen) == generator)) {
 					zend_throw_error(NULL, "Impossible to yield from the Generator being currently run");
-					zval_ptr_dtor(val);
 					HANDLE_EXCEPTION();
 				} else {
 					zend_generator_yield_from(generator, new_gen);
 				}
 			} else if (UNEXPECTED(new_gen->execute_data == NULL)) {
 				zend_throw_error(NULL, "Generator passed to yield from was aborted without proper return and is unable to continue");
-				zval_ptr_dtor(val);
 				HANDLE_EXCEPTION();
 			} else {
 				if (RETURN_VALUE_USED(opline)) {
@@ -33630,7 +33583,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_CV_VAR_HANDLER
 	    UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) &&
 	    UNEXPECTED(!Z_ISREF_P(EX_VAR(opline->op1.var)))) {
 		zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
-
 		if (UNEXPECTED(free_op2)) {zval_ptr_dtor_nogc(free_op2);};
 		HANDLE_EXCEPTION();
 	}
@@ -37046,7 +36998,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_CV_CV_HANDLER(
 	    UNEXPECTED(!Z_ISREF_P(EX_VAR(opline->op1.var)))) {
 		zend_throw_error(NULL, "Cannot assign by reference to overloaded object");

-
 		HANDLE_EXCEPTION();
 	}
 	if (IS_CV == IS_VAR &&
@@ -40865,10 +40816,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_TMPVAR_HA
 	}
 	zval_ptr_dtor_nogc(free_op1);
 	if (UNEXPECTED(EG(exception) != NULL)) {
-		if (new_op_array != NULL) {
-			destroy_op_array(new_op_array);
-			efree_size(new_op_array, sizeof(zend_op_array));
-		}
 		HANDLE_EXCEPTION();
 	} else if (EXPECTED(new_op_array != NULL)) {
 		zval *return_value = NULL;
@@ -2672,14 +2672,10 @@ AC_DEFUN([PHP_CONFIG_NICE],[

 EOF

-  clean_configure_args=$ac_configure_args
  for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS EXTRA_LDFLAGS_PROGRAM LIBS CC CXX; do
    eval val=\$$var
    if test -n "$val"; then
      echo "$var='$val' \\" >> $1
-      if test `expr "X$ac_configure_args" : ".*${var}.*"` != 0; then
-        clean_configure_args=$(echo $clean_configure_args | sed -e "s/'$var=$val'//")
-      fi
    fi
  done

@@ -2689,8 +2685,7 @@ EOF
  else 
    CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0"
  fi
-
-  for arg in $clean_configure_args; do
+  for arg in $ac_configure_args; do
    if test `expr -- $arg : "'.*"` = 0; then
      if test `expr -- $arg : "-.*"` = 0 && test `expr -- $arg : ".*=.*"` = 0; then
        continue;
@@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...);

 PHP_MAJOR_VERSION=7
 PHP_MINOR_VERSION=0
-PHP_RELEASE_VERSION=11
-PHP_EXTRA_VERSION="RC1"
+PHP_RELEASE_VERSION=7
+PHP_EXTRA_VERSION=""
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`

@@ -148,11 +148,7 @@ static size_t php_bz2iop_read(php_stream *stream, char *buf, size_t count)
 		just_read = BZ2_bzread(self->bz_file, buf, to_read);

 		if (just_read < 1) {
-			/* it is not safe to keep reading after an error, see #72613 */
-			stream->eof = 1;
-			if (just_read < 0) {
-				return -1;
-			}
+			stream->eof = 0 == just_read;
 			break;
 		}

@@ -561,8 +557,7 @@ static PHP_FUNCTION(bzcompress)
   Decompresses BZip2 compressed data */
 static PHP_FUNCTION(bzdecompress)
 {
-	char *source;
-	zend_string *dest;
+	char *source, *dest;
 	size_t source_len;
 	int error;
 	zend_long small = 0;
@@ -589,40 +584,24 @@ static PHP_FUNCTION(bzdecompress)

 	/* in most cases bz2 offers at least 2:1 compression, so we use that as our base */
 	bzs.avail_out = source_len * 2;
-	dest = zend_string_alloc(bzs.avail_out + 1, 0);
-	bzs.next_out = ZSTR_VAL(dest);
+	bzs.next_out = dest = emalloc(bzs.avail_out + 1);

 	while ((error = BZ2_bzDecompress(&bzs)) == BZ_OK && bzs.avail_in > 0) {
 		/* compression is better then 2:1, need to allocate more memory */
 		bzs.avail_out = source_len;
 		size = (bzs.total_out_hi32 * (unsigned int) -1) + bzs.total_out_lo32;
-#if !ZEND_ENABLE_ZVAL_LONG64
-		if (size > SIZE_MAX) {
-			/* no reason to continue if we're going to drop it anyway */
-			break;
-		}
-#endif
-		dest = zend_string_safe_realloc(dest, 1, bzs.avail_out+1, (size_t) size, 0);
-		bzs.next_out = ZSTR_VAL(dest) + size;
+		dest = safe_erealloc(dest, 1, bzs.avail_out+1, (size_t) size );
+		bzs.next_out = dest + size;
 	}

 	if (error == BZ_STREAM_END || error == BZ_OK) {
 		size = (bzs.total_out_hi32 * (unsigned int) -1) + bzs.total_out_lo32;
-#if !ZEND_ENABLE_ZVAL_LONG64
-		if (UNEXPECTED(size > SIZE_MAX)) {
-			php_error_docref(NULL, E_WARNING, "Decompressed size too big, max is %zd", SIZE_MAX);
-			zend_string_free(dest);
-			RETVAL_LONG(BZ_MEM_ERROR);
-		} else
-#endif
-		{
-			dest = zend_string_safe_realloc(dest, 1, (size_t)size, 1, 0);
-			ZSTR_LEN(dest) = (size_t)size;
-			ZSTR_VAL(dest)[(size_t)size] = '\0';
-			RETVAL_STR(dest);
-		}
+		dest = safe_erealloc(dest, 1, (size_t) size, 1);
+		dest[size] = '\0';
+		RETVAL_STRINGL(dest, (int) size);
+		efree(dest);
 	} else { /* real error */
-		zend_string_free(dest);
+		efree(dest);
 		RETVAL_LONG(error);
 	}

@@ -1,15 +0,0 @@
--TEST--
-Bug #72447: Type Confusion in php_bz2_filter_create()
--SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
--FILE--
-<?php
-$input = "AAAAAAAA";
-$param = array('blocks' => $input);
-
-$fp = fopen('testfile', 'w');
-stream_filter_append($fp, 'bzip2.compress', STREAM_FILTER_WRITE, $param);
-fclose($fp);
-?>
--EXPECTF--
-Warning: stream_filter_append(): Invalid parameter given for number of blocks to allocate. (0) in %s%ebug72447.php on line %d
@@ -1,23 +0,0 @@
--TEST--
-Bug #72613 (Inadequate error handling in bzread())
--SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
--FILE--
-<?php
-$fp = bzopen(__DIR__.'/72613.bz2', 'r');
-if ($fp === FALSE) {
-    exit("ERROR: bzopen()");
-}
-$data = "";
-while (!feof($fp)) {
-    $res = bzread($fp);
-    if ($res === FALSE) {
-        exit("ERROR: bzread()");
-    }
-    $data .= $res;
-}
-bzclose($fp);
-?>
-DONE
--EXPECT--
-DONE
@@ -357,10 +357,6 @@ PHP_FUNCTION(cal_days_in_month)
 		}
 		else {
 			sdn_next = calendar->to_jd(year + 1, 1, 1);
-			if (cal == CAL_FRENCH && sdn_next == 0) {
-				/* The French calendar ends on 0014-13-05. */
-				sdn_next = 2380953;
-			}
 		}
 	}

@@ -418,21 +414,15 @@ PHP_FUNCTION(cal_from_jd)
 	add_assoc_long(return_value, "year", year);

 /* day of week */
-	if (cal != CAL_JEWISH || year > 0) {
-		dow = DayOfWeek(jd);
-		add_assoc_long(return_value, "dow", dow);
-		add_assoc_string(return_value, "abbrevdayname", DayNameShort[dow]);
-		add_assoc_string(return_value, "dayname", DayNameLong[dow]);
-	} else {
-		add_assoc_null(return_value, "dow");
-		add_assoc_string(return_value, "abbrevdayname", "");
-		add_assoc_string(return_value, "dayname", "");
-	}
+	dow = DayOfWeek(jd);
+	add_assoc_long(return_value, "dow", dow);
+	add_assoc_string(return_value, "abbrevdayname", DayNameShort[dow]);
+	add_assoc_string(return_value, "dayname", DayNameLong[dow]);
 /* month name */
 	if(cal == CAL_JEWISH) {
 		/* special case for Jewish calendar */
-		add_assoc_string(return_value, "abbrevmonth", (year > 0 ? JEWISH_MONTH_NAME(year)[month] : ""));
-		add_assoc_string(return_value, "monthname", (year > 0 ? JEWISH_MONTH_NAME(year)[month] : ""));
+		add_assoc_string(return_value, "abbrevmonth", JEWISH_MONTH_NAME(year)[month]);
+		add_assoc_string(return_value, "monthname", JEWISH_MONTH_NAME(year)[month]);
 	} else {
 		add_assoc_string(return_value, "abbrevmonth", calendar->month_name_short[month]);
 		add_assoc_string(return_value, "monthname", calendar->month_name_long[month]);
@@ -745,7 +735,7 @@ PHP_FUNCTION(jdmonthname)
 		break;
 	case CAL_MONTH_JEWISH:		/* jewish month */
 		SdnToJewish(julday, &year, &month, &day);
-		monthname = (year > 0 ? JEWISH_MONTH_NAME(year)[month] : "");
+		monthname = JEWISH_MONTH_NAME(year)[month];
 		break;
 	case CAL_MONTH_FRENCH:		/* french month */
 		SdnToFrench(julday, &year, &month, &day);
@@ -1,12 +0,0 @@
--TEST--
-Bug #67976 (cal_days_month() fails for final month of the French calendar)
--SKIPIF--
-<?php
-if (!extension_loaded('calendar')) die('skip ext/calendar required');
-?>
--FILE--
-<?php
-var_dump(cal_days_in_month(CAL_FRENCH, 13, 14));
-?>
--EXPECT--
-int(5)
@@ -1,32 +0,0 @@
--TEST--
-Bug #71894 (AddressSanitizer: global-buffer-overflow in zif_cal_from_jd)
--SKIPIF--
-<?php
-if (!extension_loaded('calendar')) die('skip ext/calendar required');
-?>
--FILE--
-<?php
-var_dump(cal_from_jd(347997, CAL_JEWISH));
-var_dump(jdmonthname(347997,CAL_MONTH_JEWISH));?>
--EXPECT--
-array(9) {
-  ["date"]=>
-  string(5) "0/0/0"
-  ["month"]=>
-  int(0)
-  ["day"]=>
-  int(0)
-  ["year"]=>
-  int(0)
-  ["dow"]=>
-  NULL
-  ["abbrevdayname"]=>
-  string(0) ""
-  ["dayname"]=>
-  string(0) ""
-  ["abbrevmonth"]=>
-  string(0) ""
-  ["monthname"]=>
-  string(0) ""
-}
-string(0) ""
@@ -1,28 +0,0 @@
--TEST--
-jdtogregorian(): test overflow
--CREDITS--
-neweracracker@gmail.com
--SKIPIF--
-<?php
-if (!extension_loaded('calendar')) die('skip ext/calendar required');
-if (PHP_INT_SIZE != 4) die('skip this test is for 32bit platforms only');
-?>
--FILE--
-<?php
-for ($i=536838860; $i<536838870; $i++) {
-	echo $i, ':', jdtogregorian($i), PHP_EOL;
-}
-echo 'DONE', PHP_EOL;
-?>
--EXPECT--
-536838860:10/11/1465102
-536838861:10/12/1465102
-536838862:10/13/1465102
-536838863:10/14/1465102
-536838864:10/15/1465102
-536838865:10/16/1465102
-536838866:10/17/1465102
-536838867:0/0/0
-536838868:0/0/0
-536838869:0/0/0
-DONE
@@ -1,27 +0,0 @@
--TEST--
-jdtojewish(): test overflow
--CREDITS--
-neweracracker@gmail.com
--SKIPIF--
-<?php
-if (!extension_loaded('calendar')) die('skip ext/calendar required');
-?>
--FILE--
-<?php
-for ($i=324542840; $i<324542850; $i++) {
-	echo $i, ':', jdtojewish($i), PHP_EOL;
-}
-echo 'DONE', PHP_EOL;
-?>
--EXPECT--
-324542840:12/7/887605
-324542841:12/8/887605
-324542842:12/9/887605
-324542843:12/10/887605
-324542844:12/11/887605
-324542845:12/12/887605
-324542846:12/13/887605
-324542847:0/0/0
-324542848:0/0/0
-324542849:0/0/0
-DONE
@@ -553,10 +553,7 @@ int php_com_do_invoke_byref(php_com_dotnet_object *obj, zend_internal_function *
 			for (i = 0, j = 0; i < nargs; i++) {
 				/* if this was byref, update the zval */
 				if (f->arg_info[nargs - i - 1].pass_by_reference) {
-					zval *arg = &args[nargs - i - 1];
-
-					ZVAL_DEREF(arg);
-					SEPARATE_ZVAL_NOREF(arg);
+					SEPARATE_ZVAL_IF_NOT_REF(&args[nargs - i - 1]);

 					/* if the variant is pointing at the byref_vals, we need to map
 					 * the pointee value as a zval; otherwise, the value is pointing
@@ -564,12 +561,14 @@ int php_com_do_invoke_byref(php_com_dotnet_object *obj, zend_internal_function *
 					if (V_VT(&vargs[i]) & VT_BYREF) {
 						if (vargs[i].byref == &V_UINT(&byref_vals[j])) {
 							/* copy that value */
-							php_com_zval_from_variant(arg, &byref_vals[j], obj->code_page);
+							php_com_zval_from_variant(&args[nargs - i - 1], &byref_vals[j],
+								obj->code_page);
 						}
 					} else {
 						/* not sure if this can ever happen; the variant we marked as BYREF
 						 * is no longer BYREF - copy its value */
-						php_com_zval_from_variant(arg, &vargs[i], obj->code_page);
+						php_com_zval_from_variant(&args[nargs - i - 1], &vargs[i],
+							obj->code_page);
 					}
 					VariantClear(&byref_vals[j]);
 					j++;
@@ -279,6 +279,7 @@ static union _zend_function *com_method_get(zend_object **object_ptr, zend_strin
 		f.fn_flags = ZEND_ACC_CALL_VIA_HANDLER;
 		f.function_name = zend_string_copy(name);
 		f.handler = PHP_FN(com_method_handler);
+		zend_set_function_arg_flags((zend_function*)&f);

 		fptr = &f;

@@ -304,12 +305,11 @@ static union _zend_function *com_method_get(zend_object **object_ptr, zend_strin
 							for (i = 0; i < bindptr.lpfuncdesc->cParams; i++) {
 								f.arg_info[i].allow_null = 1;
 								if (bindptr.lpfuncdesc->lprgelemdescParam[i].paramdesc.wParamFlags & PARAMFLAG_FOUT) {
-									f.arg_info[i].pass_by_reference = ZEND_SEND_BY_REF;
+									f.arg_info[i].pass_by_reference = 1;
 								}
 							}

 							f.num_args = bindptr.lpfuncdesc->cParams;
-							zend_set_function_arg_flags((zend_function*)&f);

 							ITypeInfo_ReleaseFuncDesc(TI, bindptr.lpfuncdesc);
 							break;
@@ -100,12 +100,7 @@ PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codep
 {
 	OLECHAR *olestring;
 	php_com_dotnet_object *obj;
-	zend_uchar ztype = IS_NULL;
-
-	if (z) {
-		ZVAL_DEREF(z);
-		ztype = Z_TYPE_P(z);
-	}
+	zend_uchar ztype = (z == NULL ? IS_NULL : Z_TYPE_P(z));

 	switch (ztype) {
 		case IS_NULL:
@@ -1012,13 +1007,6 @@ PHP_FUNCTION(variant_date_from_timestamp)
 	tzset();
 	ttstamp = timestamp;
 	tmv = localtime(&ttstamp);
-#if ZEND_ENABLE_ZVAL_LONG64
-	/* Invalid after 23:59:59, December 31, 3000, UTC */
-	if (!tmv) {
-		php_error_docref(NULL, E_WARNING, "Invalid timestamp " ZEND_LONG_FMT, timestamp);
-		RETURN_FALSE;
-	}
-#endif
 	memset(&systime, 0, sizeof(systime));

 	systime.wDay = tmv->tm_mday;
@@ -1,16 +0,0 @@
--TEST--
-Bug #72498 variant_date_from_timestamp null dereference
--SKIPIF--
-<?php # vim:ft=php
-if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present";
-if (PHP_INT_SIZE != 8) print  "skip 64-bit only";
-?>
--FILE--
-<?php
-
-$v1 = PHP_INT_MAX;
-var_dump(variant_date_from_timestamp($v1));
-?>
--EXPECTF--
-Warning: variant_date_from_timestamp(): Invalid timestamp %d in %sbug72498.php on line %d
-bool(false)
@@ -1876,6 +1876,38 @@ static php_curl *alloc_curl_handle()
 /* }}} */

 #if LIBCURL_VERSION_NUM >= 0x071301 /* Available since 7.19.1 */
+/* {{{ split_certinfo
+ */
+static void split_certinfo(char *string, zval *hash)
+{
+	char *org = estrdup(string);
+	char *s = org;
+	char *split;
+
+	if(org) {
+		do {
+			char *key;
+			char *val;
+			char *tmp;
+
+			split = strstr(s, "; ");
+			if(split)
+				*split = '\0';
+
+			key = s;
+			tmp = memchr(key, '=', 64);
+			if(tmp) {
+				*tmp = '\0';
+				val = tmp+1;
+				add_assoc_string(hash, key, val);
+			}
+			s = split+2;
+		} while(split);
+		efree(org);
+	}
+}
+/* }}} */
+
 /* {{{ create_certinfo
 */
 static void create_certinfo(struct curl_certinfo *ci, zval *listcode)
@@ -1893,13 +1925,21 @@ static void create_certinfo(struct curl_certinfo *ci, zval *listcode)
 				int len;
 				char s[64];
 				char *tmp;
-				strncpy(s, slist->data, sizeof(s));
-				s[sizeof(s)-1] = '\0';
-				tmp = memchr(s, ':', sizeof(s));
+				strncpy(s, slist->data, 64);
+				tmp = memchr(s, ':', 64);
 				if(tmp) {
 					*tmp = '\0';
 					len = strlen(s);
-					add_assoc_string(&certhash, s, &slist->data[len+1]);
+					if (!strcmp(s, "Subject") || !strcmp(s, "Issuer")) {
+						zval hash;
+
+						array_init(&hash);
+
+						split_certinfo(&slist->data[len+1], &hash);
+						add_assoc_zval(&certhash, s, &hash);
+					} else {
+						add_assoc_string(&certhash, s, &slist->data[len+1]);
+					}
 				} else {
 					php_error_docref(NULL, E_WARNING, "Could not extract hash key from certificate info");
 				}
@@ -2618,12 +2658,10 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
 				}
 			} ZEND_HASH_FOREACH_END();

-			if (slist) {
-				if ((*ch->clone) == 1) {
-					zend_hash_index_update_ptr(ch->to_free->slist, option, slist);
-				} else {
-					zend_hash_next_index_insert_ptr(ch->to_free->slist, slist);
-				}
+			if ((*ch->clone) == 1) {
+				zend_hash_index_update_ptr(ch->to_free->slist, option, slist);
+			} else {
+				zend_hash_next_index_insert_ptr(ch->to_free->slist, slist);
 			}

 			error = curl_easy_setopt(ch->cp, option, slist);
@@ -3518,7 +3556,7 @@ PHP_FUNCTION(curl_reset)
 PHP_FUNCTION(curl_escape)
 {
 	char       *str = NULL, *res = NULL;
-	size_t     str_len = 0;
+	size_t        str_len = 0;
 	zval       *zid;
 	php_curl   *ch;

@@ -3530,10 +3568,6 @@ PHP_FUNCTION(curl_escape)
 		RETURN_FALSE;
 	}

-	if (ZEND_SIZE_T_INT_OVFL(str_len)) {
-		RETURN_FALSE;
-	}
-
 	if ((res = curl_easy_escape(ch->cp, str, str_len))) {
 		RETVAL_STRING(res);
 		curl_free(res);
@@ -3561,10 +3595,6 @@ PHP_FUNCTION(curl_unescape)
 		RETURN_FALSE;
 	}

-	if (ZEND_SIZE_T_INT_OVFL(str_len)) {
-		RETURN_FALSE;
-	}
-
 	if ((out = curl_easy_unescape(ch->cp, str, str_len, &out_len))) {
 		RETVAL_STRINGL(out, out_len);
 		curl_free(out);
@@ -310,33 +310,33 @@ void timelib_dump_rel_time(timelib_rel_time *d)

 timelib_long timelib_parse_tz_cor(char **ptr)
 {
-	char *begin = *ptr, *end;
-	timelib_long  tmp;
+        char *begin = *ptr, *end;
+        timelib_long  tmp;

-	while (isdigit(**ptr) || **ptr == ':') {
-		++*ptr;
-	}
-	end = *ptr;
-	switch (end - begin) {
-		case 1: /* H */
-		case 2: /* HH */
-			return HOUR(strtol(begin, NULL, 10));
-			break;
-		case 3: /* H:M */
-		case 4: /* H:MM, HH:M, HHMM */
-			if (begin[1] == ':') {
-				tmp = HOUR(strtol(begin, NULL, 10)) + strtol(begin + 2, NULL, 10);
-				return tmp;
-			} else if (begin[2] == ':') {
-				tmp = HOUR(strtol(begin, NULL, 10)) + strtol(begin + 3, NULL, 10);
-				return tmp;
-			} else {
-				tmp = strtol(begin, NULL, 10);
-				return HOUR(tmp / 100) + tmp % 100;
-			}
-		case 5: /* HH:MM */
-			tmp = HOUR(strtol(begin, NULL, 10)) + strtol(begin + 3, NULL, 10);
-			return tmp;
-	}
-	return 0;
+        while (isdigit(**ptr) || **ptr == ':') {
+                ++*ptr;
+        }
+        end = *ptr;
+        switch (end - begin) {
+                case 1:
+                case 2:
+                        return HOUR(strtol(begin, NULL, 10));
+                        break;
+                case 3:
+                case 4:
+                        if (begin[1] == ':') {
+                                tmp = HOUR(strtol(begin, NULL, 10)) + strtol(begin + 2, NULL, 10);
+                                return tmp;
+                        } else if (begin[2] == ':') {
+                                tmp = HOUR(strtol(begin, NULL, 10)) + strtol(begin + 3, NULL, 10);
+                                return tmp;
+                        } else {
+                                tmp = strtol(begin, NULL, 10);
+                                return HOUR(tmp / 100) + tmp % 100;
+                        }
+                case 5:
+                        tmp = HOUR(strtol(begin, NULL, 10)) + strtol(begin + 3, NULL, 10);
+                        return tmp;
+        }
+        return 0;
 }
@@ -38,8 +38,8 @@
 # define timelib_free    free
 #endif

-#define TIMELIB_VERSION 201602
-#define TIMELIB_ASCII_VERSION "2016.02"
+#define TIMELIB_VERSION 201502
+#define TIMELIB_ASCII_VERSION "2015.02"

 #define TIMELIB_NONE             0x00
 #define TIMELIB_OVERRIDE_TIME    0x01
@@ -152,17 +152,9 @@ static void do_adjust_for_weekday(timelib_time* time)
 	current_dow = timelib_day_of_week(time->y, time->m, time->d);
 	if (time->relative.weekday_behavior == 2)
 	{
-		/* To make "this week" work, where the current DOW is a "sunday" */
-		if (current_dow == 0 && time->relative.weekday != 0) {
-			time->relative.weekday = -6;
-		}
-
-		/* To make "sunday this week" work, where the current DOW is not a
-		 * "sunday" */
-		if (time->relative.weekday == 0 && current_dow != 0) {
+		if (time->relative.weekday == 0) {
 			time->relative.weekday = 7;
 		}
-
 		time->d -= current_dow;
 		time->d += time->relative.weekday;
 		return;
@@ -2013,7 +2013,6 @@ static void date_register_classes(void) /* {{{ */
 	date_object_handlers_immutable.clone_obj = date_object_clone_date;
 	date_object_handlers_immutable.compare_objects = date_object_compare_date;
 	date_object_handlers_immutable.get_properties = date_object_get_properties;
-	date_object_handlers_immutable.get_gc = date_object_get_gc;
 	zend_class_implements(date_ce_immutable, 1, date_ce_interface);

 	INIT_CLASS_ENTRY(ce_timezone, "DateTimeZone", date_funcs_timezone);
@@ -2171,7 +2170,7 @@ static HashTable *date_object_get_properties(zval *object) /* {{{ */

 	props = zend_std_get_properties(object);

-	if (!dateobj->time) {
+	if (!dateobj->time || GC_G(gc_active)) {
 		return props;
 	}

@@ -3611,7 +3610,6 @@ static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz, size

 	if (strlen(tz) != tz_len) {
 		php_error_docref(NULL, E_WARNING, "Timezone must not contain null bytes");
-		efree(dummy_t);
 		return FAILURE;
 	}

@@ -4853,7 +4851,7 @@ static HashTable *date_object_get_properties_period(zval *object) /* {{{ */

 	props = zend_std_get_properties(object);

-	if (!period_obj->start) {
+	if (!period_obj->start || GC_G(gc_active)) {
 		return props;
 	}

@@ -49,9 +49,9 @@ print "TZ=Asia/Baku - wrong day.\n";
 date_default_timezone_set("Asia/Baku");
 $tStamp = mktime (17, 17, 17, 1, 8299, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
-$strtotime_tstamp = strtotime("second Monday", $tStamp);
+$strtotime_tstamp = strtotime("next Sunday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
-print "wanted=Monday              00:00:00\n\n";
+print "wanted=Sunday              00:00:00\n\n";

 print "TZ=America/Noronha - wrong day.\n";
 date_default_timezone_set("America/Noronha");
@@ -227,8 +227,8 @@ wanted=Thursday             00:00:00

 TZ=Asia/Baku - wrong day.
 tStamp=Sunday 1992-09-20 17:17:17 AZST 1
-result=Monday 1992-09-28 00:00:00 AZT 0
-wanted=Monday              00:00:00
+result=Sunday 1992-09-27 00:00:00 AZT 0
+wanted=Sunday              00:00:00

 TZ=America/Noronha - wrong day.
 tStamp=Friday 1999-10-01 17:17:17 FNT 0
@@ -1,41 +0,0 @@
--TEST--
-Bug #63740 (strtotime seems to use both sunday and monday as start of week)
--FILE--
-<?php
-$dates = [
-	'2015-07-04',
-	'2015-07-05',
-	'2015-07-06',
-	'2015-07-07',
-	'2015-07-08',
-	'2015-07-09',
-	'2015-07-10',
-	'2015-07-11',
-	'2015-07-12',
-	'2015-07-13',
-	'2015-07-14',
-];
-
-foreach ( $dates as $date )
-{
-	$dt = new DateTimeImmutable( "$date 00:00 UTC" );
-
-	echo $dt->format( "D Y-m-d H:i" ), " → ";
-
-	$dtn = $dt->modify( "this week" );
-
-	echo $dtn->format( "D Y-m-d H:i" ), "\n";
-}
-?>
--EXPECT--
-Sat 2015-07-04 00:00 → Mon 2015-06-29 00:00
-Sun 2015-07-05 00:00 → Mon 2015-06-29 00:00
-Mon 2015-07-06 00:00 → Mon 2015-07-06 00:00
-Tue 2015-07-07 00:00 → Mon 2015-07-06 00:00
-Wed 2015-07-08 00:00 → Mon 2015-07-06 00:00
-Thu 2015-07-09 00:00 → Mon 2015-07-06 00:00
-Fri 2015-07-10 00:00 → Mon 2015-07-06 00:00
-Sat 2015-07-11 00:00 → Mon 2015-07-06 00:00
-Sun 2015-07-12 00:00 → Mon 2015-07-06 00:00
-Mon 2015-07-13 00:00 → Mon 2015-07-13 00:00
-Tue 2015-07-14 00:00 → Mon 2015-07-13 00:00
@@ -1,15 +0,0 @@
--TEST--
-Bug #66836 (DateTime::createFromFormat 'U' with pre 1970 dates fails parsing)
--INI--
-date.timezone=Europe/Berlin
--FILE--
-<?php
-foreach (['-1', '-86400', '-1000000'] as $timestamp) {
-    $dt = DateTime::createFromFormat('U', $timestamp);
-    var_dump($dt->format('U') === $timestamp);
-}
-?>
--EXPECT--
-bool(true)
-bool(true)
-bool(true)
@@ -250,7 +250,6 @@ val_type inifile_fetch(inifile *dba, const key_type *key, int skip) {
 	if (skip == -1 && dba->next.key.group && dba->next.key.name && !inifile_key_cmp(&dba->next.key, key)) {
 		/* we got position already from last fetch */
 		php_stream_seek(dba->fp, dba->next.pos, SEEK_SET);
-		ln.key.group = estrdup(dba->next.key.group);
 	} else {
 		/* specific instance or not same key -> restart search */
 		/* the slow way: restart and seacrch */
@@ -1,71 +0,0 @@
--TEST--
-Bug #70825 (Cannot fetch multiple values with group in ini file)
--SKIPIF--
-<?php
-if (!extension_loaded('dba')) die('skip dba extension not available');
-if (!in_array('inifile', dba_handlers())) die('skip inifile handler not available');
-?>
--FILE--
-<?php
-$filename = __DIR__ . DIRECTORY_SEPARATOR . 'bug70825.ini';
-
-$db = dba_open($filename, 'n', 'inifile');
-dba_insert('foo', 23, $db);
-dba_insert('foo', 42, $db);
-dba_insert('foo', 1337, $db);
-var_dump(dba_fetch('foo', -1, $db));
-var_dump(dba_fetch('foo', -1, $db));
-var_dump(dba_fetch('foo', -1, $db));
-dba_close($db);
-unlink($filename);
-
-$db = dba_open($filename, 'n', 'inifile');
-dba_insert(['foo', 'bar'], 23, $db);
-dba_insert(['foo', 'bar'], 42, $db);
-dba_insert(['foo', 'bar'], 1337, $db);
-var_dump(dba_fetch(['foo', 'bar'], -1, $db));
-var_dump(dba_fetch(['foo', 'bar'], -1, $db));
-var_dump(dba_fetch(['foo', 'bar'], -1, $db));
-dba_close($db);
-unlink($filename);
-
-$db = dba_open($filename, 'n', 'inifile');
-dba_insert('[foo]bar', 23, $db);
-dba_insert('[foo]bar', 42, $db);
-dba_insert('[foo]bar', 1337, $db);
-var_dump(dba_fetch('[foo]bar', -1, $db));
-var_dump(dba_fetch('[foo]bar', -1, $db));
-var_dump(dba_fetch('[foo]bar', -1, $db));
-dba_close($db);
-unlink($filename);
-
-$db = dba_open($filename, 'n', 'inifile');
-dba_insert('[foo]bar', 23, $db);
-dba_insert('[foo]bar', 42, $db);
-dba_insert('[foo]bar', 1337, $db);
-var_dump(dba_fetch('[foo]bar', 0, $db));
-var_dump(dba_fetch('[foo]bar', 1, $db));
-var_dump(dba_fetch('[foo]bar', 2, $db));
-dba_close($db);
-unlink($filename);
-?>
-==DONE==
--EXPECT--
-string(2) "23"
-string(2) "42"
-string(4) "1337"
-string(2) "23"
-string(2) "42"
-string(4) "1337"
-string(2) "23"
-string(2) "42"
-string(4) "1337"
-string(2) "23"
-string(2) "42"
-string(4) "1337"
-==DONE==
--CLEAN--
-<?php
-$filename = __DIR__ . DIRECTORY_SEPARATOR . 'bug70825.ini';
-unlink($filename);
-?>
@@ -1,28 +0,0 @@
--TEST--
-Bug #71514 (Bad dba_replace condition because of wrong API usage)
--SKIPIF--
-<?php
-if (!extension_loaded('dba')) die('skip dba extension not available');
-if (!in_array('inifile', dba_handlers())) die('skip inifile handler not available');
-?>
--FILE--
-<?php
-$filename = __DIR__ . DIRECTORY_SEPARATOR . 'bug71514.ini';
-
-$db = dba_open($filename, 'c', 'inifile');
-
-dba_insert('foo', 'value1', $db);
-dba_replace('foo', 'value2', $db);
-var_dump(dba_fetch('foo', $db));
-
-dba_close($db);
-?>
-==DONE==
--EXPECT--
-string(6) "value2"
-==DONE==
--CLEAN--
-<?php
-$filename = __DIR__ . DIRECTORY_SEPARATOR . 'bug71514.ini';
-unlink($filename);
-?>
@@ -40,7 +40,7 @@ do {
 	}
 	if ($handler != 'cdb') {
 		$db_writer = dba_open($db_filename, 'c'.$lock_flag, $handler);
-		if (($dba_reader = @dba_open($db_filename, 'r'.$lock_flag.'t', $handler))===false) {
+		if (($dba_reader = @dba_open($db_filename, 'r'.$lock_flag.($lock_flag ? 't' : ''), $handler))===false) {
 			echo "Read during write: not allowed\n";
 		} else {
 			echo "Read during write: allowed\n";
@@ -1,20 +0,0 @@
--TEST--
-Bug #66502 (DOM document dangling reference)
--SKIPIF--
-<?php
-if (!extension_loaded('dom')) die('skip requires ext/dom');
-?>
--FILE--
-<?php
-$dom = new DOMDocument('1.0', 'UTF-8');
-$element = $dom->appendChild(new DOMElement('root'));
-$comment = new DOMComment("Comment 0");
-$comment = $element->appendChild($comment);
-
-$comment->__construct("Comment 1");
-$comment->__construct("Comment 2");
-$comment->__construct("Comment 3");
-echo 'DONE', PHP_EOL;
-?>
--EXPECT--
-DONE
@@ -1703,10 +1703,6 @@ static void exif_iif_add_value(image_info_type *image_info, int section_index, c
 				break;
 		case TAG_FMT_UNDEFINED:
 			if (value) {
-				if (tag == TAG_MAKER_NOTE) {
-					length = MIN(length, strlen(value));
-				}
-
 				/* do not recompute length here */
 				info_value->s = estrndup(value, length);
 				info_data->length = length;
@@ -2608,7 +2604,6 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP
 	*pszEncoding = NULL;
 	/* Copy the comment */
 	if (ByteCount>=8) {
-		const zend_encoding *from, *to;
 		if (!memcmp(szValuePtr, "UNICODE\0", 8)) {
 			*pszEncoding = estrdup((const char*)szValuePtr);
 			szValuePtr = szValuePtr+8;
@@ -2629,16 +2624,15 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP
 			} else {
 				decode = ImageInfo->decode_unicode_le;
 			}
-			to = zend_multibyte_fetch_encoding(ImageInfo->encode_unicode);
-			from = zend_multibyte_fetch_encoding(decode);
 			/* XXX this will fail again if encoding_converter returns on error something different than SIZE_MAX   */
-			if (!to || !from || zend_multibyte_encoding_converter(
+			if (zend_multibyte_encoding_converter(
 					(unsigned char**)pszInfoPtr,
 					&len,
 					(unsigned char*)szValuePtr,
 					ByteCount,
-					to,
-					from) == (size_t)-1) {
+					zend_multibyte_fetch_encoding(ImageInfo->encode_unicode),
+					zend_multibyte_fetch_encoding(decode)
+					) == (size_t)-1) {
 				len = exif_process_string_raw(pszInfoPtr, szValuePtr, ByteCount);
 			}
 			return len;
@@ -2652,15 +2646,14 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP
 			szValuePtr = szValuePtr+8;
 			ByteCount -= 8;
 			/* XXX this will fail again if encoding_converter returns on error something different than SIZE_MAX   */
-			to = zend_multibyte_fetch_encoding(ImageInfo->encode_jis);
-			from = zend_multibyte_fetch_encoding(ImageInfo->motorola_intel ? ImageInfo->decode_jis_be : ImageInfo->decode_jis_le);
-			if (!to || !from || zend_multibyte_encoding_converter(
+			if (zend_multibyte_encoding_converter(
 					(unsigned char**)pszInfoPtr,
 					&len,
 					(unsigned char*)szValuePtr,
 					ByteCount,
-					to,
-					from) == (size_t)-1) {
+					zend_multibyte_fetch_encoding(ImageInfo->encode_jis),
+					zend_multibyte_fetch_encoding(ImageInfo->motorola_intel ? ImageInfo->decode_jis_be : ImageInfo->decode_jis_le)
+					) == (size_t)-1) {
 				len = exif_process_string_raw(pszInfoPtr, szValuePtr, ByteCount);
 			}
 			return len;
@@ -2716,14 +2709,8 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
 	char *dir_start;

 	for (i=0; i<=sizeof(maker_note_array)/sizeof(maker_note_type); i++) {
-		if (i==sizeof(maker_note_array)/sizeof(maker_note_type)) {
-#ifdef EXIF_DEBUG
-			exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "No maker note data found. Detected maker: %s (length = %d)", ImageInfo->make, strlen(ImageInfo->make));
-#endif
-			/* unknown manufacturer, not an error, use it as a string */
-			return TRUE;
-		}
-
+		if (i==sizeof(maker_note_array)/sizeof(maker_note_type))
+			return FALSE;
 		maker_note = maker_note_array+i;

 		/*exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "check (%s,%s)", maker_note->make?maker_note->make:"", maker_note->model?maker_note->model:"");*/
@@ -2736,12 +2723,6 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
 		break;
 	}

-	if (maker_note->offset >= value_len) {
-		/* Do not go past the value end */
-		exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "IFD data too short: 0x%04X offset 0x%04X", value_len, maker_note->offset);
-		return FALSE;
-	}
-
 	dir_start = value_ptr + maker_note->offset;

 #ifdef EXIF_DEBUG
@@ -2770,19 +2751,10 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
 			offset_base = value_ptr;
 			break;
 		case MN_OFFSET_GUESS:
-			if (maker_note->offset + 10 + 4 >= value_len) {
-				/* Can not read dir_start+10 since it's beyond value end */
-				exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "IFD data too short: 0x%04X", value_len);
-				return FALSE;
-			}
 			offset_diff = 2 + NumDirEntries*12 + 4 - php_ifd_get32u(dir_start+10, ImageInfo->motorola_intel);
 #ifdef EXIF_DEBUG
 			exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Using automatic offset correction: 0x%04X", ((int)dir_start-(int)offset_base+maker_note->offset+displacement) + offset_diff);
 #endif
-			if (offset_diff < 0 || offset_diff >= value_len ) {
-				exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "IFD data bad offset: 0x%04X length 0x%04X", offset_diff, value_len);
-				return FALSE;
-			}
 			offset_base = value_ptr + offset_diff;
 			break;
 		default:
@@ -2791,7 +2763,7 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu
 	}

 	if ((2+NumDirEntries*12) > value_len) {
-		exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Illegal IFD size: 2 + 0x%04X*12 = 0x%04X > 0x%04X", NumDirEntries, 2+NumDirEntries*12, value_len);
+		exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Illegal IFD size: 2 + x%04X*12 = x%04X > x%04X", NumDirEntries, 2+NumDirEntries*12, value_len);
 		return FALSE;
 	}

@@ -2897,11 +2869,11 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 			}

 			fpos = php_stream_tell(ImageInfo->infile);
-			php_stream_seek(ImageInfo->infile, displacement+offset_val, SEEK_SET);
+			php_stream_seek(ImageInfo->infile, offset_val, SEEK_SET);
 			fgot = php_stream_tell(ImageInfo->infile);
-			if (fgot!=displacement+offset_val) {
+			if (fgot!=offset_val) {
 				EFREE_IF(outside);
-				exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Wrong file pointer: 0x%08X != 0x%08X", fgot, displacement+offset_val);
+				exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Wrong file pointer: 0x%08X != 0x%08X", fgot, offset_val);
 				return FALSE;
 			}
 			fgot = php_stream_read(ImageInfo->infile, value_ptr, byte_count);
@@ -3077,10 +3049,7 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
 				break;

 			case TAG_MAKER_NOTE:
-				if (!exif_process_IFD_in_MAKERNOTE(ImageInfo, value_ptr, byte_count, offset_base, IFDlength, displacement)) {
-					EFREE_IF(outside);
-					return FALSE;
-				}
+				exif_process_IFD_in_MAKERNOTE(ImageInfo, value_ptr, byte_count, offset_base, IFDlength, displacement);
 				break;

 			case TAG_EXIF_IFD_POINTER:
@@ -3757,11 +3726,8 @@ static int exif_process_IFD_in_TIFF(image_info_type *ImageInfo, size_t dir_offse
 						fgot = php_stream_read(ImageInfo->infile, ImageInfo->Thumbnail.data, ImageInfo->Thumbnail.size);
 						if (fgot < ImageInfo->Thumbnail.size) {
 							EXIF_ERRLOG_THUMBEOF(ImageInfo)
-							efree(ImageInfo->Thumbnail.data);
-							ImageInfo->Thumbnail.data = NULL;
-						} else {
-							exif_thumbnail_build(ImageInfo);
 						}
+						exif_thumbnail_build(ImageInfo);
 					}
 #ifdef EXIF_DEBUG
 					exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Read next IFD (THUMBNAIL) done");
@@ -1,140 +0,0 @@
--TEST--
-Bug #50845 (exif_read_data() returns corrupted exif headers)
--SKIPIF--
-<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--FILE--
-<?php
-$infile = dirname(__FILE__).'/bug50845.jpg';
-var_dump(exif_read_data($infile));
--EXPECTF--
-array(44) {
-  ["FileName"]=>
-  string(12) "bug50845.jpg"
-  ["FileDateTime"]=>
-  int(%d)
-  ["FileSize"]=>
-  int(803603)
-  ["FileType"]=>
-  int(2)
-  ["MimeType"]=>
-  string(10) "image/jpeg"
-  ["SectionsFound"]=>
-  string(30) "ANY_TAG, IFD0, THUMBNAIL, EXIF"
-  ["COMPUTED"]=>
-  array(9) {
-    ["html"]=>
-    string(26) "width="5472" height="3648""
-    ["Height"]=>
-    int(3648)
-    ["Width"]=>
-    int(5472)
-    ["IsColor"]=>
-    int(1)
-    ["ByteOrderMotorola"]=>
-    int(0)
-    ["ApertureFNumber"]=>
-    string(5) "f/7.1"
-    ["Copyright"]=>
-    string(13) "Public Domain"
-    ["Thumbnail.FileType"]=>
-    int(2)
-    ["Thumbnail.MimeType"]=>
-    string(10) "image/jpeg"
-  }
-  ["ImageDescription"]=>
-  string(295) "A U.S. Marine Corps MV-22 Osprey lands on the USS Whidbey Island (LSD-41), May 5, 2016. The vehicles were loaded to support a theater security cooperation event as a part of a MEU readiness exercise. (U.S. Marine Corps photo by Lance Cpl. Koby I. Saunders/22 Marine Expeditionary Unit/ Released)"
-  ["Make"]=>
-  string(5) "Canon"
-  ["Model"]=>
-  string(22) "Canon EOS-1D X Mark II"
-  ["Orientation"]=>
-  int(1)
-  ["XResolution"]=>
-  string(5) "240/1"
-  ["YResolution"]=>
-  string(5) "240/1"
-  ["ResolutionUnit"]=>
-  int(2)
-  ["Artist"]=>
-  string(24) "Lance Cpl. Koby Saunders"
-  ["Copyright"]=>
-  string(13) "Public Domain"
-  ["Exif_IFD_Pointer"]=>
-  int(12572)
-  ["THUMBNAIL"]=>
-  array(6) {
-    ["Compression"]=>
-    int(6)
-    ["XResolution"]=>
-    string(5) "240/1"
-    ["YResolution"]=>
-    string(5) "240/1"
-    ["ResolutionUnit"]=>
-    int(2)
-    ["JPEGInterchangeFormat"]=>
-    int(860)
-    ["JPEGInterchangeFormatLength"]=>
-    int(11204)
-  }
-  ["ExposureTime"]=>
-  string(5) "1/200"
-  ["FNumber"]=>
-  string(5) "71/10"
-  ["ExposureProgram"]=>
-  int(1)
-  ["ISOSpeedRatings"]=>
-  int(100)
-  ["UndefinedTag:0x8830"]=>
-  int(2)
-  ["UndefinedTag:0x8832"]=>
-  int(100)
-  ["ExifVersion"]=>
-  string(4) "0230"
-  ["ShutterSpeedValue"]=>
-  string(15) "7643856/1000000"
-  ["ApertureValue"]=>
-  string(15) "5655638/1000000"
-  ["ExposureBiasValue"]=>
-  string(3) "0/1"
-  ["MaxApertureValue"]=>
-  string(3) "4/1"
-  ["MeteringMode"]=>
-  int(5)
-  ["Flash"]=>
-  int(16)
-  ["FocalLength"]=>
-  string(4) "24/1"
-  ["ColorSpace"]=>
-  int(65535)
-  ["FocalPlaneXResolution"]=>
-  string(12) "5472000/1438"
-  ["FocalPlaneYResolution"]=>
-  string(11) "3648000/958"
-  ["FocalPlaneResolutionUnit"]=>
-  int(2)
-  ["CustomRendered"]=>
-  int(0)
-  ["ExposureMode"]=>
-  int(1)
-  ["WhiteBalance"]=>
-  int(0)
-  ["SceneCaptureType"]=>
-  int(0)
-  ["UndefinedTag:0xA431"]=>
-  string(12) "002099000358"
-  ["UndefinedTag:0xA432"]=>
-  array(4) {
-    [0]=>
-    string(4) "24/1"
-    [1]=>
-    string(5) "105/1"
-    [2]=>
-    string(3) "0/0"
-    [3]=>
-    string(3) "0/0"
-  }
-  ["UndefinedTag:0xA434"]=>
-  string(22) "EF24-105mm f/4L IS USM"
-  ["UndefinedTag:0xA435"]=>
-  string(10) "000044bc4c"
-}
@@ -13,4 +13,8 @@ exif_read_data(__DIR__ . '/bug54002_2.jpeg');
 --EXPECTF--
 Warning: exif_read_data(bug54002_1.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d

-Warning: exif_read_data(bug54002_2.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d
+Warning: exif_read_data(bug54002_1.jpeg): Process tag(xA000=FlashPixVer): Illegal pointer offset(%s) in %sbug54002.php on line %d
+
+Warning: exif_read_data(bug54002_2.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d
+
+Warning: exif_read_data(bug54002_2.jpeg): Process tag(xA000=FlashPixVer): Illegal pointer offset(%s) in %sbug54002.php on line %d
@@ -10,9 +10,7 @@ echo "Test\n";
 var_dump(count(exif_read_data(__DIR__."/bug62523_2.jpg")));
 ?>
 Done
--EXPECTF--
+--EXPECT--
 Test
-
-Warning: exif_read_data(bug62523_2.jpg): IFD data bad offset: 0xADB23672 length 0x0D94 in %s%ebug62523_2.php on line %d
-int(30)
+int(76)
 Done
@@ -1,11 +0,0 @@
--TEST--
-Bug #72603 (Out of bound read in exif_process_IFD_in_MAKERNOTE)
--SKIPIF--
-<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--FILE--
-<?php
-var_dump(count(exif_read_data(dirname(__FILE__) . "/bug72603.jpeg")));
-?>
--EXPECTF--
-Warning: exif_read_data(bug72603.jpeg): %s in %s%ebug72603.php on line %d
-int(%d)
@@ -1,11 +0,0 @@
--TEST--
-Bug 72618 (NULL Pointer Dereference in exif_process_user_comment)
--SKIPIF--
-<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--FILE--
-<?php
-var_dump(count(exif_read_data(dirname(__FILE__) . "/bug72618.jpg")));
-?>
--EXPECTF--
-Warning: exif_read_data(bug72618.jpg): %s in %s%ebug72618.php on line %d
-int(%d)
@@ -1,71 +0,0 @@
--TEST--
-Bug #72627 (Memory Leakage In exif_process_IFD_in_TIFF)
--SKIPIF--
-<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--FILE--
-<?php
-	$exif = exif_read_data(__DIR__ . '/bug72627.tiff',0,0,true);
-	var_dump($exif);
-?>
--EXPECTF--
-Warning: exif_read_data(%s): Thumbnail goes IFD boundary or end of file reached in %sbug72627.php on line %d
-
-Warning: exif_read_data(%s): Error in TIFF: filesize(x04E2) less than start of IFD dir(x829A0004) in %sbug72627.php on line %d
-
-Warning: exif_read_data(%s): Thumbnail goes IFD boundary or end of file reached in %sbug72627.php on line %d
-array(11) {
-  ["FileName"]=>
-  string(13) "bug72627.tiff"
-  ["FileDateTime"]=>
-  int(%d)
-  ["FileSize"]=>
-  int(1250)
-  ["FileType"]=>
-  int(7)
-  ["MimeType"]=>
-  string(10) "image/tiff"
-  ["SectionsFound"]=>
-  string(30) "ANY_TAG, IFD0, THUMBNAIL, EXIF"
-  ["COMPUTED"]=>
-  array(10) {
-    ["html"]=>
-    string(24) "width="128" height="132""
-    ["Height"]=>
-    int(132)
-    ["Width"]=>
-    int(128)
-    ["IsColor"]=>
-    int(0)
-    ["ByteOrderMotorola"]=>
-    int(0)
-    ["ApertureFNumber"]=>
-    string(5) "f/1.0"
-    ["Thumbnail.FileType"]=>
-    int(2)
-    ["Thumbnail.MimeType"]=>
-    string(10) "image/jpeg"
-    ["Thumbnail.Height"]=>
-    int(132)
-    ["Thumbnail.Width"]=>
-    int(128)
-  }
-  ["XResolution"]=>
-  string(21) "1414812756/1414812756"
-  ["THUMBNAIL"]=>
-  array(5) {
-    ["ImageWidth"]=>
-    int(128)
-    ["ImageLength"]=>
-    int(132)
-    ["JPEGInterchangeFormat"]=>
-    int(1280)
-    ["JPEGInterchangeFormatLength"]=>
-    int(100)
-    ["THUMBNAIL"]=>
-    NULL
-  }
-  ["ExposureTime"]=>
-  string(21) "1414812756/1414812756"
-  ["FNumber"]=>
-  string(21) "1414812756/1414812756"
-}
@@ -1,22 +0,0 @@
--TEST--
-Bug #69107 (finfo no longer detects PHP files)
--SKIPIF--
-<?php
-if (!extension_loaded('fileinfo')) die('skip fileinfo extension not available');
-?>
--FILE--
-<?php
-$finfo = new finfo(FILEINFO_MIME_TYPE);
-
-var_dump($finfo->buffer("<?php\nclass A{}"));
-var_dump($finfo->buffer("<?php class A{}"));
-var_dump($finfo->buffer("<?php\tclass A{}"));
-var_dump($finfo->buffer("<?php\n\rclass A{}"));
-?>
-===DONE===
--EXPECT--
-string(10) "text/x-php"
-string(10) "text/x-php"
-string(10) "text/x-php"
-string(10) "text/x-php"
-===DONE===
@@ -779,7 +779,6 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 			if (flags & FILTER_FLAG_NO_PRIV_RANGE) {
 				if (
 					(ip[0] == 10) ||
-					(ip[0] == 169 && ip[1] == 254) ||
 					(ip[0] == 172 && (ip[1] >= 16 && ip[1] <= 31)) ||
 					(ip[0] == 192 && ip[1] == 168)
 				) {
@@ -790,18 +789,10 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 			if (flags & FILTER_FLAG_NO_RES_RANGE) {
 				if (
 					(ip[0] == 0) ||
-					(ip[0] == 10) ||
 					(ip[0] == 100 && (ip[1] >= 64 && ip[1] <= 127)) ||
-					(ip[0] == 127) ||
 					(ip[0] == 169 && ip[1] == 254) ||
-					(ip[0] == 172 && (ip[1] >= 16 && ip[1] <= 31)) ||
-					(ip[0] == 192 && ip[1] == 0 && ip[2] == 0) ||
 					(ip[0] == 192 && ip[1] == 0 && ip[2] == 2) ||
-					(ip[0] == 192 && ip[1] == 88 && ip[2] == 99) ||
-					(ip[0] == 192 && ip[1] == 168) ||
-					(ip[0] == 198 && (ip[1] == 18 || ip[1] == 19)) ||
-					(ip[0] == 198 && ip[1] == 51 && ip[2] == 100) ||
-					(ip[0] == 203 && ip[1] == 0 && ip[2] == 113) ||
+					(ip[0] == 127 && ip[1] == 0 && ip[2] == 0 && ip[3] == 1) ||
 					(ip[0] >= 224 && ip[0] <= 255)
 				) {
 					RETURN_VALIDATION_FAILED
@@ -41,7 +41,7 @@ string(9) "127.0.0.1"
 bool(false)
 string(12) "192.0.34.166"
 bool(false)
-bool(false)
+string(9) "192.0.0.1"
 bool(false)
 bool(false)
 string(12) "192.0.34.166"
@@ -1,137 +0,0 @@
--TEST--
-Bug #71745 FILTER_FLAG_NO_RES_RANGE does not cover whole 127.0.0.0/8 range
--FILE--
-<?php
-//https://tools.ietf.org/html/rfc6890#section-2.1
-
-$privateRanges = array();
-// 10.0.0.0/8
-$privateRanges['10.0.0.0/8'] = array('10.0.0.0', '10.255.255.255');
-
-// 169.254.0.0/16
-$privateRanges['168.254.0.0/16'] = array('169.254.0.0', '169.254.255.255');
-
-// 172.16.0.0/12
-$privateRanges['172.16.0.0/12'] = array('172.16.0.0', '172.31.0.0');
-
-// 192.168.0.0/16
-$privateRanges['192.168.0.0/16'] = array('192.168.0.0', '192.168.255.255');
-
-foreach ($privateRanges as $key => $range) {
-	list($min, $max) = $range;
-	var_dump($key);
-	var_dump(filter_var($min, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE));
-	var_dump(filter_var($max, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE));
-}
-
-$reservedRanges = array();
-
-// 0.0.0.0/8
-$reserverRanges['0.0.0.0/8'] = array('0.0.0.0', '0.255.255.255');
-
-// 10.0.0.0/8
-$reserverdRanges['10.0.0.0/8'] = array('10.0.0.0', '10.255.255.255');
-
-// 100.64.0.0/10
-$reserverdRanges['10.64.0.0/10'] = array('100.64.0.0', '100.127.255.255');
-
-// 127.0.0.0/8
-$reserverdRanges['127.0.0.0/8'] = array('127.0.0.0', '127.255.255.255');
-
-// 169.254.0.0/16
-$reserverdRanges['169.254.0.0/16'] = array('169.254.0.0', '169.254.255.255');
-
-// 172.16.0.0/12
-$reserverdRanges['172.16.0.0/12'] = array('172.16.0.0', '172.31.0.0');
-
-// 192.0.0.0/24
-$reserverdRanges['192.0.0.0/24'] = array('192.0.0.0', '192.0.0.255');
-
-// 192.0.0.0/29
-$reserverdRanges['192.0.0.0/29'] = array('192.0.0.0', '192.0.0.7');
-
-// 192.0.2.0/24
-$reserverdRanges['192.0.2.0/24'] = array('192.0.2.0', '192.0.2.255');
-
-// 198.18.0.0/15
-$reserverdRanges['198.18.0.0/15'] = array('198.18.0.0', '198.19.255.255');
-
-// 198.51.100.0/24
-$reserverdRanges['198.51.100.0/24'] = array('198.51.100.0', '198.51.100.255');
-
-// 192.88.99.0/24
-$reserverdRanges['192.88.99.0/24'] = array('192.88.99.0', '192.88.99.255');
-
-// 192.168.0.0/16
-$reserverdRanges['192.168.0.0/16'] = array('192.168.0.0', '192.168.255.255');
-
-// 203.0.113.0/24
-$reserverdRanges['203.0.113.0/24'] = array('203.0.113.0', '203.0.113.255');
-
-// 240.0.0.0/4 + 255.255.255.255/32
-$reserverdRanges['240.0.0.0/4'] = array('224.0.0.0', '255.255.255.255');
-
-foreach ($reserverdRanges as $key => $range) {
-	list($min, $max) = $range;
-	var_dump($key);
-	var_dump(filter_var($min, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_NO_RES_RANGE));
-	var_dump(filter_var($max, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_NO_RES_RANGE));
-}
-
-
-
--EXPECT--
-string(10) "10.0.0.0/8"
-bool(false)
-bool(false)
-string(14) "168.254.0.0/16"
-bool(false)
-bool(false)
-string(13) "172.16.0.0/12"
-bool(false)
-bool(false)
-string(14) "192.168.0.0/16"
-bool(false)
-bool(false)
-string(10) "10.0.0.0/8"
-bool(false)
-bool(false)
-string(12) "10.64.0.0/10"
-bool(false)
-bool(false)
-string(11) "127.0.0.0/8"
-bool(false)
-bool(false)
-string(14) "169.254.0.0/16"
-bool(false)
-bool(false)
-string(13) "172.16.0.0/12"
-bool(false)
-bool(false)
-string(12) "192.0.0.0/24"
-bool(false)
-bool(false)
-string(12) "192.0.0.0/29"
-bool(false)
-bool(false)
-string(12) "192.0.2.0/24"
-bool(false)
-bool(false)
-string(13) "198.18.0.0/15"
-bool(false)
-bool(false)
-string(15) "198.51.100.0/24"
-bool(false)
-bool(false)
-string(14) "192.88.99.0/24"
-bool(false)
-bool(false)
-string(14) "192.168.0.0/16"
-bool(false)
-bool(false)
-string(14) "203.0.113.0/24"
-bool(false)
-bool(false)
-string(11) "240.0.0.0/4"
-bool(false)
-bool(false)
@@ -291,9 +291,6 @@ ftp_login(ftpbuf_t *ftp, const char *user, const char *pass)
 #endif
 		SSL_CTX_set_options(ctx, ssl_ctx_options);

-		/* allow SSL to re-use sessions */
-		SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_BOTH);
-
 		ftp->ssl_handle = SSL_new(ctx);
 		if (ftp->ssl_handle == NULL) {
 			php_error_docref(NULL, E_WARNING, "failed to create the SSL handle");
@@ -1640,7 +1637,7 @@ data_accept(databuf_t *data, ftpbuf_t *ftp)

 #ifdef HAVE_FTP_SSL
 	SSL_CTX		*ctx;
-	SSL_SESSION *session;
+	zend_long ssl_ctx_options = SSL_OP_ALL;
 	int err, res;
 	zend_bool retry;
 #endif
@@ -1663,40 +1660,31 @@ data_accepted:

 	/* now enable ssl if we need to */
 	if (ftp->use_ssl && ftp->use_ssl_for_data) {
-		ctx = SSL_get_SSL_CTX(ftp->ssl_handle);
+		ctx = SSL_CTX_new(SSLv23_client_method());
 		if (ctx == NULL) {
-			php_error_docref(NULL, E_WARNING, "data_accept: failed to retreive the existing SSL context");
+			php_error_docref(NULL, E_WARNING, "data_accept: failed to create the SSL context");
 			return 0;
 		}

+#if OPENSSL_VERSION_NUMBER >= 0x0090605fL
+		ssl_ctx_options &= ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
+#endif
+		SSL_CTX_set_options(ctx, ssl_ctx_options);
+
 		data->ssl_handle = SSL_new(ctx);
 		if (data->ssl_handle == NULL) {
 			php_error_docref(NULL, E_WARNING, "data_accept: failed to create the SSL handle");
+			SSL_CTX_free(ctx);
 			return 0;
 		}

+
 		SSL_set_fd(data->ssl_handle, data->fd);

 		if (ftp->old_ssl) {
 			SSL_copy_session_id(data->ssl_handle, ftp->ssl_handle);
 		}

-		/* get the session from the control connection so we can re-use it */
-		session = SSL_get_session(ftp->ssl_handle);
-		if (session == NULL) {
-			php_error_docref(NULL, E_WARNING, "data_accept: failed to retreive the existing SSL session");
-			SSL_free(data->ssl_handle);
-			return 0;
-		}
-
-		/* and set it on the data connection */
-		res = SSL_set_session(data->ssl_handle, session);
-		if (res == 0) {
-			php_error_docref(NULL, E_WARNING, "data_accept: failed to set the existing SSL session");
-			SSL_free(data->ssl_handle);
-			return 0;
-		}
-
 		do {
 			res = SSL_connect(data->ssl_handle);
 			err = SSL_get_error(data->ssl_handle, res);
@@ -1757,7 +1745,10 @@ data_close(ftpbuf_t *ftp, databuf_t *data)
 	if (data->listener != -1) {
 #ifdef HAVE_FTP_SSL
 		if (data->ssl_active) {
-			/* don't free the data context, it's the same as the control */
+
+			ctx = SSL_get_SSL_CTX(data->ssl_handle);
+			SSL_CTX_free(ctx);
+
 			SSL_shutdown(data->ssl_handle);
 			SSL_free(data->ssl_handle);
 			data->ssl_active = 0;
@@ -1768,7 +1759,9 @@ data_close(ftpbuf_t *ftp, databuf_t *data)
 	if (data->fd != -1) {
 #ifdef HAVE_FTP_SSL
 		if (data->ssl_active) {
-			/* don't free the data context, it's the same as the control */
+			ctx = SSL_get_SSL_CTX(data->ssl_handle);
+			SSL_CTX_free(ctx);
+
 			SSL_shutdown(data->ssl_handle);
 			SSL_free(data->ssl_handle);
 			data->ssl_active = 0;
@@ -1,49 +1,48 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBmzCCAQQCAQAwWzELMAkGA1UEBhMCUFQxCzAJBgNVBAgTAkx4MQswCQYDVQQH
+EwJMeDEcMBoGA1UEChMTQSBtaW5oYSBlbXByZXNhLCBTQTEUMBIGA1UECxMLUEhQ
+IFFBIFRlYW0wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM9mfEOSYwXf58ch
+4NyO1QOU1XMfquz8OVpvMUITABLAevZpeQn6vZPHNyXHFQC0QC8scydK1rAYd2U+
+9K2aPub6ioMjYyjPpAE07l9EAAPUEBlqqsziB/wT8QjWkByyJEkYu+o0Wyjokhfn
+BMPvm52wLWUx9nvUeNDCftnKg1wxAgMBAAGgADANBgkqhkiG9w0BAQQFAAOBgQDD
+s1FeqPxnF2bWj8/dG8MyPaRfOAMVz1UsCZUciXIVG5LSIvR2qnMC3iEYt3s13sEq
+z8VJlNHa8nniE+VFNv093yIu+PlWXMEvb5y5EFqP2AYq3RAT+SJsSxGqIdzPZiKY
+INaktLCZmQ/E1v7/4hFzVRq9ydJI82DVS1nv282Whw==
+-----END CERTIFICATE REQUEST-----
 -----BEGIN CERTIFICATE-----
-MIIDhTCCAm2gAwIBAgIJAN75FFz+owOAMA0GCSqGSIb3DQEBCwUAMFkxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMMCTEyNy4wLjAuMTAeFw0xNjA3MjUxMjM3
-MTJaFw0yNjA3MjMxMjM3MTJaMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21l
-LVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNV
-BAMMCTEyNy4wLjAuMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALtG
-AIrNUDItISfpAqztL2TFEWEHLGTzCEh5Ag2sdMD7UYbqIPHLOE4EINv+dqEMM0Nz
-LYnw7ChtVegXT907xCaQcmeDFSdhqze4L8zawDfnn4syB8XAwGYJfpstYwe3nO6+
-0WvLSb1A5TYNeyoXjwlAUKElxkeWAo51uhR41GDhDQ9GgpqX1ccAhmSoUhgIRSzf
-6f4KE3WTdzl1p12ZtkYHB8Jo2jB/JXnwGOz6isLnpRvkex4B7sUX+7u1MqK/e1X7
-Hi1G/VkaAfC2SOfjTePtGBDBXrQ1arYXDPRA04sgFzSh55l7lC/4HasQ/jAb3h95
-dcEIqyc69iioaN1c1NcCAwEAAaNQME4wHQYDVR0OBBYEFNv3kefb1H+6/6CpjiBi
-+I2s9E90MB8GA1UdIwQYMBaAFNv3kefb1H+6/6CpjiBi+I2s9E90MAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAIzSEWpHSaBs7KduBRXX5+qFxBN6OCPl
-7ID0rxAOYfw7ruzbmwgOpBgMIHGn+KqA6CmQI0jh9bZbv5TV2aFpFsUihugPc2lW
-5EshCozxlEPmIJNsO8jDqPE4w3m4KiVTscRWjBa5cco+lwLDqboerm2l7vvrtr6B
-pgLaZct1c73MouvoJSCGK5EOGW7jsgaxjxJ3UZug+24Ko1wulO2cgBLhda9Ilrnx
-CIKI9h8Z2WVWuVQfyCyO1g7XkJgkBec77OhxD+m4onzPY6waqnnhmFOBcS+gKgBV
-jHeK9DCvZ9zet3EyEp6fyQOOtsC+gU0piYgfsQL7aCp5oLe+fjTiuUY=
+MIIC4zCCAkygAwIBAgIBADANBgkqhkiG9w0BAQQFADBbMQswCQYDVQQGEwJQVDEL
+MAkGA1UECBMCTHgxCzAJBgNVBAcTAkx4MRwwGgYDVQQKExNBIG1pbmhhIGVtcHJl
+c2EsIFNBMRQwEgYDVQQLEwtQSFAgUUEgVGVhbTAeFw0wNjExMTkxODIzNTNaFw0w
+NzExMTkxODIzNTNaMFsxCzAJBgNVBAYTAlBUMQswCQYDVQQIEwJMeDELMAkGA1UE
+BxMCTHgxHDAaBgNVBAoTE0EgbWluaGEgZW1wcmVzYSwgU0ExFDASBgNVBAsTC1BI
+UCBRQSBUZWFtMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPZnxDkmMF3+fH
+IeDcjtUDlNVzH6rs/DlabzFCEwASwHr2aXkJ+r2TxzclxxUAtEAvLHMnStawGHdl
+PvStmj7m+oqDI2Moz6QBNO5fRAAD1BAZaqrM4gf8E/EI1pAcsiRJGLvqNFso6JIX
+5wTD75udsC1lMfZ71HjQwn7ZyoNcMQIDAQABo4G2MIGzMB0GA1UdDgQWBBTIga5L
+q+Ub1SWXgNZRYCpq3c8Z+jCBgwYDVR0jBHwweoAUyIGuS6vlG9Ull4DWUWAqat3P
+GfqhX6RdMFsxCzAJBgNVBAYTAlBUMQswCQYDVQQIEwJMeDELMAkGA1UEBxMCTHgx
+HDAaBgNVBAoTE0EgbWluaGEgZW1wcmVzYSwgU0ExFDASBgNVBAsTC1BIUCBRQSBU
+ZWFtggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAe6AA8aC3KDI8
+smd+7XWjaTSp1Q0uMkEZ2PEBzif2I1aPPqw1CQykJ1iDdC/8PJ1yEIezloP2XQoZ
+NjTaCO+uubay03ncoPTZvDUwExN9BYFAYgc2z3tLMHYbA7kM2sIbKys7ZQegLibr
+TSKYQOBeYA/FB9GHECJGU3zBRvYi+Og=
 -----END CERTIFICATE-----
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC7RgCKzVAyLSEn
-6QKs7S9kxRFhByxk8whIeQINrHTA+1GG6iDxyzhOBCDb/nahDDNDcy2J8OwobVXo
-F0/dO8QmkHJngxUnYas3uC/M2sA355+LMgfFwMBmCX6bLWMHt5zuvtFry0m9QOU2
-DXsqF48JQFChJcZHlgKOdboUeNRg4Q0PRoKal9XHAIZkqFIYCEUs3+n+ChN1k3c5
-daddmbZGBwfCaNowfyV58Bjs+orC56Ub5HseAe7FF/u7tTKiv3tV+x4tRv1ZGgHw
-tkjn403j7RgQwV60NWq2Fwz0QNOLIBc0oeeZe5Qv+B2rEP4wG94feXXBCKsnOvYo
-qGjdXNTXAgMBAAECggEAD7yDISa9fWnjZlojGmrX16zjl/alWVo+sPBSJtn9+ZVk
-tWSJHihIc+3O4Q2R5FiFGj7cbcHr5j3BwT3sPRfflKoAowgVx/hiDc2RXrJnAouZ
-EXZDxu86e5iCpgF7V9OrATjRmjA74wZH/HHHjrLqFwnrfI8TCULmthfYag35Mqax
-qrIEzvSuYdaGxblNe+ZfnVEDW2F9DLBGcma0ffUlJp8AvV7bpo8Rj/JovPxit/VS
-UdwSRxwSAugctFpmcGlFkoQfxUx1WdEy8hjopLrayMjCCJvRUL4+C4zT9r9PBHOj
-fCSbJ+ajQIoRrgaL9bURk8BFMHY8+yMUsWEYVSmFAQKBgQDtOvPkhvZsNocUB5nJ
-ti3SXyDQ6OZQuKKHPSeDV/EvmZKeNlrQ1ZnwXLP3vkcedDOkt1nEVq/hUewpjt08
-2MvmMwJBQEnmbTzMf43DtlXsStdP1lhYaFbU4iMM5zRfyBHDu1GPZEPXvKKpJUk0
-M+jYIyTAP3mcZhqDKn0mPVP7VwKBgQDKFy9DtWFKxCvhFQvHx7YeZiVWJbIst/O4
-ZyuPVAErni0hzSeCkmm7+F9hgEdPSLRcSaeTWP4L0u1cixECKboIhoNs38aft7o3
-MdnI2RDSEKtKX2uVuhvpGDNuGpBAc8Qu8iCiv5INSC36ZhD1h++O/TiiUdgRJ3yX
-yeG7ej+CgQKBgCR5F95e0aw5hfMSaBaXJ9xcO9Niu2ZVvMdGI7kR4EcNOXmRqczJ
-ym0mE5VXb9/Cxd3hQq/pFAl0avbIvEMKoe62kPYvSC1hRiO6yLT6Z6N4rjncHqEZ
-CaCZVAI72dWQEQsi1ZtSMwwMOIYA8YxRHs98N75HBA+DszfPZIZoj2zpAoGBAJHp
-B3ElhmeLF/tdTLIj2bQ9H/wBH5H2Bvw/UU4c4vNxMzjSfRJjUAAtpgAptFLkNYTk
-kR9sA5DZ7BMDPXaIVg9Nv5peP3SWHNc5IPtI7kIdUu9R0cW7J+e2V3vJphlC/ITA
-wRuAoZ0BXmEKTHhae3aMEdXwrcZE8kpNsrO/4hcBAoGBAMISiPJPuxAX1UtqcxTa
-mDJfnQ2gxRu6AK9VmXqo0X4IBxDSnTjcL0huUlS849wgsE5oTXgdYb2hn+TXM5JJ
-NsEXLhV09X1mrk4M4LV1npd0mYxvFsO4+p+IX5YLiahInmQtq0gx3DWE8wouVFER
-4yzfp27z8MZT8Qvr/ZI9lzWd
-----END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,928762DB6DE222AD
+
+oOxNUBX0wrqmRqb3IEZMogc1bnVm6JoW6YFjGfHNcIz0jS7UPDhUFDR26y0dYujL
+LEgxOcYo8ItvGcXSRbs+3W7lISbosgkB0DOaKx5jVmOGwUVRergUUSY8rbf93FtP
+27CEvAfsU6do5HmlJ34mYZW1k+onCznlJXJkupQ5jmiily3GwEdr/5mMIVOmXQ6p
+xWkxHySDKyVbR0v4JY3SJLRBuhgofYNG5155PiqZ7KwYY4Aw60eVgINsvJCF9/8b
+kEj+lecHbBdAf7N82320Ga+F+VeFnUl0gWFjoIF9UFCO80+7ZvIGdGlyPkr4zMvt
+TsC1snJQdHg+IlT3sGayYrQANpTG6GPYhn3KEvK5aqq+bPEe5lija0gw34jbPCo+
+TjHR76lToxzubGZODyyF/rjl5KwUbqTCNuv1PX1jTx7n7sCbu+KHpqXMhTHLKtby
+Wh7WAfsVrbIW+P85/mkfhPbPZ2621f9cyStdFGgWU4dHdD00HIGOgAJvUSbC2Au
+oVUoKf2818t1s9aA4ptog04sNi+Ixu+z+3yYNLZj51j4ZX3KuXxLIiQvlvFQ8LQi
+RHGQk3u2W3iNtDKKUQjMPaB2FlVtC7FmtHBCpRmos6ld240DDyucqMdIDTMaqV0+
+sL4X+LIeBM/hP/IquRTuQBHBmgjkN4845ihTUJOanyKx605ANq/roHzXrbIxhR5p
+pcJLCBMLMWgdOCJMZRavSq04iXeNfP6Mk/joVpHS62Ljdfc94BBLfsOKOErA20Nq
+lfvbZqy2tI5IIDoq05S8FU0DYNqq/hyrv9Udo8IAo+WkBOABm0x/WA==
+-----END RSA PRIVATE KEY-----
+ 
@@ -2,7 +2,7 @@

 $socket = null;
 $errno = 0;
-$context = stream_context_create(array('ssl' => array('local_cert' => dirname(__FILE__).'/cert.pem')));
+$context = stream_context_create(array('ssl' => array('local_cert' => dirname(__FILE__).'/cert.pem', 'passphrase' => 'pass')));

 for ($i=0; $i<10 && !$socket; ++$i) {
 	$port = rand(50000, 65535);
@@ -265,7 +265,7 @@ if ($pid) {

 		} elseif (preg_match("~^NLST(?: ([A-Za-z./]+))?\r\n$~", $buf, $m)) {

-			if (isset($m[1]) && (($m[1] === 'bogusdir') || ($m[1] === '/bogusdir'))) {
+			if (isset($m[1]) && $m[1] === 'bogusdir') {
 				fputs($s, "250 $m[1]: No such file or directory\r\n");
 				continue;
 			}
@@ -276,20 +276,11 @@ if ($pid) {
 				continue;
 			}

-			if (empty($pasv)) {
-				fputs($s, "150 File status okay; about to open data connection\r\n");
-				if (!$fs = stream_socket_client("tcp://$host:$port")) {
-					fputs($s, "425 Can't open data connection\r\n");
-					continue;
-				}
-			} else {
-				fputs($s, "125 Data connection already open; transfer starting.\r\n");
-				$fs=$pasvs;
-			}
+			fputs($s, "150 File status okay; about to open data connection\r\n");

-
-			if ((!empty($ssl)) && (!stream_socket_enable_crypto($pasvs, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER))) {
-				die("SSLv23 handshake failed.\n");
+			if (!$fs = stream_socket_client("tcp://$host:$port")) {
+				fputs($s, "425 Can't open data connection\r\n");
+				continue;
 			}

 			if (empty($m[1]) || $m[1] !== 'emptydir') {
@@ -377,7 +368,7 @@ if ($pid) {
                                        }
 					fputs($s, "226 Closing data Connection.\r\n");
                                        break;
-				case "mediumfile":
+                case "mediumfile":
 					fputs($s, "150 File status okay; about to open data connection.\r\n");
 					for($i = 0; $i < 150; $i++){
 						fputs($fs, "This is line $i of the test data.\n");
@@ -393,22 +384,13 @@ if ($pid) {


 		}elseif (preg_match('/^PASV/', $buf, $matches)) {
-			$pasv=true;
-			$p2 = $pasv_port % ((int) 1 << 8);
-			$p1 = ($pasv_port-$p2)/((int) 1 << 8);
+			$port = $pasv_port;
+			$p2 = $port % ((int) 1 << 8);
+			$p1 = ($port-$p2)/((int) 1 << 8);
 			$host = "127.0.0.1";
-			if (!empty($ssl)) {
-				$soc = stream_socket_server("tcp://127.0.0.1:$pasv_port", $errno, $errstr, STREAM_SERVER_BIND|STREAM_SERVER_LISTEN, $context);
-			} else {
-				$soc = stream_socket_server("tcp://127.0.0.1:$pasv_port");
-			}
-
 			fputs($s, "227 Entering Passive Mode. (127,0,0,1,{$p1},{$p2})\r\n");

-			$pasvs = stream_socket_accept($soc,10);

-		}elseif (preg_match('/^EPSV/', $buf, $matches)) {
-			fputs($s, "550 Extended passsive mode not supported.\r\n");
 		} elseif (preg_match('/^SITE EXEC/', $buf, $matches)) {
 			fputs($s, "200 OK\r\n");

@@ -63,9 +63,6 @@
 static int le_gd, le_gd_font;

 #include <gd.h>
-#ifndef HAVE_GD_BUNDLED
-# include <gd_errors.h>
-#endif
 #include <gdfontt.h>  /* 1 Tiny font */
 #include <gdfonts.h>  /* 2 Small font */
 #include <gdfontmb.h> /* 3 Medium bold font */
@@ -1024,19 +1021,7 @@ static void php_free_gd_font(zend_resource *rsrc)
 void php_gd_error_method(int type, const char *format, va_list args)
 {

-	switch (type) {
-		case GD_DEBUG:
-		case GD_INFO:
-		case GD_NOTICE:
-			type = E_NOTICE;
-			break;
-		case GD_WARNING:
-			type = E_WARNING;
-			break;
-		default:
-			type = E_ERROR;
-	}
-	php_verror(NULL, "", type, format, args TSRMLS_CC);
+	php_verror(NULL, "", type, format, args);
 }
 /* }}} */
 #endif
@@ -1062,7 +1047,6 @@ PHP_MINIT_FUNCTION(gd)
 	REGISTER_LONG_CONSTANT("IMG_PNG", 4, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("IMG_WBMP", 8, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("IMG_XPM", 16, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("IMG_WEBP", 32, CONST_CS | CONST_PERSISTENT);

 	/* special colours for gd */
 	REGISTER_LONG_CONSTANT("IMG_COLOR_TILED", gdTiled, CONST_CS | CONST_PERSISTENT);
@@ -1444,7 +1428,6 @@ PHP_FUNCTION(imagesetstyle)
 	gdImagePtr im;
 	int *stylearr;
 	int index = 0;
-    uint32_t num_styles;

 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "ra", &IM, &styles) == FAILURE)  {
 		return;
@@ -1454,14 +1437,8 @@ PHP_FUNCTION(imagesetstyle)
 		RETURN_FALSE;
 	}

-    num_styles = zend_hash_num_elements(Z_ARRVAL_P(styles));
-    if (num_styles == 0) {
-        php_error_docref(NULL, E_WARNING, "styles array must not be empty");
-        RETURN_FALSE;
-    }
-
 	/* copy the style values in the stylearr */
-	stylearr = safe_emalloc(sizeof(int), num_styles, 0);
+	stylearr = safe_emalloc(sizeof(int), zend_hash_num_elements(Z_ARRVAL_P(styles)), 0);

 	ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(styles), item) {
 		stylearr[index++] = zval_get_long(item);
@@ -1537,11 +1514,11 @@ PHP_FUNCTION(imagetruecolortopalette)
 		RETURN_FALSE;
 	}

-	if (ncolors <= 0 || ZEND_LONG_INT_OVFL(ncolors)) {
-		php_error_docref(NULL, E_WARNING, "Number of colors has to be greater than zero and no more than %d", INT_MAX);
+	if (ncolors <= 0) {
+		php_error_docref(NULL, E_WARNING, "Number of colors has to be greater than zero");
 		RETURN_FALSE;
 	}
-	gdImageTrueColorToPalette(im, dither, (int)ncolors);
+	gdImageTrueColorToPalette(im, dither, ncolors);

 	RETURN_TRUE;
 }
@@ -2147,9 +2124,6 @@ PHP_FUNCTION(imagetypes)
 #if defined(HAVE_GD_XPM)
 	ret |= 16;
 #endif
-#ifdef HAVE_GD_WEBP
-	ret |= 32;
-#endif

 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -3039,11 +3013,6 @@ PHP_FUNCTION(imagegammacorrect)
 		return;
 	}

-	if ( input <= 0.0 || output <= 0.0 ) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Gamma values should be positive");
-		RETURN_FALSE;
-	}
-
 	if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
 		RETURN_FALSE;
 	}
@@ -4071,7 +4040,6 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type )
 	dest = VCWD_FOPEN(fn_dest, "wb");
 	if (!dest) {
 		php_error_docref(NULL, E_WARNING, "Unable to open '%s' for writing", fn_dest);
-        fclose(org);
 		RETURN_FALSE;
 	}

@@ -4080,8 +4048,6 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type )
 			im_org = gdImageCreateFromGif(org);
 			if (im_org == NULL) {
 				php_error_docref(NULL, E_WARNING, "Unable to open '%s' Not a valid GIF file", fn_dest);
-                fclose(org);
-                fclose(dest);
 				RETURN_FALSE;
 			}
 			break;
@@ -4092,8 +4058,6 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type )
 			im_org = gdImageCreateFromJpegEx(org, ignore_warning);
 			if (im_org == NULL) {
 				php_error_docref(NULL, E_WARNING, "Unable to open '%s' Not a valid JPEG file", fn_dest);
-                fclose(org);
-                fclose(dest);
 				RETURN_FALSE;
 			}
 			break;
@@ -4104,8 +4068,6 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type )
 			im_org = gdImageCreateFromPng(org);
 			if (im_org == NULL) {
 				php_error_docref(NULL, E_WARNING, "Unable to open '%s' Not a valid PNG file", fn_dest);
-                fclose(org);
-                fclose(dest);
 				RETURN_FALSE;
 			}
 			break;
@@ -4113,14 +4075,10 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type )

 		default:
 			php_error_docref(NULL, E_WARNING, "Format not supported");
-            fclose(org);
-            fclose(dest);
 			RETURN_FALSE;
 			break;
 	}

-	fclose(org);
-
 	org_width  = gdImageSX (im_org);
 	org_height = gdImageSY (im_org);

@@ -4151,8 +4109,6 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type )
 	im_tmp = gdImageCreate (dest_width, dest_height);
 	if (im_tmp == NULL ) {
 		php_error_docref(NULL, E_WARNING, "Unable to allocate temporary buffer");
-        fclose(dest);
-        gdImageDestroy(im_org);
 		RETURN_FALSE;
 	}

@@ -4160,29 +4116,23 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type )

 	gdImageDestroy(im_org);

+	fclose(org);
+
 	im_dest = gdImageCreate(dest_width, dest_height);
 	if (im_dest == NULL) {
 		php_error_docref(NULL, E_WARNING, "Unable to allocate destination buffer");
-        fclose(dest);
-        gdImageDestroy(im_tmp);
 		RETURN_FALSE;
 	}

 	white = gdImageColorAllocate(im_dest, 255, 255, 255);
 	if (white == -1) {
 		php_error_docref(NULL, E_WARNING, "Unable to allocate the colors for the destination buffer");
-        fclose(dest);
-        gdImageDestroy(im_tmp);
-        gdImageDestroy(im_dest);
 		RETURN_FALSE;
 	}

 	black = gdImageColorAllocate(im_dest, 0, 0, 0);
 	if (black == -1) {
 		php_error_docref(NULL, E_WARNING, "Unable to allocate the colors for the destination buffer");
-        fclose(dest);
-        gdImageDestroy(im_tmp);
-        gdImageDestroy(im_dest);
 		RETURN_FALSE;
 	}

@@ -4667,8 +4617,8 @@ PHP_FUNCTION(imagecropauto)
 			break;

 		case GD_CROP_THRESHOLD:
-			if (color < 0 || (!gdImageTrueColor(im) && color >= gdImageColorsTotal(im))) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Color argument missing with threshold mode");
+			if (color < 0) {
+				php_error_docref(NULL, E_WARNING, "Color argument missing with threshold mode");
 				RETURN_FALSE;
 			}
 			im_crop = gdImageCropThreshold(im, color, (float) threshold);
@@ -4717,10 +4667,6 @@ PHP_FUNCTION(imagescale)
 		}
 	}

-	if (tmp_h <= 0 || tmp_w <= 0) {
-		RETURN_FALSE;
-	}
-
 	new_width = tmp_w;
 	new_height = tmp_h;

@@ -131,10 +131,6 @@ gdImagePtr gdImageCreate (int sx, int sy)
 		return NULL;
 	}

-	if (overflow2(sizeof(unsigned char *), sx)) {
-		return NULL;
-	}
-
 	im = (gdImage *) gdCalloc(1, sizeof(gdImage));

 	/* Row-major ever since gd 1.3 */
@@ -188,7 +184,7 @@ gdImagePtr gdImageCreateTrueColor (int sx, int sy)
 		return NULL;
 	}

-	if (overflow2(sizeof(int *), sx)) {
+	if (overflow2(sizeof(int), sx)) {
 		return NULL;
 	}

@@ -597,18 +593,15 @@ void gdImageColorDeallocate (gdImagePtr im, int color)

 void gdImageColorTransparent (gdImagePtr im, int color)
 {
-	if (color < 0) {
-		return;
-	}
 	if (!im->trueColor) {
-		if((color >= im->colorsTotal)) {
-			return;
-		}
-		/* Make the old transparent color opaque again */
 		if (im->transparent != -1) {
 			im->alpha[im->transparent] = gdAlphaOpaque;
 		}
-		im->alpha[color] = gdAlphaTransparent;
+		if (color > -1 && color < im->colorsTotal && color < gdMaxColors) {
+			im->alpha[color] = gdAlphaTransparent;
+		} else {
+			return;
+		}
 	}
 	im->transparent = color;
 }
@@ -1056,13 +1049,11 @@ void gdImageAABlend (gdImagePtr im)
 	}
 }

-static void _gdImageFilledHRectangle (gdImagePtr im, int x1, int y1, int x2, int y2, int color);
-
 static void gdImageHLine(gdImagePtr im, int y, int x1, int x2, int col)
 {
 	if (im->thick > 1) {
 		int thickhalf = im->thick >> 1;
-		_gdImageFilledHRectangle(im, x1, y - thickhalf, x2, y + im->thick - thickhalf - 1, col);
+		gdImageFilledRectangle(im, x1, y - thickhalf, x2, y + im->thick - thickhalf - 1, col);
 	} else {
 		if (x2 < x1) {
 			int t = x2;
@@ -1668,17 +1659,23 @@ long lsqrt (long n)
 /* s and e are integers modulo 360 (degrees), with 0 degrees
   being the rightmost extreme and degrees changing clockwise.
   cx and cy are the center in pixels; w and h are the horizontal
-   and vertical diameter in pixels. */
+   and vertical diameter in pixels. Nice interface, but slow.
+   See gd_arc_f_buggy.c for a better version that doesn't
+   seem to be bug-free yet. */

 void gdImageArc (gdImagePtr im, int cx, int cy, int w, int h, int s, int e, int color)
 {
-	gdImageFilledArc(im, cx, cy, w, h, s, e, color, gdNoFill);
+	if ((s % 360) == (e % 360)) {
+		gdImageEllipse(im, cx, cy, w, h, color);
+	} else {
+		gdImageFilledArc(im, cx, cy, w, h, s, e, color, gdNoFill);
+	}
 }

 void gdImageFilledArc (gdImagePtr im, int cx, int cy, int w, int h, int s, int e, int color, int style)
 {
-	gdPoint pts[363];
-	int i, pti;
+	gdPoint pts[3];
+	int i;
 	int lx = 0, ly = 0;
 	int fx = 0, fy = 0;

@@ -1706,7 +1703,7 @@ void gdImageFilledArc (gdImagePtr im, int cx, int cy, int w, int h, int s, int e
 		}
 	}

-	for (i = s, pti = 1; i <= e; i++, pti++) {
+	for (i = s; i <= e; i++) {
 		int x, y;
 		x = ((long) gdCosT[i % 360] * (long) w / (2 * 1024)) + cx;
 		y = ((long) gdSinT[i % 360] * (long) h / (2 * 1024)) + cy;
@@ -1715,28 +1712,19 @@ void gdImageFilledArc (gdImagePtr im, int cx, int cy, int w, int h, int s, int e
 				if (style & gdNoFill) {
 					gdImageLine(im, lx, ly, x, y, color);
 				} else {
-					if (y == ly) {
-						pti--; /* don't add this point */
-						if (((i > 270 || i < 90) && x > lx) || ((i >  90 && i < 270) && x < lx)) {
-							/* replace the old x coord, if increasing on the
-							   right side or decreasing on the left side */
-							pts[pti].x = x;
-						}
-					} else {
-						pts[pti].x = x;
-						pts[pti].y = y;
-					}
-  				}
+					/* This is expensive! */
+					pts[0].x = lx;
+					pts[0].y = ly;
+					pts[1].x = x;
+					pts[1].y = y;
+					pts[2].x = cx;
+					pts[2].y = cy;
+					gdImageFilledPolygon(im, pts, 3, color);
+				}
 			}
 		} else {
 			fx = x;
 			fy = y;
-			if (!(style & (gdChord | gdNoFill))) {
-				pts[0].x = cx;
-				pts[0].y = cy;
-				pts[pti].x = x;
-				pts[pti].y = y;
-			}
 		}
 		lx = x;
 		ly = y;
@@ -1763,10 +1751,6 @@ void gdImageFilledArc (gdImagePtr im, int cx, int cy, int w, int h, int s, int e
 				gdImageLine(im, cx, cy, lx, ly, color);
 				gdImageLine(im, cx, cy, fx, fy, color);
 			}
-		} else {
-			pts[pti].x = cx;
-			pts[pti].y = cy;
-			gdImageFilledPolygon(im, pts, pti+1, color);
 		}
 	}
 }
@@ -1783,12 +1767,6 @@ void gdImageFillToBorder (gdImagePtr im, int x, int y, int border, int color)
 		return;
 	}

-	if (!im->trueColor) {
-		if ((color > (im->colorsTotal - 1)) || (border > (im->colorsTotal - 1)) || (color < 0)) {
-			return;
-		}
-	}
-
 	restoreAlphaBlending = im->alphaBlendingFlag;
 	im->alphaBlendingFlag = 0;

@@ -2134,53 +2112,10 @@ void gdImageRectangle (gdImagePtr im, int x1, int y1, int x2, int y2, int color)
 	}
 }

-static void _gdImageFilledHRectangle (gdImagePtr im, int x1, int y1, int x2, int y2, int color)
+void gdImageFilledRectangle (gdImagePtr im, int x1, int y1, int x2, int y2, int color)
 {
 	int x, y;

-	if (x1 == x2 && y1 == y2) {
-		gdImageSetPixel(im, x1, y1, color);
-		return;
-	}
-
-	if (x1 > x2) {
-		x = x1;
-		x1 = x2;
-		x2 = x;
-	}
-
-	if (y1 > y2) {
-		y = y1;
-		y1 = y2;
-		y2 = y;
-	}
-
-	if (x1 < 0) {
-		x1 = 0;
-	}
-
-	if (x2 >= gdImageSX(im)) {
-		x2 = gdImageSX(im) - 1;
-	}
-
-	if (y1 < 0) {
-		y1 = 0;
-	}
-
-	if (y2 >= gdImageSY(im)) {
-		y2 = gdImageSY(im) - 1;
-	}
-
-	for (x = x1; (x <= x2); x++) {
-		for (y = y1; (y <= y2); y++) {
-			gdImageSetPixel (im, x, y, color);
-		}
-	}
-}
-
-static void _gdImageFilledVRectangle (gdImagePtr im, int x1, int y1, int x2, int y2, int color)
-{
-	int x, y;

 	if (x1 == x2 && y1 == y2) {
 		gdImageSetPixel(im, x1, y1, color);
@@ -2222,11 +2157,6 @@ static void _gdImageFilledVRectangle (gdImagePtr im, int x1, int y1, int x2, int
 	}
 }

-void gdImageFilledRectangle (gdImagePtr im, int x1, int y1, int x2, int y2, int color)
-{
-	_gdImageFilledVRectangle(im, x1, y1, x2, y2, color);
-}
-
 void gdImageCopy (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int w, int h)
 {
 	int c;
@@ -2245,9 +2175,7 @@ void gdImageCopy (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX,
 			for (y = 0; (y < h); y++) {
 				for (x = 0; (x < w); x++) {
 					int c = gdImageGetTrueColorPixel (src, srcX + x, srcY + y);
-					if (c != src->transparent) {
-						gdImageSetPixel (dst, dstX + x, dstY + y, c);
-					}
+					gdImageSetPixel (dst, dstX + x, dstY + y, c);
 				}
 			}
 		} else {
@@ -2264,6 +2192,26 @@ void gdImageCopy (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX,
 		return;
 	}

+	/* Destination is palette based */
+	if (src->trueColor) { /* But source is truecolor (Ouch!) */
+		toy = dstY;
+		for (y = srcY; (y < (srcY + h)); y++) {
+			tox = dstX;
+			for (x = srcX; x < (srcX + w); x++) {
+				int nc;
+				c = gdImageGetPixel (src, x, y);
+
+				/* Get best match possible. */
+				nc = gdImageColorResolveAlpha(dst, gdTrueColorGetRed(c), gdTrueColorGetGreen(c), gdTrueColorGetBlue(c), gdTrueColorGetAlpha(c));
+
+				gdImageSetPixel(dst, tox, toy, nc);
+				tox++;
+			}
+			toy++;
+		}
+		return;
+	}
+
 	/* Palette based to palette based */
 	for (i = 0; i < gdMaxColors; i++) {
 		colorMap[i] = (-1);
@@ -2711,19 +2659,6 @@ void gdImageFilledPolygon (gdImagePtr im, gdPointPtr p, int n, int c)
 			maxy = p[i].y;
 		}
 	}
-	/* necessary special case: horizontal line */
-	if (n > 1 && miny == maxy) {
-		x1 = x2 = p[0].x;
-		for (i = 1; (i < n); i++) {
-			if (p[i].x < x1) {
-				x1 = p[i].x;
-			} else if (p[i].x > x2) {
-				x2 = p[i].x;
-			}
-		}
-		gdImageLine(im, x1, miny, x2, miny, c);
-		return;
-	}
 	pmaxy = maxy;
 	/* 2.0.16: Optimization by Ilia Chipitsine -- don't waste time offscreen */
 	if (miny < 0) {
@@ -138,18 +138,11 @@ static int _gd2GetHeader(gdIOCtxPtr in, int *sx, int *sy, int *cs, int *vers, in
 	if (gd2_compressed(*fmt)) {
 		nc = (*ncx) * (*ncy);
 		GD2_DBG(php_gd_error("Reading %d chunk index entries", nc));
-		if (overflow2(sizeof(t_chunk_info), nc)) {
-			goto fail1;
-		}
 		sidx = sizeof(t_chunk_info) * nc;
 		if (sidx <= 0) {
 			goto fail1;
 		}
 		cidx = gdCalloc(sidx, 1);
-		if (cidx == NULL) {
-			goto fail1;
-		}
-
 		for (i = 0; i < nc; i++) {
 			if (gdGetInt(&cidx[i].offset, in) != 1) {
 				gdFree(cidx);
@@ -601,26 +601,14 @@ nomatch:
 * code in turn.  When the buffer fills up empty it and start over.
 */

-static const unsigned long masks[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F,
+static unsigned long masks[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F,
                                  0x001F, 0x003F, 0x007F, 0x00FF,
                                  0x01FF, 0x03FF, 0x07FF, 0x0FFF,
                                  0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF };

-
-/* Arbitrary value to mark output is done.  When we see EOFCode, then we don't
- * expect to see any more data.  If we do (e.g. corrupt image inputs), cur_bits
- * might be negative, so flag it to return early.
- */
-#define CUR_BITS_FINISHED -1000
-
-
 static void
 output(code_int code, GifCtx *ctx)
 {
-	if (ctx->cur_bits == CUR_BITS_FINISHED) {
-		return;
-	}
-
    ctx->cur_accum &= masks[ ctx->cur_bits ];

    if( ctx->cur_bits > 0 )
@@ -667,10 +655,8 @@ output(code_int code, GifCtx *ctx)
                ctx->cur_bits -= 8;
        }

-		/* Flag that it's done to prevent re-entry. */
-		ctx->cur_bits = CUR_BITS_FINISHED;
-
        flush_char(ctx);
+
    }
 }

@@ -879,42 +879,20 @@ int getPixelInterpolated(gdImagePtr im, const double x, const double y, const in
 static inline LineContribType * _gdContributionsAlloc(unsigned int line_length, unsigned int windows_size)
 {
 	unsigned int u = 0;
-	LineContribType *res;
-	int overflow_error = 0;
+    LineContribType *res;

 	res = (LineContribType *) gdMalloc(sizeof(LineContribType));
 	if (!res) {
 		return NULL;
 	}
-	res->WindowSize = windows_size;
-	res->LineLength = line_length;
-	if (overflow2(line_length, sizeof(ContributionType))) {
-		gdFree(res);
-		return NULL;
-	}
-	res->ContribRow = (ContributionType *) gdMalloc(line_length * sizeof(ContributionType));
-	if (res->ContribRow == NULL) {
-		gdFree(res);
-		return NULL;
-	}
-	for (u = 0 ; u < line_length ; u++) {
-		if (overflow2(windows_size, sizeof(double))) {
-			overflow_error = 1;
-		} else {
-			res->ContribRow[u].Weights = (double *) gdMalloc(windows_size * sizeof(double));
-		}
-		if (overflow_error == 1 || res->ContribRow[u].Weights == NULL) {
-			unsigned int i;
-			u--;
-			for (i=0;i<=u;i++) {
-				gdFree(res->ContribRow[i].Weights);
-			}
-			gdFree(res->ContribRow);
-			gdFree(res);
-			return NULL;
-		}
-	}
-	return res;
+    res->WindowSize = windows_size;
+    res->LineLength = line_length;
+    res->ContribRow = (ContributionType *) gdMalloc(line_length * sizeof(ContributionType));
+
+    for (u = 0 ; u < line_length ; u++) {
+        res->ContribRow[u].Weights = (double *) gdMalloc(windows_size * sizeof(double));
+    }
+    return res;
 }

 static inline void _gdContributionsFree(LineContribType * p)
@@ -929,62 +907,59 @@ static inline void _gdContributionsFree(LineContribType * p)

 static inline LineContribType *_gdContributionsCalc(unsigned int line_size, unsigned int src_size, double scale_d,  const interpolation_method pFilter)
 {
-	double width_d;
-	double scale_f_d = 1.0;
-	const double filter_width_d = DEFAULT_BOX_RADIUS;
+    double width_d;
+    double scale_f_d = 1.0;
+    const double filter_width_d = DEFAULT_BOX_RADIUS;
 	int windows_size;
 	unsigned int u;
 	LineContribType *res;
-	int overflow_error = 0;

-	if (scale_d < 1.0) {
-		width_d = filter_width_d / scale_d;
-		scale_f_d = scale_d;
-	}  else {
-		width_d= filter_width_d;
-	}
+    if (scale_d < 1.0) {
+        width_d = filter_width_d / scale_d;
+        scale_f_d = scale_d;
+    }  else {
+        width_d= filter_width_d;
+    }

-	windows_size = 2 * (int)ceil(width_d) + 1;
-	res = _gdContributionsAlloc(line_size, windows_size);
-	if (res == NULL) {
-		return NULL;
-	}
-	for (u = 0; u < line_size; u++) {
-	const double dCenter = (double)u / scale_d;
-	/* get the significant edge points affecting the pixel */
-	register int iLeft = MAX(0, (int)floor (dCenter - width_d));
-	int iRight = MIN((int)ceil(dCenter + width_d), (int)src_size - 1);
-	double dTotalWeight = 0.0;
+    windows_size = 2 * (int)ceil(width_d) + 1;
+    res = _gdContributionsAlloc(line_size, windows_size);
+
+    for (u = 0; u < line_size; u++) {
+        const double dCenter = (double)u / scale_d;
+        /* get the significant edge points affecting the pixel */
+        register int iLeft = MAX(0, (int)floor (dCenter - width_d));
+        int iRight = MIN((int)ceil(dCenter + width_d), (int)src_size - 1);
+        double dTotalWeight = 0.0;
 		int iSrc;

-	/* Cut edge points to fit in filter window in case of spill-off */
-	if (iRight - iLeft + 1 > windows_size)  {
-		if (iLeft < ((int)src_size - 1 / 2))  {
-			iLeft++;
-		} else {
-			iRight--;
-		}
-	}
+        /* Cut edge points to fit in filter window in case of spill-off */
+        if (iRight - iLeft + 1 > windows_size)  {
+            if (iLeft < ((int)src_size - 1 / 2))  {
+                iLeft++;
+            } else {
+                iRight--;
+            }
+        }

-	res->ContribRow[u].Left = iLeft;
-	res->ContribRow[u].Right = iRight;
+        res->ContribRow[u].Left = iLeft;
+        res->ContribRow[u].Right = iRight;

-	for (iSrc = iLeft; iSrc <= iRight; iSrc++) {
-		dTotalWeight += (res->ContribRow[u].Weights[iSrc-iLeft] =  scale_f_d * (*pFilter)(scale_f_d * (dCenter - (double)iSrc)));
-	}
+        for (iSrc = iLeft; iSrc <= iRight; iSrc++) {
+            dTotalWeight += (res->ContribRow[u].Weights[iSrc-iLeft] =  scale_f_d * (*pFilter)(scale_f_d * (dCenter - (double)iSrc)));
+        }

 		if (dTotalWeight < 0.0) {
 			_gdContributionsFree(res);
 			return NULL;
 		}

-	if (dTotalWeight > 0.0) {
-		for (iSrc = iLeft; iSrc <= iRight; iSrc++) {
-			res->ContribRow[u].Weights[iSrc-iLeft] /= dTotalWeight;
-		}
-	}
-	}
-	return res;
+        if (dTotalWeight > 0.0) {
+            for (iSrc = iLeft; iSrc <= iRight; iSrc++) {
+                res->ContribRow[u].Weights[iSrc-iLeft] /= dTotalWeight;
+            }
+        }
+   }
+   return res;
 }

 static inline void _gdScaleRow(gdImagePtr pSrc,  unsigned int src_width, gdImagePtr dst, unsigned int dst_width, unsigned int row, LineContribType *contrib)
@@ -1072,9 +1047,6 @@ static inline void _gdScaleVert (const gdImagePtr pSrc, const unsigned int src_w
 	}

 	contrib = _gdContributionsCalc(dst_height, src_height, (double)(dst_height) / (double)(src_height), pSrc->interpolation);
-	if (contrib == NULL) {
-		return;
-	}
 	/* scale each column */
 	for (u = 0; u < dst_width - 1; u++) {
 		_gdScaleCol(pSrc, src_width, pDst, dst_width, dst_height, u, contrib);
@@ -1087,10 +1059,6 @@ gdImagePtr gdImageScaleTwoPass(const gdImagePtr src, const unsigned int src_widt
 	gdImagePtr tmp_im;
 	gdImagePtr dst;

-	if (new_width == 0 || new_height == 0) {
-		return NULL;
-	}
-
 	/* Convert to truecolor if it isn't; this code requires it. */
 	if (!src->trueColor) {
 		gdImagePaletteToTrueColor(src);
@@ -1119,10 +1087,6 @@ gdImagePtr Scale(const gdImagePtr src, const unsigned int src_width, const unsig
 {
 	gdImagePtr tmp_im;

-	if (new_width == 0 || new_height == 0) {
-		return NULL;
-	}
-
 	tmp_im = gdImageCreateTrueColor(new_width, src_height);
 	if (tmp_im == NULL) {
 		return NULL;
@@ -1156,10 +1120,6 @@ gdImagePtr gdImageScaleNearestNeighbour(gdImagePtr im, const unsigned int width,
 	unsigned long  dst_offset_y = 0;
 	unsigned int i;

-	if (new_width == 0 || new_height == 0) {
-		return NULL;
-	}
-
 	dst_img = gdImageCreateTrueColor(new_width, new_height);

 	if (dst_img == NULL) {
@@ -1261,21 +1221,11 @@ static gdImagePtr gdImageScaleBilinearPalette(gdImagePtr im, const unsigned int
 	gdImagePtr new_img;
 	const int transparent = im->transparent;

-	if (new_width == 0 || new_height == 0) {
-		return NULL;
-	}
-
 	new_img = gdImageCreateTrueColor(new_width, new_height);
 	if (new_img == NULL) {
 		return NULL;
 	}
-
-	if (transparent < 0) {
-		/* uninitialized */
-		new_img->transparent = -1;
-	} else {
-		new_img->transparent = gdTrueColorAlpha(im->red[transparent], im->green[transparent], im->blue[transparent], im->alpha[transparent]);
-	}
+	new_img->transparent = gdTrueColorAlpha(im->red[transparent], im->green[transparent], im->blue[transparent], im->alpha[transparent]);

 	for (i=0; i < _height; i++) {
 		long j;
@@ -1363,10 +1313,6 @@ static gdImagePtr gdImageScaleBilinearTC(gdImagePtr im, const unsigned int new_w
 	long i;
 	gdImagePtr new_img;

-	if (new_width == 0 || new_height == 0) {
-		return NULL;
-	}
-
 	new_img = gdImageCreateTrueColor(new_width, new_height);
 	if (!new_img){
 		return NULL;
@@ -1466,10 +1412,6 @@ gdImagePtr gdImageScaleBicubicFixed(gdImagePtr src, const unsigned int width, co
 	unsigned int dst_offset_y = 0;
 	long i;

-	if (new_width == 0 || new_height == 0) {
-		return NULL;
-	}
-
 	/* impact perf a bit, but not that much. Implementation for palette
 	   images can be done at a later point.
 	*/
@@ -1509,8 +1451,13 @@ gdImagePtr gdImageScaleBicubicFixed(gdImagePtr src, const unsigned int width, co
 				src_offset_y[0] = m;
 			}

-			src_offset_x[1] = n;
-			src_offset_y[1] = m;
+			if (m < 1) {
+				src_offset_x[1] = n;
+				src_offset_y[1] = m;
+			} else {
+				src_offset_x[1] = n;
+				src_offset_y[1] = m;
+			}

 			if ((m < 1) || (n >= src_w - 1)) {
 				src_offset_x[2] = n;
@@ -1562,8 +1509,13 @@ gdImagePtr gdImageScaleBicubicFixed(gdImagePtr src, const unsigned int width, co
 				src_offset_y[8] = m;
 			}

-			src_offset_x[9] = n;
-			src_offset_y[9] = m;
+			if (m >= src_h - 1) {
+				src_offset_x[8] = n;
+				src_offset_y[8] = m;
+			} else {
+				src_offset_x[9] = n;
+				src_offset_y[9] = m;
+			}

 			if ((m >= src_h-1) || (n >= src_w-1)) {
 				src_offset_x[10] = n;
@@ -1589,8 +1541,13 @@ gdImagePtr gdImageScaleBicubicFixed(gdImagePtr src, const unsigned int width, co
 				src_offset_y[12] = m;
 			}

-			src_offset_x[13] = n;
-			src_offset_y[13] = m;
+			if (m >= src_h - 2) {
+				src_offset_x[13] = n;
+				src_offset_y[13] = m;
+			} else {
+				src_offset_x[13] = n;
+				src_offset_y[13] = m;
+			}

 			if ((m >= src_h - 2) || (n >= src_w - 1)) {
 				src_offset_x[14] = n;
@@ -1677,11 +1634,7 @@ gdImagePtr gdImageScale(const gdImagePtr src, const unsigned int new_width, cons
 	gdImagePtr im_scaled = NULL;

 	if (src == NULL || src->interpolation_id < 0 || src->interpolation_id > GD_METHOD_COUNT) {
-		return NULL;
-	}
-
-	if (new_width == 0 || new_height == 0) {
-		return NULL;
+		return 0;
 	}

 	switch (src->interpolation_id) {
@@ -1727,10 +1680,6 @@ gdImagePtr gdImageRotateNearestNeighbour(gdImagePtr src, const float degrees, co
 	unsigned int i;
 	gdImagePtr dst;

-	if (new_width == 0 || new_height == 0) {
-		return NULL;
-	}
-
 	dst = gdImageCreateTrueColor(new_width, new_height);
 	if (!dst) {
 		return NULL;
@@ -1999,8 +1948,13 @@ gdImagePtr gdImageRotateBicubicFixed(gdImagePtr src, const float degrees, const
 					src_offset_y[0] = m;
 				}

-				src_offset_x[1] = n;
-				src_offset_y[1] = m;
+				if (m < 1) {
+					src_offset_x[1] = n;
+					src_offset_y[1] = m;
+				} else {
+					src_offset_x[1] = n;
+					src_offset_y[1] = m ;
+				}

 				if ((m < 1) || (n >= src_w-1)) {
 					src_offset_x[2] = - 1;
@@ -2053,8 +2007,8 @@ gdImagePtr gdImageRotateBicubicFixed(gdImagePtr src, const float degrees, const
 				}

 				if (m >= src_h-1) {
-					src_offset_x[9] = - 1;
-					src_offset_y[9] = - 1;
+					src_offset_x[8] = - 1;
+					src_offset_y[8] = - 1;
 				} else {
 					src_offset_x[9] = n;
 					src_offset_y[9] = m;
@@ -1329,7 +1329,7 @@ pass2_no_dither (j_decompress_ptr cinfo,
 	  /* If the pixel is transparent, we assign it the palette index that
 	   * will later be added at the end of the palette as the transparent
 	   * index. */
-	  if ((oim->transparent >= 0) && (oim->transparent == *inptr))
+	  if ((oim->transparent >= 0) && (oim->transparent == *(inptr - 1)))
 	    {
 	      *outptr++ = nim->colorsTotal;
 	      inptr++;
@@ -329,7 +329,7 @@ han2zen (int *p1, int *p2)
    {
      if ((*p2 >= 74 && *p2 <= 103) || (*p2 >= 110 && *p2 <= 122))
 	(*p2)++;
-      else if (*p2 == 131 || *p2 == 69)
+      else if (*p2 == 131 && *p2 == 69)
 	*p2 = 148;
    }
  else if (handaku && *p2 >= 110 && *p2 <= 122)
@@ -210,7 +210,7 @@ void gdImageXbmCtx(gdImagePtr image, char* file_name, int fg, gdIOCtx * out)
 			if (gdImageGetPixel(image, x, y) == fg) {
 				c |= b;
 			}
-			if ((b == 128) || (x == sx - 1)) {
+			if ((b == 128) || (x == sx && y == sy)) {
 				b = 1;
 				if (p) {
 					gdCtxPrintf(out, ", ");
@@ -15,9 +15,9 @@ Bug #22544 (TrueColor transparency in PNG images).
 	$red = imageColorAllocate($image, 255, 50, 50);
 	imageColorTransparent($image, $transparent);
 	imageFilledRectangle($image, 0, 0, 640-1, 100-1, $transparent);
-	imagegd($image, $dest);
+	imagePng($image, $dest);
 	echo md5_file($dest) . "\n";
 	@unlink($dest);
 ?>
 --EXPECT--
-7643ef115f642a79c2de6e411f485ddd
+10a57d09a2c63fad87b85b38d6b258d6
@@ -3,9 +3,6 @@ Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd)
 --SKIPIF--
 <?php
 	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) {
-		die("skip test requires GD 2.2.0 or higher");
-	}
 ?>
 --FILE--
 <?php
@@ -1,62 +0,0 @@
--TEST--
-Bug #43475 (Thick styled lines have scrambled patterns)
--SKIPIF--
-<?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-		die("skip test requires GD 2.2.2 or higher");
-	}
-?>
--FILE--
-<?php
-require_once __DIR__ . '/similarity.inc';
-
-function setStyleAndThickness($im, $color, $thickness)
-{
-	$style = array();
-	$i = 0;
-	while ($i < 16 * $thickness) {
-		$style[$i++] = $color;
-	}
-	while ($i < 20 * $thickness) {
-		$style[$i++] = IMG_COLOR_TRANSPARENT;
-	}
-	while ($i < 28 * $thickness) {
-		$style[$i++] = $color;
-	}
-	while ($i < 32 * $thickness) {
-		$style[$i++] = IMG_COLOR_TRANSPARENT;
-	}
-	imagesetstyle($im, $style);
-	imagesetthickness($im, $thickness);
-}
-
-$im = imagecreate(800, 800);
-imagecolorallocate($im, 255, 255, 255);
-$black = imagecolorallocate($im, 0, 0, 0);
-
-setStyleAndThickness($im, $black, 1);
-imageline($im,  50, 250, 550, 250, IMG_COLOR_STYLED);
-imageline($im, 550, 250, 550, 750, IMG_COLOR_STYLED);
-imageline($im, 550, 750,  50, 250, IMG_COLOR_STYLED);
-
-setStyleAndThickness($im, $black, 2);
-imageline($im, 100, 200, 600, 200, IMG_COLOR_STYLED);
-imageline($im, 600, 200, 600, 700, IMG_COLOR_STYLED);
-imageline($im, 600, 700, 100, 200, IMG_COLOR_STYLED);
-
-setStyleAndThickness($im, $black, 4);
-imageline($im, 150, 150, 650, 150, IMG_COLOR_STYLED);
-imageline($im, 650, 150, 650, 650, IMG_COLOR_STYLED);
-imageline($im, 650, 650, 150, 150, IMG_COLOR_STYLED);
-
-setStyleAndThickness($im, $black, 6);
-imageline($im, 200, 100, 700, 100, IMG_COLOR_STYLED);
-imageline($im, 700, 100, 700, 600, IMG_COLOR_STYLED);
-imageline($im, 700, 600, 200, 100, IMG_COLOR_STYLED);
-
-$ex = imagecreatefrompng(__DIR__ . '/bug43475.png');
-var_dump(calc_image_dissimilarity($ex, $im) < 1e-5);
-?>
--EXPECT--
-bool(true)
@@ -1,26 +0,0 @@
--TEST--
-Bug #43828 (broken transparency of imagearc for truecolor in blendingmode)
--SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip ext/gd not available');
-if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-	die("skip test requires GD 2.2.2 or higher");
-}
-?>
--FILE--
-<?php
-
-$im = imagecreatetruecolor(100,100);
-
-$transparent = imagecolorallocatealpha($im, 255, 255, 255, 80);
-imagefilledrectangle($im, 0,0, 99,99, $transparent);
-$color = imagecolorallocatealpha($im, 0, 255, 0, 100);
-imagefilledarc($im, 49, 49, 99,99, 0 , 360, $color, IMG_ARC_PIE);
-
-ob_start();
-imagegd($im);
-echo md5(ob_get_clean());
-imagedestroy($im);
-?>
--EXPECT--
-2400a58cd7570b5472c25264715321cd
@@ -3,9 +3,6 @@ Bug #53154 (Zero-height rectangle has whiskers)
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die('skip gd extension not available');
-if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-    die("skip test requires GD 2.2.2 or higher");
-}
 ?>
 --FILE--
 <?php
@@ -3,9 +3,6 @@ Bug #53640 (XBM images require width to be multiple of 8)
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die('skip gd extension not available');
-if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.3', '<')) {
-    die("skip test requires GD 2.2.3 or higher");
-}
 ?>
 --FILE--
 <?php
@@ -15,6 +12,8 @@ $white = imagecolorallocate($im, 255, 255, 255);
 imagefilledrectangle($im, 2, 2, 6, 6, $white);
 imagexbm($im, NULL);
 ?>
+--XFAIL--
+Padding is not implemented yet
 --EXPECT--
 #define image_width 9
 #define image_height 9
@@ -1,41 +0,0 @@
--TEST--
-Bug #64641 (imagefilledpolygon doesn't draw horizontal line)
--SKIPIF--
-<?php
-if (!extension_loaded('gd')) die("skip gd extension not available\n");
-if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-	die("skip test requires GD 2.2.2 or higher");
-}
-?>
--FILE--
-<?php
-require_once __DIR__ . '/similarity.inc';
-
-$im = imagecreatetruecolor(640, 480);
-
-$points = array(
-	100, 100,
-	100, 200,
-	100, 300
-);
-imagefilledpolygon($im, $points, 3, 0xFFFF00);
-
-$points = array(
-	300, 200,
-	400, 200,
-	500, 200
-);
-imagefilledpolygon($im, $points, 3, 0xFFFF00);
-
-$ex = imagecreatefrompng(__DIR__ . '/bug64641.png');
-if (($diss = calc_image_dissimilarity($ex, $im)) < 1e-5) {
-	echo "IDENTICAL";
-} else {
-	echo "DISSIMILARITY: $diss";
-}
-imagedestroy($ex);
-
-imagedestroy($im);
-?>
--EXPECT--
-IDENTICAL
Author	SHA1	Message	Date
Anatol Belski	fb59213fc4	reorder entries and fix typo	2016-05-25 11:31:05 +02:00
Anatol Belski	bcad8619f8	set version and update NEWS	2016-05-25 10:22:53 +02:00