Browse Source
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74906 redirecting incorrect include <sys/errno.h>
PHP-7.1.8
Joe Watkins
9 years ago
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E
2 changed files with
2 additions and
7 deletions
-
NEWS
-
ext/snmp/snmp.c
|
|
|
@ -11,6 +11,7 @@ PHP NEWS |
|
|
|
. Fixed bug #73900 (Use After Free in unserialize() SplFixedArray). (nikic) |
|
|
|
. Fixed bug #74923 (Crash when crawling through network share). (Anatol) |
|
|
|
. Fixed bug #74913 (fixed incorrect poll.h include). (petk) |
|
|
|
. Fixed bug #74906 (fixed incorrect errno.h include). (petk) |
|
|
|
|
|
|
|
- Date: |
|
|
|
. Fixed bug #74852 (property_exists returns true on unknown DateInterval |
|
|
|
|
|
|
|
@ -38,9 +38,9 @@ |
|
|
|
#if HAVE_SNMP |
|
|
|
|
|
|
|
#include <sys/types.h> |
|
|
|
#include <errno.h> |
|
|
|
#ifdef PHP_WIN32 |
|
|
|
#include <winsock2.h> |
|
|
|
#include <errno.h> |
|
|
|
#include <process.h> |
|
|
|
#include "win32/time.h" |
|
|
|
#elif defined(NETWARE) |
|
|
|
@ -49,17 +49,11 @@ |
|
|
|
#else |
|
|
|
#include <sys/socket.h> |
|
|
|
#endif |
|
|
|
#include <errno.h> |
|
|
|
#include <sys/timeval.h> |
|
|
|
#else |
|
|
|
#include <sys/socket.h> |
|
|
|
#include <netinet/in.h> |
|
|
|
#include <arpa/inet.h> |
|
|
|
#ifndef _OSD_POSIX |
|
|
|
#include <sys/errno.h> |
|
|
|
#else |
|
|
|
#include <errno.h> /* BS2000/OSD uses <errno.h>, not <sys/errno.h> */ |
|
|
|
#endif |
|
|
|
#include <netdb.h> |
|
|
|
#endif |
|
|
|
#ifdef HAVE_UNISTD_H |
|
|
|
|
