iliaa Thu Jul 22 22:05:51 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard url_scanner_ex.re url_scanner_ex.c
Log:
MFH: Fixed bug #29333 (output_buffering + trans_sess_id can corrupt output)
http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.re?r1=1.72&r2=1.72.2.1&ty=u
Index: php-src/ext/standard/url_scanner_ex.re
diff -u php-src/ext/standard/url_scanner_ex.re:1.72
php-src/ext/standard/url_scanner_ex.re:1.72.2.1
--- php-src/ext/standard/url_scanner_ex.re:1.72 Wed May 12 06:17:12 2004
+++ php-src/ext/standard/url_scanner_ex.re Thu Jul 22 22:05:51 2004
@@ -416,16 +416,31 @@
{
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);
+ 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);
if (sizeof(uint) < sizeof(size_t)) {
if (len > UINT_MAX)
len = UINT_MAX;
}
*handled_output_len = len;
- } else {
- *handled_output = NULL;
- }
+ } else if (BG(url_adapt_state_ex).url_app.len == 0) {
+ url_adapt_state_ex_t *ctx = &BG(url_adapt_state_ex);
+ if (ctx->buf.len) {
+ smart_str_appendl(&ctx->result, ctx->buf.c, ctx->buf.len);
+ smart_str_appendl(&ctx->result, output, output_len);
+
+ *handled_output = ctx->result.c;
+ *handled_output_len = ctx->buf.len + output_len;
+
+ ctx->result.c = NULL;
+ ctx->result.len = 0;
+ smart_str_free(&ctx->buf);
+ } else {
+ *handled_output = NULL;
+ }
+ } else {
+ *handled_output = NULL;
+ }
}
int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int
urlencode TSRMLS_DC)
http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.c?r1=1.86&r2=1.86.2.1&ty=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.86
php-src/ext/standard/url_scanner_ex.c:1.86.2.1
--- php-src/ext/standard/url_scanner_ex.c:1.86 Wed May 12 06:19:06 2004
+++ php-src/ext/standard/url_scanner_ex.c Thu Jul 22 22:05:51 2004
@@ -987,16 +987,31 @@
{
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);
+ 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);
if (sizeof(uint) < sizeof(size_t)) {
if (len > UINT_MAX)
len = UINT_MAX;
}
*handled_output_len = len;
- } else {
- *handled_output = NULL;
- }
+ } else if (BG(url_adapt_state_ex).url_app.len == 0) {
+ url_adapt_state_ex_t *ctx = &BG(url_adapt_state_ex);
+ if (ctx->buf.len) {
+ smart_str_appendl(&ctx->result, ctx->buf.c, ctx->buf.len);
+ smart_str_appendl(&ctx->result, output, output_len);
+
+ *handled_output = ctx->result.c;
+ *handled_output_len = ctx->buf.len + output_len;
+
+ ctx->result.c = NULL;
+ ctx->result.len = 0;
+ smart_str_free(&ctx->buf);
+ } else {
+ *handled_output = NULL;
+ }
+ } else {
+ *handled_output = NULL;
+ }
}
int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int
urlencode TSRMLS_DC)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
