[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c

2009-04-25 Thread Arnaud Le Blanc 
lbarnaudSat Apr 25 21:09:23 2009 UTC

  Modified files:  
/php-src/ext/standard   url_scanner_ex.c 
  Log:
  gen
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.111r2=1.112diff_format=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.111 
php-src/ext/standard/url_scanner_ex.c:1.112
--- php-src/ext/standard/url_scanner_ex.c:1.111 Tue Mar 10 23:39:40 2009
+++ php-src/ext/standard/url_scanner_ex.c   Sat Apr 25 21:09:23 2009
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Jul 21 16:04:35 2008 */
+/* Generated by re2c 0.13.5 on Sat Apr 25 23:08:58 2009 */
 #line 1 ext/standard/url_scanner_ex.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.111 2009/03/10 23:39:40 helly Exp $ */
+/* $Id: url_scanner_ex.c,v 1.112 2009/04/25 21:09:23 lbarnaud Exp $ */
 
 #include php.h
 
@@ -993,7 +993,7 @@
size_t len;
 
if (BG(url_adapt_state_ex).url_app.len != 0) {
-   *handled_output = url_adapt_ext(output, output_len, len, 
(zend_bool) (mode  (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) 
TSRMLS_CC);
+   *handled_output = url_adapt_ext(output, output_len, len, 
(zend_bool) (mode  (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT | 
PHP_OUTPUT_HANDLER_FLUSH | PHP_OUTPUT_HANDLER_FINAL) ? 1 : 0) TSRMLS_CC);
if (sizeof(uint)  sizeof(size_t)) {
if (len  UINT_MAX)
len = UINT_MAX;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c

2008-07-25 Thread Jani Taskinen 
janiFri Jul 25 09:17:53 2008 UTC

  Modified files:  
/php-src/ext/standard   url_scanner_ex.c 
  Log:
  MFB: generated with a bit newer re2c
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.109r2=1.110diff_format=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.109 
php-src/ext/standard/url_scanner_ex.c:1.110
--- php-src/ext/standard/url_scanner_ex.c:1.109 Wed Mar 12 02:45:15 2008
+++ php-src/ext/standard/url_scanner_ex.c   Fri Jul 25 09:17:52 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.12.1 on Wed Oct 10 12:27:56 2007 */
+/* Generated by re2c 0.13.5 on Mon Jul 21 16:04:35 2008 */
 #line 1 ext/standard/url_scanner_ex.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.109 2008/03/12 02:45:15 felipe Exp $ */
+/* $Id: url_scanner_ex.c,v 1.110 2008/07/25 09:17:52 jani Exp $ */
 
 #include php.h
 
@@ -109,7 +109,10 @@
q = (p = url-c) + url-len;
 
 scan:
+
+#line 114 ext/standard/url_scanner_ex.c
 {
+   YYCTYPE yych;
static const unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
@@ -145,42 +148,37 @@
128, 128, 128, 128, 128, 128, 128, 128, 
};
 
-#line 149 ext/standard/url_scanner_ex.c
-   {
-   YYCTYPE yych;
-
-   if(YYLIMIT == YYCURSOR) YYFILL(1);
-   yych = *YYCURSOR;
-   if(yybm[0+yych]  128) {
-   goto yy8;
-   }
-   if(yych = '9') goto yy6;
-   if(yych = ';') goto yy4;
-   ++YYCURSOR;
+   if (YYLIMIT = YYCURSOR) YYFILL(1);
+   yych = *YYCURSOR;
+   if (yybm[0+yych]  128) {
+   goto yy8;
+   }
+   if (yych = '9') goto yy6;
+   if (yych = ';') goto yy4;
+   ++YYCURSOR;
 #line 116 ext/standard/url_scanner_ex.re
-   { smart_str_append(dest, url); return; }
-#line 163 ext/standard/url_scanner_ex.c
+   { smart_str_append(dest, url); return; }
+#line 162 ext/standard/url_scanner_ex.c
 yy4:
-   ++YYCURSOR;
+   ++YYCURSOR;
 #line 117 ext/standard/url_scanner_ex.re
-   { sep = separator; goto scan; }
-#line 168 ext/standard/url_scanner_ex.c
+   { sep = separator; goto scan; }
+#line 167 ext/standard/url_scanner_ex.c
 yy6:
-   ++YYCURSOR;
+   ++YYCURSOR;
 #line 118 ext/standard/url_scanner_ex.re
-   { bash = p - 1; goto done; }
-#line 173 ext/standard/url_scanner_ex.c
+   { bash = p - 1; goto done; }
+#line 172 ext/standard/url_scanner_ex.c
 yy8:
-   ++YYCURSOR;
-   if(YYLIMIT == YYCURSOR) YYFILL(1);
-   yych = *YYCURSOR;
-   if(yybm[0+yych]  128) {
-   goto yy8;
-   }
-#line 119 ext/standard/url_scanner_ex.re
-   { goto scan; }
-#line 183 ext/standard/url_scanner_ex.c
+   ++YYCURSOR;
+   if (YYLIMIT = YYCURSOR) YYFILL(1);
+   yych = *YYCURSOR;
+   if (yybm[0+yych]  128) {
+   goto yy8;
}
+#line 119 ext/standard/url_scanner_ex.re
+   { goto scan; }
+#line 182 ext/standard/url_scanner_ex.c
 }
 #line 120 ext/standard/url_scanner_ex.re
 
@@ -361,7 +359,10 @@

 state_plain:
start = YYCURSOR;
+
+#line 364 ext/standard/url_scanner_ex.c
 {
+   YYCTYPE yych;
static const unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
@@ -396,37 +397,35 @@
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
};
-
-#line 401 ext/standard/url_scanner_ex.c
-   {
-   YYCTYPE yych;
-   if(YYLIMIT == YYCURSOR) YYFILL(1);
-   yych = *YYCURSOR;
-   if(yybm[0+yych]  128) {
-   goto yy15;
-   }
-   ++YYCURSOR;
+   if (YYLIMIT = YYCURSOR) YYFILL(1);
+   yych = *YYCURSOR;
+   if (yybm[0+yych]  128) {
+   goto yy15;
+   }
+   ++YYCURSOR;
 #line 299 ext/standard/url_scanner_ex.re
-   { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
-#line 412 ext/standard/url_scanner_ex.c
+   { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
+#line 409 ext/standard/url_scanner_ex.c
 yy15:
-   ++YYCURSOR;
-   if(YYLIMIT == YYCURSOR) YYFILL(1);
-   yych = *YYCURSOR;
-   if(yybm[0+yych]  128) {
-   goto yy15;
-   }
-#line 300 ext/standard/url_scanner_ex.re
-   { passthru(STD_ARGS); goto state_plain; }
-#line 422 ext/standard/url_scanner_ex.c
+   ++YYCURSOR;
+   if

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c /ext/standard/tests/general_functions bug44394.phpt bug44394_2.phpt

2008-03-11 Thread Felipe Pena 
felipe  Wed Mar 12 02:45:15 2008 UTC

  Modified files:  
/php-src/ext/standard   url_scanner_ex.c 
/php-src/ext/standard/tests/general_functions   bug44394.phpt 
bug44394_2.phpt 
  Log:
  MFB: Fixed bug #44394 (Last two bytes missing from output)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.108r2=1.109diff_format=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.108 
php-src/ext/standard/url_scanner_ex.c:1.109
--- php-src/ext/standard/url_scanner_ex.c:1.108 Wed Oct 10 09:28:25 2007
+++ php-src/ext/standard/url_scanner_ex.c   Wed Mar 12 02:45:15 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.108 2007/10/10 09:28:25 jani Exp $ */
+/* $Id: url_scanner_ex.c,v 1.109 2008/03/12 02:45:15 felipe Exp $ */
 
 #include php.h
 
@@ -1007,7 +1007,7 @@
size_t len;
 
if (BG(url_adapt_state_ex).url_app.len != 0) {
-   *handled_output = url_adapt_ext(output, output_len, len, 
(zend_bool) (mode  PHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
+   *handled_output = url_adapt_ext(output, output_len, len, 
(zend_bool) (mode  (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) 
TSRMLS_CC);
if (sizeof(uint)  sizeof(size_t)) {
if (len  UINT_MAX)
len = UINT_MAX;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug44394.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug44394.phpt
diff -u /dev/null php-src/ext/standard/tests/general_functions/bug44394.phpt:1.2
--- /dev/null   Wed Mar 12 02:45:15 2008
+++ php-src/ext/standard/tests/general_functions/bug44394.phpt  Wed Mar 12 
02:45:15 2008
@@ -0,0 +1,18 @@
+--TEST--
+Bug #44394 Last two bytes missing from output
+--FILE--
+?php
+
+$string = a href='a?q=1'asd/a;
+
+output_add_rewrite_var('a', 'b');
+
+echo $string;
+
+ob_flush();
+
+ob_end_clean();
+
+?
+--EXPECT--
+a href='a?q=1a=b'asd/a
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug44394_2.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug44394_2.phpt
diff -u /dev/null 
php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.2
--- /dev/null   Wed Mar 12 02:45:15 2008
+++ php-src/ext/standard/tests/general_functions/bug44394_2.phptWed Mar 
12 02:45:15 2008
@@ -0,0 +1,24 @@
+--TEST--
+Bug #44394 (Last two bytes missing from output) with session.use_trans_id
+--FILE--
+?php
+
+ini_set('session.use_trans_sid', 1);
+
+session_start();
+
+ob_start();
+
+$string = a href='a?q=1'asd/a;
+
+output_add_rewrite_var('a', 'b');
+
+echo $string;
+
+ob_flush();
+
+ob_end_clean();
+
+?
+--EXPECTF--
+a href='a?q=1PHPSESSID=%sa=b'asd/a



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c

2007-10-10 Thread Jani Taskinen 
janiWed Oct 10 09:28:25 2007 UTC

  Modified files:  
/php-src/ext/standard   url_scanner_ex.c 
  Log:
  - Generated with more recent re2c version
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.107r2=1.108diff_format=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.107 
php-src/ext/standard/url_scanner_ex.c:1.108
--- php-src/ext/standard/url_scanner_ex.c:1.107 Wed Oct 10 00:36:25 2007
+++ php-src/ext/standard/url_scanner_ex.c   Wed Oct 10 09:28:25 2007
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.11.0 on Tue Oct  9 20:36:17 2007 */
+/* Generated by re2c 0.12.1 on Wed Oct 10 12:27:56 2007 */
 #line 1 ext/standard/url_scanner_ex.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.107 2007/10/10 00:36:25 iliaa Exp $ */
+/* $Id: url_scanner_ex.c,v 1.108 2007/10/10 09:28:25 jani Exp $ */
 
 #include php.h
 
@@ -109,48 +109,78 @@
q = (p = url-c) + url-len;
 
 scan:
-
-#line 114 ext/standard/url_scanner_ex.c
 {
-   YYCTYPE yych;
-
-   if(YYLIMIT == YYCURSOR) YYFILL(1);
-   yych = *YYCURSOR;
-   switch(yych) {
-   case '#':   goto yy6;
-   case ':':   goto yy2;
-   case '?':   goto yy4;
-   default:goto yy8;
-   }
-yy2:
-   ++YYCURSOR;
+   static const unsigned char yybm[] = {
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128,   0, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128,   0, 128, 128, 128, 128,   0, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   };
+
+#line 149 ext/standard/url_scanner_ex.c
+   {
+   YYCTYPE yych;
+
+   if(YYLIMIT == YYCURSOR) YYFILL(1);
+   yych = *YYCURSOR;
+   if(yybm[0+yych]  128) {
+   goto yy8;
+   }
+   if(yych = '9') goto yy6;
+   if(yych = ';') goto yy4;
+   ++YYCURSOR;
 #line 116 ext/standard/url_scanner_ex.re
-   { smart_str_append(dest, url); return; }
-#line 130 ext/standard/url_scanner_ex.c
+   { smart_str_append(dest, url); return; }
+#line 163 ext/standard/url_scanner_ex.c
 yy4:
-   ++YYCURSOR;
+   ++YYCURSOR;
 #line 117 ext/standard/url_scanner_ex.re
-   { sep = separator; goto scan; }
-#line 135 ext/standard/url_scanner_ex.c
+   { sep = separator; goto scan; }
+#line 168 ext/standard/url_scanner_ex.c
 yy6:
-   ++YYCURSOR;
+   ++YYCURSOR;
 #line 118 ext/standard/url_scanner_ex.re
-   { bash = p - 1; goto done; }
-#line 140 ext/standard/url_scanner_ex.c
+   { bash = p - 1; goto done; }
+#line 173 ext/standard/url_scanner_ex.c
 yy8:
-   ++YYCURSOR;
-   if(YYLIMIT == YYCURSOR) YYFILL(1);
-   yych = *YYCURSOR;
-   switch(yych) {
-   case '#':
-   case ':':
-   case '?':   goto yy10;
-   default:goto yy8;
-   }
-yy10:
+   ++YYCURSOR;
+   if(YYLIMIT == YYCURSOR) YYFILL(1);
+   yych = *YYCURSOR;
+   if(yybm[0+yych]  128) {
+   goto yy8;
+   }
 #line 119 ext/standard/url_scanner_ex.re
-   { goto scan; }

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c url_scanner_ex.re

2007-10-09 Thread Ilia Alshanetsky 
iliaa   Wed Oct 10 00:36:25 2007 UTC

  Modified files:  
/php-src/ext/standard   url_scanner_ex.c url_scanner_ex.re 
  Log:
  
  MFB: Fixed bug #42869 (automatic session id insertion adds sessions id to
  non-local forms)
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.106r2=1.107diff_format=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.106 
php-src/ext/standard/url_scanner_ex.c:1.107
--- php-src/ext/standard/url_scanner_ex.c:1.106 Wed Jun  6 12:29:06 2007
+++ php-src/ext/standard/url_scanner_ex.c   Wed Oct 10 00:36:25 2007
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.11.0 on Tue Jun  5 20:00:54 2007 */
+/* Generated by re2c 0.11.0 on Tue Oct  9 20:36:17 2007 */
 #line 1 ext/standard/url_scanner_ex.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.106 2007/06/06 12:29:06 nlopess Exp $ */
+/* $Id: url_scanner_ex.c,v 1.107 2007/10/10 00:36:25 iliaa Exp $ */
 
 #include php.h
 
@@ -109,78 +109,48 @@
q = (p = url-c) + url-len;
 
 scan:
+
+#line 114 ext/standard/url_scanner_ex.c
 {
-   static unsigned char yybm[] = {
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128,   0, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128,   0, 128, 128, 128, 128,   0, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   128, 128, 128, 128, 128, 128, 128, 128, 
-   };
-
-#line 149 ext/standard/url_scanner_ex.c
-   {
-   YYCTYPE yych;
-
-   if(YYLIMIT == YYCURSOR) YYFILL(1);
-   yych = *YYCURSOR;
-   if(yybm[0+yych]  128) {
-   goto yy8;
-   }
-   if(yych = '9') goto yy6;
-   if(yych = ';') goto yy4;
-   ++YYCURSOR;
+   YYCTYPE yych;
+
+   if(YYLIMIT == YYCURSOR) YYFILL(1);
+   yych = *YYCURSOR;
+   switch(yych) {
+   case '#':   goto yy6;
+   case ':':   goto yy2;
+   case '?':   goto yy4;
+   default:goto yy8;
+   }
+yy2:
+   ++YYCURSOR;
 #line 116 ext/standard/url_scanner_ex.re
-   { smart_str_append(dest, url); return; }
-#line 163 ext/standard/url_scanner_ex.c
+   { smart_str_append(dest, url); return; }
+#line 130 ext/standard/url_scanner_ex.c
 yy4:
-   ++YYCURSOR;
+   ++YYCURSOR;
 #line 117 ext/standard/url_scanner_ex.re
-   { sep = separator; goto scan; }
-#line 168 ext/standard/url_scanner_ex.c
+   { sep = separator; goto scan; }
+#line 135 ext/standard/url_scanner_ex.c
 yy6:
-   ++YYCURSOR;
+   ++YYCURSOR;
 #line 118 ext/standard/url_scanner_ex.re
-   { bash = p - 1; goto done; }
-#line 173 ext/standard/url_scanner_ex.c
+   { bash = p - 1; goto done; }
+#line 140 ext/standard/url_scanner_ex.c
 yy8:
-   ++YYCURSOR;
-   if(YYLIMIT == YYCURSOR) YYFILL(1);
-   yych = *YYCURSOR;
-   if(yybm[0+yych]  128) {
-   goto yy8;
-   }
-#line 119 ext/standard/url_scanner_ex.re
-   { goto scan; }
-#line 183 ext/standard/url_scanner_ex.c
+   ++YYCURSOR;
+   if(YYLIMIT == YYCURSOR) YYFILL(1);
+   yych = *YYCURSOR;
+   switch(yych) {
+

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c

2007-06-06 Thread Nuno Lopes 
nlopess Wed Jun  6 12:29:06 2007 UTC

  Modified files:  
/php-src/ext/standard   url_scanner_ex.c 
  Log:
  fix gcov build..
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.105r2=1.106diff_format=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.105 
php-src/ext/standard/url_scanner_ex.c:1.106
--- php-src/ext/standard/url_scanner_ex.c:1.105 Wed Jun  6 00:01:13 2007
+++ php-src/ext/standard/url_scanner_ex.c   Wed Jun  6 12:29:06 2007
@@ -1,5 +1,5 @@
 /* Generated by re2c 0.11.0 on Tue Jun  5 20:00:54 2007 */
-#line 1 url_scanner_ex.re
+#line 1 ext/standard/url_scanner_ex.re
 /*
   +--+
   | PHP Version 5|
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.105 2007/06/06 00:01:13 iliaa Exp $ */
+/* $Id: url_scanner_ex.c,v 1.106 2007/06/06 12:29:06 nlopess Exp $ */
 
 #include php.h
 
@@ -91,7 +91,7 @@
STD_PHP_INI_ENTRY(url_rewriter.tags, 
a=href,area=href,frame=src,form=,fieldset=, PHP_INI_ALL, OnUpdateTags, 
url_adapt_state_ex, php_basic_globals, basic_globals)
 PHP_INI_END()
 
-#line 98 url_scanner_ex.re
+#line 98 ext/standard/url_scanner_ex.re
 
 
 #define YYFILL(n) goto done
@@ -145,7 +145,7 @@
128, 128, 128, 128, 128, 128, 128, 128, 
};
 
-#line 149 url_scanner_ex.c
+#line 149 ext/standard/url_scanner_ex.c
{
YYCTYPE yych;
 
@@ -157,19 +157,19 @@
if(yych = '9') goto yy6;
if(yych = ';') goto yy4;
++YYCURSOR;
-#line 116 url_scanner_ex.re
+#line 116 ext/standard/url_scanner_ex.re
{ smart_str_append(dest, url); return; }
-#line 163 url_scanner_ex.c
+#line 163 ext/standard/url_scanner_ex.c
 yy4:
++YYCURSOR;
-#line 117 url_scanner_ex.re
+#line 117 ext/standard/url_scanner_ex.re
{ sep = separator; goto scan; }
-#line 168 url_scanner_ex.c
+#line 168 ext/standard/url_scanner_ex.c
 yy6:
++YYCURSOR;
-#line 118 url_scanner_ex.re
+#line 118 ext/standard/url_scanner_ex.re
{ bash = p - 1; goto done; }
-#line 173 url_scanner_ex.c
+#line 173 ext/standard/url_scanner_ex.c
 yy8:
++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -177,12 +177,12 @@
if(yybm[0+yych]  128) {
goto yy8;
}
-#line 119 url_scanner_ex.re
+#line 119 ext/standard/url_scanner_ex.re
{ goto scan; }
-#line 183 url_scanner_ex.c
+#line 183 ext/standard/url_scanner_ex.c
}
 }
-#line 120 url_scanner_ex.re
+#line 120 ext/standard/url_scanner_ex.re
 
 done:

@@ -386,7 +386,7 @@
128, 128, 128, 128, 128, 128, 128, 128, 
};
 
-#line 390 url_scanner_ex.c
+#line 390 ext/standard/url_scanner_ex.c
{
YYCTYPE yych;
if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -395,9 +395,9 @@
goto yy15;
}
++YYCURSOR;
-#line 288 url_scanner_ex.re
+#line 288 ext/standard/url_scanner_ex.re
{ passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
-#line 401 url_scanner_ex.c
+#line 401 ext/standard/url_scanner_ex.c
 yy15:
++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -405,12 +405,12 @@
if(yybm[0+yych]  128) {
goto yy15;
}
-#line 289 url_scanner_ex.re
+#line 289 ext/standard/url_scanner_ex.re
{ passthru(STD_ARGS); goto state_plain; }
-#line 411 url_scanner_ex.c
+#line 411 ext/standard/url_scanner_ex.c
}
 }
-#line 290 url_scanner_ex.re
+#line 290 ext/standard/url_scanner_ex.re
 
 
 state_tag: 
@@ -451,7 +451,7 @@
  0,   0,   0,   0,   0,   0,   0,   0, 
};
 
-#line 455 url_scanner_ex.c
+#line 455 ext/standard/url_scanner_ex.c
{
YYCTYPE yych;
if((YYLIMIT - YYCURSOR)  2) YYFILL(2);
@@ -468,14 +468,14 @@
yych = *YYCURSOR;
goto yy25;
 yy21:
-#line 295 url_scanner_ex.re
+#line 295 ext/standard/url_scanner_ex.re
{ handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); 
if (STATE == STATE_PLAIN) goto state_plain; else goto state_next_arg; }
-#line 474 url_scanner_ex.c
+#line 474 ext/standard/url_scanner_ex.c
 yy22:
++YYCURSOR;
-#line 296 url_scanner_ex.re
+#line 296 ext/standard/url_scanner_ex.re
{ passthru(STD_ARGS); goto state_plain_begin; }
-#line 479 url_scanner_ex.c
+#line 479 ext/standard/url_scanner_ex.c
 yy24:
++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -487,7 +487,7 @@
goto yy21;
}
 }
-#line 297 url_scanner_ex.re
+#line 297

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c url_scanner_ex.re

2006-02-28 Thread Ilia Alshanetsky 
iliaa   Tue Feb 28 14:46:29 2006 UTC

  Modified files:  
/php-src/ext/standard   url_scanner_ex.re url_scanner_ex.c 
  Log:
  Parsers for previous patch
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/url_scanner_ex.re?r1=1.77r2=1.78diff_format=u
Index: php-src/ext/standard/url_scanner_ex.re
diff -u php-src/ext/standard/url_scanner_ex.re:1.77 
php-src/ext/standard/url_scanner_ex.re:1.78
--- php-src/ext/standard/url_scanner_ex.re:1.77 Sun Jan  1 13:09:56 2006
+++ php-src/ext/standard/url_scanner_ex.re  Tue Feb 28 14:46:29 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.re,v 1.77 2006/01/01 13:09:56 sniper Exp $ */
+/* $Id: url_scanner_ex.re,v 1.78 2006/02/28 14:46:29 iliaa Exp $ */
 
 #include php.h
 
@@ -302,7 +302,7 @@
start = YYCURSOR;
 /*!re2c
 { passthru(STD_ARGS); handle_form(STD_ARGS); goto 
state_plain_begin; }
-  [ \v\t\n]+   { passthru(STD_ARGS); goto state_next_arg; }
+  [ \v\r\t\n]+ { passthru(STD_ARGS); goto state_next_arg; }
   alpha{ --YYCURSOR; STATE = STATE_ARG; goto state_arg; }
   any  { passthru(STD_ARGS); goto state_plain_begin; }
 */
@@ -327,7 +327,7 @@
 /*!re2c
   [] (any\[])* []  { handle_val(STD_ARGS, 1, ''); goto 
state_next_arg_begin; }
   ['] (any\['])* [']  { handle_val(STD_ARGS, 1, '\''); goto 
state_next_arg_begin; }
-  (any\[ \t\n])+  { handle_val(STD_ARGS, 0, '\0'); goto 
state_next_arg_begin; }
+  (any\[ \r\t\n])+{ handle_val(STD_ARGS, 0, ' '); goto 
state_next_arg_begin; }
   any  { passthru(STD_ARGS); goto 
state_next_arg_begin; }
 */
 
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.100r2=1.101diff_format=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.100 
php-src/ext/standard/url_scanner_ex.c:1.101
--- php-src/ext/standard/url_scanner_ex.c:1.100 Tue Feb 28 14:45:52 2006
+++ php-src/ext/standard/url_scanner_ex.c   Tue Feb 28 14:46:29 2006
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.11 on Tue Feb 28 09:45:27 2006 */
+/* Generated by re2c 0.9.11 on Tue Feb 28 09:46:12 2006 */
 #line 1 ext/standard/url_scanner_ex.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.100 2006/02/28 14:45:52 iliaa Exp $ */
+/* $Id: url_scanner_ex.c,v 1.101 2006/02/28 14:46:29 iliaa Exp $ */
 
 #include php.h
 
@@ -515,7 +515,7 @@
switch(yych){
case 0x09:
case 0x0A:
-   case 0x0B:  case ' ':   goto yy30;
+   case 0x0B:  case 0x0D:  case ' ':   goto yy30;
case '':   goto yy28;
case 'A':
case 'B':
@@ -602,7 +602,7 @@
 yy37:  switch(yych){
case 0x09:
case 0x0A:
-   case 0x0B:  case ' ':   goto yy36;
+   case 0x0B:  case 0x0D:  case ' ':   goto yy36;
default:goto yy31;
}
 }
@@ -826,7 +826,7 @@
yych = *YYCURSOR;
switch(yych){
case 0x09:
-   case 0x0A:  case ' ':   case '':   goto yy64;
+   case 0x0A:  case 0x0D:  case ' ':   case '':   goto 
yy64;
case '':   goto yy60;
case '\'':  goto yy62;
default:goto yy63;
@@ -836,7 +836,7 @@
goto yy77;
 yy61:
 #line 330 ext/standard/url_scanner_ex.re
-{ handle_val(STD_ARGS, 0, '\0'); goto state_next_arg_begin; }
+{ handle_val(STD_ARGS, 0, ' '); goto state_next_arg_begin; }
 #line 841 ext/standard/url_scanner_ex.c
 yy62:  yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
@@ -855,7 +855,7 @@
goto yy67;
 yy67:  switch(yych){
case 0x09:
-   case 0x0A:  case ' ':   case '':   goto yy61;
+   case 0x0A:  case 0x0D:  case ' ':   case '':   goto 
yy61;
default:goto yy66;
}
 yy68:  yyaccept = 0;
@@ -865,7 +865,7 @@
goto yy69;
 yy69:  switch(yych){
case 0x09:
-   case 0x0A:  case ' ':   goto yy72;
+   case 0x0A:  case 0x0D:  case ' ':   goto yy72;
case '\'':  goto yy70;
case '':   goto yy61;
default:goto yy68;
@@ -873,7 +873,7 @@
 yy70:  ++YYCURSOR;
switch((yych = *YYCURSOR)) {
case 0x09:
-   case 0x0A:  case ' ':   case '':   goto yy71;
+   case 0x0A:  case 0x0D:  case ' ':   case '':   goto 
yy71;
default:goto yy66;
}
 yy71:
@@ -902,7 +902,7 @@
goto yy77;
 yy77:  switch(yych){
case 0x09:
-   case 0x0A:  case ' ':   goto yy80;
+   case 0x0A:  case 0x0D:  case ' ':   goto yy80;
case '':   goto yy78;
case '':   goto yy61;
default:goto yy76;
@@ -910,7 +910,7 @@
 yy78:

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c var_unserializer.c

2005-12-18 Thread Jani Taskinen 
sniper  Sun Dec 18 19:52:02 2005 EDT

  Modified files:  
/php-src/ext/standard   url_scanner_ex.c var_unserializer.c 
  Log:
  touch with re2c 0.9.11
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.97r2=1.98diff_format=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.97 
php-src/ext/standard/url_scanner_ex.c:1.98
--- php-src/ext/standard/url_scanner_ex.c:1.97  Tue Nov  8 12:35:01 2005
+++ php-src/ext/standard/url_scanner_ex.c   Sun Dec 18 19:52:02 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.10 on Tue Nov  8 14:06:23 2005 */
+/* Generated by re2c 0.9.11 on Sun Dec 18 21:50:56 2005 */
 #line 1 ext/standard/url_scanner_ex.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.97 2005/11/08 12:35:01 sniper Exp $ */
+/* $Id: url_scanner_ex.c,v 1.98 2005/12/18 19:52:02 sniper Exp $ */
 
 #include php.h
 
@@ -731,7 +731,7 @@
 #line 732 ext/standard/url_scanner_ex.c
 {
YYCTYPE yych;
-   unsigned int yyaccept;
+   unsigned int yyaccept = 0;
goto yy46;
++YYCURSOR;
 yy46:
@@ -824,7 +824,7 @@
 #line 825 ext/standard/url_scanner_ex.c
 {
YYCTYPE yych;
-   unsigned int yyaccept;
+   unsigned int yyaccept = 0;
goto yy58;
++YYCURSOR;
 yy58:
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/var_unserializer.c?r1=1.74r2=1.75diff_format=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.74 
php-src/ext/standard/var_unserializer.c:1.75
--- php-src/ext/standard/var_unserializer.c:1.74Tue Nov  8 12:35:01 2005
+++ php-src/ext/standard/var_unserializer.c Sun Dec 18 19:52:02 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.10 on Tue Nov  8 14:06:09 2005 */
+/* Generated by re2c 0.9.11 on Sun Dec 18 21:50:01 2005 */
 #line 1 ext/standard/var_unserializer.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.74 2005/11/08 12:35:01 sniper Exp $ */
+/* $Id: var_unserializer.c,v 1.75 2005/12/18 19:52:02 sniper Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -393,7 +393,7 @@
 #line 394 ext/standard/var_unserializer.c
 {
YYCTYPE yych;
-   unsigned int yyaccept;
+   unsigned int yyaccept = 0;
goto yy0;
++YYCURSOR;
 yy0:

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c var_unserializer.c

2005-11-08 Thread Jani Taskinen 
sniper  Tue Nov  8 07:35:02 2005 EDT

  Modified files:  
/php-src/ext/standard   var_unserializer.c url_scanner_ex.c 
  Log:
  - Use the source file as output filename instead of stdout
  http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.73r2=1.74ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.73 
php-src/ext/standard/var_unserializer.c:1.74
--- php-src/ext/standard/var_unserializer.c:1.73Mon Nov  7 19:02:50 2005
+++ php-src/ext/standard/var_unserializer.c Tue Nov  8 07:35:01 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.10 on Tue Nov  8 02:01:41 2005 */
+/* Generated by re2c 0.9.10 on Tue Nov  8 14:06:09 2005 */
 #line 1 ext/standard/var_unserializer.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.73 2005/11/08 00:02:50 sniper Exp $ */
+/* $Id: var_unserializer.c,v 1.74 2005/11/08 12:35:01 sniper Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -390,7 +390,7 @@
  0,   0,   0,   0,   0,   0,   0,   0, 
};
 
-#line 394 stdout
+#line 394 ext/standard/var_unserializer.c
 {
YYCTYPE yych;
unsigned int yyaccept;
@@ -420,7 +420,7 @@
 yy3:
 #line 626 ext/standard/var_unserializer.re
 { return 0; }
-#line 424 stdout
+#line 424 ext/standard/var_unserializer.c
 yy4:   yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
if(yych == ':') goto yy81;
@@ -465,7 +465,7 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unexpected end of 
serialized data);
return 0; /* not sure if it should be 0 or 1 here? */
 }
-#line 469 stdout
+#line 469 ext/standard/var_unserializer.c
 yy15:  yych = *++YYCURSOR;
goto yy3;
 yy16:  yych = *++YYCURSOR;
@@ -610,7 +610,7 @@
 
return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
-#line 614 stdout
+#line 614 ext/standard/var_unserializer.c
 yy24:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy17;
@@ -647,7 +647,7 @@
return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU, 
ZEND_STANDARD_CLASS_DEF_PTR));
 }
-#line 651 stdout
+#line 651 ext/standard/var_unserializer.c
 yy31:  yych = *++YYCURSOR;
if(yych == '+') goto yy32;
if(yych = '/') goto yy17;
@@ -693,7 +693,7 @@
 
return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-#line 697 stdout
+#line 697 ext/standard/var_unserializer.c
 yy38:  yych = *++YYCURSOR;
if(yych == '+') goto yy39;
if(yych = '/') goto yy17;
@@ -745,7 +745,7 @@
ZVAL_STRINGL(*rval, str, len, 1);
return 1;
 }
-#line 749 stdout
+#line 749 ext/standard/var_unserializer.c
 yy45:  yych = *++YYCURSOR;
if(yych = '/'){
if(yych = ','){
@@ -841,7 +841,7 @@
ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
return 1;
 }
-#line 845 stdout
+#line 845 ext/standard/var_unserializer.c
 yy57:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy17;
@@ -916,7 +916,7 @@
 
return 1;
 }
-#line 920 stdout
+#line 920 ext/standard/var_unserializer.c
 yy68:  yych = *++YYCURSOR;
if(yych == 'N') goto yy65;
goto yy17;
@@ -952,7 +952,7 @@
ZVAL_LONG(*rval, parse_iv(start + 2));
return 1;
 }
-#line 956 stdout
+#line 956 ext/standard/var_unserializer.c
 yy75:  yych = *++YYCURSOR;
if(yych = '/') goto yy17;
if(yych = '2') goto yy17;
@@ -970,7 +970,7 @@
ZVAL_BOOL(*rval, parse_iv(start + 2));
return 1;
 }
-#line 974 stdout
+#line 974 ext/standard/var_unserializer.c
 yy79:  ++YYCURSOR;
goto yy80;
 yy80:
@@ -981,7 +981,7 @@
ZVAL_NULL(*rval);
return 1;
 }
-#line 985 stdout
+#line 985 ext/standard/var_unserializer.c
 yy81:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy17;
@@ -1030,7 +1030,7 @@

return 1;
 }
-#line 1034 stdout
+#line 1034 ext/standard/var_unserializer.c
 yy87:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy17;
@@ -1077,7 +1077,7 @@

return 1;
 }
-#line 1081 stdout
+#line 1081 ext/standard/var_unserializer.c
 }
 }
 #line 628 ext/standard/var_unserializer.re
http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.c?r1=1.96r2=1.97ty=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.96 
php-src/ext/standard/url_scanner_ex.c:1.97
--- php-src/ext/standard/url_scanner_ex.c:1.96  Mon Nov  7 19:02:47 2005
+++ php-src/ext/standard/url_scanner_ex.c   Tue Nov  8 07:35:01 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.10 on Tue Nov  8 02:01:27 2005 */
+/* Generated by re2c 0.9.10 on Tue Nov  8 14:06:23 2005 */
 #line 1 ext/standard/url_scanner_ex.re
 /*

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c var_unserializer.c

2005-06-28 Thread Jani Taskinen 
sniper  Tue Jun 28 19:16:51 2005 EDT

  Modified files:  
/php-src/ext/standard   url_scanner_ex.c var_unserializer.c 
  Log:
  - Regenerated with re2c 0.9.8
  
  http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.c?r1=1.93r2=1.94ty=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.93 
php-src/ext/standard/url_scanner_ex.c:1.94
--- php-src/ext/standard/url_scanner_ex.c:1.93  Sat Jun 11 19:53:21 2005
+++ php-src/ext/standard/url_scanner_ex.c   Tue Jun 28 19:16:49 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.6 on Sun Jun 12 02:51:22 2005 */
+/* Generated by re2c 0.9.8 on Wed Jun 29 02:16:53 2005 */
 #line 1 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.93 2005/06/11 23:53:21 sniper Exp $ */
+/* $Id: url_scanner_ex.c,v 1.94 2005/06/28 23:16:49 sniper Exp $ */
 
 #include php.h
 
@@ -109,11 +109,7 @@
q = (p = url-c) + url-len;
 
 scan:
-
-#line 7 stdout
 {
-   YYCTYPE yych;
-   unsigned int yyaccept;
static unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
@@ -148,6 +144,10 @@
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
};
+
+#line 149 stdout
+{
+   YYCTYPE yych;
goto yy0;
++YYCURSOR;
 yy0:
@@ -164,19 +164,19 @@
 yy3:
 #line 115 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { smart_str_append(dest, url); return; }
-#line 61 stdout
+#line 168 stdout
 yy4:   ++YYCURSOR;
goto yy5;
 yy5:
 #line 116 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { sep = separator; goto scan; }
-#line 67 stdout
+#line 174 stdout
 yy6:   ++YYCURSOR;
goto yy7;
 yy7:
 #line 117 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { bash = p - 1; goto done; }
-#line 73 stdout
+#line 180 stdout
 yy8:   ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -188,7 +188,8 @@
 yy10:
 #line 118 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { goto scan; }
-#line 86 stdout
+#line 192 stdout
+}
 }
 #line 119 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 
@@ -358,11 +359,7 @@

 state_plain:
start = YYCURSOR;
-
-#line 90 stdout
 {
-   YYCTYPE yych;
-   unsigned int yyaccept;
static unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
@@ -397,6 +394,10 @@
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
};
+
+#line 399 stdout
+{
+   YYCTYPE yych;
goto yy11;
++YYCURSOR;
 yy11:
@@ -411,7 +412,7 @@
 yy14:
 #line 287 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
-#line 142 stdout
+#line 416 stdout
 yy15:  ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -423,18 +424,15 @@
 yy17:
 #line 288 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { passthru(STD_ARGS); goto state_plain; }
-#line 155 stdout
+#line 428 stdout
+}
 }
 #line 289 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 
 
 state_tag: 
