Imported Upstream version 5.0.5upstream/5.0.5

1 files changed, 84 insertions, 47 deletions

diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index eff1c30c1..92c35479e 100644
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.2 on Sat Mar 13 15:56:45 2004 */
+/* Generated by re2c 0.9.6 on Fri Apr 15 01:39:15 2005 */
 /*
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
@@ -144,23 +144,25 @@ scan:
 	128, 128, 128, 128, 128, 128, 128, 128, 
 	};
 	goto yy0;
-yy1:	++YYCURSOR;
+	++YYCURSOR;
 yy0:
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if(yybm[0+yych] & 128)	goto yy8;
+	if(yybm[0+yych] & 128) {
+		goto yy8;
+	}
 	if(yych <= '9')	goto yy6;
 	if(yych >= ';')	goto yy4;
 	goto yy2;
-yy2:	yych = *++YYCURSOR;
+yy2:	++YYCURSOR;
 	goto yy3;
 yy3:
 { smart_str_append(dest, url); return; }
-yy4:	yych = *++YYCURSOR;
+yy4:	++YYCURSOR;
 	goto yy5;
 yy5:
 { sep = separator; goto scan; }
-yy6:	yych = *++YYCURSOR;
+yy6:	++YYCURSOR;
 	goto yy7;
 yy7:
 { bash = p - 1; goto done; }
@@ -168,7 +170,9 @@ yy8:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy9;
-yy9:	if(yybm[0+yych] & 128)	goto yy8;
+yy9:	if(yybm[0+yych] & 128) {
+		goto yy8;
+	}
 	goto yy10;
 yy10:
 { goto scan; }
@@ -379,13 +383,15 @@ state_plain:
 	128, 128, 128, 128, 128, 128, 128, 128, 
 	};
 	goto yy11;
-yy12:	++YYCURSOR;
+	++YYCURSOR;
 yy11:
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if(yybm[0+yych] & 128)	goto yy15;
+	if(yybm[0+yych] & 128) {
+		goto yy15;
+	}
 	goto yy13;
-yy13:	yych = *++YYCURSOR;
+yy13:	++YYCURSOR;
 	goto yy14;
 yy14:
 { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
@@ -393,7 +399,9 @@ yy15:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy16;
-yy16:	if(yybm[0+yych] & 128)	goto yy15;
+yy16:	if(yybm[0+yych] & 128) {
+		goto yy15;
+	}
 	goto yy17;
 yy17:
 { passthru(STD_ARGS); goto state_plain; }
@@ -441,7 +449,7 @@ state_tag:
 	  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
 	goto yy18;
-yy19:	++YYCURSOR;
+	++YYCURSOR;
 yy18:
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
@@ -450,11 +458,12 @@ yy18:
 	if(yych <= '`')	goto yy22;
 	if(yych >= '{')	goto yy22;
 	goto yy20;
-yy20:	yych = *++YYCURSOR;
+yy20:	++YYCURSOR;
+	yych = *YYCURSOR;
 	goto yy25;
 yy21:
 { handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == STATE_PLAIN) goto state_plain; else goto state_next_arg; }
-yy22:	yych = *++YYCURSOR;
+yy22:	++YYCURSOR;
 	goto yy23;
 yy23:
 { passthru(STD_ARGS); goto state_plain_begin; }
@@ -462,7 +471,9 @@ yy24:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy25;
-yy25:	if(yybm[0+yych] & 128)	goto yy24;
+yy25:	if(yybm[0+yych] & 128) {
+		goto yy24;
+	}
 	goto yy21;
 }
 
@@ -511,13 +522,13 @@ state_next_arg:
 	  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
 	goto yy26;
-yy27:	++YYCURSOR;
+	++YYCURSOR;
 yy26:
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	if(yych <= '='){
-		if(yych <= '\v'){
-			if(yych <= '\b')	goto yy34;
+		if(yych <= 0x0B){
+			if(yych <= 0x08)	goto yy34;
 			goto yy30;
 		} else {
 			if(yych == ' ')	goto yy30;
@@ -534,19 +545,20 @@ yy26:
 			goto yy34;
 		}
 	}
-yy28:	yych = *++YYCURSOR;
+yy28:	++YYCURSOR;
 	goto yy29;
 yy29:
 { passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; }
-yy30:	yych = *++YYCURSOR;
+yy30:	++YYCURSOR;
+	yych = *YYCURSOR;
 	goto yy37;
 yy31:
 { passthru(STD_ARGS); goto state_next_arg; }
-yy32:	yych = *++YYCURSOR;
+yy32:	++YYCURSOR;
 	goto yy33;
 yy33:
 { --YYCURSOR; STATE = STATE_ARG; goto state_arg; }
-yy34:	yych = *++YYCURSOR;
+yy34:	++YYCURSOR;
 	goto yy35;
 yy35:
 { passthru(STD_ARGS); goto state_plain_begin; }
@@ -554,7 +566,9 @@ yy36:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy37;
-yy37:	if(yybm[0+yych] & 128)	goto yy36;
+yy37:	if(yybm[0+yych] & 128) {
+		goto yy36;
+	}
 	goto yy31;
 }
 
@@ -600,7 +614,7 @@ state_arg:
 	  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
 	goto yy38;
-yy39:	++YYCURSOR;
+	++YYCURSOR;
 yy38:
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
@@ -609,11 +623,12 @@ yy38:
 	if(yych <= '`')	goto yy42;
 	if(yych >= '{')	goto yy42;
 	goto yy40;
-yy40:	yych = *++YYCURSOR;
+yy40:	++YYCURSOR;
+	yych = *YYCURSOR;
 	goto yy45;
 yy41:
 { passthru(STD_ARGS); handle_arg(STD_ARGS); STATE = STATE_BEFORE_VAL; goto state_before_val; }
-yy42:	yych = *++YYCURSOR;
+yy42:	++YYCURSOR;
 	goto yy43;
 yy43:
 { passthru(STD_ARGS); STATE = STATE_NEXT_ARG; goto state_next_arg; }
@@ -621,7 +636,9 @@ yy44:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy45;
-yy45:	if(yybm[0+yych] & 128)	goto yy44;
+yy45:	if(yybm[0+yych] & 128) {
+		goto yy44;
+	}
 	goto yy41;
 }
 
@@ -667,7 +684,7 @@ state_before_val:
 	  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
 	goto yy46;
-yy47:	++YYCURSOR;
+	++YYCURSOR;
 yy46:
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
@@ -681,7 +698,8 @@ yy48:	yyaccept = 0;
 	goto yy49;
 yy49:
 { --YYCURSOR; goto state_next_arg_begin; }
-yy50:	yych = *++YYCURSOR;
+yy50:	++YYCURSOR;
+	yych = *YYCURSOR;
 	goto yy54;
 yy51:
 { passthru(STD_ARGS); STATE = STATE_VAL; goto state_val; }
@@ -691,7 +709,9 @@ yy53:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy54;
-yy54:	if(yybm[0+yych] & 128)	goto yy53;
+yy54:	if(yybm[0+yych] & 128) {
+		goto yy53;
+	}
 	goto yy51;
 yy55:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -749,13 +769,13 @@ state_val:
 	248, 248, 248, 248, 248, 248, 248, 248, 
 	};
 	goto yy58;
-yy59:	++YYCURSOR;
+	++YYCURSOR;
 yy58:
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych <= '\b')	goto yy63;
+		if(yych <= 0x0A){
+			if(yych <= 0x08)	goto yy63;
 			goto yy64;
 		} else {
 			if(yych == ' ')	goto yy64;
@@ -781,7 +801,7 @@ yy62:	yyaccept = 0;
 	goto yy69;
 yy63:	yych = *++YYCURSOR;
 	goto yy67;
-yy64:	yych = *++YYCURSOR;
+yy64:	++YYCURSOR;
 	goto yy65;
 yy65:
 { passthru(STD_ARGS); goto state_next_arg_begin; }
@@ -789,19 +809,26 @@ yy66:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy67;
-yy67:	if(yybm[0+yych] & 8)	goto yy66;
+yy67:	if(yybm[0+yych] & 8) {
+		goto yy66;
+	}
 	goto yy61;
 yy68:	yyaccept = 0;
 	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	goto yy69;
-yy69:	if(yybm[0+yych] & 16)	goto yy68;
+yy69:	if(yybm[0+yych] & 16) {
+		goto yy68;
+	}
 	if(yych <= '&')	goto yy72;
 	if(yych >= '(')	goto yy61;
 	goto yy70;
-yy70:	yych = *++YYCURSOR;
-	if(yybm[0+yych] & 8)	goto yy66;
+yy70:	++YYCURSOR;
+	if(yybm[0+(yych = *YYCURSOR)] & 8) {
+		yych = *YYCURSOR;
+		goto yy66;
+	}
 	goto yy71;
 yy71:
 { handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
@@ -809,7 +836,9 @@ yy72:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy73;
-yy73:	if(yybm[0+yych] & 32)	goto yy72;
+yy73:	if(yybm[0+yych] & 32) {
+		goto yy72;
+	}
 	if(yych <= '=')	goto yy75;
 	goto yy74;
 yy74:	YYCURSOR = YYMARKER;
@@ -820,15 +849,20 @@ yy75:	yych = *++YYCURSOR;
 	goto yy71;
 yy76:	yyaccept = 0;
 	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	goto yy77;
-yy77:	if(yybm[0+yych] & 64)	goto yy76;
+yy77:	if(yybm[0+yych] & 64) {
+		goto yy76;
+	}
 	if(yych <= '!')	goto yy80;
 	if(yych >= '#')	goto yy61;
 	goto yy78;
-yy78:	yych = *++YYCURSOR;
-	if(yybm[0+yych] & 8)	goto yy66;
+yy78:	++YYCURSOR;
+	if(yybm[0+(yych = *YYCURSOR)] & 8) {
+		yych = *YYCURSOR;
+		goto yy66;
+	}
 	goto yy79;
 yy79:
 { handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
@@ -836,10 +870,13 @@ yy80:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy81;
-yy81:	if(yybm[0+yych] & 128)	goto yy80;
+yy81:	if(yybm[0+yych] & 128) {
+		goto yy80;
+	}
 	if(yych >= '>')	goto yy74;
 	goto yy82;
-yy82:	yych = *++YYCURSOR;
+yy82:	++YYCURSOR;
+	yych = *YYCURSOR;
 	goto yy79;
 }
 
@@ -1003,7 +1040,7 @@ int php_url_scanner_reset_vars(TSRMLS_D)
 	BG(url_adapt_state_ex).form_app.len = 0;
 	BG(url_adapt_state_ex).url_app.len = 0;
 
-	return FAILURE;
+	return SUCCESS;
 }
 
 PHP_MINIT_FUNCTION(url_scanner)