Index: Zend/zend.c
===================================================================
RCS file: /repository/ZendEngine2/zend.c,v
retrieving revision 1.395
diff -u -p -d -r1.395 zend.c
--- Zend/zend.c	15 Mar 2007 16:42:51 -0000	1.395
+++ Zend/zend.c	12 Apr 2007 19:13:06 -0000
@@ -670,11 +670,9 @@ static void register_standard_class(TSRM
 }
 
 #ifdef ZTS
-static zend_bool asp_tags_default      = 0;
 static zend_bool short_tags_default    = 1;
 static zend_bool extended_info_default = 0;
 #else
-# define asp_tags_default      0
 # define short_tags_default    1
 # define extended_info_default 0
 #endif
@@ -682,7 +680,6 @@ static zend_bool extended_info_default =
 static void zend_set_default_compile_time_values(TSRMLS_D)
 {
 	/* default compile-time values */
-	CG(asp_tags) = asp_tags_default;
 	CG(short_tags) = short_tags_default;
 	CG(extended_info) = extended_info_default;
 	CG(literal_type) = ZEND_STR_TYPE;
@@ -1163,7 +1160,6 @@ void zend_post_startup(TSRMLS_D)
 	*GLOBAL_CLASS_TABLE = *compiler_globals->class_table;
 	*GLOBAL_CONSTANTS_TABLE = *executor_globals->zend_constants;
 
-	asp_tags_default = CG(asp_tags);
 	short_tags_default = CG(short_tags);
 	extended_info_default = CG(extended_info);
 
Index: Zend/zend_globals.h
===================================================================
RCS file: /repository/ZendEngine2/zend_globals.h,v
retrieving revision 1.167
diff -u -p -d -r1.167 zend_globals.h
--- Zend/zend_globals.h	16 Feb 2007 19:36:45 -0000	1.167
+++ Zend/zend_globals.h	12 Apr 2007 19:13:06 -0000
@@ -100,7 +100,6 @@ struct _zend_compiler_globals {
 
 	zend_bool in_compilation;
 	zend_bool short_tags;
-	zend_bool asp_tags;
 
 	zend_declarables declarables;
 
Index: Zend/zend_language_scanner.l
===================================================================
RCS file: /repository/ZendEngine2/zend_language_scanner.l,v
retrieving revision 1.163
diff -u -p -d -r1.163 zend_language_scanner.l
--- Zend/zend_language_scanner.l	15 Feb 2007 10:42:51 -0000	1.163
+++ Zend/zend_language_scanner.l	12 Apr 2007 19:13:07 -0000
@@ -2030,8 +2030,8 @@ NEWLINE ("\r"|"\n"|"\r\n")
 }
 
 
-<INITIAL>"<%="|"<?=" {
-	if ((yytext[1]=='%' && CG(asp_tags)) || (yytext[1]=='?' && CG(short_tags))) {
+<INITIAL>"<?=" {
+	if (yytext[1]=='?' && CG(short_tags)) {
 		Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
 		Z_STRLEN_P(zendlval) = yyleng;
 		Z_TYPE_P(zendlval) = IS_STRING;
@@ -2046,22 +2046,6 @@ NEWLINE ("\r"|"\n"|"\r\n")
 }
 
 
-<INITIAL>"<%" {
-	if (CG(asp_tags)) {
-		Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
-		Z_STRLEN_P(zendlval) = yyleng;
-		Z_TYPE_P(zendlval) = IS_STRING;
-		BEGIN(ST_IN_SCRIPTING);
-		return T_OPEN_TAG;
-	} else {
-		Z_STRVAL_P(zendlval) = (char *) estrndup(yytext, yyleng);
-		Z_STRLEN_P(zendlval) = yyleng;
-		Z_TYPE_P(zendlval) = IS_STRING;
-		return T_INLINE_HTML;
-	}
-}
-
-
 <INITIAL>"<?php"([ \t]|{NEWLINE}) {
 	Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
 	Z_STRLEN_P(zendlval) = yyleng;
@@ -2144,17 +2128,13 @@ NEWLINE ("\r"|"\n"|"\r\n")
 	return T_COMMENT;
 }
 
-<ST_ONE_LINE_COMMENT>"?>"|"%>" {
-    if (CG(asp_tags) || yytext[yyleng-2] != '%') { /* asp comment? */
-		Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
-		Z_STRLEN_P(zendlval) = yyleng-2;
-		Z_TYPE_P(zendlval) = IS_STRING;
-		yyless(yyleng-2);
-		BEGIN(ST_IN_SCRIPTING);
-		return T_COMMENT;
-	} else {
-		yymore();
-	}
+<ST_ONE_LINE_COMMENT>"?>" {
+	Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
+	Z_STRLEN_P(zendlval) = yyleng-2;
+	Z_TYPE_P(zendlval) = IS_STRING;
+	yyless(yyleng-2);
+	BEGIN(ST_IN_SCRIPTING);
+	return T_COMMENT;
 }
 
 <ST_IN_SCRIPTING>"/**"{WHITESPACE} {
@@ -2207,20 +2187,6 @@ NEWLINE ("\r"|"\n"|"\r\n")
 }
 
 
-<ST_IN_SCRIPTING>"%>"{NEWLINE}? {
-	if (CG(asp_tags)) {
-		BEGIN(INITIAL);
-		Z_STRLEN_P(zendlval) = yyleng;
-		Z_TYPE_P(zendlval) = IS_STRING;
-		Z_STRVAL_P(zendlval) = yytext; /* no copying - intentional */
-		return T_CLOSE_TAG;  /* implicit ';' at php-end tag */
-	} else {
-		yyless(1);
-		return yytext[0];
-	}
-}
-
-
 <ST_IN_SCRIPTING>(["]([^$"\\]|("\\".))*["]) {
 	if (UG(unicode)) {
 		return zend_scan_unicode_double_string(zendlval TSRMLS_CC);
Index: main/main.c
===================================================================
RCS file: /repository/php-src/main/main.c,v
retrieving revision 1.725
diff -u -p -d -r1.725 main.c
--- main/main.c	8 Apr 2007 08:02:02 -0000	1.725
+++ main/main.c	12 Apr 2007 19:13:07 -0000
@@ -355,7 +355,6 @@ PHP_INI_BEGIN()
 	PHP_INI_ENTRY_EX("highlight.keyword",		HL_KEYWORD_COLOR,	PHP_INI_ALL,	NULL,			php_ini_color_displayer_cb)
 	PHP_INI_ENTRY_EX("highlight.string",		HL_STRING_COLOR,	PHP_INI_ALL,	NULL,			php_ini_color_displayer_cb)
 
-	STD_PHP_INI_BOOLEAN("asp_tags",				"0",		PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateBool,			asp_tags,				zend_compiler_globals,	compiler_globals)
 	STD_PHP_INI_BOOLEAN("display_errors",		"1",		PHP_INI_ALL,		OnUpdateBool,			display_errors,			php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("display_startup_errors",	"0",	PHP_INI_ALL,		OnUpdateBool,			display_startup_errors,	php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("expose_php",			"1",		PHP_INI_SYSTEM,		OnUpdateBool,			expose_php,				php_core_globals,	core_globals)
Index: sapi/cli/php_cli_readline.c
===================================================================
RCS file: /repository/php-src/sapi/cli/php_cli_readline.c,v
retrieving revision 1.12
diff -u -p -d -r1.12 php_cli_readline.c
--- sapi/cli/php_cli_readline.c	1 Jan 2007 09:29:36 -0000	1.12
+++ sapi/cli/php_cli_readline.c	12 Apr 2007 19:13:07 -0000
@@ -140,12 +140,6 @@ int cli_is_valid_code(char *code, int le
 						}
 						valid_end = 0;
 						break;
-					case '%':
-						if (!CG(asp_tags)) {
-							valid_end = 0;
-							break;
-						}
-						/* no break */
 					case '?':
 						if (code[i+1] == '>') {
 							i++;
@@ -229,7 +223,6 @@ int cli_is_valid_code(char *code, int le
 				break;
 			case outside:
 				if ((CG(short_tags) && !strncmp(code+i-1, "<?", 2))
-				||  (CG(asp_tags) && !strncmp(code+i-1, "<%", 2))
 				||  (i > 3 && !strncmp(code+i-4, "<?php", 5))
 				) {
 					code_type = body;