From 79c01f065f0345dd4a32fa69a27a57932b4c7848 Mon Sep 17 00:00:00 2001
From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 13 Dec 2005 21:45:00 +0000
Subject: [PATCH] MFH: Fixed bug #35655 (whitespace following end of heredoc is
 lost).

---
 NEWS                              |  1 +
 ext/tokenizer/tests/bug26463.phpt | 62 +++++++++++++++++++------------
 2 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/NEWS b/NEWS
index 1a72785b6b..e004e3d03e 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP 4                                                                      NEWS
 ?? ??? 2005, Version 4.4.2
 - Prevent header injection by limiting each header to a single line. (Ilia)
 - Fixed possible XSS inside error reporting functionality. (Ilia)
+- Fixed bug #35655 (whitespace following end of heredoc is lost). (Ilia)
 - Fixed bug #35646 (%{mod_php_memory_usage}n is not reset after exit). 
   (vovik at getart dot ru, Tony)
 - Fixed bug #35594 (Multiple calls to getopt() may result in a crash).
diff --git a/ext/tokenizer/tests/bug26463.phpt b/ext/tokenizer/tests/bug26463.phpt
index 7480aa2f59..679ffe3c37 100644
--- a/ext/tokenizer/tests/bug26463.phpt
+++ b/ext/tokenizer/tests/bug26463.phpt
@@ -14,11 +14,11 @@ DDDD;
 var_dump(token_get_all($str));
 ?>
 --EXPECTF--
-array(17) {
+array(19) {
   [0]=>
   array(2) {
     [0]=>
-    int(%d)
+    int(367)
     [1]=>
     string(6) "<?php
 "
@@ -26,7 +26,7 @@ array(17) {
   [1]=>
   array(2) {
     [0]=>
-    int(%d)
+    int(309)
     [1]=>
     string(2) "$x"
   }
@@ -35,7 +35,7 @@ array(17) {
   [3]=>
   array(2) {
     [0]=>
-    int(%d)
+    int(371)
     [1]=>
     string(6) "<<<DD
 "
@@ -43,7 +43,7 @@ array(17) {
   [4]=>
   array(2) {
     [0]=>
-    int(%d)
+    int(307)
     [1]=>
     string(13) "jhdsjkfhjdsh
 "
@@ -51,67 +51,83 @@ array(17) {
   [5]=>
   array(2) {
     [0]=>
-    int(%d)
+    int(372)
     [1]=>
     string(2) "DD"
   }
   [6]=>
-  string(1) "."
+  array(2) {
+    [0]=>
+    int(370)
+    [1]=>
+    string(1) "
+"
+  }
   [7]=>
+  string(1) "."
+  [8]=>
   array(2) {
     [0]=>
-    int(%d)
+    int(315)
     [1]=>
     string(2) """"
   }
-  [8]=>
-  string(1) ";"
   [9]=>
+  string(1) ";"
+  [10]=>
   array(2) {
     [0]=>
-    int(%d)
+    int(370)
     [1]=>
     string(1) "
 "
   }
-  [10]=>
+  [11]=>
   array(2) {
     [0]=>
-    int(%d)
+    int(309)
     [1]=>
     string(2) "$a"
   }
-  [11]=>
-  string(1) "="
   [12]=>
+  string(1) "="
+  [13]=>
   array(2) {
     [0]=>
-    int(%d)
+    int(371)
     [1]=>
     string(8) "<<<DDDD
 "
   }
-  [13]=>
+  [14]=>
   array(2) {
     [0]=>
-    int(%d)
+    int(307)
     [1]=>
     string(13) "jhdsjkfhjdsh
 "
   }
-  [14]=>
+  [15]=>
   array(2) {
     [0]=>
-    int(%d)
+    int(372)
     [1]=>
     string(4) "DDDD"
   }
-  [15]=>
-  string(1) ";"
   [16]=>
+  string(1) ";"
+  [17]=>
+  array(2) {
+    [0]=>
+    int(370)
+    [1]=>
+    string(1) "
+"
+  }
+  [18]=>
   array(2) {
     [0]=>
-    int(%d)
+    int(369)
     [1]=>
     string(2) "?>"
   }
-- 
2.50.1