com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/standard/browscap.c

Commit: 8fcfacf7465f7bdfa2f88f520af8ba35e77afd91 Author: Christoph M. Becker <cmbecker69@gmx.de> Sat, 27 Aug 2016 01:13:32 +0200 Parents: c4c3eb55a75f59fd73d0ee034ccaaf81ae46d8ec 2139918ea6f5088e9ed5daa734568b4a50217f52 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8fcfacf7465f7bdfa2f88f520af8ba35e77afd91 Log: Merge branch 'PHP-5.6' into PHP-7.0 Changed paths: MM NEWS MM ext/standard/browscap.c Diff: diff --cc NEWS index b2f9c4b,fcb811f..12cc50d --- a/NEWS +++ b/NEWS @@@ -61,29 -41,14 +61,31 @@@ PH 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) + - Standard: - . Fixed bug #72823 (strtr out-of-bound access). (cmb) + . 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) diff --cc ext/standard/browscap.c index f47478a,36def71..8ad5582 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@@ -115,8 -123,12 +115,12 @@@ static void convert_browscap_pattern(zv t[j++] = '\\'; t[j] = '~'; break; + case '+': + t[j++] = '\\'; + t[j] = '+'; + break; default: - t[j] = Z_STRVAL_P(pattern)[i]; + t[j] = lc_pattern[i]; break; } }