From: Zeev Suraski <zeev@php.net>
Date: Mon, 12 Jun 2000 16:07:15 +0000 (+0000)
Subject: Get rid of <?php_track_vars?>
X-Git-Tag: php-4.0.1RC~256
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=968d2c5b3395aad0112520fa8d9f7610d95c9efc;p=php

Get rid of <?php_track_vars?>
---

diff --git a/Zend/zend-parser.y b/Zend/zend-parser.y
index ba65b01bad..de13873e5d 100644
--- a/Zend/zend-parser.y
+++ b/Zend/zend-parser.y
@@ -133,7 +133,6 @@
 %token T_DOLLAR_OPEN_CURLY_BRACES
 %token T_CURLY_OPEN
 %token T_PAAMAYIM_NEKUDOTAYIM
-%token T_PHP_TRACK_VARS
 
 %% /* Rules */
 
diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index 18711267e0..30ab9dc3b4 100644
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -1241,9 +1241,12 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 
 
 <INITIAL>"<?php_track_vars?>"([\n]|"\r\n")? {
-	zend_message_dispatcher(ZMSG_ENABLE_TRACK_VARS, NULL);
+	zend_error(E_WARNING, "<?php_track_vars?> is no longer supported - please use the track_vars INI directive instead");
 	HANDLE_NEWLINE(yytext[yyleng-1]);
-	return T_PHP_TRACK_VARS;
+	zendlval->value.str.val = (char *) estrndup(yytext, yyleng);
+	zendlval->value.str.len = yyleng;
+	zendlval->type = IS_STRING;
+	return T_INLINE_HTML;
 }
 
 <ST_IN_SCRIPTING,ST_DOUBLE_QUOTES,ST_HEREDOC,ST_BACKQUOTE>"$"{LABEL} {
diff --git a/Zend/zend.h b/Zend/zend.h
index e585ce585b..5596fe61c5 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -351,13 +351,12 @@ ZEND_API int zend_get_ini_entry(char *name, uint name_length, zval *contents);
 
 
 /* Messages for applications of Zend */
-#define ZMSG_ENABLE_TRACK_VARS			1L
-#define ZMSG_FAILED_INCLUDE_FOPEN		2L
-#define ZMSG_FAILED_REQUIRE_FOPEN		3L
-#define ZMSG_FAILED_HIGHLIGHT_FOPEN		4L
-#define ZMSG_MEMORY_LEAK_DETECTED		5L
-#define ZMSG_MEMORY_LEAK_REPEATED		6L
-#define ZMSG_LOG_SCRIPT_NAME		7L
+#define ZMSG_FAILED_INCLUDE_FOPEN		1L
+#define ZMSG_FAILED_REQUIRE_FOPEN		2L
+#define ZMSG_FAILED_HIGHLIGHT_FOPEN		3L
+#define ZMSG_MEMORY_LEAK_DETECTED		4L
+#define ZMSG_MEMORY_LEAK_REPEATED		5L
+#define ZMSG_LOG_SCRIPT_NAME			6L
 
 #define INIT_PZVAL(z)		\
 	(z)->refcount = 1;		\
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 3d1666e326..65a183efdc 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2289,7 +2289,6 @@ int zendlex(znode *zendlval CLS_DC)
 		case T_COMMENT:
 		case T_OPEN_TAG:
 		case T_WHITESPACE:
-		case T_PHP_TRACK_VARS:
 			retval = zendlex(zendlval CLS_CC);
 			break;
 		case T_CLOSE_TAG: