Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)

Author: adoy

Zend/zend_highlight.c

@@ -186,7 +186,6 @@ ZEND_API void zend_strip(TSRMLS_D)
 
 			case T_END_HEREDOC:
 				zend_write((char*)LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
-				efree(token.value.str.val);
 				/* read the following character, either newline or ; */
 				if (lex_scan(&token TSRMLS_CC) != T_WHITESPACE) {
 					zend_write((char*)LANG_SCNG(yy_text), LANG_SCNG(yy_leng));

ext/standard/tests/strings/bug63874.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Bug #63874 (Segfault if php_strip_whitespace has heredoc)
+--FILE--
+<?php
+echo php_strip_whitespace(__FILE__);
+
+return <<<A
+a
+A;
+?>
+--EXPECT--
+<?php
+echo php_strip_whitespace(__FILE__); return <<<A
+a
+A;
+?>