From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 7 Oct 2014 22:27:12 +0000 (+0200)
Subject: Merge branch 'master' into xml-protocol
X-Git-Tag: php-5.6.3RC1~51^2~52^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89a0d3c2b228e9c536ae2b1c7eb0a76fc4014127;p=php

Merge branch 'master' into xml-protocol

Conflicts:
	phpdbg_lexer.c
	phpdbg_prompt.c
---

89a0d3c2b228e9c536ae2b1c7eb0a76fc4014127
diff --cc phpdbg_lexer.c
index 5ead27981b,af044937e3..bca4754c80
--- a/phpdbg_lexer.c
+++ b/phpdbg_lexer.c
@@@ -128,8 -134,14 +128,12 @@@ yyc_INITIAL
  yy2:
  		YYDEBUG(2, *YYCURSOR);
  		++YYCURSOR;
- 		if ((yych = *YYCURSOR) == '\t') goto yy26;
- 		if (yych == ' ') goto yy26;
 -		if ((yych = *YYCURSOR) <= '\f') {
 -			if (yych <= 0x00) goto yy29;
 -			if (yych <= 0x08) goto yy3;
 -			if (yych <= '\n') goto yy29;
++		if ((yych = *YYCURSOR) <= '\n') {
++			if (yych <= 0x00) goto yy27;
++			if (yych >= '\t') goto yy27;
+ 		} else {
 -			if (yych <= '\r') goto yy29;
 -			if (yych == ' ') goto yy29;
++			if (yych == ' ') goto yy27;
+ 		}
  yy3:
  		YYDEBUG(3, *YYCURSOR);
  		yyleng = (size_t) YYCURSOR - (size_t) yytext;
@@@ -140,27 -152,29 +144,27 @@@
  	YYCURSOR = LEX(text);
  	goto restart;
  }
- #line 144 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 156 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
++#line 148 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
  yy4:
  		YYDEBUG(4, *YYCURSOR);
 -		++YYCURSOR;
 -		YYFILL(1);
 -		yych = *YYCURSOR;
 +		yych = *++YYCURSOR;
 +		goto yy3;
 +yy5:
  		YYDEBUG(5, *YYCURSOR);
 -		if (yybm[0+yych] & 128) {
 -			goto yy28;
 -		}
 -		if (yych <= 0x00) goto yy27;
 -		if (yych == '\n') goto yy4;
 -yy6:
 +		++YYCURSOR;
  		YYDEBUG(6, *YYCURSOR);
  		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 -#line 68 "/root/php-src/sapi/phpdbg/phpdbg_lexer.l"
 +#line 68 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.l"
  		{
  	return 0;
  }
- #line 158 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 175 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
++#line 162 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
  yy7:
  		YYDEBUG(7, *YYCURSOR);
 -		yych = *++YYCURSOR;
 +		yyaccept = 0;
 +		yych = *(YYMARKER = ++YYCURSOR);
 +		if (yych == 'V') goto yy22;
 +		if (yych == 'v') goto yy22;
  		goto yy3;
  yy8:
  		YYDEBUG(8, *YYCURSOR);
@@@ -223,14 -244,19 +227,14 @@@ yy15
  	phpdbg_init_param(yylval, EMPTY_PARAM);
  	return T_RUN;
  }
- #line 227 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 248 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
++#line 231 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy18:
 +		YYDEBUG(18, *YYCURSOR);
 +		yych = *++YYCURSOR;
 +		if (yych == '\t') goto yy19;
 +		if (yych != ' ') goto yy13;
  yy19:
  		YYDEBUG(19, *YYCURSOR);
 -		yych = *++YYCURSOR;
 -		if (yych <= '\f') {
 -			if (yych <= 0x08) goto yy14;
 -			if (yych >= '\v') goto yy14;
 -		} else {
 -			if (yych <= '\r') goto yy20;
 -			if (yych != ' ') goto yy14;
 -		}
 -yy20:
 -		YYDEBUG(20, *YYCURSOR);
  		++YYCURSOR;
  		YYFILL(1);
  		yych = *YYCURSOR;
