Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add mitigation for CVE-2015-0235 (bug #68925)

diff --cc ext/standard/dns.c
Simple merge

diff --cc main/network.c
index 6072e76e72099bd041b4c36a577981244ba717b0,41b2cfa0ba2372e4f259f20d7f515cf2f20d623f..702509a9d90048393593716c50f4bfc18d29cd66
--- 1/main/network.c
--- 2/main/network.c
+++ b/main/network.c
@@@ -24,11 -24,9 +24,12 @@@
  #include "php.h"
  
  #include <stddef.h>
+ #include <errno.h>
  
 +
 +
  #ifdef PHP_WIN32
 +# include <Ws2tcpip.h>
  # include "win32/inet.h"
  # define O_RDONLY _O_RDONLY
  # include "win32/param.h"

diff --cc sapi/cgi/fastcgi.c
Simple merge