From: Christoph M. Becker Date: Wed, 31 Jul 2019 16:08:05 +0000 (+0200) Subject: Merge branch 'PHP-7.3' into PHP-7.4 X-Git-Tag: php-7.4.0beta2~12 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f9a77baefb65dee1a9c01bde90dc27f5b824b29;p=php Merge branch 'PHP-7.3' into PHP-7.4 * PHP-7.3: Fix 78213: Empty row pocket --- 1f9a77baefb65dee1a9c01bde90dc27f5b824b29 diff --cc NEWS index 57c80a88f7,db44d9b535..7d1914c470 --- a/NEWS +++ b/NEWS @@@ -19,7 -18,59 +19,10 @@@ PH . Fixed bug #78342 (Bus error in configure test for iconv //IGNORE). (Rainer Jung) -- LiteSpeed: - . Updated to LiteSpeed SAPI V7.5 (Fixed clean shutdown). (George Wang) - + - MySQLnd: + . Fixed bug #78213 (Empty row pocket). (cmb) + -- Standard: - . Fixed bug #69100 (Bus error from stream_copy_to_stream (file -> SSL stream) - with invalid length). (Nikita) - . Fixed bug #78326 (improper memory deallocation on stream_get_contents() - with fixed length buffer). (Albert Casademont) - -01 Aug 2019, PHP 7.3.8 - -- Core: - . Added syslog.filter=raw option. (Erik Lundin) - . Fixed bug #78212 (Segfault in built-in webserver). (cmb) - -- Date: - . Fixed bug #69044 (discrepency between time and microtime). (krakjoe) - . Updated timelib to 2018.02. (Derick) - -- EXIF: - . Fixed bug #78256 (heap-buffer-overflow on exif_process_user_comment). - (CVE-2019-11042) (Stas) - . Fixed bug #78222 (heap-buffer-overflow on exif_scan_thumbnail). - (CVE-2019-11041) (Stas) - -- FTP: - . Fixed bug #78039 (FTP with SSL memory leak). (Nikita) - -- Libxml: - . Fixed bug #78279 (libxml_disable_entity_loader settings is shared between - requests (cgi-fcgi)). (Nikita) - -- LiteSpeed: - . Updated to LiteSpeed SAPI V7.4.3 (increased response header count limit from - 100 to 1000, added crash handler to cleanly shutdown PHP request, added - CloudLinux mod_lsapi mode). (George Wang) - . Fixed bug #76058 (After "POST data can't be buffered", using php://input - makes huge tmp files). (George Wang) - -- Openssl: - . Fixed bug #78231 (Segmentation fault upon stream_socket_accept of exported - socket-to-stream). (Nikita) - - Opcache: - . Fixed bug #78189 (file cache strips last character of uname hash). (cmb) - . Fixed bug #78202 (Opcache stats for cache hits are capped at 32bit NUM). - (cmb) - . Fixed bug #78271 (Invalid result of if-else). (Nikita) - . Fixed bug #78291 (opcache_get_configuration doesn't list all directives). - (Andrew Collington) . Fixed bug #78341 (Failure to detect smart branch in DFA pass). (Nikita) - PCRE: diff --cc ext/mysqlnd/mysqlnd_block_alloc.c index 63a48f4faa,10f6bd3b6d..7ee952d1c8 --- a/ext/mysqlnd/mysqlnd_block_alloc.c +++ b/ext/mysqlnd/mysqlnd_block_alloc.c @@@ -95,8 -161,8 +95,8 @@@ mysqlnd_mempool_create(size_t arena_siz MYSQLND_MEMORY_POOL * ret; DBG_ENTER("mysqlnd_mempool_create"); - arena = zend_arena_create(MAX(arena_size, sizeof(zend_arena))); - arena = mysqlnd_arena_create(MAX(arena_size, ZEND_MM_ALIGNED_SIZE(sizeof(zend_arena)))); - ret = mysqlnd_arena_alloc(&arena, sizeof(MYSQLND_MEMORY_POOL)); ++ arena = zend_arena_create(MAX(arena_size, ZEND_MM_ALIGNED_SIZE(sizeof(zend_arena)))); + ret = zend_arena_alloc(&arena, sizeof(MYSQLND_MEMORY_POOL)); ret->arena = arena; ret->last = NULL; ret->checkpoint = NULL;