@@@ -245,14 -277,19 +249,14 @@@
  	phpdbg_init_param(yylval, EMPTY_PARAM);
  	return T_SHELL;
  }
- #line 249 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 281 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
++#line 253 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy22:
 +		YYDEBUG(22, *YYCURSOR);
 +		yych = *++YYCURSOR;
 +		if (yych == '\t') goto yy23;
 +		if (yych != ' ') goto yy13;
  yy23:
  		YYDEBUG(23, *YYCURSOR);
 -		yych = *++YYCURSOR;
 -		if (yych <= '\f') {
 -			if (yych <= 0x08) goto yy14;
 -			if (yych >= '\v') goto yy14;
 -		} else {
 -			if (yych <= '\r') goto yy24;
 -			if (yych != ' ') goto yy14;
 -		}
 -yy24:
 -		YYDEBUG(24, *YYCURSOR);
  		++YYCURSOR;
  		YYFILL(1);
  		yych = *YYCURSOR;
@@@ -267,24 -310,32 +271,30 @@@
  	phpdbg_init_param(yylval, EMPTY_PARAM);
  	return T_EVAL;
  }
- #line 271 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 314 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
 -yy27:
 -		YYDEBUG(27, *YYCURSOR);
 -		yych = *++YYCURSOR;
 -		goto yy6;
 -yy28:
 -		YYDEBUG(28, *YYCURSOR);
++#line 275 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy26:
 +		YYDEBUG(26, *YYCURSOR);
  		++YYCURSOR;
  		YYFILL(1);
  		yych = *YYCURSOR;
 -yy29:
 -		YYDEBUG(29, *YYCURSOR);
 -		if (yybm[0+yych] & 128) {
 -			goto yy28;
++yy27:
 +		YYDEBUG(27, *YYCURSOR);
- 		if (yych == '\t') goto yy26;
- 		if (yych == ' ') goto yy26;
++		if (yych <= '\t') {
++			if (yych <= 0x00) goto yy5;
++			if (yych >= '\t') goto yy26;
++		} else {
++			if (yych <= '\n') goto yy5;
++			if (yych == ' ') goto yy26;
+ 		}
 -		if (yych <= 0x00) goto yy27;
 -		if (yych == '\n') goto yy4;
 -		YYDEBUG(30, *YYCURSOR);
 +		YYDEBUG(28, *YYCURSOR);
  		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 -#line 139 "/root/php-src/sapi/phpdbg/phpdbg_lexer.l"
 +#line 146 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.l"
  		{
  	/* ignore whitespace */
  
  	goto restart;
  }
- #line 288 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 339 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
++#line 298 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
  	}
  /* *********************************** */
  yyc_NORMAL:
@@@ -393,58 -470,64 +403,60 @@@ yy32
  		++YYCURSOR;
  		YYFILL(1);
  		yych = *YYCURSOR;
 -		YYDEBUG(34, *YYCURSOR);
 -		if (yybm[0+yych] & 2) {
 -			goto yy33;
 +		YYDEBUG(33, *YYCURSOR);
 +		if (yybm[0+yych] & 8) {
 +			goto yy32;
  		}
 -		if (yych <= 0x00) goto yy39;
 -		if (yych == '\n') goto yy36;
 -		YYDEBUG(35, *YYCURSOR);
++		if (yych <= 0x00) goto yy35;
++		if (yych == '\n') goto yy35;
 +		YYDEBUG(34, *YYCURSOR);
  		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 -#line 139 "/root/php-src/sapi/phpdbg/phpdbg_lexer.l"
 +#line 146 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.l"
  		{
  	/* ignore whitespace */
  
  	goto restart;
  }
- #line 409 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 488 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
 -yy36:
 -		YYDEBUG(36, *YYCURSOR);
++#line 421 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy35:
 +		YYDEBUG(35, *YYCURSOR);
  		++YYCURSOR;
 -		YYFILL(1);
 -		yych = *YYCURSOR;
 -		YYDEBUG(37, *YYCURSOR);
 -		if (yybm[0+yych] & 2) {
 -			goto yy33;
 -		}
 -		if (yych <= 0x00) goto yy39;
 -		if (yych == '\n') goto yy36;
 -yy38:
 -		YYDEBUG(38, *YYCURSOR);
 +		YYDEBUG(36, *YYCURSOR);
  		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 -#line 68 "/root/php-src/sapi/phpdbg/phpdbg_lexer.l"
 +#line 68 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.l"
  		{
  	return 0;
  }
- #line 419 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 507 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
 -yy39:
 -		YYDEBUG(39, *YYCURSOR);
 -		yych = *++YYCURSOR;
 -		goto yy38;
 -yy40:
 -		YYDEBUG(40, *YYCURSOR);
++#line 431 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy37:
 +		YYDEBUG(37, *YYCURSOR);
  		yyaccept = 0;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yych == 'F') goto yy109;
 -		if (yych == 'f') goto yy109;
 -		goto yy43;
 -yy41:
 -		YYDEBUG(41, *YYCURSOR);
 +		if (yybm[0+yych] & 32) {
 +			goto yy42;
 +		}
 +		if (yych == 'r') goto yy109;
 +		goto yy41;
 +yy38:
 +		YYDEBUG(38, *YYCURSOR);
  		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 -#line 125 "/root/php-src/sapi/phpdbg/phpdbg_lexer.l"
 +#line 132 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.l"
  		{
  	phpdbg_init_param(yylval, STR_PARAM);
  	yylval->str = zend_strndup(yytext, yyleng);
  	yylval->len = yyleng;
  	return T_ID; 
  }