start = YYCURSOR;
-
-#line 159 stdout
 {
-   YYCTYPE yych;
-   unsigned int yyaccept;
static unsigned char yybm[] = {
  0,   0,   0,   0,   0,   0,   0,   0, 
  0,   0,   0,   0,   0,   0,   0,   0, 
@@ -469,6 +467,10 @@
  0,   0,   0,   0,   0,   0,   0,   0, 
  0,   0,   0,   0,   0,   0,   0,   0, 
};
+
+#line 472 stdout
+{
+   YYCTYPE yych;
goto yy18;
++YYCURSOR;
 yy18:
@@ -485,13 +487,13 @@
 yy21:
 #line 294 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == 
STATE_PLAIN) goto state_plain; else goto state_next_arg; }
-#line 212 stdout
+#line 491 stdout
 yy22:  ++YYCURSOR;
goto yy23;
 yy23:
 #line 295 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { passthru(STD_ARGS); goto state_plain_begin; }
-#line 218 stdout
+#line 497 stdout
 yy24:  ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -501,6 +503,7 @@
}
goto yy21;
 }
+}
 #line 296 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 
 
@@ -509,11 +512,7 @@

 state_next_arg:
start = YYCURSOR;
-
-#line 231 stdout
 {
-   YYCTYPE yych;
-   unsigned int yyaccept;
static unsigned char yybm[] = {
  0,   0,   0,   0,   0,   0,   0,   0, 
  0, 128, 128, 128,   0,   0,   0,   0, 
@@ -548,6 +547,10 @@
  0,   0,   0,   0,   0,   0,   0,   0, 
  0,   0,   0,   0,   0,   0,   0,   0, 
};
+
+#line 552 stdout
+{
+   YYCTYPE

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c var_unserializer.c

2005-06-11 Thread Jani Taskinen 
sniper  Sat Jun 11 14:00:38 2005 EDT

  Modified files:  
/php-src/ext/standard   var_unserializer.c url_scanner_ex.c 
  Log:
  regenerated with re2c 0.9.7
  http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.66r2=1.67ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.66 
php-src/ext/standard/var_unserializer.c:1.67
--- php-src/ext/standard/var_unserializer.c:1.66Thu Jun  2 01:49:56 2005
+++ php-src/ext/standard/var_unserializer.c Sat Jun 11 14:00:36 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.6 on Thu Jun  2 08:48:59 2005 */
+/* Generated by re2c 0.9.7 on Sat Jun 11 20:57:50 2005 */
 #line 1 /usr/src/php/php5/ext/standard/var_unserializer.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.66 2005/06/02 05:49:56 sniper Exp $ */
+/* $Id: var_unserializer.c,v 1.67 2005/06/11 18:00:36 sniper Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -354,11 +354,6 @@
 


-
-#line 7 stdout
-{
-   YYCTYPE yych;
-   unsigned int yyaccept;
static unsigned char yybm[] = {
  0,   0,   0,   0,   0,   0,   0,   0, 
  0,   0,   0,   0,   0,   0,   0,   0, 
@@ -393,6 +388,11 @@
  0,   0,   0,   0,   0,   0,   0,   0, 
  0,   0,   0,   0,   0,   0,   0,   0, 
};
+
+#line 393 stdout
+{
+   YYCTYPE yych;
+   unsigned int yyaccept;
goto yy0;
++YYCURSOR;
 yy0:
@@ -451,7 +451,7 @@
 yy4:
 #line 626 /usr/src/php/php5/ext/standard/var_unserializer.re
 { return 0; }
-#line 103 stdout
+#line 455 stdout
 yy5:   yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
if(yych == ':') goto yy81;
@@ -496,7 +496,7 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unexpected end of 
serialized data);
return 0; /* not sure if it should be 0 or 1 here? */
 }
-#line 148 stdout
+#line 500 stdout
 yy16:  yych = *++YYCURSOR;
goto yy4;
 yy17:  yych = *++YYCURSOR;
@@ -637,7 +637,7 @@
 
return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
-#line 290 stdout
+#line 641 stdout
 yy24:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy2;
@@ -674,7 +674,7 @@
return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU, 
ZEND_STANDARD_CLASS_DEF_PTR));
 }
