diff options
| author | Ondřej Surý <ondrej@sury.org> | 2012-02-01 21:25:15 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2012-02-01 21:25:15 +0100 |
| commit | 96fb2ff5760132a915766f1d9ec7c63001feacd8 (patch) | |
| tree | 160904a89a8f3522fa4e47632db101b045e7814a /ext/standard/url_scanner_ex.c | |
| parent | 8f1428d29ef91d74b4d272af171675f2971eb15b (diff) | |
| download | php-96fb2ff5760132a915766f1d9ec7c63001feacd8.tar.gz | |
Imported Upstream version 5.4.0~rc6upstream/5.4.0_rc6
Diffstat (limited to 'ext/standard/url_scanner_ex.c')
| -rw-r--r-- | ext/standard/url_scanner_ex.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c index d22ee057d..7feb04377 100644 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@ -1,7 +1,7 @@ -/* Generated by re2c 0.13.5 on Fri Dec 31 23:52:51 2010 */ +/* Generated by re2c 0.13.5 on Mon May 23 12:29:55 2011 */ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 6 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2006 The PHP Group | +----------------------------------------------------------------------+ @@ -300,7 +300,7 @@ static void handle_form(STD_PARA) static inline void handle_tag(STD_PARA) { int ok = 0; - int i; + unsigned int i; ctx->tag.len = 0; smart_str_appendl(&ctx->tag, start, YYCURSOR - start); @@ -940,7 +940,7 @@ static void php_url_scanner_output_handler(char *output, uint output_len, char * 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; @@ -959,7 +959,7 @@ static void php_url_scanner_output_handler(char *output, uint output_len, char * 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; @@ -974,7 +974,7 @@ PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int va if (! BG(url_adapt_state_ex).active) { php_url_scanner_ex_activate(TSRMLS_C); - php_ob_set_internal_handler(php_url_scanner_output_handler, 0, "URL-Rewriter", 1 TSRMLS_CC); + php_output_start_internal(ZEND_STRL("URL-Rewriter"), php_url_scanner_output_handler, 0, PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC); BG(url_adapt_state_ex).active = 1; } |