Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Simpler fix for #74974

Author: sgolemon

Zend/zend_operators.c

@@ -2166,16 +2166,6 @@ ZEND_API int ZEND_FASTCALL is_not_equal_function(zval *result, zval *op1, zval *
 
 ZEND_API int ZEND_FASTCALL is_smaller_function(zval *result, zval *op1, zval *op2) /* {{{ */
 {
-	if (UNEXPECTED((Z_TYPE_P(op1) == IS_DOUBLE) && zend_isnan(Z_DVAL_P(op1)))) {
-		ZVAL_FALSE(result);
-		return SUCCESS;
-	}
-
-	if (UNEXPECTED((Z_TYPE_P(op2) == IS_DOUBLE) && zend_isnan(Z_DVAL_P(op2)))) {
-		ZVAL_FALSE(result);
-		return SUCCESS;
-	}
-
 	if (compare_function(result, op1, op2) == FAILURE) {
 		return FAILURE;
 	}
@@ -2186,16 +2176,6 @@ ZEND_API int ZEND_FASTCALL is_smaller_function(zval *result, zval *op1, zval *op
 
 ZEND_API int ZEND_FASTCALL is_smaller_or_equal_function(zval *result, zval *op1, zval *op2) /* {{{ */
 {
-	if (UNEXPECTED((Z_TYPE_P(op1) == IS_DOUBLE) && isnan(Z_DVAL_P(op1)))) {
-		ZVAL_FALSE(result);
-		return SUCCESS;
-	}
-
-	if (UNEXPECTED((Z_TYPE_P(op2) == IS_DOUBLE) && isnan(Z_DVAL_P(op2)))) {
-		ZVAL_FALSE(result);
-		return SUCCESS;
-	}
-
 	if (compare_function(result, op1, op2) == FAILURE) {
 		return FAILURE;
 	}

Zend/zend_portability.h

@@ -433,7 +433,7 @@ char *alloca();
 #define ZEND_STRL(str)		(str), (sizeof(str)-1)
 #define ZEND_STRS(str)		(str), (sizeof(str))
 #define ZEND_NORMALIZE_BOOL(n)			\
-	((n) ? (((n)>0) ? 1 : -1) : 0)
+	((n) ? (((n)<0) ? -1 : 1) : 0)
 #define ZEND_TRUTH(x)		((x) ? 1 : 0)
 #define ZEND_LOG_XOR(a, b)		(ZEND_TRUTH(a) ^ ZEND_TRUTH(b))