-#line 328 stdout
+#line 678 stdout
 yy31:  yych = *++YYCURSOR;
if(yych == '+') goto yy32;
if(yych = '/') goto yy2;
@@ -720,7 +720,7 @@
 
return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-#line 375 stdout
+#line 724 stdout
 yy38:  yych = *++YYCURSOR;
if(yych == '+') goto yy39;
if(yych = '/') goto yy2;
@@ -772,7 +772,7 @@
ZVAL_STRINGL(*rval, str, len, 1);
return 1;
 }
-#line 428 stdout
+#line 776 stdout
 yy45:  yych = *++YYCURSOR;
if(yych = '/'){
if(yych = ','){
@@ -868,7 +868,7 @@
ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
return 1;
 }
-#line 526 stdout
+#line 872 stdout
 yy57:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy2;
@@ -943,7 +943,7 @@
 
return 1;
 }
-#line 603 stdout
+#line 947 stdout
 yy68:  yych = *++YYCURSOR;
if(yych == 'N') goto yy65;
goto yy2;
@@ -979,7 +979,7 @@
ZVAL_LONG(*rval, parse_iv(start + 2));
return 1;
 }
-#line 640 stdout
+#line 983 stdout
 yy75:  yych = *++YYCURSOR;
if(yych = '/') goto yy2;
if(yych = '2') goto yy2;
@@ -997,7 +997,7 @@
ZVAL_BOOL(*rval, parse_iv(start + 2));
return 1;
 }
