- Fix for bug 16810 (XHTML compliance)

diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index 6441626d0bb4cc441df12580bd0d311bfd109747..98f97fb72be03746014e37e9c289e2f3c64ccf15 100644 (file)
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.5 on Tue Mar 26 11:22:58 2002 */
+/* Generated by re2c 0.5 on Thu Apr 25 08:29:22 2002 */
 #line 1 "url_scanner_ex.re"
 /*
   +----------------------------------------------------------------------+
@@ -247,6 +247,8 @@ static inline void handle_form(STD_PARA)
        if (ctx->tag.len == 4 && strncasecmp(ctx->tag.c, "form", 4) == 0) {
                smart_str_appends(&ctx->result, "<input type=\"hidden\" name=\""); 
                smart_str_append(&ctx->result, &ctx->q_name);
+               smart_str_appends(&ctx->result, "\" id=\"");
+               smart_str_append(&ctx->result, &ctx->q_name);
                smart_str_appends(&ctx->result, "\" value=\"");
                smart_str_append(&ctx->result, &ctx->q_value);
                smart_str_appends(&ctx->result, "\" />");
@@ -364,17 +366,17 @@ yy11:
        if(yybm[0+yych] & 128)  goto yy15;
 yy13:  yych = *++YYCURSOR;
 yy14:
-#line 263
+#line 265
        { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
 yy15:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
 yy16:  if(yybm[0+yych] & 128)  goto yy15;
 yy17:
-#line 264
+#line 266
        { passthru(STD_ARGS); goto state_plain; }
 }
-#line 265
+#line 267
 
 
 state_tag:     
@@ -428,11 +430,11 @@ yy18:
 yy20:  yych = *++YYCURSOR;
        goto yy25;
 yy21:
-#line 270
+#line 272
        { handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == STATE_PLAIN) goto state_plain; else goto state_next_arg; }
 yy22:  yych = *++YYCURSOR;
 yy23:
-#line 271
+#line 273
        { passthru(STD_ARGS); goto state_plain_begin; }
 yy24:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -440,7 +442,7 @@ yy24:       ++YYCURSOR;
 yy25:  if(yybm[0+yych] & 128)  goto yy24;
        goto yy21;
 }
-#line 272
+#line 274
 
 
 state_next_arg_begin:
@@ -511,20 +513,20 @@ yy26:
        }
 yy28:  yych = *++YYCURSOR;
 yy29:
-#line 280
+#line 282
        { passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; }
 yy30:  yych = *++YYCURSOR;
        goto yy37;
 yy31:
-#line 281
+#line 283
        { passthru(STD_ARGS); goto state_next_arg; }
 yy32:  yych = *++YYCURSOR;
 yy33:
-#line 282
+#line 284
        { --YYCURSOR; STATE = STATE_ARG; goto state_arg; }
 yy34:  yych = *++YYCURSOR;
 yy35:
-#line 283
+#line 285
        { passthru(STD_ARGS); goto state_plain_begin; }
 yy36:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -532,7 +534,7 @@ yy36:       ++YYCURSOR;
 yy37:  if(yybm[0+yych] & 128)  goto yy36;
        goto yy31;
 }
-#line 284
+#line 286
 
 
 state_arg:
@@ -586,11 +588,11 @@ yy38:
 yy40:  yych = *++YYCURSOR;
        goto yy45;
 yy41:
-#line 289
+#line 291
        { passthru(STD_ARGS); handle_arg(STD_ARGS); STATE = STATE_BEFORE_VAL; goto state_before_val; }
 yy42:  yych = *++YYCURSOR;
 yy43:
-#line 290
+#line 292
        { passthru(STD_ARGS); STATE = STATE_NEXT_ARG; goto state_next_arg; }
 yy44:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -598,7 +600,7 @@ yy44:       ++YYCURSOR;
 yy45:  if(yybm[0+yych] & 128)  goto yy44;
        goto yy41;
 }
-#line 291
+#line 293
 
 
 state_before_val:
@@ -653,12 +655,12 @@ yy48:     yyaccept = 0;
        if(yych == ' ') goto yy55;
        if(yych == '=') goto yy53;
 yy49:
-#line 297
+#line 299
        { --YYCURSOR; goto state_next_arg_begin; }
 yy50:  yych = *++YYCURSOR;
        goto yy54;
 yy51:
-#line 296
+#line 298
        { passthru(STD_ARGS); STATE = STATE_VAL; goto state_val; }
 yy52:  yych = *++YYCURSOR;
        goto yy49;
@@ -677,7 +679,7 @@ yy57:       YYCURSOR = YYMARKER;
        case 0: goto yy49;
        }
 }
-#line 298
+#line 300
 
 
 
@@ -747,7 +749,7 @@ yy60:       yyaccept = 0;
        yych = *(YYMARKER = ++YYCURSOR);
        if(yych != '>') goto yy74;
 yy61:
-#line 307
+#line 309
        { passthru(STD_ARGS); goto state_next_arg_begin; }
 yy62:  yyaccept = 0;
        yych = *(YYMARKER = ++YYCURSOR);
@@ -756,7 +758,7 @@ yy62:       yyaccept = 0;
 yy63:  yych = *++YYCURSOR;
        goto yy67;
 yy64:
-#line 306
+#line 308
        { handle_val(STD_ARGS, 0, '"'); goto state_next_arg_begin; }
 yy65:  yych = *++YYCURSOR;
        goto yy61;
@@ -776,7 +778,7 @@ yy70:       YYCURSOR = YYMARKER;
        }
 yy71:  yych = *++YYCURSOR;
 yy72:
-#line 305
+#line 307
        { handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
 yy73:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -785,10 +787,10 @@ yy74:     if(yybm[0+yych] & 128)  goto yy73;
        if(yych >= '>') goto yy70;
 yy75:  yych = *++YYCURSOR;
 yy76:
-#line 304
+#line 306
        { handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
 }
-#line 308
+#line 310
 
 
 stop:

diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re
index 4d7c507894085eab2dd4a61e089f7a7774c4ff71..508a792435c60e838e8d0ad38c94b419df94b87c 100644 (file)
--- a/ext/standard/url_scanner_ex.re
+++ b/ext/standard/url_scanner_ex.re
@@ -187,6 +187,8 @@ static inline void handle_form(STD_PARA)
        if (ctx->tag.len == 4 && strncasecmp(ctx->tag.c, "form", 4) == 0) {
                smart_str_appends(&ctx->result, "<input type=\"hidden\" name=\""); 
                smart_str_append(&ctx->result, &ctx->q_name);
+               smart_str_appends(&ctx->result, "\" id=\"");
+               smart_str_append(&ctx->result, &ctx->q_name);
                smart_str_appends(&ctx->result, "\" value=\"");
                smart_str_append(&ctx->result, &ctx->q_value);
                smart_str_appends(&ctx->result, "\" />");