Merge branch 'PHP-7.1' into PHP-7.2

Author: nikic

ext/phar/phar.c

@@ -1843,7 +1843,7 @@ static int phar_check_str(const char *fname, const char *ext_str, int ext_len, i
 		pos = strstr(ext_str, ".phar");
 
 		if (!pos
-			|| pos != ext_str && (*(pos - 1) == '/')
+			|| (pos != ext_str && (*(pos - 1) == '/'))
 			|| (ext_len - (pos - ext_str)) < 5
 			|| !(pos += 5)
 			|| !(*pos == '\0' || *pos == '/' || *pos == '.')) {

ext/posix/config.m4

@@ -9,7 +9,7 @@ if test "$PHP_POSIX" = "yes"; then
   AC_DEFINE(HAVE_POSIX, 1, [whether to include POSIX-like functions])
   PHP_NEW_EXTENSION(posix, posix.c, $ext_shared)
 
-  AC_CHECK_HEADERS(sys/mkdev.h)
+  AC_CHECK_HEADERS([sys/mkdev.h sys/sysmacros.h])
 
   AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod setrlimit getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r)
 

ext/posix/posix.c

@@ -52,6 +52,9 @@
 #if HAVE_SYS_MKDEV_H
 # include <sys/mkdev.h>
 #endif
+#if HAVE_SYS_SYSMACROS_H
+# include <sys/sysmacros.h>
+#endif
 
 ZEND_DECLARE_MODULE_GLOBALS(posix)
 static PHP_MINFO_FUNCTION(posix);