-#line 658 stdout
+#line 1001 stdout
 yy79:  ++YYCURSOR;
goto yy80;
 yy80:
@@ -1008,7 +1008,7 @@
ZVAL_NULL(*rval);
return 1;
 }
-#line 669 stdout
+#line 1012 stdout
 yy81:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy2;
@@ -1057,7 +1057,7 @@

return 1;
 }
-#line 719 stdout
+#line 1061 stdout
 yy87:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy2;
@@ -1104,7 +1104,7 @@

return 1;
 }
-#line 767 stdout
+#line 1108 stdout
 }
 #line 628 /usr/src/php/php5/ext/standard/var_unserializer.re
 
http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.c?r1=1.91r2=1.92ty=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.91 
php-src/ext/standard/url_scanner_ex.c:1.92
--- php-src/ext/standard/url_scanner_ex.c:1.91  Thu Apr 14 18:38:29 2005
+++ php-src/ext/standard/url_scanner_ex.c   Sat Jun 11 14:00:37 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.6 on Fri Apr 15 01:37:31 2005 */
+/* Generated by re2c 0.9.7 on Sat Jun 11 20:58:17 2005 */
 #line 1 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 /*

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c var_unserializer.c

2005-06-11 Thread Jani Taskinen 
sniper  Sat Jun 11 19:53:22 2005 EDT

  Modified files:  