- #line 439 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 529 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
 -yy42:
 -		YYDEBUG(42, *YYCURSOR);
++#line 451 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy39:
 +		YYDEBUG(39, *YYCURSOR);
 +		yyaccept = 0;
 +		yych = *(YYMARKER = ++YYCURSOR);
 +		if (yych == 'F') goto yy105;
 +		if (yych == 'f') goto yy105;
 +		goto yy41;
 +yy40:
 +		YYDEBUG(40, *YYCURSOR);
  		yyaccept = 0;
  		YYMARKER = ++YYCURSOR;
  		YYFILL(3);
@@@ -491,13 -582,13 +503,13 @@@ yy44
  	yylval->num = atoi(yytext);
  	return T_DIGITS;
  }
- #line 495 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 586 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
 -yy48:
 -		YYDEBUG(48, *YYCURSOR);
++#line 507 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy45:
 +		YYDEBUG(45, *YYCURSOR);
  		yyaccept = 1;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yybm[0+yych] & 16) {
 -			goto yy45;
 +		if (yybm[0+yych] & 32) {
 +			goto yy42;
  		}
  		if (yych <= 0x1F) {
  			if (yych <= '\n') {
@@@ -598,72 -689,89 +610,72 @@@ yy55
  		{
  	return T_POUND;
  }
- #line 602 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 693 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
 -yy60:
 -		YYDEBUG(60, *YYCURSOR);
++#line 614 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy57:
 +		YYDEBUG(57, *YYCURSOR);
  		++YYCURSOR;
 -		if ((yych = *YYCURSOR) == ':') goto yy62;
 -		YYDEBUG(61, *YYCURSOR);
 +		if ((yych = *YYCURSOR) == ':') goto yy59;
 +		YYDEBUG(58, *YYCURSOR);
  		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 -#line 90 "/root/php-src/sapi/phpdbg/phpdbg_lexer.l"
 +#line 97 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.l"
  		{
  	return T_COLON;
  }
- #line 613 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 704 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
 -yy62:
 -		YYDEBUG(62, *YYCURSOR);
++#line 625 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy59:
 +		YYDEBUG(59, *YYCURSOR);
  		++YYCURSOR;
 -		YYDEBUG(63, *YYCURSOR);
 +		YYDEBUG(60, *YYCURSOR);
  		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 -#line 87 "/root/php-src/sapi/phpdbg/phpdbg_lexer.l"
 +#line 94 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.l"
  		{
  	return T_DCOLON;
  }
- #line 623 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 714 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
 -yy64:
 -		YYDEBUG(64, *YYCURSOR);
++#line 635 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy61:
 +		YYDEBUG(61, *YYCURSOR);
  		yyaccept = 0;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yych == 'n') goto yy70;
 -		goto yy43;
 -yy65:
 -		YYDEBUG(65, *YYCURSOR);
 +		if (yych == 'n') goto yy66;
 +		goto yy41;
 +yy62:
 +		YYDEBUG(62, *YYCURSOR);
  		yych = *++YYCURSOR;
 -		if (yych == '/') goto yy67;
 -yy66:
 -		YYDEBUG(66, *YYCURSOR);
 -		YYCURSOR = YYMARKER;
 -		if (yyaccept <= 1) {
 -			if (yyaccept <= 0) {
 -				goto yy41;
 -			} else {
 -				goto yy47;
 -			}
 -		} else {
 -			if (yyaccept <= 2) {
 -				goto yy75;
 -			} else {
 -				goto yy108;
 -			}
 -		}
 -yy67:
 -		YYDEBUG(67, *YYCURSOR);
 +		if (yych != '/') goto yy31;
 +		YYDEBUG(63, *YYCURSOR);
  		yych = *++YYCURSOR;
 -		if (yych != '/') goto yy66;
 -		YYDEBUG(68, *YYCURSOR);
 +		if (yych != '/') goto yy31;
 +		YYDEBUG(64, *YYCURSOR);
  		++YYCURSOR;
 -		YYDEBUG(69, *YYCURSOR);
 +		YYDEBUG(65, *YYCURSOR);
  		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 -#line 78 "/root/php-src/sapi/phpdbg/phpdbg_lexer.l"
 +#line 85 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.l"
  		{
  	phpdbg_init_param(yylval, STR_PARAM);
  	yylval->str = zend_strndup(yytext, yyleng);
  	yylval->len = yyleng;
  	return T_PROTO;
  }
- #line 648 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 756 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
 -yy70:
 -		YYDEBUG(70, *YYCURSOR);
++#line 660 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy66:
 +		YYDEBUG(66, *YYCURSOR);
  		yyaccept = 0;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yych != 'd') goto yy43;
 -		YYDEBUG(71, *YYCURSOR);
 +		if (yych != 'd') goto yy41;
 +		YYDEBUG(67, *YYCURSOR);
  		yyaccept = 0;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yych != '_') goto yy43;
 -yy72:
 -		YYDEBUG(72, *YYCURSOR);
 +		if (yych != '_') goto yy41;
 +yy68:
 +		YYDEBUG(68, *YYCURSOR);
  		yyaccept = 0;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yybm[0+yych] & 32) {
 -			goto yy73;
 +		if (yybm[0+yych] & 64) {
 +			goto yy69;
  		}
 -		goto yy43;
 -yy73:
 -		YYDEBUG(73, *YYCURSOR);
 +		goto yy41;
 +yy69:
 +		YYDEBUG(69, *YYCURSOR);
  		yyaccept = 2;
  		YYMARKER = ++YYCURSOR;
  		YYFILL(3);
@@@ -698,35 -806,37 +710,35 @@@ yy71
  	yylval->len = yyleng;
  	return T_OPCODE;
  }
