Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug 74913 redirecting incorrect include <sys/poll.h>

diff --cc NEWS
index 502468b05831a0244db4688217f1b42a08dd8c74,d0c0efa919a95cb456ecf37088a6463a6e14c756..3c55f0ae0e06b8e169846ac446dc9652140f78ac
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -9,31 -65,13 +9,32 @@@ PH
      unserialize). (Nikita)
    . Fixed bug #74819 (wddx_deserialize() heap out-of-bound read via
      php_parse_date()). (Derick)
 +  . Fixed bug #49649 (unserialize() doesn't handle changes in property 
 +    visibility). (pmmaga)
 +  . Fixed #74866 (extension_dir = "./ext" now use current directory for base).
 +    (Francois Laupretre)
 +  . Fixed bug #74923 (Crash when crawling through network share). (Anatol)
++  . Fixed bug #74913 (fixed incorrect poll.h include). (petk)
  
  - Date:
 -  . Fixed bug #74639 (implement clone for DatePeriod and DateInterval).
 -    (andrewnester)
 +  . Fixed bug #74852 (property_exists returns true on unknown DateInterval 
 +    property). (jhdxr)        
  
  - DOM:
 -  . Fixed bug #69373 (References to deleted XPath query results). (ttoohey)
 +  . Implement #74837 (Implement Countable for DomNodeList and DOMNamedNodeMap).
 +    (Andreas Treichel)
 +
 +- EXIF:
 +  . Implemented #65187 (exif_read_data/thumbnail: add support for stream 
 +    resource). (Kalle)
 +  . Deprecated the read_exif_data() alias. (Kalle)
 +  . Fixed bug #74428 (exif_read_data(): "Illegal IFD size" warning occurs with 
 +    correct exif format). (bradpiccho at gmail dot com, Kalle)
 +  . Fixed bug #72819 (EXIF thumbnails not read anymore). (Kalle)
 +  . Fixed bug #62523 (php crashes with segfault when exif_read_data called). 
 +    (Kalle)
 +  . Fixed bug #50660 (exif_read_data(): Illegal IFD offset (works fine with 
 +    other exif readers). (skinny dot bravo at gmail dot com, Kalle)
  
  - GD:
    . Fixed bug #74435 (Buffer over-read into uninitialized memory). (cmb)

diff --cc sapi/phpdbg/phpdbg.c
Simple merge