/php-src/ext/standard   url_scanner_ex.c var_unserializer.c 
  Log:
  revert
  http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.c?r1=1.92r2=1.93ty=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.92 
php-src/ext/standard/url_scanner_ex.c:1.93
--- php-src/ext/standard/url_scanner_ex.c:1.92  Sat Jun 11 14:00:37 2005
+++ php-src/ext/standard/url_scanner_ex.c   Sat Jun 11 19:53:21 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.7 on Sat Jun 11 20:58:17 2005 */
+/* Generated by re2c 0.9.6 on Sun Jun 12 02:51:22 2005 */
 #line 1 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.92 2005/06/11 18:00:37 sniper Exp $ */
+/* $Id: url_scanner_ex.c,v 1.93 2005/06/11 23:53:21 sniper Exp $ */
 
 #include php.h
 
@@ -109,6 +109,11 @@
q = (p = url-c) + url-len;
 
 scan:
+
+#line 7 stdout
+{
+   YYCTYPE yych;
+   unsigned int yyaccept;
static unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
@@ -143,10 +148,6 @@
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
};
-
-#line 148 stdout
-{
-   YYCTYPE yych;
goto yy0;
++YYCURSOR;
 yy0:
@@ -163,19 +164,19 @@
 yy3:
 #line 115 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { smart_str_append(dest, url); return; }
-#line 167 stdout
+#line 61 stdout
 yy4:   ++YYCURSOR;
goto yy5;
 yy5:
 #line 116 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { sep = separator; goto scan; }
-#line 173 stdout
+#line 67 stdout
 yy6:   ++YYCURSOR;
goto yy7;
 yy7:
 #line 117 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { bash = p - 1; goto done; }
-#line 179 stdout
+#line 73 stdout
 yy8:   ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -187,7 +188,7 @@
 yy10:
 #line 118 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { goto scan; }
-#line 191 stdout
+#line 86 stdout
 }
 #line 119 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 