- #line 702 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 810 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
 -yy76:
 -		YYDEBUG(76, *YYCURSOR);
++#line 714 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy72:
 +		YYDEBUG(72, *YYCURSOR);
  		yyaccept = 0;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yych != 'N') goto yy43;
 -		YYDEBUG(77, *YYCURSOR);
 +		if (yych != 'N') goto yy41;
 +		YYDEBUG(73, *YYCURSOR);
  		yyaccept = 0;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yych != 'D') goto yy43;
 -		YYDEBUG(78, *YYCURSOR);
 +		if (yych != 'D') goto yy41;
 +		YYDEBUG(74, *YYCURSOR);
  		yyaccept = 0;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yych == '_') goto yy72;
 -		goto yy43;
 -yy79:
 -		YYDEBUG(79, *YYCURSOR);
 +		if (yych == '_') goto yy68;
 +		goto yy41;
 +yy75:
 +		YYDEBUG(75, *YYCURSOR);
  		yyaccept = 0;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yych == 'S') goto yy80;
 -		if (yych != 's') goto yy43;
 -yy80:
 -		YYDEBUG(80, *YYCURSOR);
 +		if (yych == 'S') goto yy76;
 +		if (yych != 's') goto yy41;
 +yy76:
 +		YYDEBUG(76, *YYCURSOR);
  		yyaccept = 0;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yybm[0+yych] & 64) {
 -			goto yy81;
 -		}
 -		goto yy43;
 -yy81:
 -		YYDEBUG(81, *YYCURSOR);
 +		if (yych == '\t') goto yy77;
 +		if (yych != ' ') goto yy41;
 +yy77:
 +		YYDEBUG(77, *YYCURSOR);
  		++YYCURSOR;
  		YYFILL(1);
  		yych = *YYCURSOR;
