From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 11 Jan 2019 09:25:32 +0000 (+0100)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.2RC1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6eac08abd4aae0ea8052331c5ae81fc053e9138;p=php

Merge branch 'PHP-7.2' into PHP-7.3
---

e6eac08abd4aae0ea8052331c5ae81fc053e9138
diff --cc NEWS
index c35c1e1595,99bc6e5172..c2bb842df6
--- a/NEWS
+++ b/NEWS
@@@ -24,24 -11,14 +24,26 @@@ PH
    . Fixed bug #77272 (imagescale() may return image resource on failure). (cmb)
    . Fixed bug #77391 (1bpp BMPs may fail to be loaded). (Romain Déoux, cmb)
  
 +- Mbstring:
 +  . Fixed bug #77428 (mb_ereg_replace() doesn't replace a substitution
 +    variable). (Nikita)
 +
  - MySQLnd:
    . Fixed bug #75684 (In mysqlnd_ext_plugin.h the plugin methods family has
 -    no external visibility). (Anatol)
 +      no external visibility). (Anatol)
  
  - Opcache:
 +  . Fixed bug #77266 (Assertion failed in dce_live_ranges). (Laruence)
 +  . Fixed bug #77257 (value of variable assigned in a switch() construct gets
 +    lost). (Nikita)
 +  . Fixed bug #77434 (php-fpm workers are segfaulting in zend_gc_addre).
 +    (Nikita)
+   . Fixed bug #77361 (configure fails on 64-bit AIX when opcache enabled).
+     (Kevin Adler)
  
 +- PCRE:
 +  . Fixed bug #77338 (get_browser with empty string). (Nikita)
 +
  - PDO:
    . Fixed bug #77273 (array_walk_recursive corrupts value types leading to PDO
      failure). (Nikita)
diff --cc ext/opcache/config.m4
index a267c639e0,ec14487c12..392f4c65a3
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@@ -342,8 -344,26 +342,26 @@@ int main() 
    AC_MSG_RESULT([$msg])
  
  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_TRY_RUN([
++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_TRY_RUN([
 +AC_RUN_IFELSE([AC_LANG_SOURCE([[
    #include <fcntl.h>
    struct flock lock = { 1, 2, 3, 4, 5 };
    int main() {
@@@ -352,14 -372,14 +370,14 @@@
      }
      return 1;
    }
 -], [
 +]])], [
  	flock_type=linux
      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_TRY_RUN([
 +AC_RUN_IFELSE([AC_LANG_SOURCE([[
    #include <fcntl.h>
    struct flock lock = { 1, 2, 3, 4, 5 };
    int main() {
@@@ -368,11 -388,13 +386,13 @@@
      }
      return 1;
    }
 -], [
 +]])], [
  	flock_type=bsd
      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
  	AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])