From: Stanislav Malyshev <stas@php.net>
Date: Sun, 1 Feb 2015 03:08:37 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.22RC1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=237128603f99a97da9d0d261b8d0849f27b4c7b8;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

237128603f99a97da9d0d261b8d0849f27b4c7b8
diff --cc main/network.c
index 6072e76e72,41b2cfa0ba..702509a9d9
--- a/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"