@@@ -741,34 -852,39 +753,34 @@@
  	yylval->num = 1;		
  	return T_TRUTHY;
  }
- #line 745 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 856 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
 -yy84:
 -		YYDEBUG(84, *YYCURSOR);
++#line 757 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy80:
 +		YYDEBUG(80, *YYCURSOR);
  		yyaccept = 0;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yych == 'U') goto yy85;
 -		if (yych != 'u') goto yy43;
 -yy85:
 -		YYDEBUG(85, *YYCURSOR);
 +		if (yych == 'U') goto yy81;
 +		if (yych != 'u') goto yy41;
 +yy81:
 +		YYDEBUG(81, *YYCURSOR);
  		yyaccept = 0;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yych == 'E') goto yy80;
 -		if (yych == 'e') goto yy80;
 -		goto yy43;
 -yy86:
 -		YYDEBUG(86, *YYCURSOR);
 +		if (yych == 'E') goto yy76;
 +		if (yych == 'e') goto yy76;
 +		goto yy41;
 +yy82:
 +		YYDEBUG(82, *YYCURSOR);
  		yyaccept = 0;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yych == 'F') goto yy87;
 -		if (yych != 'f') goto yy43;
 -yy87:
 -		YYDEBUG(87, *YYCURSOR);
 +		if (yych == 'F') goto yy83;
 +		if (yych != 'f') goto yy41;
 +yy83:
 +		YYDEBUG(83, *YYCURSOR);
  		yyaccept = 0;
  		yych = *(YYMARKER = ++YYCURSOR);
 -		if (yych <= '\f') {
 -			if (yych <= 0x08) goto yy43;
 -			if (yych >= '\v') goto yy43;
 -		} else {
 -			if (yych <= '\r') goto yy88;
 -			if (yych != ' ') goto yy43;
 -		}
 -yy88:
 -		YYDEBUG(88, *YYCURSOR);
 +		if (yych == '\t') goto yy84;
 +		if (yych != ' ') goto yy41;
 +yy84:
 +		YYDEBUG(84, *YYCURSOR);
  		++YYCURSOR;
  		YYFILL(1);
  		yych = *YYCURSOR;
@@@ -783,32 -905,7 +795,32 @@@
  	yylval->num = 0;
  	return T_FALSY;
  }
- #line 787 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 909 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
++#line 799 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy87:
 +		YYDEBUG(87, *YYCURSOR);
 +		yyaccept = 0;
 +		yych = *(YYMARKER = ++YYCURSOR);
 +		if (yych == 'L') goto yy88;
 +		if (yych != 'l') goto yy41;
 +yy88:
 +		YYDEBUG(88, *YYCURSOR);
 +		yyaccept = 0;
 +		yych = *(YYMARKER = ++YYCURSOR);
 +		if (yych == 'S') goto yy89;
 +		if (yych != 's') goto yy41;
 +yy89:
 +		YYDEBUG(89, *YYCURSOR);
 +		yyaccept = 0;
 +		yych = *(YYMARKER = ++YYCURSOR);
 +		if (yych == 'E') goto yy83;
 +		if (yych == 'e') goto yy83;
 +		goto yy41;
 +yy90:
 +		YYDEBUG(90, *YYCURSOR);
 +		yyaccept = 0;
 +		yych = *(YYMARKER = ++YYCURSOR);
 +		if (yych == 'A') goto yy91;
 +		if (yych != 'a') goto yy41;
  yy91:
  		YYDEBUG(91, *YYCURSOR);
  		yyaccept = 0;