@@ -357,6 +358,11 @@

 state_plain:
start = YYCURSOR;
+
+#line 90 stdout
+{
+   YYCTYPE yych;
+   unsigned int yyaccept;
static unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
@@ -391,10 +397,6 @@
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
};
-
-#line 396 stdout
-{
-   YYCTYPE yych;
goto yy11;
++YYCURSOR;
 yy11:
@@ -409,7 +411,7 @@
 yy14:
 #line 287 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
-#line 413 stdout
+#line 142 stdout
 yy15:  ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -421,13 +423,18 @@
 yy17:
 #line 288 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { passthru(STD_ARGS); goto state_plain; }
-#line 425 stdout
+#line 155 stdout
 }
 #line 289 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 
 
 state_tag: 
start = YYCURSOR;
+
+#line 159 stdout
+{
+   YYCTYPE yych;
+   unsigned int yyaccept;
static unsigned char yybm[] = {
  0,   0,   0,   0,   0,   0,   0,   0, 
  0,   0,   0,   0,   0,   0,   0,   0, 
@@ -462,10 +469,6 @@
  0,   0,   0,   0,   0,   0,   0,   0, 
  0,   0,   0,   0,   0,   0,   0,   0, 
};
-
-#line 467 stdout
-{
-   YYCTYPE yych;
goto yy18;
++YYCURSOR;
 yy18:
@@ -482,13 +485,13 @@
 yy21:
 #line 294 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == 
STATE_PLAIN) goto state_plain; else goto state_next_arg; }
-#line 486 stdout
+#line 212 stdout
 yy22:  ++YYCURSOR;
