clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.2' into PHP-7.3

Browse Source
This commit is contained in:
Nikita Popov 2019-01-11 10:25:32 +01:00
commit e6eac08abd
3 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -38,6 +38,8 @@ PHP NEWS
lost). (Nikita) lost). (Nikita)
. Fixed bug #77434 (php-fpm workers are segfaulting in zend_gc_addre). . Fixed bug #77434 (php-fpm workers are segfaulting in zend_gc_addre).
(Nikita) (Nikita)
. Fixed bug #77361 (configure fails on 64-bit AIX when opcache enabled).
(Kevin Adler)
- PCRE: - PCRE:
. Fixed bug #77338 (get_browser with empty string). (Nikita) . Fixed bug #77338 (get_browser with empty string). (Nikita)

16
ext/opcache/ZendAccelerator.h
View File

@ -90,23 +90,9 @@
#ifndef ZEND_WIN32 #ifndef ZEND_WIN32
extern int lock_file; extern int lock_file;
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || (defined(__APPLE__) && defined(__MACH__)/* Darwin */) || defined(__OpenBSD__) || defined(__NetBSD__) # if defined(HAVE_FLOCK_AIX64)
# define FLOCK_STRUCTURE(name, type, whence, start, len) \ # define FLOCK_STRUCTURE(name, type, whence, start, len) \
struct flock name = {start, len, -1, type, whence}
# elif defined(__svr4__)
# define FLOCK_STRUCTURE(name, type, whence, start, len) \
struct flock name = {type, whence, start, len}
# elif defined(__linux__) || defined(__hpux) || defined(__GNU__)
# define FLOCK_STRUCTURE(name, type, whence, start, len) \
struct flock name = {type, whence, start, len, 0}
# elif defined(_AIX)
# if defined(_LARGE_FILES) || defined(__64BIT__)
# define FLOCK_STRUCTURE(name, type, whence, start, len) \
struct flock name = {type, whence, 0, 0, 0, start, len } struct flock name = {type, whence, 0, 0, 0, start, len }
# else
# define FLOCK_STRUCTURE(name, type, whence, start, len) \
struct flock name = {type, whence, start, len}
# endif
# elif defined(HAVE_FLOCK_BSD) # elif defined(HAVE_FLOCK_BSD)
# define FLOCK_STRUCTURE(name, type, whence, start, len) \ # define FLOCK_STRUCTURE(name, type, whence, start, len) \
struct flock name = {start, len, -1, type, whence} struct flock name = {start, len, -1, type, whence}

32
ext/opcache/config.m4
View File

@ -342,7 +342,25 @@ int main() {
AC_MSG_RESULT([$msg]) AC_MSG_RESULT([$msg])
flock_type=unknown flock_type=unknown
AC_MSG_CHECKING("whether flock struct is linux ordered") AC_MSG_CHECKING(for struct flock layout)
if test "$flock_type" = "unknown"; then
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <fcntl.h>
struct flock lock = { 1, 2, 3, 4, 5, 6, 7 };
int main() {
if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 6 && lock.l_len== 7) {
return 0;
}
return 1;
}
]])], [
flock_type=aix64
AC_DEFINE([HAVE_FLOCK_AIX64], [], [Struct flock is 64-bit AIX-type])
], [])
fi
if test "$flock_type" = "unknown"; then
AC_RUN_IFELSE([AC_LANG_SOURCE([[ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <fcntl.h> #include <fcntl.h>
struct flock lock = { 1, 2, 3, 4, 5 }; struct flock lock = { 1, 2, 3, 4, 5 };
@ -355,10 +373,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
]])], [ ]])], [
flock_type=linux flock_type=linux
AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
AC_MSG_RESULT("yes") ], [])
], [AC_MSG_RESULT("no")], [AC_MSG_RESULT([no])]) fi
AC_MSG_CHECKING("whether flock struct is BSD ordered") if test "$flock_type" = "unknown"; then
AC_RUN_IFELSE([AC_LANG_SOURCE([[ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <fcntl.h> #include <fcntl.h>
struct flock lock = { 1, 2, 3, 4, 5 }; struct flock lock = { 1, 2, 3, 4, 5 };
@ -371,8 +389,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
]])], [ ]])], [
flock_type=bsd flock_type=bsd
AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
AC_MSG_RESULT("yes") ], [])
], [AC_MSG_RESULT("no")], [AC_MSG_RESULT([no])]) fi
AC_MSG_RESULT([$flock_type])
if test "$flock_type" = "unknown"; then if test "$flock_type" = "unknown"; then
AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])