@@@ -914,30 -1036,7 +926,30 @@@ yy104
  	yylval->addr = strtoul(yytext, 0, 16);
  	return T_ADDR;
  }
- #line 918 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 1040 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
++#line 930 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy105:
 +		YYDEBUG(105, *YYCURSOR);
 +		yyaccept = 0;
 +		yych = *(YYMARKER = ++YYCURSOR);
 +		if (yych == '\t') goto yy106;
 +		if (yych != ' ') goto yy41;
 +yy106:
 +		YYDEBUG(106, *YYCURSOR);
 +		++YYCURSOR;
 +		YYFILL(1);
 +		yych = *YYCURSOR;
 +		YYDEBUG(107, *YYCURSOR);
 +		if (yych == '\t') goto yy106;
 +		if (yych == ' ') goto yy106;
 +		YYDEBUG(108, *YYCURSOR);
 +		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 +#line 79 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.l"
 +		{
 +	YYSETCONDITION(RAW);
 +	phpdbg_init_param(yylval, EMPTY_PARAM);
 +	return T_IF;
 +}
- #line 941 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
++#line 953 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
  yy109:
  		YYDEBUG(109, *YYCURSOR);
  		yyaccept = 0;
@@@ -984,65 -1063,14 +996,65 @@@ yy110
  		}
  yy112:
  		YYDEBUG(112, *YYCURSOR);
 +		yyaccept = 0;
 +		yych = *(YYMARKER = ++YYCURSOR);
 +		if (yych == '.') goto yy113;
 +		if (yych <= '/') goto yy41;
 +		if (yych >= ':') goto yy41;
 +yy113:
 +		YYDEBUG(113, *YYCURSOR);
 +		yyaccept = 4;
 +		YYMARKER = ++YYCURSOR;
 +		YYFILL(3);
 +		yych = *YYCURSOR;
 +		YYDEBUG(114, *YYCURSOR);
 +		if (yych <= ' ') {
 +			if (yych <= '\n') {
 +				if (yych <= 0x00) goto yy115;
 +				if (yych <= 0x08) goto yy40;
 +			} else {
 +				if (yych == '\r') goto yy115;
 +				if (yych <= 0x1F) goto yy40;
 +			}
 +		} else {
 +			if (yych <= '.') {
 +				if (yych == '#') goto yy115;
 +				if (yych <= '-') goto yy40;
 +				goto yy113;
 +			} else {
 +				if (yych <= '/') goto yy40;
 +				if (yych <= '9') goto yy113;
 +				if (yych <= ':') goto yy62;
 +				goto yy40;
 +			}
 +		}
 +yy115:
 +		YYDEBUG(115, *YYCURSOR);
  		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 -#line 72 "/root/php-src/sapi/phpdbg/phpdbg_lexer.l"
 +#line 72 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.l"
  		{
 -	YYSETCONDITION(RAW);
 -	phpdbg_init_param(yylval, EMPTY_PARAM);
 -	return T_IF;
 +	char *text = yytext + 2;
 +	while (*++text < '0');
 +	yylval->num = atoi(text);
 +	return T_REQ_ID;
  }
- #line 1030 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 1074 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
++#line 1042 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy116:
 +		YYDEBUG(116, *YYCURSOR);
 +		yych = *++YYCURSOR;
 +		if (yych == '.') goto yy117;
 +		if (yych <= '/') goto yy31;
 +		if (yych >= ':') goto yy31;
 +yy117:
 +		YYDEBUG(117, *YYCURSOR);
 +		++YYCURSOR;
 +		YYFILL(1);
 +		yych = *YYCURSOR;
 +		YYDEBUG(118, *YYCURSOR);
 +		if (yych == '.') goto yy117;
 +		if (yych <= '/') goto yy115;
 +		if (yych <= '9') goto yy117;
 +		goto yy115;
  	}
  /* *********************************** */
  yyc_RAW:
@@@ -1100,101 -1123,89 +1112,102 @@@ yy121
  		++YYCURSOR;
  		YYFILL(1);
  		yych = *YYCURSOR;
 -		YYDEBUG(116, *YYCURSOR);
 +		YYDEBUG(122, *YYCURSOR);
  		if (yybm[0+yych] & 32) {
 -			goto yy115;
 +			goto yy121;
  		}
- 		if (yych <= 0x00) goto yy123;
- 		if (yych != '\n') goto yy127;
 -		if (yych <= 0x00) goto yy121;
 -		if (yych == '\n') goto yy118;
 -		goto yy122;
 -yy117:
 -		YYDEBUG(117, *YYCURSOR);
++		if (yych <= 0x00) goto yy124;
++		if (yych == '\n') goto yy124;
++		goto yy127;
 +yy123:
 +		YYDEBUG(123, *YYCURSOR);
  		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 -#line 132 "/root/php-src/sapi/phpdbg/phpdbg_lexer.l"
 +#line 139 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.l"
  		{
  	phpdbg_init_param(yylval, STR_PARAM);
  	yylval->str = zend_strndup(yytext, yyleng);
  	yylval->len = yyleng;
  	return T_INPUT;
  }
- #line 1120 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 1144 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
 -yy118:
 -		YYDEBUG(118, *YYCURSOR);
++#line 1133 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy124:
 +		YYDEBUG(124, *YYCURSOR);
  		++YYCURSOR;
 -		YYFILL(1);
 -		yych = *YYCURSOR;
 -		YYDEBUG(119, *YYCURSOR);
 -		if (yybm[0+yych] & 64) {
 -			goto yy118;
 -		}
 -		if (yych <= '\f') {
 -			if (yych <= 0x00) goto yy121;
 -			if (yych == '\t') goto yy124;
 -		} else {
 -			if (yych <= '\r') goto yy124;
 -			if (yych == ' ') goto yy124;
 -		}
 -yy120:
 -		YYDEBUG(120, *YYCURSOR);
 +		YYDEBUG(125, *YYCURSOR);
  		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 -#line 68 "/root/php-src/sapi/phpdbg/phpdbg_lexer.l"
 +#line 68 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.l"
  		{
  	return 0;
  }
- #line 1130 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 1168 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
 -yy121:
 -		YYDEBUG(121, *YYCURSOR);
++#line 1143 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 +yy126:
 +		YYDEBUG(126, *YYCURSOR);
  		yych = *++YYCURSOR;
 -		goto yy120;
 -yy122:
 -		YYDEBUG(122, *YYCURSOR);
 +		if (yych == 'r') goto yy129;
 +		goto yy128;
 +yy127:
 +		YYDEBUG(127, *YYCURSOR);
  		++YYCURSOR;
  		YYFILL(1);
  		yych = *YYCURSOR;
 -		YYDEBUG(123, *YYCURSOR);
 -		if (yybm[0+yych] & 128) {
 -			goto yy122;
 +yy128:
 +		YYDEBUG(128, *YYCURSOR);
 +		if (yybm[0+yych] & 64) {
 +			goto yy127;
  		}
 -		goto yy117;
 -yy124:
 -		YYDEBUG(124, *YYCURSOR);
 +		goto yy123;
 +yy129:
 +		YYDEBUG(129, *YYCURSOR);
  		++YYCURSOR;
 -		YYFILL(1);
 +		YYFILL(2);
  		yych = *YYCURSOR;
 -		YYDEBUG(125, *YYCURSOR);
 -		if (yybm[0+yych] & 64) {
 -			goto yy118;
 +		YYDEBUG(130, *YYCURSOR);
 +		if (yybm[0+yych] & 128) {
 +			goto yy132;
  		}
 -		if (yych <= '\f') {
 -			if (yych <= 0x00) goto yy121;
 -			if (yych == '\t') goto yy124;
 +		if (yych <= '\n') {
 +			if (yych <= 0x00) goto yy123;
 +			if (yych <= 0x08) goto yy127;
 +			if (yych <= '\t') goto yy129;
 +			goto yy123;
  		} else {
 -			if (yych <= '\r') goto yy124;
 -			if (yych == ' ') goto yy124;
 +			if (yych <= ' ') {
 +				if (yych <= 0x1F) goto yy127;
 +				goto yy129;
 +			} else {
 +				if (yych != '-') goto yy127;
 +			}
  		}
 -		YYDEBUG(126, *YYCURSOR);
 +		YYDEBUG(131, *YYCURSOR);
 +		yych = *++YYCURSOR;
 +		if (yybm[0+yych] & 128) {
 +			goto yy132;
 +		}
 +		goto yy128;
 +yy132:
 +		YYDEBUG(132, *YYCURSOR);
 +		++YYCURSOR;
 +		YYFILL(1);
 +		yych = *YYCURSOR;
 +		YYDEBUG(133, *YYCURSOR);
 +		if (yybm[0+yych] & 128) {
 +			goto yy132;
 +		}
 +		if (yych <= 0x00) goto yy134;
 +		if (yych != '\n') goto yy127;
 +yy134:
 +		YYDEBUG(134, *YYCURSOR);
  		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 -#line 139 "/root/php-src/sapi/phpdbg/phpdbg_lexer.l"
 +#line 72 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.l"
  		{
 -	/* ignore whitespace */
 -
 -	goto restart;
 +	char *text = yytext + 2;
 +	while (*++text < '0');
 +	yylval->num = atoi(text);
 +	return T_REQ_ID;
  }
- #line 1196 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
 -#line 1207 "/root/php-src/sapi/phpdbg/phpdbg_lexer.c"
++#line 1209 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.c"
  	}
  }
 -#line 168 "/root/php-src/sapi/phpdbg/phpdbg_lexer.l"
 +#line 175 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_lexer.l"
  
  }