goto yy23;
 yy23:
 #line 295 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { passthru(STD_ARGS); goto state_plain_begin; }
-#line 492 stdout
+#line 218 stdout
 yy24:  ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -506,6 +509,11 @@

 state_next_arg:
start = YYCURSOR;
+
+#line 231 stdout
+{
+   YYCTYPE yych;
+   unsigned int yyaccept;
static unsigned char yybm[] = {
  0,   0,   0,   0,   0,   0,   0,   0, 
  0, 128, 128, 128,   0,   0,   0,   0, 
@@ -540,10 +548,6 @@
  0,   0,   0,   0,   0,   0,   0,   0, 
  0,   0,   0,   0,   0,   0,   0,   0, 
};
-
-#line 545 stdout
-{
-   YYCTYPE yych;
goto yy26;
++YYCURSOR;
 yy26:
@@ -573,26 +577,26 @@
 yy29:
 #line 304 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 {

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c var_unserializer.c

2005-04-14 Thread Jani Taskinen 
sniper  Thu Apr 14 18:38:30 2005 EDT

  Modified files:  
/php-src/ext/standard   url_scanner_ex.c var_unserializer.c 
  Log:
  - Regenerated with re2c 0.9.6 (fixes severe bugs)
  http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.c?r1=1.90r2=1.91ty=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.90 
php-src/ext/standard/url_scanner_ex.c:1.91
--- php-src/ext/standard/url_scanner_ex.c:1.90  Wed Apr  6 15:42:36 2005
+++ php-src/ext/standard/url_scanner_ex.c   Thu Apr 14 18:38:29 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.4 on Mon Apr  4 01:01:25 2005 */
+/* Generated by re2c 0.9.6 on Fri Apr 15 01:37:31 2005 */
 #line 1 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.90 2005/04/06 19:42:36 sniper Exp $ */
+/* $Id: url_scanner_ex.c,v 1.91 2005/04/14 22:38:29 sniper Exp $ */
 
 #include php.h
 
@@ -149,11 +149,13 @@
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;
@@ -162,29 +164,31 @@
 yy3:
 #line 115 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { smart_str_append(dest, url); return; }
-#line 59 stdout
+#line 61 stdout
 yy4:   ++YYCURSOR;
goto yy5;
 yy5:
 #line 116 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { sep = separator; goto scan; }
-#line 65 stdout
+#line 67 stdout
 yy6:   ++YYCURSOR;
goto yy7;
 yy7:
 #line 117 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { bash = p - 1; goto done; }
-#line 71 stdout
+#line 73 stdout
 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:
 #line 118 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { goto scan; }
-#line 82 stdout
+#line 86 stdout
 }
 #line 119 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 
@@ -355,7 +359,7 @@
 state_plain:
start = YYCURSOR;
 
-#line 86 stdout
+#line 90 stdout
 {
YYCTYPE yych;
unsigned int yyaccept;
@@ -394,28 +398,32 @@
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:  ++YYCURSOR;
goto yy14;
 yy14:
 #line 287 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
-#line 136 stdout
+#line 142 stdout
 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:
 #line 288 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { passthru(STD_ARGS); goto state_plain; }
-#line 147 stdout
+#line 155 stdout
 }
 #line 289 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 
@@ -423,7 +431,7 @@
 state_tag: 
start = YYCURSOR;
 
-#line 151 stdout
+#line 159 stdout
 {
YYCTYPE yych;
unsigned int yyaccept;
@@ -462,7 +470,7 @@
  0,   0,   0,   0,   0,   0,   0,   0, 
};
goto yy18;
-yy19:  ++YYCURSOR;
+   ++YYCURSOR;
 yy18:
if((YYLIMIT - YYCURSOR)  2) YYFILL(2);
yych = *YYCURSOR;
@@ -477,18 +485,20 @@
 yy21:
 #line 294 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == 
STATE_PLAIN) goto state_plain; else goto state_next_arg; }
-#line 204 stdout
+#line 212 stdout
 yy22:  ++YYCURSOR;
