Merge branch 'PHP-5.6' into PHP-7.0

diff --cc NEWS
index b2f9c4b3a6600a106ffdee1be1e46272c396fb6b,fcb811f1d6878c5ef2b6afc7a4b83d1440555ed9..12cc50d064842a07838f90fc841651d6a78b39d0
--- 1/NEWS
--- 2/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 f47478a2415c97608567a40de4f454f5a4ae9180,36def7183877fbc79086cea61dc9674fa9aee14b..8ad55829c8a85ee8f7e6c8b70fd62f547906c681
--- 1/ext/standard/browscap.c
--- 2/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;
                }
        }