Merge branch 'master' into assert

* master:
  Implemented AST pretty-printer
  update NEWS to match the actual stuff in 5.6.6
  update NEWS to match the actual stuff in 5.5.22
  update NEWS(add missing entry for the enchant fix, and reorder the entries a bit)
  fix typo in bug#
  update NEWS
  fix email format
  update NEWS
  update 5.6.6 release date in NEWS
  Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)
  BFN
  fix test
  fix test
  fix test
  Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)
  Updated NEWS
  add CVE
  5.4.39 next
  Fix associativity to match Perl
  Blast off to space.

Conflicts:
	Zend/zend_ast.c

Author: dstogov

Zend/zend_ast.c

@@ -467,7 +467,7 @@ ZEND_API void zend_ast_apply(zend_ast *ast, zend_ast_apply_func fn) {
  *  150     left            ^
  *  160     left            &
  *  170     non-associative == != === !==
- *  180     non-associative < <= > >=
+ *  180     non-associative < <= > >= <=>
  *  190     left            << >>
  *  200     left            + - .
  *  210     left            * / %
@@ -1252,6 +1252,7 @@ static void zend_ast_export_ex(smart_str *str, zend_ast *ast, int priority, int
 				case ZEND_IS_SMALLER_OR_EQUAL: BINARY_OP(" <= ",  180, 181, 181);
 				case ZEND_POW:                 BINARY_OP(" ** ",  250, 251, 250);
 				case ZEND_BOOL_XOR:            BINARY_OP(" xor ",  40,  40,  41);
+				case ZEND_SPACESHIP:           BINARY_OP(" <=> ", 180, 181, 181);
 				EMPTY_SWITCH_DEFAULT_CASE();
 			}
 			break;

Zend/zend_language_parser.y

@@ -75,7 +75,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %left '|'
 %left '^'
 %left '&'
-%nonassoc T_IS_EQUAL T_IS_NOT_EQUAL T_IS_IDENTICAL T_IS_NOT_IDENTICAL
+%nonassoc T_IS_EQUAL T_IS_NOT_EQUAL T_IS_IDENTICAL T_IS_NOT_IDENTICAL T_SPACESHIP
 %nonassoc '<' T_IS_SMALLER_OR_EQUAL '>' T_IS_GREATER_OR_EQUAL
 %left T_SL T_SR
 %left '+' '-' '.'
@@ -131,6 +131,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %token T_IS_NOT_IDENTICAL "!== (T_IS_NOT_IDENTICAL)"
 %token T_IS_SMALLER_OR_EQUAL "<= (T_IS_SMALLER_OR_EQUAL)"
 %token T_IS_GREATER_OR_EQUAL ">= (T_IS_GREATER_OR_EQUAL)"
+%token T_SPACESHIP "<=> (T_SPACESHIP)"
 %token T_SL "<< (T_SL)"
 %token T_SR ">> (T_SR)"
 %token T_INSTANCEOF  "instanceof (T_INSTANCEOF)"
@@ -846,6 +847,8 @@ expr_without_variable:
 			{ $$ = zend_ast_create(ZEND_AST_GREATER, $1, $3); }
 	|	expr T_IS_GREATER_OR_EQUAL expr
 			{ $$ = zend_ast_create(ZEND_AST_GREATER_EQUAL, $1, $3); }
+	|	expr T_SPACESHIP expr
+			{ $$ = zend_ast_create_binary_op(ZEND_SPACESHIP, $1, $3); }
 	|	expr T_INSTANCEOF class_name_reference
 			{ $$ = zend_ast_create(ZEND_AST_INSTANCEOF, $1, $3); }
 	|	'(' expr ')' { $$ = $2; }