goto yy23;
 yy23:
 #line 295 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { passthru(STD_ARGS); goto state_plain_begin; }
-#line 210 stdout
+#line 218 stdout
 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;
 }
 #line 296 /usr/src/php/php5/ext/standard/url_scanner_ex.re
@@ -500,7 +510,7 @@
 state_next_arg:
start = YYCURSOR;
 
-#line 221 stdout
+#line 231 stdout
 {
YYCTYPE yych;
unsigned int yyaccept;
@@ -539,7 +549,7 @@
  0,   0,   0,   0,   0,   0,   0,   0, 
};
goto yy26;
-yy27:  ++YYCURSOR;
+

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c

2004-05-12 Thread Marcus Boerger 
helly   Wed May 12 06:19:07 2004 EDT

  Modified files:  
/php-src/ext/standard   url_scanner_ex.c 
  Log:
  - Touch
  
http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.c?r1=1.85r2=1.86ty=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.85 
php-src/ext/standard/url_scanner_ex.c:1.86
--- php-src/ext/standard/url_scanner_ex.c:1.85  Thu Mar 25 17:40:25 2004
+++ php-src/ext/standard/url_scanner_ex.c   Wed May 12 06:19:06 2004
@@ -1061,8 +1061,6 @@
 PHP_MSHUTDOWN_FUNCTION(url_scanner)
 {
UNREGISTER_INI_ENTRIES();
-   zend_hash_destroy(BG(url_adapt_state_ex).tags);
-   free(BG(url_adapt_state_ex).tags);
 
return SUCCESS;
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c var_unserializer.c

2004-01-08 Thread Jani Taskinen 
sniper  Thu Jan  8 14:17:51 2004 EDT

  Modified files:  
/php-src/ext/standard   url_scanner_ex.c var_unserializer.c 
  Log:
  touch generated files
  
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.81 
php-src/ext/standard/url_scanner_ex.c:1.82
--- php-src/ext/standard/url_scanner_ex.c:1.81  Thu Jan  8 03:17:35 2004
+++ php-src/ext/standard/url_scanner_ex.c   Thu Jan  8 14:17:50 2004
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Thu Apr 17 05:49:48 2003 */
-#line 1 url_scanner_ex.re
+/* Generated by re2c 0.5 on Thu Jan  8 20:25:46 2004 */
+#line 1 /usr/src/web/php/php5/ext/standard/url_scanner_ex.re
 /*
   +--+
   | PHP Version 5|
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.32 
php-src/ext/standard/var_unserializer.c:1.33
--- php-src/ext/standard/var_unserializer.c:1.32Thu Jan  8 03:17:35 2004
+++ php-src/ext/standard/var_unserializer.c Thu Jan  8 14:17:50 2004
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Fri Jan  2 04:02:19 2004 */
-#line 1 /usr/src/php5/ext/standard/var_unserializer.re
+/* Generated by re2c 0.5 on Thu Jan  8 20:25:56 2004 */
+#line 1 /usr/src/web/php/php5/ext/standard/var_unserializer.re
 /*
   +--+
   | PHP Version 5|
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.32 2004/01/08 08:17:35 andi Exp $ */
+/* $Id: var_unserializer.c,v 1.33 2004/01/08 19:17:50 sniper Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php