svn: /php/php-src/trunk/ext/standard/ url_scanner_ex.c url_scanner_ex.re
| From: | Michael Wallner | Date: | Mon, 23 May 2011 10:42:00 +0000 |
| Subject: | svn: /php/php-src/trunk/ext/standard/ url_scanner_ex.c url_scanner_ex.re | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65013@lists.php.net to get a copy of this message | ||
mike Mon, 23 May 2011 10:42:00 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=311348
Log:
Fix Bug #54727, a re-incarnation of #26862
Bugs: http://bugs.php.net/54727 (Assigned) ob_flush() before
output_reset_rewrite_vars() results in data loss
http://bugs.php.net/26862 (Closed) ob_flush()
doesn't output last two chars
Changed paths:
U php/php-src/trunk/ext/standard/url_scanner_ex.c
U php/php-src/trunk/ext/standard/url_scanner_ex.re
Modified: php/php-src/trunk/ext/standard/url_scanner_ex.c
===================================================================
--- php/php-src/trunk/ext/standard/url_scanner_ex.c 2011-05-23 10:05:55 UTC (rev 311347)
+++ php/php-src/trunk/ext/standard/url_scanner_ex.c 2011-05-23 10:42:00 UTC (rev 311348)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon May 31 11:07:50 2010 */
+/* Generated by re2c 0.13.5 on Mon May 23 12:29:55 2011 */
#line 1 "ext/standard/url_scanner_ex.re"
/*
+----------------------------------------------------------------------+
@@ -1012,7 +1012,7 @@
ctx->result.len = 0;
smart_str_free(&ctx->buf);
} else {
- *handled_output = NULL;
+ *handled_output = estrndup(output, *handled_output_len = output_len);
}
} else {
*handled_output = NULL;
Modified: php/php-src/trunk/ext/standard/url_scanner_ex.re
===================================================================
--- php/php-src/trunk/ext/standard/url_scanner_ex.re 2011-05-23 10:05:55 UTC (rev 311347)
+++ php/php-src/trunk/ext/standard/url_scanner_ex.re 2011-05-23 10:42:00 UTC (rev 311348)
@@ -450,7 +450,7 @@
ctx->result.len = 0;
smart_str_free(&ctx->buf);
} else {
- *handled_output = NULL;
+ *handled_output = estrndup(output, *handled_output_len = output_len);
}
} else {
*handled_output = NULL;