diff --cc phpdbg_prompt.c
index 6830f1bf96,ef2ba6fa3b..ad8c104475
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@@ -91,14 -91,19 +91,17 @@@ static inline int phpdbg_call_register(
  	phpdbg_param_t *name = NULL;
  
  	if (stack->type == STACK_PARAM) {
+ 		char *lc_name;
 -	    
++
  		name = stack->next;
 -		
 +
  		if (!name || name->type != STR_PARAM) {
  			return FAILURE;
  		}
 -		
 +
- 		if (zend_hash_exists(&PHPDBG_G(registered), name->str, name->len+1)) {
+ 		lc_name = zend_str_tolower_dup(name->str, name->len);
 -		
 -		if (zend_hash_exists(
 -				&PHPDBG_G(registered), lc_name, name->len+1)) {
  
++		if (zend_hash_exists(&PHPDBG_G(registered), lc_name, name->len+1)) {
  			zval fname, *fretval;
  			zend_fcall_info fci;
  
@@@ -151,15 -159,15 +154,15 @@@
  								next->str, next->num);
  							add_next_index_string(&params, buffered, 0);
  						break;
 -							
 +
  						case FILE_PARAM:
--							spprintf(&buffered, 0, "%s:%ld", 
++							spprintf(&buffered, 0, "%s:%ld",
  								next->file.name, next->file.line);
  							add_next_index_string(&params, buffered, 0);
  						break;
 -						
 +
  						case NUMERIC_FILE_PARAM:
--							spprintf(&buffered, 0, "%s:#%ld", 
++							spprintf(&buffered, 0, "%s:#%ld",
  								next->file.name, next->file.line);
  							add_next_index_string(&params, buffered, 0);
  						break;
@@@ -191,9 -199,12 +194,12 @@@
  			}
  
  			zval_dtor(&fname);
+ 			efree(lc_name);
  
  			return SUCCESS;
 -		}	
 +		}
+ 
+ 		efree(lc_name);
  	}
  
  	return FAILURE;
diff --cc phpdbg_wait.c
index 98dd726603,11279a9ab2..ea506a2d93
--- a/phpdbg_wait.c
+++ b/phpdbg_wait.c
@@@ -409,8 -412,8 +412,8 @@@ PHPDBG_COMMAND(wait) /* {{{ *
  
  	efree(data);
  
 -	phpdbg_notice("Successfully imported request data, stopped before executing");
 +	phpdbg_notice("wait", "import=\"success\"", "Successfully imported request data, stopped before executing");
  
  	return SUCCESS;
+ #endif
  } /* }}} */
-