diff options
108 files changed, 4020 insertions, 3314 deletions
diff --git a/README.NEW-OUTPUT-API b/README.NEW-OUTPUT-API new file mode 100644 index 0000000000..6296ab7da5 --- /dev/null +++ b/README.NEW-OUTPUT-API @@ -0,0 +1,142 @@ +$Id: README.NEW-OUTPUT-API 219039 2006-08-30 07:39:09Z mike $ + + +API adjustment to the old output control code: + + Everything now resides beneath the php_output namespace, + and there's an API call for every output handler op. + + Checking output control layers status: + // Using OG() + php_output_get_status(TSRMLS_C); + + Starting the default output handler: + // php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC); + php_output_start_default(TSRMLS_C); + + Starting an user handler by zval: + // php_start_ob_buffer(zhandler, chunk_size, erase TSRMLS_CC); + php_output_start_user(zhandler, chunk_size, flags TSRMLS_CC); + + Starting an internal handler whithout context: + // php_ob_set_internal_handler(my_php_output_handler_func_t, buffer_size, "output handler name", erase TSRMLS_CC); + php_output_start_internal(handler_name_zval, my_php_output_handler_func_t, chunk_size, flags TSRMLS_CC); + + Starting an internal handler with context: + // not possible with old API + php_output_handler *h; + h = php_output_handler_create_internal(handler_name_zval, my_php_output_handler_context_func_t, chunk_size, flags TSRMLS_CC); + php_output_handler_set_context(h, my_context, my_context_dtor); + php_output_handler_start(h TSRMLS_CC); + + Testing whether a certain output handler has already been started: + // php_ob_handler_used("output handler name" TSRMLS_CC); + php_output_handler_started(handler_name_zval TSRMLS_CC); + + Flushing one output buffer: + // php_ob_end_buffer(1, 1 TSRMLS_CC); + php_output_flush(TSRMLS_C); + + Flushing all output buffers: + // not possible with old API + php_output_flush_all(TSRMLS_C); + + Cleaning one output buffer: + // php_ob_end_buffer(0, 1 TSRMLS_CC); + php_output_clean(TSRMLS_C); + + Cleaning all output buffers: + // not possible with old API + php_output_clean_all(TSRMLS_C); + + Discarding one output buffer: + // php_ob_end_buffer(0, 0 TSRMLS_CC); + php_output_discard(TSRMLS_C); + + Discarding all output buffers: + // php_ob_end_buffers(0 TSRMLS_CC); + php_output_discard_all(TSRMLS_C); + + Stopping (and dropping) one output buffer: + // php_ob_end_buffer(1, 0 TSRMLS_CC) + php_output_end(TSRMLS_C); + + Stopping (and dropping) all output buffers: + // php_ob_end_buffers(1, 0 TSRMLS_CC); + php_output_end_all(TSRMLS_C); + + Retrieving output buffers contents: + // php_ob_get_buffer(zstring TSRMLS_CC); + php_output_get_contents(zstring TSRMLS_CC); + + Retrieving output buffers length: + // php_ob_get_length(zlength TSRMLS_CC); + php_output_get_length(zlength TSRMLS_CC); + + Retrieving output buffering level: + // OG(nesting_level); + php_output_get_level(TSRMLS_C); + + Issue a warning because of an output handler conflict: + // php_ob_init_conflict("to be started handler name", "to be tested if already started handler name" TSRMLS_CC); + php_output_handler_conflict(new_handler_name_zval, set_handler_name_zval TSRMLS_CC); + + Registering a conflict checking function, which will be checked prior starting the handler: + // not possible with old API, unless hardcoding into output.c + php_output_handler_conflict_register(handler_name_zval, my_php_output_handler_conflict_check_t TSRMLS_CC); + + Registering a reverse conflict checking function, which will be checked prior starting the specified foreign handler: + // not possible with old API + php_output_handler_reverse_conflict_register(foreign_handler_name_zval, my_php_output_handler_conflict_check_t TSRMLS_CC); + + Facilitating a context from within an output handler callable with ob_start(): + // not possible with old API + php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, (void *) &custom_ctx_ptr_ptr TSRMLS_CC); + + Disabling of the output handler by itself: + //not possible with old API + php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_DISABLE, NULL TSRMLS_CC); + + Marking an output handler immutable by itself because of irreversibility of its operation: + // not possible with old API + php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC); + + Restarting the output handler because of a CLEAN operation: + // not possible with old API + if (flags & PHP_OUTPUT_HANDLER_CLEAN) { ... } + + Recognizing by the output handler itself if it gets discarded: + // not possible with old API + if ((flags & PHP_OUTPUT_HANDLER_CLEAN) && (flags & PHP_OUTPUT_HANDLER_FINAL)) { ... } + + +Output handler hooks + + The output handler can change its abilities at runtime. Eg. the gz handler can + remove the CLEANABLE and REMOVABLE bits when the first output has passed through it; + or handlers implemented in C to be used with ob_start() can contain a non-global + context: + PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ + pass a void*** pointer as second arg to receive the address of a pointer + pointer to the opaque field of the output handler context + PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS + pass a int* pointer as second arg to receive the flags set for the output handler + PHP_OUTPUT_HANDLER_HOOK_GET_LEVEL + pass a int* pointer as second arg to receive the level of this output handler + (starts with 0) + PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE + the second arg is ignored; marks the output handler to be neither cleanable + nor removable + PHP_OUTPUT_HANDLER_HOOK_DISABLE + the second arg is ignored; marks the output handler as disabled + + +Open questions + + Should the userland API be adjusted and unified? + + Many bits of the manual (and very first implementation) do not comply + with the behaviour of the current (to be obsoleted) code, thus should + the manual or the behaviour be adjusted? + +END diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c index 171789b83b..a229fb6dda 100644 --- a/Zend/zend_highlight.c +++ b/Zend/zend_highlight.c @@ -26,7 +26,7 @@ #include "zend_ptr_stack.h" #include "zend_globals.h" -ZEND_API void zend_html_putc(char c) +ZEND_API void zend_html_putc(char c) /* {{{ */ { switch (c) { case '\n': @@ -52,9 +52,9 @@ ZEND_API void zend_html_putc(char c) break; } } +/* }}} */ - -ZEND_API void zend_html_puts(const char *s, uint len TSRMLS_DC) +ZEND_API void zend_html_puts(const char *s, uint len TSRMLS_DC) /* {{{ */ { const char *ptr=s, *end=s+len; @@ -85,9 +85,9 @@ ZEND_API void zend_html_puts(const char *s, uint len TSRMLS_DC) } #endif /* ZEND_MULTIBYTE */ } +/* }}} */ - -ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini TSRMLS_DC) +ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini TSRMLS_DC) /* {{{Â */ { zval token; int token_type; @@ -97,7 +97,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini zend_printf("<code>"); zend_printf("<span style=\"color: %s\">\n", last_color); /* highlight stuff coming back from zendlex() */ - token.type = 0; + Z_TYPE(token) = 0; while ((token_type=lex_scan(&token TSRMLS_CC))) { switch (token_type) { case T_INLINE_HTML: @@ -121,11 +121,11 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini break; case T_WHITESPACE: zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(yy_leng) TSRMLS_CC); /* no color needed */ - token.type = 0; + Z_TYPE(token) = 0; continue; break; default: - if (token.type == 0) { + if (Z_TYPE(token) == 0) { next_color = syntax_highlighter_ini->highlight_keyword; } else { next_color = syntax_highlighter_ini->highlight_default; @@ -145,7 +145,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(yy_leng) TSRMLS_CC); - if (token.type == IS_STRING) { + if (Z_TYPE(token) == IS_STRING) { switch (token_type) { case T_OPEN_TAG: case T_OPEN_TAG_WITH_ECHO: @@ -155,13 +155,13 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini case T_DOC_COMMENT: break; default: - efree(token.value.str.val); + efree(Z_STRVAL(token)); break; } } else if (token_type == T_END_HEREDOC) { - efree(token.value.str.val); + efree(Z_STRVAL(token)); } - token.type = 0; + Z_TYPE(token) = 0; } if (last_color != syntax_highlighter_ini->highlight_html) { @@ -170,14 +170,15 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini zend_printf("</span>\n"); zend_printf("</code>"); } +/* }}} */ -ZEND_API void zend_strip(TSRMLS_D) +ZEND_API void zend_strip(TSRMLS_D) /* {{{ */ { zval token; int token_type; int prev_space = 0; - token.type = 0; + Z_TYPE(token) = 0; while ((token_type=lex_scan(&token TSRMLS_CC))) { switch (token_type) { case T_WHITESPACE: @@ -188,19 +189,19 @@ ZEND_API void zend_strip(TSRMLS_D) /* lack of break; is intentional */ case T_COMMENT: case T_DOC_COMMENT: - token.type = 0; + Z_TYPE(token) = 0; continue; - + case T_END_HEREDOC: zend_write(LANG_SCNG(yy_text), LANG_SCNG(yy_leng)); - efree(token.value.str.val); + efree(Z_STRVAL(token)); /* read the following character, either newline or ; */ if (lex_scan(&token TSRMLS_CC) != T_WHITESPACE) { zend_write(LANG_SCNG(yy_text), LANG_SCNG(yy_leng)); } zend_write("\n", sizeof("\n") - 1); prev_space = 1; - token.type = 0; + Z_TYPE(token) = 0; continue; default: @@ -208,7 +209,7 @@ ZEND_API void zend_strip(TSRMLS_D) break; } - if (token.type == IS_STRING) { + if (Z_TYPE(token) == IS_STRING) { switch (token_type) { case T_OPEN_TAG: case T_OPEN_TAG_WITH_ECHO: @@ -219,13 +220,14 @@ ZEND_API void zend_strip(TSRMLS_D) break; default: - efree(token.value.str.val); + efree(Z_STRVAL(token)); break; } } - prev_space = token.type = 0; + prev_space = Z_TYPE(token) = 0; } } +/* }}} */ /* * Local variables: @@ -234,4 +236,3 @@ ZEND_API void zend_strip(TSRMLS_D) * indent-tabs-mode: t * End: */ - diff --git a/Zend/zend_indent.c b/Zend/zend_indent.c index 8c44c50cd0..edcd252a85 100644 --- a/Zend/zend_indent.c +++ b/Zend/zend_indent.c @@ -30,11 +30,10 @@ #define zendtext LANG_SCNG(yy_text) #define zendleng LANG_SCNG(yy_leng) - -static void handle_whitespace(int *emit_whitespace) +static void handle_whitespace(unsigned int *emit_whitespace) /* {{{ */ { unsigned char c; - int i; + unsigned int i; for (c=0; c<128; c++) { if (emit_whitespace[c]>0) { @@ -45,29 +44,29 @@ static void handle_whitespace(int *emit_whitespace) } memset(emit_whitespace, 0, sizeof(int)*256); } +/* }}} */ - -ZEND_API void zend_indent() +ZEND_API void zend_indent(void) /* {{{ */ { zval token; int token_type; int in_string=0; - int nest_level=0; - int emit_whitespace[256]; - int i; + unsigned int nest_level=0; + unsigned int emit_whitespace[256]; + unsigned int i; TSRMLS_FETCH(); memset(emit_whitespace, 0, sizeof(int)*256); /* highlight stuff coming back from zendlex() */ - token.type = 0; + Z_TYPE(token) = 0; while ((token_type=lex_scan(&token TSRMLS_CC))) { switch (token_type) { case T_INLINE_HTML: zend_write(LANG_SCNG(yy_text), LANG_SCNG(yy_leng)); break; case T_WHITESPACE: { - token.type = 0; + Z_TYPE(token) = 0; /* eat whitespace, emit newlines */ for (i=0; i<LANG_SCNG(yy_leng); i++) { emit_whitespace[(unsigned char) LANG_SCNG(yy_text)[i]]++; @@ -79,7 +78,7 @@ ZEND_API void zend_indent() in_string = !in_string; /* break missing intentionally */ default: - if (token.type==0) { + if (Z_TYPE(token)==0) { /* keyword */ switch (token_type) { case ',': @@ -132,20 +131,21 @@ dflt_printout: } break; } - if (token.type == IS_STRING) { + if (Z_TYPE(token) == IS_STRING) { switch (token_type) { case T_OPEN_TAG: case T_CLOSE_TAG: case T_WHITESPACE: break; default: - efree(token.value.str.val); + efree(Z_STRVAL(token)); break; } } - token.type = 0; + Z_TYPE(token) = 0; } } +/* }}} */ /* * Local variables: diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 9ab771889a..f3f15d7c3f 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -112,11 +112,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_iconv, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_ob_iconv_handler, 0) - ZEND_ARG_INFO(0, contents) - ZEND_ARG_INFO(0, status) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO(arginfo_iconv_set_encoding, 0) ZEND_ARG_INFO(0, type) ZEND_ARG_INFO(0, charset) @@ -132,7 +127,6 @@ ZEND_END_ARG_INFO() */ const zend_function_entry iconv_functions[] = { PHP_RAW_NAMED_FE(iconv,php_if_iconv, arginfo_iconv) - PHP_FE(ob_iconv_handler, arginfo_ob_iconv_handler) PHP_FE(iconv_get_encoding, arginfo_iconv_get_encoding) PHP_FE(iconv_set_encoding, arginfo_iconv_set_encoding) PHP_FE(iconv_strlen, arginfo_iconv_strlen) @@ -214,6 +208,10 @@ static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *st static php_iconv_err_t php_iconv_stream_filter_register_factory(TSRMLS_D); static php_iconv_err_t php_iconv_stream_filter_unregister_factory(TSRMLS_D); + +static int php_iconv_output_conflict(zval *handler_name TSRMLS_DC); +static php_output_handler *php_iconv_output_handler_init(zval *name, size_t chunk_size, int flags TSRMLS_DC); +static int php_iconv_output_handler(void **nothing, php_output_context *output_context); /* }}} */ /* {{{ static globals */ @@ -278,6 +276,9 @@ PHP_MINIT_FUNCTION(miconv) return FAILURE; } + PHP_OUTPUT_ALIAS_REGISTER("ob_iconv_handler", php_iconv_output_handler_init); + PHP_OUTPUT_CONFLICT_REGISTER("ob_iconv_handler", php_iconv_output_conflict); + return SUCCESS; } /* }}} */ @@ -312,6 +313,60 @@ PHP_MINFO_FUNCTION(miconv) } /* }}} */ +static int php_iconv_output_conflict(zval *handler_name TSRMLS_DC) +{ + if (php_output_get_level(TSRMLS_C)) { + PHP_OUTPUT_CONFLICT("ob_iconv_handler", return FAILURE); + PHP_OUTPUT_CONFLICT("mb_output_handler", return FAILURE); + } + return SUCCESS; +} + +static php_output_handler *php_iconv_output_handler_init(zval *handler_name, size_t chunk_size, int flags TSRMLS_DC) +{ + return php_output_handler_create_internal(handler_name, php_iconv_output_handler, chunk_size, flags TSRMLS_CC); +} + +static int php_iconv_output_handler(void **nothing, php_output_context *output_context) +{ + char *s, *content_type, *mimetype = NULL; + int output_status, mimetype_len = 0; + PHP_OUTPUT_TSRMLS(output_context); + + if (output_context->op & PHP_OUTPUT_HANDLER_START) { + output_status = php_output_get_status(TSRMLS_C); + if (output_status & PHP_OUTPUT_SENT) { + return FAILURE; + } + + if (SG(sapi_headers).mimetype && !strncasecmp(SG(sapi_headers).mimetype, "text/", 5)) { + if ((s = strchr(SG(sapi_headers).mimetype,';')) == NULL){ + mimetype = SG(sapi_headers).mimetype; + } else { + mimetype = SG(sapi_headers).mimetype; + mimetype_len = s - SG(sapi_headers).mimetype; + } + } else if (SG(sapi_headers).send_default_content_type) { + mimetype = SG(default_mimetype) ? SG(default_mimetype) : SAPI_DEFAULT_MIMETYPE; + } + + if (mimetype != NULL && !(output_context->op & PHP_OUTPUT_HANDLER_CLEAN)) { + int len = spprintf(&content_type, 0, "Content-Type: %.*s; charset=%s", mimetype_len?mimetype_len:strlen(mimetype), mimetype, ICONVG(output_encoding)); + if (content_type && SUCCESS == sapi_add_header(content_type, len, 0)) { + SG(sapi_headers).send_default_content_type = 0; + php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC); + } + } + } + + if (output_context->in.used) { + output_context->out.free = 1; + _php_iconv_show_error(php_iconv_string(output_context->in.data, output_context->in.used, &output_context->out.data, &output_context->out.used, ICONVG(output_encoding), ICONVG(internal_encoding)), ICONVG(output_encoding), ICONVG(internal_encoding) TSRMLS_CC); + } + + return SUCCESS; +} + /* {{{ _php_iconv_appendl() */ static php_iconv_err_t _php_iconv_appendl(smart_str *d, const char *s, size_t l, iconv_t cd) { @@ -351,7 +406,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d, const char *s, size_t l, } #else if (prev_in_left == in_left) { - return PHP_ICONV_ERR_UNKNOWN; + return PHP_ICONV_ERR_UNKNOWN; } #endif } @@ -382,7 +437,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d, const char *s, size_t l, #else if (out_left != 0) { return PHP_ICONV_ERR_UNKNOWN; - } + } #endif } (d)->len += (buf_growth - out_left); @@ -428,21 +483,21 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len, in_size = in_len; cd = iconv_open(out_charset, in_charset); - + if (cd == (iconv_t)(-1)) { return PHP_ICONV_ERR_UNKNOWN; } out_buffer = (char *) emalloc(out_size + 1); out_p = out_buffer; - + #ifdef NETWARE result = iconv(cd, (char **) &in_p, &in_size, (char **) #else result = iconv(cd, (const char **) &in_p, &in_size, (char **) #endif &out_p, &out_left); - + if (result == (size_t)(-1)) { efree(out_buffer); return PHP_ICONV_ERR_UNKNOWN; @@ -509,7 +564,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len, out_p = out_buf = tmp_buf; out_p += out_size; out_left = bsz - out_size; - continue; + continue; } } break; @@ -528,7 +583,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len, if (errno == E2BIG) { bsz += 16; tmp_buf = (char *) erealloc(out_buf, bsz); - + out_p = out_buf = tmp_buf; out_p += out_size; out_left = bsz - out_size; @@ -671,12 +726,12 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pretval, unsigned int cnt; int total_len; - + err = _php_iconv_strlen(&total_len, str, nbytes, enc); if (err != PHP_ICONV_ERR_SUCCESS) { return err; } - + if (len < 0) { if ((len += (total_len - offset)) < 0) { return PHP_ICONV_ERR_SUCCESS; @@ -708,7 +763,7 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pretval, smart_str_0(pretval); return PHP_ICONV_ERR_SUCCESS; } - + cd1 = iconv_open(GENERIC_SUPERSET_NAME, enc); if (cd1 == (iconv_t)(-1)) { @@ -793,7 +848,7 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pretval, if (cd2 != (iconv_t)NULL) { iconv_close(cd2); - } + } return err; } @@ -978,7 +1033,7 @@ static php_iconv_err_t _php_iconv_strpos(unsigned int *pretval, if (ndl_buf) { efree(ndl_buf); } - + iconv_close(cd); return err; @@ -1231,7 +1286,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_str *pretval, const char *fn goto out; } break; - + default: err = PHP_ICONV_ERR_UNKNOWN; goto out; @@ -1308,7 +1363,7 @@ out: } if (encoded != NULL) { efree(encoded); - } + } if (buf != NULL) { efree(buf); } @@ -1366,7 +1421,7 @@ static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *st break; case '\n': - scan_stat = 8; + scan_stat = 8; break; case '=': /* first letter of an encoded chunk */ @@ -1406,7 +1461,7 @@ static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *st csname = p1 + 1; scan_stat = 2; break; - + case 2: /* expecting a charset name */ switch (*p1) { case '?': /* normal delimiter: encoding scheme follows */ @@ -1517,7 +1572,7 @@ static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *st } } break; - + case 4: /* expecting a delimiter */ if (*p1 != '?') { if ((mode & PHP_ICONV_MIME_DECODE_CONTINUE_ON_ERROR)) { @@ -1725,7 +1780,7 @@ static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *st break; case '\n': - scan_stat = 8; + scan_stat = 8; break; case '=': /* first letter of an encoded chunk */ @@ -2150,7 +2205,7 @@ PHP_FUNCTION(iconv_mime_decode) char *charset = ICONVG(internal_encoding); int charset_len = 0; long mode = 0; - + smart_str retval = {0}; php_iconv_err_t err; @@ -2191,7 +2246,7 @@ PHP_FUNCTION(iconv_mime_decode_headers) char *charset = ICONVG(internal_encoding); int charset_len = 0; long mode = 0; - + php_iconv_err_t err = PHP_ICONV_ERR_SUCCESS; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls", @@ -2259,14 +2314,14 @@ PHP_FUNCTION(iconv_mime_decode_headers) zend_hash_update(Z_ARRVAL_P(return_value), header_name, header_name_len, (void *)&new_elem, sizeof(new_elem), NULL); elem = &new_elem; - } + } add_next_index_stringl(*elem, header_value, header_value_len, 1); } else { add_assoc_stringl_ex(return_value, header_name, header_name_len, header_value, header_value_len, 1); } } encoded_str_len -= next_pos - encoded_str; - encoded_str = next_pos; + encoded_str = next_pos; smart_str_free(&decoded_header); } @@ -2287,7 +2342,7 @@ PHP_NAMED_FUNCTION(php_if_iconv) size_t out_len; int in_charset_len = 0, out_charset_len = 0, in_buffer_len; php_iconv_err_t err; - + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", &in_charset, &in_charset_len, &out_charset, &out_charset_len, &in_buffer, &in_buffer_len) == FAILURE) return; @@ -2308,58 +2363,6 @@ PHP_NAMED_FUNCTION(php_if_iconv) } /* }}} */ -/* {{{ proto string ob_iconv_handler(string contents, int status) - Returns str in output buffer converted to the iconv.output_encoding character set */ -PHP_FUNCTION(ob_iconv_handler) -{ - char *out_buffer, *content_type, *mimetype = NULL, *s; - zval *zv_string; - size_t out_len; - int mimetype_alloced = 0; - long status; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl", &zv_string, &status) == FAILURE) - return; - - convert_to_string(zv_string); - - if (SG(sapi_headers).mimetype && - strncasecmp(SG(sapi_headers).mimetype, "text/", 5) == 0) { - if ((s = strchr(SG(sapi_headers).mimetype,';')) == NULL){ - mimetype = SG(sapi_headers).mimetype; - } else { - mimetype = estrndup(SG(sapi_headers).mimetype, s-SG(sapi_headers).mimetype); - mimetype_alloced = 1; - } - } else if (SG(sapi_headers).send_default_content_type) { - mimetype =(SG(default_mimetype) ? SG(default_mimetype) : SAPI_DEFAULT_MIMETYPE); - } - if (mimetype != NULL) { - php_iconv_err_t err = php_iconv_string(Z_STRVAL_P(zv_string), - Z_STRLEN_P(zv_string), &out_buffer, &out_len, - ICONVG(output_encoding), ICONVG(internal_encoding)); - _php_iconv_show_error(err, ICONVG(output_encoding), ICONVG(internal_encoding) TSRMLS_CC); - if (out_buffer != NULL) { - int len = spprintf(&content_type, 0, "Content-Type:%s; charset=%s", mimetype, ICONVG(output_encoding)); - if (content_type && sapi_add_header(content_type, len, 0) != FAILURE) { - SG(sapi_headers).send_default_content_type = 0; - } - if (mimetype_alloced) { - efree(mimetype); - } - RETURN_STRINGL(out_buffer, out_len, 0); - } - if (mimetype_alloced) { - efree(mimetype); - } - } - - zval_dtor(return_value); - *return_value = *zv_string; - zval_copy_ctor(return_value); -} -/* }}} */ - /* {{{ proto bool iconv_set_encoding(string type, string charset) Sets internal encoding and output encoding for ob_iconv_handler() */ PHP_FUNCTION(iconv_set_encoding) @@ -2488,7 +2491,7 @@ static int php_iconv_stream_filter_append_bucket( char *pd, *pt; size_t ocnt, prev_ocnt, icnt, tcnt; size_t initial_out_buf_size; - + if (ps == NULL) { initial_out_buf_size = 64; icnt = 1; @@ -2784,7 +2787,7 @@ static php_stream_filter *php_iconv_stream_filter_factory_create(const char *nam pefree(inst, persistent); } - return retval; + return retval; } /* }}} */ diff --git a/ext/session/session.c b/ext/session/session.c index 0ef856c9bf..b948318cf6 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1165,8 +1165,8 @@ static int php_session_cache_limiter(TSRMLS_D) /* {{{ */ if (PS(cache_limiter)[0] == '\0') return 0; if (SG(headers_sent)) { - char *output_start_filename = php_get_output_start_filename(TSRMLS_C); - int output_start_lineno = php_get_output_start_lineno(TSRMLS_C); + char *output_start_filename = php_output_get_start_filename(TSRMLS_C); + int output_start_lineno = php_output_get_start_lineno(TSRMLS_C); if (output_start_filename) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot send session cache limiter - headers already sent (output started at %s:%d)", output_start_filename, output_start_lineno); @@ -1205,8 +1205,8 @@ static void php_session_send_cookie(TSRMLS_D) /* {{{ */ char *e_session_name, *e_id; if (SG(headers_sent)) { - char *output_start_filename = php_get_output_start_filename(TSRMLS_C); - int output_start_lineno = php_get_output_start_lineno(TSRMLS_C); + char *output_start_filename = php_output_get_start_filename(TSRMLS_C); + int output_start_lineno = php_output_get_start_lineno(TSRMLS_C); if (output_start_filename) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot send session cookie - headers already sent by (output started at %s:%d)", output_start_filename, output_start_lineno); diff --git a/ext/soap/soap.c b/ext/soap/soap.c index ff430cabd5..bd351a0a2f 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -1650,7 +1650,7 @@ PHP_METHOD(SoapServer, handle) ALLOC_INIT_ZVAL(retval); - if (php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC) != SUCCESS) { + if (php_output_start_default(TSRMLS_C) != SUCCESS) { php_error_docref(NULL TSRMLS_CC, E_ERROR,"ob_start failed"); } @@ -1737,7 +1737,7 @@ PHP_METHOD(SoapServer, handle) #ifdef ZEND_ENGINE_2 if (EG(exception)) { - php_end_ob_buffer(0, 0 TSRMLS_CC); + php_output_discard(TSRMLS_C); if (Z_TYPE_P(EG(exception)) == IS_OBJECT && instanceof_function(Z_OBJCE_P(EG(exception)), soap_fault_class_entry TSRMLS_CC)) { soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); @@ -1791,7 +1791,7 @@ PHP_METHOD(SoapServer, handle) php_error_docref(NULL TSRMLS_CC, E_ERROR, "Error calling constructor"); } if (EG(exception)) { - php_end_ob_buffer(0, 0 TSRMLS_CC); + php_output_discard(TSRMLS_C); if (Z_TYPE_P(EG(exception)) == IS_OBJECT && instanceof_function(Z_OBJCE_P(EG(exception)), soap_fault_class_entry TSRMLS_CC)) { soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); @@ -1823,7 +1823,7 @@ PHP_METHOD(SoapServer, handle) } #ifdef ZEND_ENGINE_2 if (EG(exception)) { - php_end_ob_buffer(0, 0 TSRMLS_CC); + php_output_discard(TSRMLS_C); if (Z_TYPE_P(EG(exception)) == IS_OBJECT && instanceof_function(Z_OBJCE_P(EG(exception)), soap_fault_class_entry TSRMLS_CC)) { soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); @@ -1902,14 +1902,14 @@ PHP_METHOD(SoapServer, handle) Z_TYPE_PP(tmp) != IS_NULL) { headerfault = *tmp; } - php_end_ob_buffer(0, 0 TSRMLS_CC); + php_output_discard(TSRMLS_C); soap_server_fault_ex(function, &h->retval, h TSRMLS_CC); efree(fn_name); if (service->type == SOAP_CLASS && soap_obj) {zval_ptr_dtor(&soap_obj);} goto fail; #ifdef ZEND_ENGINE_2 } else if (EG(exception)) { - php_end_ob_buffer(0, 0 TSRMLS_CC); + php_output_discard(TSRMLS_C); if (Z_TYPE_P(EG(exception)) == IS_OBJECT && instanceof_function(Z_OBJCE_P(EG(exception)), soap_fault_class_entry TSRMLS_CC)) { zval *headerfault = NULL, **tmp; @@ -1959,7 +1959,7 @@ PHP_METHOD(SoapServer, handle) #ifdef ZEND_ENGINE_2 if (EG(exception)) { - php_end_ob_buffer(0, 0 TSRMLS_CC); + php_output_discard(TSRMLS_C); if (Z_TYPE_P(EG(exception)) == IS_OBJECT && instanceof_function(Z_OBJCE_P(EG(exception)), soap_fault_class_entry TSRMLS_CC)) { soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); @@ -1981,7 +1981,7 @@ PHP_METHOD(SoapServer, handle) if (Z_TYPE_P(retval) == IS_OBJECT && instanceof_function(Z_OBJCE_P(retval), soap_fault_class_entry TSRMLS_CC)) { - php_end_ob_buffer(0, 0 TSRMLS_CC); + php_output_discard(TSRMLS_C); soap_server_fault_ex(function, retval, NULL TSRMLS_CC); goto fail; } @@ -2002,7 +2002,7 @@ PHP_METHOD(SoapServer, handle) #ifdef ZEND_ENGINE_2 if (EG(exception)) { - php_end_ob_buffer(0, 0 TSRMLS_CC); + php_output_discard(TSRMLS_C); if (Z_TYPE_P(EG(exception)) == IS_OBJECT && instanceof_function(Z_OBJCE_P(EG(exception)), soap_fault_class_entry TSRMLS_CC)) { soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); @@ -2021,7 +2021,7 @@ PHP_METHOD(SoapServer, handle) #endif /* Flush buffer */ - php_end_ob_buffer(0, 0 TSRMLS_CC); + php_output_discard(TSRMLS_C); if (doc_return) { /* xmlDocDumpMemoryEnc(doc_return, &buf, &size, XML_CHAR_ENCODING_UTF8); */ @@ -2039,39 +2039,14 @@ PHP_METHOD(SoapServer, handle) xmlFreeDoc(doc_return); - if (zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0) && - zend_hash_exists(EG(function_table), "ob_gzhandler", sizeof("ob_gzhandler"))) { - zval nm_ob_gzhandler; - zval str; - zval mode; - zval result; - zval *params[2]; - - INIT_ZVAL(result); - ZVAL_STRINGL(&nm_ob_gzhandler, "ob_gzhandler", sizeof("ob_gzhandler") - 1, 0); - INIT_PZVAL(&str); - ZVAL_STRINGL(&str, (char*)buf, size, 0); - params[0] = &str; - INIT_PZVAL(&mode); - ZVAL_LONG(&mode, PHP_OUTPUT_HANDLER_START | PHP_OUTPUT_HANDLER_END); - params[1] = &mode; - if (call_user_function(CG(function_table), NULL, &nm_ob_gzhandler, &result, 2, params TSRMLS_CC) != FAILURE && - Z_TYPE(result) == IS_STRING && - zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0")-1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME) == SUCCESS) { - xmlFree(buf); - buf = NULL; - snprintf(cont_len, sizeof(cont_len), "Content-Length: %d", Z_STRLEN(result)); - sapi_add_header(cont_len, strlen(cont_len), 1); - php_write(Z_STRVAL(result), Z_STRLEN(result) TSRMLS_CC); - } - zval_dtor(&result); - } - if (buf) { + if (zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0)) { + sapi_add_header("Connection: close", sizeof("Connection: close")-1, 1); + } else { snprintf(cont_len, sizeof(cont_len), "Content-Length: %d", size); sapi_add_header(cont_len, strlen(cont_len), 1); - php_write(buf, size TSRMLS_CC); - xmlFree(buf); } + php_write(buf, size TSRMLS_CC); + xmlFree(buf); } else { sapi_add_header("HTTP/1.1 202 Accepted", sizeof("HTTP/1.1 202 Accepted")-1, 1); sapi_add_header("Content-Length: 0", sizeof("Content-Length: 0")-1, 1); @@ -2210,47 +2185,22 @@ static void soap_server_fault_ex(sdlFunctionPtr function, zval* fault, soapHeade if (use_http_error_status) { sapi_add_header("HTTP/1.1 500 Internal Service Error", sizeof("HTTP/1.1 500 Internal Service Error")-1, 1); } + if (zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0)) { + sapi_add_header("Connection: close", sizeof("Connection: close")-1, 1); + } else { + snprintf(cont_len, sizeof(cont_len), "Content-Length: %d", size); + sapi_add_header(cont_len, strlen(cont_len), 1); + } if (soap_version == SOAP_1_2) { sapi_add_header("Content-Type: application/soap+xml; charset=utf-8", sizeof("Content-Type: application/soap+xml; charset=utf-8")-1, 1); } else { sapi_add_header("Content-Type: text/xml; charset=utf-8", sizeof("Content-Type: text/xml; charset=utf-8")-1, 1); } - if (zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0) && - zend_hash_exists(EG(function_table), "ob_gzhandler", sizeof("ob_gzhandler"))) { - zval nm_ob_gzhandler; - zval str; - zval mode; - zval result; - zval *params[2]; - - INIT_ZVAL(result); - ZVAL_STRINGL(&nm_ob_gzhandler, "ob_gzhandler", sizeof("ob_gzhandler") - 1, 0); - INIT_PZVAL(&str); - ZVAL_STRINGL(&str, (char*)buf, size, 0); - params[0] = &str; - INIT_PZVAL(&mode); - ZVAL_LONG(&mode, PHP_OUTPUT_HANDLER_START | PHP_OUTPUT_HANDLER_END); - params[1] = &mode; - if (call_user_function(CG(function_table), NULL, &nm_ob_gzhandler, &result, 2, params TSRMLS_CC) != FAILURE && - Z_TYPE(result) == IS_STRING && - zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0")-1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME) == SUCCESS) { - xmlFree(buf); - buf = NULL; - snprintf(cont_len, sizeof(cont_len), "Content-Length: %d", Z_STRLEN(result)); - sapi_add_header(cont_len, strlen(cont_len), 1); - php_write(Z_STRVAL(result), Z_STRLEN(result) TSRMLS_CC); - } - zval_dtor(&result); - } - if (buf) { - snprintf(cont_len, sizeof(cont_len), "Content-Length: %d", size); - sapi_add_header(cont_len, strlen(cont_len), 1); - php_write(buf, size TSRMLS_CC); - xmlFree(buf); - } + php_write(buf, size TSRMLS_CC); xmlFreeDoc(doc_return); + xmlFree(buf); zend_clear_exception(TSRMLS_C); } @@ -2413,11 +2363,11 @@ static void soap_error_handler(int error_num, const char *error_filename, const } /* Get output buffer and send as fault detials */ - if (php_ob_get_length(&outbuflen TSRMLS_CC) != FAILURE && Z_LVAL(outbuflen) != 0) { + if (php_output_get_length(&outbuflen TSRMLS_CC) != FAILURE && Z_LVAL(outbuflen) != 0) { ALLOC_INIT_ZVAL(outbuf); - php_ob_get_buffer(outbuf TSRMLS_CC); + php_output_get_contents(outbuf TSRMLS_CC); } - php_end_ob_buffer(0, 0 TSRMLS_CC); + php_output_discard(TSRMLS_C); } INIT_ZVAL(fault_obj); diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 38c608f670..02b661ca5d 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -5137,7 +5137,7 @@ ZEND_API void php_get_highlight_struct(zend_syntax_highlighter_ini *syntax_highl PHP_FUNCTION(highlight_file) { char *filename; - int filename_len; + int filename_len, ret; zend_syntax_highlighter_ini syntax_highlighter_ini; zend_bool i = 0; @@ -5154,32 +5154,23 @@ PHP_FUNCTION(highlight_file) } if (i) { - php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC); + php_output_start_default(TSRMLS_C); } php_get_highlight_struct(&syntax_highlighter_ini); - if (highlight_file(filename, &syntax_highlighter_ini TSRMLS_CC) == FAILURE) { - if (i) { - int res = php_ob_get_buffer(return_value TSRMLS_CC); + ret = highlight_file(filename, &syntax_highlighter_ini TSRMLS_CC); - /* flush the buffer only if there is something to flush */ - if (res == SUCCESS && Z_STRLEN_P(return_value) > 0) { - php_end_ob_buffer (1, 0 TSRMLS_CC); - zval_dtor(return_value); - } else { - php_end_ob_buffer (0, 0 TSRMLS_CC); - if (res == SUCCESS) { - zval_dtor(return_value); - } - } + if (ret == FAILURE) { + if (i) { + php_output_end(TSRMLS_C); } RETURN_FALSE; } if (i) { - php_ob_get_buffer (return_value TSRMLS_CC); - php_end_ob_buffer (0, 0 TSRMLS_CC); + php_output_get_contents(return_value TSRMLS_CC); + php_output_discard(TSRMLS_C); } else { RETURN_TRUE; } @@ -5199,25 +5190,26 @@ PHP_FUNCTION(php_strip_whitespace) RETURN_FALSE; } + php_output_start_default(TSRMLS_C); + file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = filename; file_handle.free_filename = 0; file_handle.opened_path = NULL; zend_save_lexical_state(&original_lex_state TSRMLS_CC); - if (open_file_for_scanning(&file_handle TSRMLS_CC)==FAILURE) { + if (open_file_for_scanning(&file_handle TSRMLS_CC) == FAILURE) { zend_restore_lexical_state(&original_lex_state TSRMLS_CC); + php_output_end(TSRMLS_C); RETURN_EMPTY_STRING(); } - php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC); - zend_strip(TSRMLS_C); zend_destroy_file_handle(&file_handle TSRMLS_CC); zend_restore_lexical_state(&original_lex_state TSRMLS_CC); - php_ob_get_buffer(return_value TSRMLS_CC); - php_end_ob_buffer(0, 0 TSRMLS_CC); + php_output_get_contents(return_value TSRMLS_CC); + php_output_discard(TSRMLS_C); } /* }}} */ @@ -5237,7 +5229,7 @@ PHP_FUNCTION(highlight_string) convert_to_string_ex(expr); if (i) { - php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC); + php_output_start_default(TSRMLS_C); } EG(error_reporting) = E_ERROR; @@ -5250,7 +5242,7 @@ PHP_FUNCTION(highlight_string) efree(hicompiled_string_description); EG(error_reporting) = old_error_reporting; if (i) { - php_end_ob_buffer (1, 0 TSRMLS_CC); + php_output_end(TSRMLS_C); } RETURN_FALSE; } @@ -5259,8 +5251,8 @@ PHP_FUNCTION(highlight_string) EG(error_reporting) = old_error_reporting; if (i) { - php_ob_get_buffer (return_value TSRMLS_CC); - php_end_ob_buffer (0, 0 TSRMLS_CC); + php_output_get_contents(return_value TSRMLS_CC); + php_output_discard(TSRMLS_C); } else { RETURN_TRUE; } @@ -5517,14 +5509,14 @@ PHP_FUNCTION(print_r) } if (do_return) { - php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC); + php_output_start_default(TSRMLS_C); } zend_print_zval_r(var, 0 TSRMLS_CC); if (do_return) { - php_ob_get_buffer (return_value TSRMLS_CC); - php_end_ob_buffer (0, 0 TSRMLS_CC); + php_output_get_contents(return_value TSRMLS_CC); + php_output_discard(TSRMLS_C); } else { RETURN_TRUE; } diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 5850026e17..7e770abd1d 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -139,8 +139,10 @@ PHPAPI int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_ } if (type == 1) { + int ob_level; + PHPWRITE(buf, bufl); - if (OG(ob_nesting_level) < 1) { + if ((php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_LEVEL, &ob_level TSRMLS_CC) == SUCCESS) && ob_level < 1) { sapi_flush(TSRMLS_C); } } else if (type == 2) { diff --git a/ext/standard/head.c b/ext/standard/head.c index ac8c9b1a72..d8d5bce72e 100644 --- a/ext/standard/head.c +++ b/ext/standard/head.c @@ -64,7 +64,7 @@ PHP_FUNCTION(header_remove) } /* }}} */ -PHPAPI int php_header(TSRMLS_D) +PHPAPI int php_header(TSRMLS_D) /* {{{ */ { if (sapi_send_headers(TSRMLS_C)==FAILURE || SG(request_info).headers_only) { return 0; /* don't allow output */ @@ -72,9 +72,10 @@ PHPAPI int php_header(TSRMLS_D) return 1; /* allow output */ } } +/* }}} */ -PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, time_t expires, char *path, int path_len, char *domain, int domain_len, int secure, int url_encode, int httponly TSRMLS_DC) +PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, time_t expires, char *path, int path_len, char *domain, int domain_len, int secure, int url_encode, int httponly TSRMLS_DC) /* {{{ */ { char *cookie, *encoded_value = NULL; int len=sizeof("Set-Cookie: "); @@ -167,7 +168,7 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t efree(cookie); return result; } - +/* }}} */ /* php_set_cookie(name, value, expires, path, domain, secure) */ /* {{{ proto bool setcookie(string name [, string value [, int expires [, string path [, string domain [, bool secure[, bool httponly]]]]]]) @@ -229,8 +230,8 @@ PHP_FUNCTION(headers_sent) return; if (SG(headers_sent)) { - line = php_get_output_start_lineno(TSRMLS_C); - file = php_get_output_start_filename(TSRMLS_C); + line = php_output_get_start_lineno(TSRMLS_C); + file = php_output_get_start_filename(TSRMLS_C); } switch(ZEND_NUM_ARGS()) { diff --git a/ext/standard/info.c b/ext/standard/info.c index a1e2b1edff..792fd0834b 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -38,16 +38,15 @@ #include <sys/utsname.h> #endif + #ifdef PHP_WIN32 typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO); typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD); - # include "winver.h" -#if _MSC_VER < 1300 -# define OSVERSIONINFOEX php_win_OSVERSIONINFOEX -#endif - +# if _MSC_VER < 1300 +# define OSVERSIONINFOEX php_win_OSVERSIONINFOEX +# endif #endif #if HAVE_MBSTRING @@ -61,7 +60,7 @@ ZEND_EXTERN_MODULE_GLOBALS(iconv) #endif #define SECTION(name) if (!sapi_module.phpinfo_as_text) { \ - PUTS("<h2>" name "</h2>\n"); \ + php_info_print("<h2>" name "</h2>\n"); \ } else { \ php_info_print_table_start(); \ php_info_print_table_header(1, name); \ @@ -71,29 +70,99 @@ ZEND_EXTERN_MODULE_GLOBALS(iconv) PHPAPI extern char *php_ini_opened_path; PHPAPI extern char *php_ini_scanned_path; PHPAPI extern char *php_ini_scanned_files; - -static int php_info_write_wrapper(const char *str, uint str_length) + +static int php_info_print_html_esc(const char *str, int len) /* {{{ */ { int new_len, written; - char *elem_esc; + char *new_str; + TSRMLS_FETCH(); + + new_str = php_escape_html_entities((char *) str, len, &new_len, 0, ENT_QUOTES, "utf-8" TSRMLS_CC); + written = php_output_write(new_str, new_len TSRMLS_CC); + efree(new_str); + return written; +} +/* }}} */ +static int php_info_printf(const char *fmt, ...) /* {{{ */ +{ + char *buf; + int len, written; + va_list argv; TSRMLS_FETCH(); + + va_start(argv, fmt); + len = vspprintf(&buf, 0, fmt, argv); + va_end(argv); + + written = php_output_write(buf, len TSRMLS_CC); + efree(buf); + return written; +} +/* }}} */ - elem_esc = php_escape_html_entities((unsigned char *)str, str_length, &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC); +static void php_info_print_request_uri(TSRMLS_D) /* {{{ */ +{ + if (SG(request_info).request_uri) { + php_info_print_html_esc(SG(request_info).request_uri, strlen(SG(request_info).request_uri)); + } +} +/* }}} */ - written = php_body_write(elem_esc, new_len TSRMLS_CC); +static int php_info_print(const char *str) /* {{{ */ +{ + TSRMLS_FETCH(); + return php_output_write(str, strlen(str) TSRMLS_CC); +} +/* }}} */ - efree(elem_esc); +static void php_info_print_stream_hash(const char *name, HashTable *ht TSRMLS_DC) /* {{{ */ +{ + char *key; + uint len; + int type; + + if (ht) { + if (zend_hash_num_elements(ht)) { + HashPosition pos; - return written; + if (!sapi_module.phpinfo_as_text) { + php_info_printf("<tr class=\"v\"><td>Registered %s</td><td>", name); + } else { + php_info_printf("\nRegistered %s => ", name); + } + + zend_hash_internal_pointer_reset_ex(ht, &pos); + while (zend_hash_get_current_key_ex(ht, &key, &len, NULL, 0, &pos) == HASH_KEY_IS_STRING) + { + php_info_print(key); + zend_hash_move_forward_ex(ht, &pos); + if (zend_hash_get_current_key_ex(ht, &key, &len, NULL, 0, &pos) == HASH_KEY_IS_STRING) { + php_info_print(", "); + } else { + break; + } + } + + if (!sapi_module.phpinfo_as_text) { + php_info_print("</td></tr>\n"); + } + } else { + char reg_name[128]; + snprintf(reg_name, sizeof(reg_name), "Registered %s", name); + php_info_print_table_row(2, reg_name, "none registered"); + } + } else { + php_info_print_table_row(2, name, "disabled"); + } } - +/* }}} */ PHPAPI void php_info_print_module(zend_module_entry *zend_module TSRMLS_DC) /* {{{ */ { if (zend_module->info_func || zend_module->version) { if (!sapi_module.phpinfo_as_text) { - php_printf("<h2><a name=\"module_%s\">%s</a></h2>\n", zend_module->name, zend_module->name); + php_info_printf("<h2><a name=\"module_%s\">%s</a></h2>\n", zend_module->name, zend_module->name); } else { php_info_print_table_start(); php_info_print_table_header(1, zend_module->name); @@ -109,9 +178,9 @@ PHPAPI void php_info_print_module(zend_module_entry *zend_module TSRMLS_DC) /* { } } else { if (!sapi_module.phpinfo_as_text) { - php_printf("<tr><td>%s</td></tr>\n", zend_module->name); + php_info_printf("<tr><td>%s</td></tr>\n", zend_module->name); } else { - php_printf("%s\n", zend_module->name); + php_info_printf("%s\n", zend_module->name); } } } @@ -151,70 +220,66 @@ static void php_print_gpcse_array(char *name, uint name_length TSRMLS_DC) zend_hash_internal_pointer_reset(Z_ARRVAL_PP(data)); while (zend_hash_get_current_data(Z_ARRVAL_PP(data), (void **) &tmp) == SUCCESS) { if (!sapi_module.phpinfo_as_text) { - PUTS("<tr>"); - PUTS("<td class=\"e\">"); - + php_info_print("<tr>"); + php_info_print("<td class=\"e\">"); } - PUTS(name); - PUTS("[\""); + php_info_print(name); + php_info_print("[\""); switch (zend_hash_get_current_key_ex(Z_ARRVAL_PP(data), &string_key, &string_len, &num_key, 0, NULL)) { case HASH_KEY_IS_STRING: if (!sapi_module.phpinfo_as_text) { - php_info_html_esc_write(string_key, string_len - 1 TSRMLS_CC); + php_info_print_html_esc(string_key, string_len-1); } else { - PHPWRITE(string_key, string_len - 1); - } + php_info_print(string_key); + } break; case HASH_KEY_IS_LONG: - php_printf("%ld", num_key); + php_info_printf("%ld", num_key); break; } - PUTS("\"]"); + php_info_print("\"]"); if (!sapi_module.phpinfo_as_text) { - PUTS("</td><td class=\"v\">"); + php_info_print("</td><td class=\"v\">"); } else { - PUTS(" => "); + php_info_print(" => "); } if (Z_TYPE_PP(tmp) == IS_ARRAY) { if (!sapi_module.phpinfo_as_text) { - PUTS("<pre>"); - zend_print_zval_r_ex((zend_write_func_t) php_info_write_wrapper, *tmp, 0 TSRMLS_CC); - PUTS("</pre>"); + php_info_print("<pre>"); + zend_print_zval_r_ex((zend_write_func_t) php_info_print_html_esc, *tmp, 0 TSRMLS_CC); + php_info_print("</pre>"); } else { zend_print_zval_r(*tmp, 0 TSRMLS_CC); } - } else if (Z_TYPE_PP(tmp) != IS_STRING) { - tmp2 = **tmp; - zval_copy_ctor(&tmp2); - convert_to_string(&tmp2); - if (!sapi_module.phpinfo_as_text) { - if (Z_STRLEN(tmp2) == 0) { - PUTS("<i>no value</i>"); - } else { - php_info_html_esc_write(Z_STRVAL(tmp2), Z_STRLEN(tmp2) TSRMLS_CC); - } - } else { - PHPWRITE(Z_STRVAL(tmp2), Z_STRLEN(tmp2)); - } - zval_dtor(&tmp2); } else { - if (!sapi_module.phpinfo_as_text) { - if (Z_STRLEN_PP(tmp) == 0) { - PUTS("<i>no value</i>"); - } else { - php_info_html_esc_write(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp) TSRMLS_CC); - } - } else { - PHPWRITE(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp)); - } + tmp2 = **tmp; + switch (Z_TYPE_PP(tmp)) { + default: + tmp = NULL; + zval_copy_ctor(&tmp2); + convert_to_string(&tmp2); + case IS_STRING: + if (!sapi_module.phpinfo_as_text) { + if (Z_STRLEN(tmp2) == 0) { + php_info_print("<i>no value</i>"); + } else { + php_info_print_html_esc(Z_STRVAL(tmp2), Z_STRLEN(tmp2)); + } + } else { + php_info_print(Z_STRVAL(tmp2)); + } + } + if (!tmp) { + zval_dtor(&tmp2); + } } if (!sapi_module.phpinfo_as_text) { - PUTS("</td></tr>\n"); + php_info_print("</td></tr>\n"); } else { - PUTS("\n"); - } + php_info_print("\n"); + } zend_hash_move_forward(Z_ARRVAL_PP(data)); } } @@ -225,21 +290,9 @@ static void php_print_gpcse_array(char *name, uint name_length TSRMLS_DC) */ void php_info_print_style(TSRMLS_D) { - php_printf("<style type=\"text/css\">\n"); + php_info_printf("<style type=\"text/css\">\n"); php_info_print_css(TSRMLS_C); - php_printf("</style>\n"); -} -/* }}} */ - -/* {{{ php_info_html_esc_write - */ -PHPAPI void php_info_html_esc_write(char *string, int str_len TSRMLS_DC) -{ - int new_len; - char *ret = php_escape_html_entities((unsigned char *)string, str_len, &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC); - - PHPWRITE(ret, new_len); - efree(ret); + php_info_printf("</style>\n"); } /* }}} */ @@ -248,13 +301,13 @@ PHPAPI void php_info_html_esc_write(char *string, int str_len TSRMLS_DC) PHPAPI char *php_info_html_esc(char *string TSRMLS_DC) { int new_len; - return php_escape_html_entities((unsigned char *)string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC); + return php_escape_html_entities(string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC); } /* }}} */ - #ifdef PHP_WIN32 /* {{{ */ + char* php_get_windows_name() { OSVERSIONINFOEX osvi; @@ -349,9 +402,9 @@ char* php_get_windows_name() if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2 ) { if (GetSystemMetrics(SM_SERVERR2)) major = "Windows Server 2003 R2"; - else if (osvi.wSuiteMask == VER_SUITE_STORAGE_SERVER) + else if (osvi.wSuiteMask==VER_SUITE_STORAGE_SERVER) major = "Windows Storage Server 2003"; - else if (osvi.wSuiteMask == VER_SUITE_WH_SERVER) + else if (osvi.wSuiteMask==VER_SUITE_WH_SERVER) major = "Windows Home Server"; else if (osvi.wProductType == VER_NT_WORKSTATION && si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64) { @@ -577,54 +630,18 @@ PHPAPI char *php_get_uname(char mode) } /* }}} */ - /* {{{ php_print_info_htmlhead */ PHPAPI void php_print_info_htmlhead(TSRMLS_D) { - -/*** none of this is needed now *** - - const char *charset = NULL; - - if (SG(default_charset)) { - charset = SG(default_charset); - } - -#if HAVE_MBSTRING - if (php_ob_handler_used("mb_output_handler" TSRMLS_CC)) { - if (MBSTRG(current_http_output_encoding) == mbfl_no_encoding_pass) { - charset = "US-ASCII"; - } else { - charset = mbfl_no2preferred_mime_name(MBSTRG(current_http_output_encoding)); - } - } -#endif - -#if HAVE_ICONV - if (php_ob_handler_used("ob_iconv_handler" TSRMLS_CC)) { - charset = ICONVG(output_encoding); - } -#endif - - if (!charset || !charset[0]) { - charset = "US-ASCII"; - } - -*** none of that is needed now ***/ - - - PUTS("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"DTD/xhtml1-transitional.dtd\">\n"); - PUTS("<html>"); - PUTS("<head>\n"); + php_info_print("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"DTD/xhtml1-transitional.dtd\">\n"); + php_info_print("<html>"); + php_info_print("<head>\n"); php_info_print_style(TSRMLS_C); - PUTS("<title>phpinfo()</title>"); - PUTS("<meta name=\"ROBOTS\" content=\"NOINDEX,NOFOLLOW,NOARCHIVE\" />"); -/* - php_printf("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\" />\n", charset); -*/ - PUTS("</head>\n"); - PUTS("<body><div class=\"center\">\n"); + php_info_print("<title>phpinfo()</title>"); + php_info_print("<meta name=\"ROBOTS\" content=\"NOINDEX,NOFOLLOW,NOARCHIVE\" />"); + php_info_print("</head>\n"); + php_info_print("<body><div class=\"center\">\n"); } /* }}} */ @@ -650,8 +667,8 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) if (!sapi_module.phpinfo_as_text) { php_print_info_htmlhead(TSRMLS_C); } else { - PUTS("phpinfo()\n"); - } + php_info_print("phpinfo()\n"); + } if (flag & PHP_INFO_GENERAL) { char *zend_version = get_zend_version(); @@ -665,21 +682,17 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) } if (expose_php && !sapi_module.phpinfo_as_text) { - PUTS("<a href=\"http://www.php.net/\"><img border=\"0\" src=\""); - if (SG(request_info).request_uri) { - char *elem_esc = php_info_html_esc(SG(request_info).request_uri TSRMLS_CC); - PUTS(elem_esc); - efree(elem_esc); - } - PUTS("?="); + php_info_print("<a href=\"http://www.php.net/\"><img border=\"0\" src=\""); + php_info_print_request_uri(TSRMLS_C); + php_info_print("?="); logo_guid = php_logo_guid(); - PUTS(logo_guid); + php_info_print(logo_guid); efree(logo_guid); - PUTS("\" alt=\"PHP Logo\" /></a>"); + php_info_print("\" alt=\"PHP Logo\" /></a>"); } if (!sapi_module.phpinfo_as_text) { - php_printf("<h1 class=\"p\">PHP Version %s</h1>\n", PHP_VERSION); + php_info_printf("<h1 class=\"p\">PHP Version %s</h1>\n", PHP_VERSION); } else { php_info_print_table_row(2, "PHP Version", PHP_VERSION); } @@ -749,139 +762,24 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) #else php_info_print_table_row(2, "IPv6 Support", "disabled" ); #endif - { - HashTable *url_stream_wrappers_hash; - char *stream_protocol, *stream_protocols_buf = NULL; - int stream_protocol_len, stream_protocols_buf_len = 0; - ulong num_key; - - if ((url_stream_wrappers_hash = php_stream_get_url_stream_wrappers_hash())) { - HashPosition pos; - for (zend_hash_internal_pointer_reset_ex(url_stream_wrappers_hash, &pos); - zend_hash_get_current_key_ex(url_stream_wrappers_hash, &stream_protocol, (uint *)&stream_protocol_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING; - zend_hash_move_forward_ex(url_stream_wrappers_hash, &pos)) { - stream_protocols_buf = erealloc(stream_protocols_buf, stream_protocols_buf_len + stream_protocol_len + 2 + 1); - memcpy(stream_protocols_buf + stream_protocols_buf_len, stream_protocol, stream_protocol_len - 1); - stream_protocols_buf[stream_protocols_buf_len + stream_protocol_len - 1] = ','; - stream_protocols_buf[stream_protocols_buf_len + stream_protocol_len] = ' '; - stream_protocols_buf_len += stream_protocol_len + 1; - } - if (stream_protocols_buf) { - stream_protocols_buf[stream_protocols_buf_len - 2] = ' '; - stream_protocols_buf[stream_protocols_buf_len] = 0; - php_info_print_table_row(2, "Registered PHP Streams", stream_protocols_buf); - efree(stream_protocols_buf); - } else { - /* Any chances we will ever hit this? */ - php_info_print_table_row(2, "Registered PHP Streams", "no streams registered"); - } - } else { - /* Any chances we will ever hit this? */ - php_info_print_table_row(2, "PHP Streams", "disabled"); /* ?? */ - } - } - - { - HashTable *stream_xport_hash; - char *xport_name, *xport_buf = NULL; - int xport_name_len, xport_buf_len = 0, xport_buf_size = 0; - ulong num_key; - - if ((stream_xport_hash = php_stream_xport_get_hash())) { - HashPosition pos; - for(zend_hash_internal_pointer_reset_ex(stream_xport_hash, &pos); - zend_hash_get_current_key_ex(stream_xport_hash, &xport_name, (uint *)&xport_name_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING; - zend_hash_move_forward_ex(stream_xport_hash, &pos)) { - if (xport_buf_len + xport_name_len + 2 > xport_buf_size) { - while (xport_buf_len + xport_name_len + 2 > xport_buf_size) { - xport_buf_size += 256; - } - if (xport_buf) { - xport_buf = erealloc(xport_buf, xport_buf_size); - } else { - xport_buf = emalloc(xport_buf_size); - } - } - if (xport_buf_len > 0) { - xport_buf[xport_buf_len++] = ','; - xport_buf[xport_buf_len++] = ' '; - } - memcpy(xport_buf + xport_buf_len, xport_name, xport_name_len - 1); - xport_buf_len += xport_name_len - 1; - xport_buf[xport_buf_len] = '\0'; - } - if (xport_buf) { - php_info_print_table_row(2, "Registered Stream Socket Transports", xport_buf); - efree(xport_buf); - } else { - /* Any chances we will ever hit this? */ - php_info_print_table_row(2, "Registered Stream Socket Transports", "no transports registered"); - } - } else { - /* Any chances we will ever hit this? */ - php_info_print_table_row(2, "Stream Socket Transports", "disabled"); /* ?? */ - } - } - - { - HashTable *stream_filter_hash; - char *filter_name, *filter_buf = NULL; - int filter_name_len, filter_buf_len = 0, filter_buf_size = 0; - ulong num_key; - - if ((stream_filter_hash = php_get_stream_filters_hash())) { - HashPosition pos; - for(zend_hash_internal_pointer_reset_ex(stream_filter_hash, &pos); - zend_hash_get_current_key_ex(stream_filter_hash, &filter_name, (uint *)&filter_name_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING; - zend_hash_move_forward_ex(stream_filter_hash, &pos)) { - if (filter_buf_len + filter_name_len + 2 > filter_buf_size) { - while (filter_buf_len + filter_name_len + 2 > filter_buf_size) { - filter_buf_size += 256; - } - if (filter_buf) { - filter_buf = erealloc(filter_buf, filter_buf_size); - } else { - filter_buf = emalloc(filter_buf_size); - } - } - if (filter_buf_len > 0) { - filter_buf[filter_buf_len++] = ','; - filter_buf[filter_buf_len++] = ' '; - } - memcpy(filter_buf + filter_buf_len, filter_name, filter_name_len - 1); - filter_buf_len += filter_name_len - 1; - filter_buf[filter_buf_len] = '\0'; - } - if (filter_buf) { - php_info_print_table_row(2, "Registered Stream Filters", filter_buf); - efree(filter_buf); - } else { - /* Any chances we will ever hit this? */ - php_info_print_table_row(2, "Registered Stream Filters", "no filters registered"); - } - } else { - /* Any chances we will ever hit this? */ - php_info_print_table_row(2, "Stream Filters", "disabled"); /* ?? */ - } - } + php_info_print_stream_hash("PHP Streams", php_stream_get_url_stream_wrappers_hash() TSRMLS_CC); + php_info_print_stream_hash("Stream Socket Transports", php_stream_xport_get_hash() TSRMLS_CC); + php_info_print_stream_hash("Stream Filters", php_get_stream_filters_hash() TSRMLS_CC); + php_info_print_table_end(); /* Zend Engine */ php_info_print_box_start(0); if (expose_php && !sapi_module.phpinfo_as_text) { - PUTS("<a href=\"http://www.zend.com/\"><img border=\"0\" src=\""); - if (SG(request_info).request_uri) { - char *elem_esc = php_info_html_esc(SG(request_info).request_uri TSRMLS_CC); - PUTS(elem_esc); - efree(elem_esc); - } - PUTS("?="ZEND_LOGO_GUID"\" alt=\"Zend logo\" /></a>\n"); + php_info_print("<a href=\"http://www.zend.com/\"><img border=\"0\" src=\""); + php_info_print_request_uri(TSRMLS_C); + php_info_print("?="ZEND_LOGO_GUID"\" alt=\"Zend logo\" /></a>\n"); } - PUTS("This program makes use of the Zend Scripting Language Engine:"); - PUTS(!sapi_module.phpinfo_as_text?"<br />":"\n"); + php_info_print("This program makes use of the Zend Scripting Language Engine:"); + php_info_print(!sapi_module.phpinfo_as_text?"<br />":"\n"); if (sapi_module.phpinfo_as_text) { - PUTS(zend_version); + php_info_print(zend_version); } else { zend_html_puts(zend_version, strlen(zend_version) TSRMLS_CC); } @@ -891,15 +789,11 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) if ((flag & PHP_INFO_CREDITS) && expose_php && !sapi_module.phpinfo_as_text) { php_info_print_hr(); - PUTS("<h1><a href=\""); - if (SG(request_info).request_uri) { - char *elem_esc = php_info_html_esc(SG(request_info).request_uri TSRMLS_CC); - PUTS(elem_esc); - efree(elem_esc); - } - PUTS("?=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000\">"); - PUTS("PHP Credits"); - PUTS("</a></h1>\n"); + php_info_print("<h1><a href=\""); + php_info_print_request_uri(TSRMLS_C); + php_info_print("?=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000\">"); + php_info_print("PHP Credits"); + php_info_print("</a></h1>\n"); } zend_ini_sort_entries(TSRMLS_C); @@ -907,7 +801,7 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) if (flag & PHP_INFO_CONFIGURATION) { php_info_print_hr(); if (!sapi_module.phpinfo_as_text) { - PUTS("<h1>Configuration</h1>\n"); + php_info_print("<h1>Configuration</h1>\n"); } else { SECTION("Configuration"); } @@ -987,103 +881,108 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) if (!sapi_module.phpinfo_as_text) { SECTION("PHP License"); php_info_print_box_start(0); - PUTS("<p>\n"); - PUTS("This program is free software; you can redistribute it and/or modify "); - PUTS("it under the terms of the PHP License as published by the PHP Group "); - PUTS("and included in the distribution in the file: LICENSE\n"); - PUTS("</p>\n"); - PUTS("<p>"); - PUTS("This program is distributed in the hope that it will be useful, "); - PUTS("but WITHOUT ANY WARRANTY; without even the implied warranty of "); - PUTS("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); - PUTS("</p>\n"); - PUTS("<p>"); - PUTS("If you did not receive a copy of the PHP license, or have any questions about "); - PUTS("PHP licensing, please contact license@php.net.\n"); - PUTS("</p>\n"); + php_info_print("<p>\n"); + php_info_print("This program is free software; you can redistribute it and/or modify "); + php_info_print("it under the terms of the PHP License as published by the PHP Group "); + php_info_print("and included in the distribution in the file: LICENSE\n"); + php_info_print("</p>\n"); + php_info_print("<p>"); + php_info_print("This program is distributed in the hope that it will be useful, "); + php_info_print("but WITHOUT ANY WARRANTY; without even the implied warranty of "); + php_info_print("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); + php_info_print("</p>\n"); + php_info_print("<p>"); + php_info_print("If you did not receive a copy of the PHP license, or have any questions about "); + php_info_print("PHP licensing, please contact license@php.net.\n"); + php_info_print("</p>\n"); php_info_print_box_end(); } else { - PUTS("\nPHP License\n"); - PUTS("This program is free software; you can redistribute it and/or modify\n"); - PUTS("it under the terms of the PHP License as published by the PHP Group\n"); - PUTS("and included in the distribution in the file: LICENSE\n"); - PUTS("\n"); - PUTS("This program is distributed in the hope that it will be useful,\n"); - PUTS("but WITHOUT ANY WARRANTY; without even the implied warranty of\n"); - PUTS("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); - PUTS("\n"); - PUTS("If you did not receive a copy of the PHP license, or have any\n"); - PUTS("questions about PHP licensing, please contact license@php.net.\n"); + php_info_print("\nPHP License\n"); + php_info_print("This program is free software; you can redistribute it and/or modify\n"); + php_info_print("it under the terms of the PHP License as published by the PHP Group\n"); + php_info_print("and included in the distribution in the file: LICENSE\n"); + php_info_print("\n"); + php_info_print("This program is distributed in the hope that it will be useful,\n"); + php_info_print("but WITHOUT ANY WARRANTY; without even the implied warranty of\n"); + php_info_print("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); + php_info_print("\n"); + php_info_print("If you did not receive a copy of the PHP license, or have any\n"); + php_info_print("questions about PHP licensing, please contact license@php.net.\n"); } } if (!sapi_module.phpinfo_as_text) { - PUTS("</div></body></html>"); + php_info_print("</div></body></html>"); } } /* }}} */ - -PHPAPI void php_info_print_table_start(void) +PHPAPI void php_info_print_table_start(void) /* {{{ */ { if (!sapi_module.phpinfo_as_text) { - php_printf("<table border=\"0\" cellpadding=\"3\" width=\"600\">\n"); + php_info_print("<table border=\"0\" cellpadding=\"3\" width=\"600\">\n"); } else { - php_printf("\n"); + php_info_print("\n"); } } +/* }}} */ -PHPAPI void php_info_print_table_end(void) +PHPAPI void php_info_print_table_end(void) /* {{{ */ { if (!sapi_module.phpinfo_as_text) { - php_printf("</table><br />\n"); + php_info_print("</table><br />\n"); } } +/* }}} */ -PHPAPI void php_info_print_box_start(int flag) +PHPAPI void php_info_print_box_start(int flag) /* {{{ */ { php_info_print_table_start(); if (flag) { if (!sapi_module.phpinfo_as_text) { - php_printf("<tr class=\"h\"><td>\n"); + php_info_print("<tr class=\"h\"><td>\n"); } } else { if (!sapi_module.phpinfo_as_text) { - php_printf("<tr class=\"v\"><td>\n"); + php_info_print("<tr class=\"v\"><td>\n"); } else { - php_printf("\n"); + php_info_print("\n"); } } } +/* }}} */ -PHPAPI void php_info_print_box_end(void) +PHPAPI void php_info_print_box_end(void) /* {{{ */ { if (!sapi_module.phpinfo_as_text) { - php_printf("</td></tr>\n"); + php_info_print("</td></tr>\n"); } php_info_print_table_end(); } +/* }}} */ -PHPAPI void php_info_print_hr(void) +PHPAPI void php_info_print_hr(void) /* {{{ */ { if (!sapi_module.phpinfo_as_text) { - php_printf("<hr />\n"); + php_info_print("<hr />\n"); } else { - php_printf("\n\n _______________________________________________________________________\n\n"); + php_info_print("\n\n _______________________________________________________________________\n\n"); } } +/* }}} */ -PHPAPI void php_info_print_table_colspan_header(int num_cols, char *header) +PHPAPI void php_info_print_table_colspan_header(int num_cols, char *header) /* {{{ */ { int spaces; if (!sapi_module.phpinfo_as_text) { - php_printf("<tr class=\"h\"><th colspan=\"%d\">%s</th></tr>\n", num_cols, header ); + php_info_printf("<tr class=\"h\"><th colspan=\"%d\">%s</th></tr>\n", num_cols, header ); } else { spaces = (74 - strlen(header)); - php_printf("%*s%s%*s\n", (int)(spaces/2), " ", header, (int)(spaces/2), " "); + php_info_printf("%*s%s%*s\n", (int)(spaces/2), " ", header, (int)(spaces/2), " "); } } +/* }}} */ /* {{{ php_info_print_table_header */ @@ -1093,11 +992,9 @@ PHPAPI void php_info_print_table_header(int num_cols, ...) va_list row_elements; char *row_element; - TSRMLS_FETCH(); - va_start(row_elements, num_cols); if (!sapi_module.phpinfo_as_text) { - php_printf("<tr class=\"h\">"); + php_info_print("<tr class=\"h\">"); } for (i=0; i<num_cols; i++) { row_element = va_arg(row_elements, char *); @@ -1105,21 +1002,21 @@ PHPAPI void php_info_print_table_header(int num_cols, ...) row_element = " "; } if (!sapi_module.phpinfo_as_text) { - PUTS("<th>"); - PUTS(row_element); - PUTS("</th>"); + php_info_print("<th>"); + php_info_print(row_element); + php_info_print("</th>"); } else { - PUTS(row_element); + php_info_print(row_element); if (i < num_cols-1) { - PUTS(" => "); + php_info_print(" => "); } else { - PUTS("\n"); - } - } + php_info_print("\n"); + } + } } if (!sapi_module.phpinfo_as_text) { - php_printf("</tr>\n"); - } + php_info_print("</tr>\n"); + } va_end(row_elements); } @@ -1132,49 +1029,41 @@ static void php_info_print_table_row_internal(int num_cols, { int i; char *row_element; - char *elem_esc = NULL; -/* - int elem_esc_len; -*/ - - TSRMLS_FETCH(); if (!sapi_module.phpinfo_as_text) { - php_printf("<tr>"); + php_info_print("<tr>"); } for (i=0; i<num_cols; i++) { if (!sapi_module.phpinfo_as_text) { - php_printf("<td class=\"%s\">", + php_info_printf("<td class=\"%s\">", (i==0 ? "e" : value_class ) ); } row_element = va_arg(row_elements, char *); if (!row_element || !*row_element) { if (!sapi_module.phpinfo_as_text) { - PUTS( "<i>no value</i>" ); + php_info_print( "<i>no value</i>" ); } else { - PUTS( " " ); + php_info_print( " " ); } } else { if (!sapi_module.phpinfo_as_text) { - elem_esc = php_info_html_esc(row_element TSRMLS_CC); - PUTS(elem_esc); - efree(elem_esc); + php_info_print_html_esc(row_element, strlen(row_element)); } else { - PUTS(row_element); + php_info_print(row_element); if (i < num_cols-1) { - PUTS(" => "); + php_info_print(" => "); } } } if (!sapi_module.phpinfo_as_text) { - php_printf(" </td>"); + php_info_print(" </td>"); } else if (i == (num_cols - 1)) { - PUTS("\n"); + php_info_print("\n"); } } if (!sapi_module.phpinfo_as_text) { - php_printf("</tr>\n"); + php_info_print("</tr>\n"); } } /* }}} */ @@ -1238,9 +1127,9 @@ PHP_FUNCTION(phpinfo) } /* Andale! Andale! Yee-Hah! */ - php_start_ob_buffer(NULL, 4096, 0 TSRMLS_CC); + php_output_start_default(TSRMLS_C); php_print_info(flag TSRMLS_CC); - php_end_ob_buffer(1, 0 TSRMLS_CC); + php_output_end(TSRMLS_C); RETURN_TRUE; } @@ -1251,20 +1140,18 @@ PHP_FUNCTION(phpinfo) Return the current PHP version */ PHP_FUNCTION(phpversion) { - zval **arg; - const char *version; - int argc = ZEND_NUM_ARGS(); + char *ext_name = NULL; + int ext_name_len = 0; - if (argc == 0) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &ext_name, &ext_name_len) == FAILURE) { + return; + } + + if (!ext_name) { RETURN_STRING(PHP_VERSION, 1); } else { - if (zend_parse_parameters(argc TSRMLS_CC, "Z", &arg) == FAILURE) { - return; - } - - convert_to_string_ex(arg); - version = zend_get_module_version(Z_STRVAL_PP(arg)); - + const char *version; + version = zend_get_module_version(ext_name); if (version == NULL) { RETURN_FALSE; } @@ -1288,7 +1175,6 @@ PHP_FUNCTION(phpcredits) } /* }}} */ - /* {{{ php_logo_guid */ PHPAPI char *php_logo_guid(void) @@ -1316,7 +1202,6 @@ PHPAPI char *php_logo_guid(void) Return the special ID used to request the PHP logo in phpinfo screens*/ PHP_FUNCTION(php_logo_guid) { - if (zend_parse_parameters_none() == FAILURE) { return; } @@ -1329,7 +1214,6 @@ PHP_FUNCTION(php_logo_guid) Return the special ID used to request the PHP logo in phpinfo screens*/ PHP_FUNCTION(php_real_logo_guid) { - if (zend_parse_parameters_none() == FAILURE) { return; } @@ -1385,6 +1269,7 @@ PHP_FUNCTION(php_uname) { char *mode = "a"; int modelen = sizeof("a")-1; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &mode, &modelen) == FAILURE) { return; } diff --git a/ext/standard/tests/general_functions/ob_get_flush_error.phpt b/ext/standard/tests/general_functions/ob_get_flush_error.phpt index db666c5a6a..1d3538120d 100644 --- a/ext/standard/tests/general_functions/ob_get_flush_error.phpt +++ b/ext/standard/tests/general_functions/ob_get_flush_error.phpt @@ -26,5 +26,7 @@ var_dump( ob_get_flush() ); Warning: ob_get_flush() expects exactly 0 parameters, 1 given in %s on line %d NULL + +Notice: ob_get_flush(): failed to delete and flush buffer. No buffer to delete or flush in %s on line %d bool(false) ===DONE=== diff --git a/ext/standard/tests/general_functions/phpinfo.phpt b/ext/standard/tests/general_functions/phpinfo.phpt index 7da94c3596..20828f4fcd 100644 --- a/ext/standard/tests/general_functions/phpinfo.phpt +++ b/ext/standard/tests/general_functions/phpinfo.phpt @@ -37,6 +37,7 @@ Thread Safety => %s Zend Memory Manager => %s Zend Multibyte Support => %s IPv6 Support => %s + Registered PHP Streams => %s Registered Stream Socket Transports => %s Registered Stream Filters => %s diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c index 905734918a..c073695dbd 100644 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@ -1,8 +1,8 @@ -/* Generated by re2c 0.13.5 on Mon Jul 27 02:20:40 2009 */ +/* Generated by re2c 0.13.5 on Tue Dec 8 14:00:51 2009 */ #line 1 "ext/standard/url_scanner_ex.re" /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 6 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2006 The PHP Group | +----------------------------------------------------------------------+ @@ -993,7 +993,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; @@ -1024,11 +1024,15 @@ PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int va char *encoded; int encoded_len; smart_str val; + zval *ob_name; if (! BG(url_adapt_state_ex).active) { + MAKE_STD_ZVAL(ob_name); + ZVAL_STRING(ob_name, "URL-Rewriter", 1); 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(ob_name, php_url_scanner_output_handler, 0, PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC); BG(url_adapt_state_ex).active = 1; + zval_ptr_dtor(&ob_name); } diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re index 888bb0667a..cb248b448f 100644 --- a/ext/standard/url_scanner_ex.re +++ b/ext/standard/url_scanner_ex.re @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 6 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2006 The PHP Group | +----------------------------------------------------------------------+ @@ -431,7 +431,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; @@ -462,11 +462,15 @@ PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int va char *encoded; int encoded_len; smart_str val; + zval *ob_name; if (! BG(url_adapt_state_ex).active) { + MAKE_STD_ZVAL(ob_name); + ZVAL_STRING(ob_name, "URL-Rewriter", 1); 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(ob_name, php_url_scanner_output_handler, 0, PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC); BG(url_adapt_state_ex).active = 1; + zval_ptr_dtor(&ob_name); } diff --git a/ext/standard/var.c b/ext/standard/var.c index de321060f8..8f3381743d 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -453,14 +453,14 @@ PHP_FUNCTION(var_export) } if (return_output) { - php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC); + php_output_start_default(TSRMLS_C); } php_var_export(&var, 1 TSRMLS_CC); if (return_output) { - php_ob_get_buffer (return_value TSRMLS_CC); - php_end_ob_buffer (0, 0 TSRMLS_CC); + php_output_get_contents(return_value TSRMLS_CC); + php_output_discard(TSRMLS_C); } } /* }}} */ diff --git a/ext/tidy/php_tidy.h b/ext/tidy/php_tidy.h index 90a3e095d2..45d81ea064 100644 --- a/ext/tidy/php_tidy.h +++ b/ext/tidy/php_tidy.h @@ -36,6 +36,7 @@ extern zend_module_entry tidy_module_entry; ZEND_BEGIN_MODULE_GLOBALS(tidy) char *default_config; + zend_bool clean_output; ZEND_END_MODULE_GLOBALS(tidy) #ifdef ZTS diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index dfc15d97f0..1dc968852a 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -43,8 +43,10 @@ /* {{{ ext/tidy macros */ +#define FIX_BUFFER(bptr) do { if ((bptr)->size) { (bptr)->bp[(bptr)->size-1] = '\0'; } } while(0) + #define TIDY_SET_CONTEXT \ - zval *object = getThis(); + zval *object = getThis(); #define TIDY_FETCH_OBJECT \ PHPTidyObj *obj; \ @@ -58,7 +60,7 @@ RETURN_FALSE; \ } \ } \ - obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC); \ + obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC); #define TIDY_FETCH_ONLY_OBJECT \ PHPTidyObj *obj; \ @@ -66,25 +68,25 @@ if (zend_parse_parameters_none() == FAILURE) { \ return; \ } \ - obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC); \ + obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC); #define TIDY_APPLY_CONFIG_ZVAL(_doc, _val) \ - if(_val) { \ - if(Z_TYPE_PP(_val) == IS_ARRAY) { \ - _php_tidy_apply_config_array(_doc, HASH_OF(*_val) TSRMLS_CC); \ - } else { \ - convert_to_string_ex(_val); \ - TIDY_SAFE_MODE_CHECK(Z_STRVAL_PP(_val)); \ - switch (tidyLoadConfig(_doc, Z_STRVAL_PP(_val))) { \ - case -1: \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not load configuration file '%s'", Z_STRVAL_PP(_val)); \ - break; \ - case 1: \ - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "There were errors while parsing the configuration file '%s'", Z_STRVAL_PP(_val)); \ - break; \ - } \ - } \ - } + if (_val) { \ + if (Z_TYPE_PP(_val) == IS_ARRAY) { \ + _php_tidy_apply_config_array(_doc, HASH_OF(*_val) TSRMLS_CC); \ + } else if (Z_TYPE_PP(_val) != IS_NULL) { \ + convert_to_string_ex(_val); \ + TIDY_SAFE_MODE_CHECK(Z_STRVAL_PP(_val)); \ + switch (tidyLoadConfig(_doc, Z_STRVAL_PP(_val))) { \ + case -1: \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not load configuration file '%s'", Z_STRVAL_PP(_val)); \ + break; \ + case 1: \ + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "There were errors while parsing the configuration file '%s'", Z_STRVAL_PP(_val)); \ + break; \ + } \ + } \ + } #define REGISTER_TIDY_CLASS(classname, name, parent, __flags) \ { \ @@ -121,16 +123,16 @@ } #define ADD_PROPERTY_STRINGL(_table, _key, _string, _len) \ - { \ - zval *tmp; \ - MAKE_STD_ZVAL(tmp); \ - if (_string) { \ - ZVAL_STRINGL(tmp, (char *)_string, _len, 1); \ - } else { \ - ZVAL_EMPTY_STRING(tmp); \ - } \ - zend_hash_update(_table, #_key, sizeof(#_key), (void *)&tmp, sizeof(zval *), NULL); \ - } + { \ + zval *tmp; \ + MAKE_STD_ZVAL(tmp); \ + if (_string) { \ + ZVAL_STRINGL(tmp, (char *)_string, _len, 1); \ + } else { \ + ZVAL_EMPTY_STRING(tmp); \ + } \ + zend_hash_update(_table, #_key, sizeof(#_key), (void *)&tmp, sizeof(zval *), NULL); \ + } #define ADD_PROPERTY_LONG(_table, _key, _long) \ { \ @@ -149,27 +151,27 @@ } #define ADD_PROPERTY_BOOL(_table, _key, _bool) \ - { \ - zval *tmp; \ - MAKE_STD_ZVAL(tmp); \ - ZVAL_BOOL(tmp, _bool); \ - zend_hash_update(_table, #_key, sizeof(#_key), (void *)&tmp, sizeof(zval *), NULL); \ - } + { \ + zval *tmp; \ + MAKE_STD_ZVAL(tmp); \ + ZVAL_BOOL(tmp, _bool); \ + zend_hash_update(_table, #_key, sizeof(#_key), (void *)&tmp, sizeof(zval *), NULL); \ + } #define TIDY_SAFE_MODE_CHECK(filename) \ -if ((PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC)) { \ - RETURN_FALSE; \ -} \ + if ((PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC)) { \ + RETURN_FALSE; \ + } #define TIDY_SET_DEFAULT_CONFIG(_doc) \ if (TG(default_config) && TG(default_config)[0]) { \ if (tidyLoadConfig(_doc, TG(default_config)) < 0) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to load Tidy configuration file at '%s'.", TG(default_config)); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to load Tidy configuration file at '%s'", TG(default_config)); \ } \ } /* }}} */ -/* {{{ ext/tidy structs +/* {{{ ext/tidy structs */ typedef struct _PHPTidyDoc PHPTidyDoc; typedef struct _PHPTidyObj PHPTidyObj; @@ -187,16 +189,16 @@ typedef enum { } tidy_base_nodetypes; struct _PHPTidyDoc { - TidyDoc doc; - TidyBuffer *errbuf; - unsigned int ref_count; + TidyDoc doc; + TidyBuffer *errbuf; + unsigned int ref_count; }; struct _PHPTidyObj { - zend_object std; - TidyNode node; - tidy_obj_type type; - PHPTidyDoc *ptdoc; + zend_object std; + TidyNode node; + tidy_obj_type type; + PHPTidyDoc *ptdoc; }; /* }}} */ @@ -217,6 +219,10 @@ static int _php_tidy_set_tidy_opt(TidyDoc, char *, zval * TSRMLS_DC); static int _php_tidy_apply_config_array(TidyDoc doc, HashTable *ht_options TSRMLS_DC); static void _php_tidy_register_nodetypes(INIT_FUNC_ARGS); static void _php_tidy_register_tags(INIT_FUNC_ARGS); +static PHP_INI_MH(php_tidy_set_clean_output); +static void php_tidy_clean_output_start(zval *name TSRMLS_DC); +static php_output_handler *php_tidy_output_handler_init(zval *handler_name, size_t chunk_size, int flags TSRMLS_DC); +static int php_tidy_output_handler(void **nothing, php_output_context *output_context); static PHP_MINIT_FUNCTION(tidy); static PHP_MSHUTDOWN_FUNCTION(tidy); @@ -246,8 +252,6 @@ static PHP_FUNCTION(tidy_warning_count); static PHP_FUNCTION(tidy_access_count); static PHP_FUNCTION(tidy_config_count); -static PHP_FUNCTION(ob_tidyhandler); - static PHP_FUNCTION(tidy_get_root); static PHP_FUNCTION(tidy_get_html); static PHP_FUNCTION(tidy_get_head); @@ -272,8 +276,8 @@ static TIDY_NODE_METHOD(__construct); ZEND_DECLARE_MODULE_GLOBALS(tidy) PHP_INI_BEGIN() -STD_PHP_INI_ENTRY("tidy.default_config", "", PHP_INI_SYSTEM, OnUpdateString, default_config, zend_tidy_globals, tidy_globals) -PHP_INI_ENTRY("tidy.clean_output", "0", PHP_INI_PERDIR, NULL) +STD_PHP_INI_ENTRY("tidy.default_config", "", PHP_INI_SYSTEM, OnUpdateString, default_config, zend_tidy_globals, tidy_globals) +STD_PHP_INI_ENTRY("tidy.clean_output", "0", PHP_INI_USER, php_tidy_set_clean_output, clean_output, zend_tidy_globals, tidy_globals) PHP_INI_END() /* {{{ arginfo */ @@ -283,8 +287,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_parse_string, 0, 0, 1) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_error_buffer, 0, 0, 0) - ZEND_ARG_INFO(0, detailed) +ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_error_buffer, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_output, 0) @@ -369,11 +372,6 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_body, 0, 0, 1) ZEND_ARG_INFO(0, tidy) ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_ob_tidyhandler, 0, 0, 1) - ZEND_ARG_INFO(0, input) - ZEND_ARG_INFO(0, mode) -ZEND_END_ARG_INFO() /* }}} */ static const zend_function_entry tidy_functions[] = { @@ -381,21 +379,21 @@ static const zend_function_entry tidy_functions[] = { PHP_FE(tidy_parse_string, arginfo_tidy_parse_string) PHP_FE(tidy_parse_file, arginfo_tidy_parse_file) PHP_FE(tidy_get_output, arginfo_tidy_get_output) - PHP_FE(tidy_get_error_buffer, arginfo_tidy_get_error_buffer) + PHP_FE(tidy_get_error_buffer, arginfo_tidy_get_error_buffer) PHP_FE(tidy_clean_repair, arginfo_tidy_clean_repair) PHP_FE(tidy_repair_string, arginfo_tidy_repair_string) PHP_FE(tidy_repair_file, arginfo_tidy_repair_file) - PHP_FE(tidy_diagnose, arginfo_tidy_diagnose) + PHP_FE(tidy_diagnose, arginfo_tidy_diagnose) PHP_FE(tidy_get_release, arginfo_tidy_get_release) PHP_FE(tidy_get_config, arginfo_tidy_get_config) PHP_FE(tidy_get_status, arginfo_tidy_get_status) PHP_FE(tidy_get_html_ver, arginfo_tidy_get_html_ver) PHP_FE(tidy_is_xhtml, arginfo_tidy_is_xhtml) - PHP_FE(tidy_is_xml, arginfo_tidy_is_xml) + PHP_FE(tidy_is_xml, arginfo_tidy_is_xml) PHP_FE(tidy_error_count, arginfo_tidy_error_count) PHP_FE(tidy_warning_count, arginfo_tidy_warning_count) PHP_FE(tidy_access_count, arginfo_tidy_access_count) - PHP_FE(tidy_config_count, arginfo_tidy_config_count) + PHP_FE(tidy_config_count, arginfo_tidy_config_count) #if HAVE_TIDYOPTGETDOC PHP_FE(tidy_get_opt_doc, arginfo_tidy_get_opt_doc) #endif @@ -403,7 +401,6 @@ static const zend_function_entry tidy_functions[] = { PHP_FE(tidy_get_head, arginfo_tidy_get_head) PHP_FE(tidy_get_html, arginfo_tidy_get_html) PHP_FE(tidy_get_body, arginfo_tidy_get_body) - PHP_FE(ob_tidyhandler, arginfo_ob_tidyhandler) {NULL, NULL, NULL} }; @@ -502,7 +499,7 @@ static int _php_tidy_set_tidy_opt(TidyDoc doc, char *optname, zval *value TSRMLS php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unknown Tidy Configuration Option '%s'", optname); return FAILURE; } - + if (tidyOptIsReadOnly(opt)) { php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Attempting to set read-only option '%s'", optname); return FAILURE; @@ -548,7 +545,7 @@ static int _php_tidy_set_tidy_opt(TidyDoc doc, char *optname, zval *value TSRMLS default: php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to determine type of configuration option"); break; - } + } return FAILURE; } @@ -565,7 +562,7 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_fil if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|Zsb", &arg1, &arg1_len, &config, &enc, &enc_len, &use_include_path) == FAILURE) { RETURN_FALSE; } - + if (is_file) { if (!(data = php_tidy_file_to_mem(arg1, use_include_path, &data_len TSRMLS_CC))) { RETURN_FALSE; @@ -578,35 +575,35 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_fil doc = tidyCreate(); errbuf = emalloc(sizeof(TidyBuffer)); tidyBufInit(errbuf); - + if (tidySetErrorBuffer(doc, errbuf) != 0) { tidyBufFree(errbuf); efree(errbuf); tidyRelease(doc); php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not set Tidy error buffer"); } - + tidyOptSetBool(doc, TidyForceOutput, yes); tidyOptSetBool(doc, TidyMark, no); - + TIDY_SET_DEFAULT_CONFIG(doc); - + if (config) { TIDY_APPLY_CONFIG_ZVAL(doc, config); } - if(enc_len) { + if (enc_len) { if (tidySetCharEncoding(doc, enc) < 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not set encoding '%s'", enc); RETVAL_FALSE; } } - + if (data) { TidyBuffer buf; tidyBufInit(&buf); - tidyBufAppend(&buf, data, data_len); + tidyBufAttach(&buf, (byte *) data, data_len); if (tidyParseBuffer(doc, &buf) < 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errbuf->bp); @@ -617,20 +614,19 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_fil tidyBufInit(&output); tidySaveBuffer (doc, &output); - RETVAL_STRINGL((char*)output.bp, output.size ? output.size-1 : 0, 1); + FIX_BUFFER(&output); + RETVAL_STRINGL((char *) output.bp, output.size ? output.size-1 : 0, 1); tidyBufFree(&output); } else { RETVAL_FALSE; } } - - tidyBufFree(&buf); } if (is_file) { efree(data); } - + tidyBufFree(errbuf); efree(errbuf); tidyRelease(doc); @@ -644,7 +640,7 @@ static char *php_tidy_file_to_mem(char *filename, zend_bool use_include_path, in if (!(stream = php_stream_open_wrapper(filename, "rb", (use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE, NULL))) { return NULL; } - if ((*len = (int) php_stream_copy_to_mem(stream, &data, PHP_STREAM_COPY_ALL, 0)) == 0) { + if ((*len = (int) php_stream_copy_to_mem(stream, (void*) &data, PHP_STREAM_COPY_ALL, 0)) == 0) { data = estrdup(""); *len = 0; } @@ -673,16 +669,15 @@ static void tidy_object_free_storage(void *object TSRMLS_DC) efree(object); } -static void tidy_object_new(zend_class_entry *class_type, zend_object_handlers *handlers, - zend_object_value *retval, tidy_obj_type objtype TSRMLS_DC) +static void tidy_object_new(zend_class_entry *class_type, zend_object_handlers *handlers, zend_object_value *retval, tidy_obj_type objtype TSRMLS_DC) { PHPTidyObj *intern; zval *tmp; intern = emalloc(sizeof(PHPTidyObj)); memset(intern, 0, sizeof(PHPTidyObj)); + zend_object_std_init(&intern->std, class_type TSRMLS_CC); - zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); switch(objtype) { @@ -690,11 +685,6 @@ static void tidy_object_new(zend_class_entry *class_type, zend_object_handlers * break; case is_doc: - tidySetMallocCall(php_tidy_malloc); - tidySetReallocCall(php_tidy_realloc); - tidySetFreeCall(php_tidy_free); - tidySetPanicCall(php_tidy_panic); - intern->ptdoc = emalloc(sizeof(PHPTidyDoc)); intern->ptdoc->doc = tidyCreate(); intern->ptdoc->ref_count = 1; @@ -717,9 +707,6 @@ static void tidy_object_new(zend_class_entry *class_type, zend_object_handlers * tidy_add_default_properties(intern, is_doc TSRMLS_CC); break; - - default: - break; } retval->handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) tidy_object_free_storage, NULL TSRMLS_CC); @@ -775,7 +762,7 @@ static int tidy_doc_cast_handler(zval *in, zval *out, int type TSRMLS_DC) obj = (PHPTidyObj *)zend_object_store_get_object(in TSRMLS_CC); tidyBufInit(&output); tidySaveBuffer (obj->ptdoc->doc, &output); - ZVAL_STRINGL(out, (char*)output.bp, output.size ? output.size-1 : 0, TRUE); + ZVAL_STRINGL(out, (char *) output.bp, output.size ? output.size-1 : 0, 1); tidyBufFree(&output); break; @@ -809,8 +796,10 @@ static int tidy_node_cast_handler(zval *in, zval *out, int type TSRMLS_DC) tidyBufInit(&buf); if (obj->ptdoc) { tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf); + ZVAL_STRINGL(out, (char *) buf.bp, buf.size-1, 1); + } else { + ZVAL_EMPTY_STRING(out); } - ZVAL_STRINGL(out, (char*)buf.bp, buf.size ? buf.size-1 : 0, TRUE); tidyBufFree(&buf); break; @@ -823,24 +812,23 @@ static int tidy_node_cast_handler(zval *in, zval *out, int type TSRMLS_DC) static void tidy_doc_update_properties(PHPTidyObj *obj TSRMLS_DC) { - TidyBuffer output; zval *temp; tidyBufInit(&output); tidySaveBuffer (obj->ptdoc->doc, &output); - + if (output.size) { MAKE_STD_ZVAL(temp); - ZVAL_STRINGL(temp, (char*)output.bp, output.size-1, TRUE); + ZVAL_STRINGL(temp, (char *) output.bp, output.size-1, 1); zend_hash_update(obj->std.properties, "value", sizeof("value"), (void *)&temp, sizeof(zval *), NULL); } - + tidyBufFree(&output); if (obj->ptdoc->errbuf->size) { MAKE_STD_ZVAL(temp); - ZVAL_STRINGL(temp, (char*)obj->ptdoc->errbuf->bp, obj->ptdoc->errbuf->size-1, TRUE); + ZVAL_STRINGL(temp, (char *) obj->ptdoc->errbuf->bp, obj->ptdoc->errbuf->size-1, TRUE); zend_hash_update(obj->std.properties, "errorBuffer", sizeof("errorBuffer"), (void *)&temp, sizeof(zval *), NULL); } } @@ -859,7 +847,7 @@ static void tidy_add_default_properties(PHPTidyObj *obj, tidy_obj_type type TSRM case is_node: tidyBufInit(&buf); tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf); - ADD_PROPERTY_STRINGL(obj->std.properties, value, buf.bp, buf.size-1); + ADD_PROPERTY_STRINGL(obj->std.properties, value, buf.bp, buf.size ? buf.size-1 : 0); tidyBufFree(&buf); ADD_PROPERTY_STRING(obj->std.properties, name, tidyNodeGetName(obj->node)); @@ -874,7 +862,7 @@ static void tidy_add_default_properties(PHPTidyObj *obj, tidy_obj_type type TSRM case TidyNode_Text: case TidyNode_Comment: break; - + default: ADD_PROPERTY_LONG(obj->std.properties, id, tidyNodeGetId(obj->node)); } @@ -1000,49 +988,55 @@ static void php_tidy_create_node(INTERNAL_FUNCTION_PARAMETERS, tidy_base_nodetyp static int _php_tidy_apply_config_array(TidyDoc doc, HashTable *ht_options TSRMLS_DC) { - char *opt_name = NULL; + char *opt_name; zval **opt_val; ulong opt_indx; - + uint opt_name_len; + zend_bool clear_str; + for (zend_hash_internal_pointer_reset(ht_options); - zend_hash_get_current_data(ht_options, (void **)&opt_val) == SUCCESS; + zend_hash_get_current_data(ht_options, (void *) &opt_val) == SUCCESS; zend_hash_move_forward(ht_options)) { - - if(zend_hash_get_current_key(ht_options, &opt_name, &opt_indx, FALSE) == FAILURE) { + + switch (zend_hash_get_current_key_ex(ht_options, &opt_name, &opt_name_len, &opt_indx, FALSE, NULL)) { + case HASH_KEY_IS_STRING: + clear_str = 0; + break; + + case HASH_KEY_IS_LONG: + continue; /* ignore numeric keys */ + + default: php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not retrieve key from option array"); return FAILURE; } - if(opt_name) { - _php_tidy_set_tidy_opt(doc, opt_name, *opt_val TSRMLS_CC); - opt_name = NULL; + _php_tidy_set_tidy_opt(doc, opt_name, *opt_val TSRMLS_CC); + if (clear_str) { + efree(opt_name); } - } - + return SUCCESS; } static int php_tidy_parse_string(PHPTidyObj *obj, char *string, int len, char *enc TSRMLS_DC) { TidyBuffer buf; - - if(enc) { + + if (enc) { if (tidySetCharEncoding(obj->ptdoc->doc, enc) < 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not set encoding '%s'", enc); return FAILURE; } } - + tidyBufInit(&buf); - tidyBufAppend(&buf, string, len); + tidyBufAttach(&buf, (byte *) string, len); if (tidyParseBuffer(obj->ptdoc->doc, &buf) < 0) { - tidyBufFree(&buf); php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", obj->ptdoc->errbuf->bp); return FAILURE; - } - tidyBufFree(&buf); tidy_doc_update_properties(obj TSRMLS_CC); return SUCCESS; @@ -1050,6 +1044,11 @@ static int php_tidy_parse_string(PHPTidyObj *obj, char *string, int len, char *e static PHP_MINIT_FUNCTION(tidy) { + tidySetMallocCall(php_tidy_malloc); + tidySetReallocCall(php_tidy_realloc); + tidySetFreeCall(php_tidy_free); + tidySetPanicCall(php_tidy_panic); + REGISTER_INI_ENTRIES(); REGISTER_TIDY_CLASS(tidy, doc, NULL, 0); REGISTER_TIDY_CLASS(tidyNode, node, NULL, ZEND_ACC_FINAL_CLASS); @@ -1060,16 +1059,19 @@ static PHP_MINIT_FUNCTION(tidy) _php_tidy_register_tags(INIT_FUNC_ARGS_PASSTHRU); _php_tidy_register_nodetypes(INIT_FUNC_ARGS_PASSTHRU); + PHP_OUTPUT_ALIAS_REGISTER("ob_tidyhandler", php_tidy_output_handler_init); + return SUCCESS; } static PHP_RINIT_FUNCTION(tidy) { - if (INI_BOOL("tidy.clean_output") == TRUE) { - if (php_start_ob_buffer_named("ob_tidyhandler", 0, 1 TSRMLS_CC) == FAILURE) { - zend_error(E_NOTICE, "Failure installing Tidy output buffering."); - } - } + zval *name; + + MAKE_STD_ZVAL(name); + ZVAL_STRING(name, "ob_tidyhandler", 1); + php_tidy_clean_output_start(name TSRMLS_CC); + zval_ptr_dtor(&name); return SUCCESS; } @@ -1091,97 +1093,148 @@ static PHP_MINFO_FUNCTION(tidy) DISPLAY_INI_ENTRIES(); } -static PHP_FUNCTION(ob_tidyhandler) +static PHP_INI_MH(php_tidy_set_clean_output) { - char *input; - int input_len; - long mode; - TidyBuffer errbuf; - TidyDoc doc; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &input, &input_len, &mode) == FAILURE) { - return; + int status; + zend_bool value; + + if (new_value_length==2 && strcasecmp("on", new_value)==0) { + value = (zend_bool) 1; + } else if (new_value_length==3 && strcasecmp("yes", new_value)==0) { + value = (zend_bool) 1; + } else if (new_value_length==4 && strcasecmp("true", new_value)==0) { + value = (zend_bool) 1; + } else { + value = (zend_bool) atoi(new_value); } - doc = tidyCreate(); - tidyBufInit(&errbuf); + if (stage == PHP_INI_STAGE_RUNTIME) { + status = php_output_get_status(TSRMLS_C); - tidyOptSetBool(doc, TidyForceOutput, yes); - tidyOptSetBool(doc, TidyMark, no); + if (value && (status & PHP_OUTPUT_WRITTEN)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot enable tidy.clean_output - there has already been output"); + return FAILURE; + } + if (status & PHP_OUTPUT_SENT) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot change tidy.clean_output - headers already sent"); + return FAILURE; + } + } - if (tidySetErrorBuffer(doc, &errbuf) != 0) { - tidyRelease(doc); - tidyBufFree(&errbuf); + status = OnUpdateBool(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not set Tidy error buffer"); + if (stage == PHP_INI_STAGE_RUNTIME && value) { + zval *tmp; + + MAKE_STD_ZVAL(tmp); + ZVAL_STRING(tmp, "ob_tidyhandler", 1); + if (!php_output_handler_started(tmp TSRMLS_CC)) { + php_tidy_clean_output_start(tmp TSRMLS_CC); + } + zval_ptr_dtor(&tmp); } - TIDY_SET_DEFAULT_CONFIG(doc); + return status; +} - if (input_len > 1) { - TidyBuffer buf; - - tidyBufInit(&buf); - tidyBufAppend(&buf, input, input_len); - - if (tidyParseBuffer(doc, &buf) < 0 || tidyCleanAndRepair(doc) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errbuf.bp); - RETVAL_NULL(); - } else { - TidyBuffer output; - tidyBufInit(&output); +/* + * NOTE: tidy does not support iterative/cumulative parsing, so chunk-sized output handler is not possible + */ - tidySaveBuffer(doc, &output); - RETVAL_STRINGL((char*)output.bp, output.size ? output.size-1 : 0, 1); +static void php_tidy_clean_output_start(zval *name TSRMLS_DC) +{ + php_output_handler *h; - tidyBufFree(&output); + if (TG(clean_output) && (h = php_tidy_output_handler_init(name, 0, PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC))) { + php_output_handler_start(h TSRMLS_CC); + } +} + +static php_output_handler *php_tidy_output_handler_init(zval *handler_name, size_t chunk_size, int flags TSRMLS_DC) +{ + if (chunk_size) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot use a chunk size for ob_tidyhandler"); + return NULL; + } + if (!TG(clean_output)) { + TG(clean_output) = 1; + } + return php_output_handler_create_internal(handler_name, php_tidy_output_handler, chunk_size, flags TSRMLS_CC); +} + +static int php_tidy_output_handler(void **nothing, php_output_context *output_context) +{ + int status = FAILURE; + TidyDoc doc; + TidyBuffer inbuf, outbuf, errbuf; + PHP_OUTPUT_TSRMLS(output_context); + + if (TG(clean_output) && (output_context->op & PHP_OUTPUT_HANDLER_START) && (output_context->op & PHP_OUTPUT_HANDLER_FINAL)) { + doc = tidyCreate(); + tidyBufInit(&errbuf); + + if (0 == tidySetErrorBuffer(doc, &errbuf)) { + tidyOptSetBool(doc, TidyForceOutput, yes); + tidyOptSetBool(doc, TidyMark, no); + + TIDY_SET_DEFAULT_CONFIG(doc); + + tidyBufInit(&inbuf); + tidyBufAttach(&inbuf, (byte *) output_context->in.data, output_context->in.used); + + if (0 <= tidyParseBuffer(doc, &inbuf) && 0 <= tidyCleanAndRepair(doc)) { + tidyBufInit(&outbuf); + tidySaveBuffer(doc, &outbuf); + FIX_BUFFER(&outbuf); + output_context->out.data = (char *) outbuf.bp; + output_context->out.used = outbuf.size ? outbuf.size-1 : 0; + output_context->out.free = 1; + status = SUCCESS; + } } - - tidyBufFree(&buf); - } else { - RETVAL_NULL(); + + tidyRelease(doc); + tidyBufFree(&errbuf); } - tidyRelease(doc); - tidyBufFree(&errbuf); + return status; } -/* {{{ proto bool tidy_parse_string(string input [, mixed config_options [, string encoding]]) +/* {{{ proto bool tidy_parse_string(string input [, mixed config_options [, string encoding]]) U Parse a document stored in a string */ static PHP_FUNCTION(tidy_parse_string) { - char *input, *enc = NULL; - int input_len, enc_len = 0; + char *input; + char *enc = NULL; + int input_len, enc_len; zval **options = NULL; - PHPTidyObj *obj; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|Zs", &input, &input_len, &options, &enc, &enc_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|Zs&", &input, &input_len, &options, &enc, &enc_len) == FAILURE) { RETURN_FALSE; } tidy_instanciate(tidy_ce_doc, return_value TSRMLS_CC); obj = (PHPTidyObj *) zend_object_store_get_object(return_value TSRMLS_CC); - + TIDY_APPLY_CONFIG_ZVAL(obj->ptdoc->doc, options); - - if(php_tidy_parse_string(obj, input, input_len, enc TSRMLS_CC) == FAILURE) { + + if (php_tidy_parse_string(obj, input, input_len, enc TSRMLS_CC) == FAILURE) { zval_dtor(return_value); INIT_ZVAL(*return_value); - RETURN_FALSE; + RETVAL_FALSE; } - } /* }}} */ -/* {{{ proto string tidy_get_error_buffer([boolean detailed]) +/* {{{ proto string tidy_get_error_buffer() Return warnings and errors which occured parsing the specified document*/ static PHP_FUNCTION(tidy_get_error_buffer) { TIDY_FETCH_OBJECT; if (obj->ptdoc->errbuf && obj->ptdoc->errbuf->bp) { - RETURN_STRINGL((char*)obj->ptdoc->errbuf->bp, obj->ptdoc->errbuf->size-1, 1); + RETURN_STRINGL((char *) obj->ptdoc->errbuf->bp, obj->ptdoc->errbuf->size-1, 1); } else { RETURN_FALSE; } @@ -1197,9 +1250,8 @@ static PHP_FUNCTION(tidy_get_output) tidyBufInit(&output); tidySaveBuffer(obj->ptdoc->doc, &output); - - RETVAL_STRINGL((char*)output.bp, output.size ? output.size-1 : 0, 1); - + FIX_BUFFER(&output); + RETVAL_STRINGL((char *) output.bp, output.size ? output.size-1 : 0, 1); tidyBufFree(&output); } /* }}} */ @@ -1213,11 +1265,10 @@ static PHP_FUNCTION(tidy_parse_file) zend_bool use_include_path = 0; char *contents; zval **options = NULL; - + PHPTidyObj *obj; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|Zsb", &inputfile, &input_len, - &options, &enc, &enc_len, &use_include_path) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|Zsb", &inputfile, &input_len, &options, &enc, &enc_len, &use_include_path) == FAILURE) { RETURN_FALSE; } @@ -1225,13 +1276,13 @@ static PHP_FUNCTION(tidy_parse_file) obj = (PHPTidyObj *) zend_object_store_get_object(return_value TSRMLS_CC); if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path, &contents_len TSRMLS_CC))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot Load '%s' into memory %s", inputfile, (use_include_path) ? "(Using include path)" : ""); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot Load '%s' into memory%s", inputfile, (use_include_path) ? " (Using include path)" : ""); RETURN_FALSE; } TIDY_APPLY_CONFIG_ZVAL(obj->ptdoc->doc, options); - if(php_tidy_parse_string(obj, contents, contents_len, enc TSRMLS_CC) == FAILURE) { + if (php_tidy_parse_string(obj, contents, contents_len, enc TSRMLS_CC) == FAILURE) { zval_dtor(return_value); INIT_ZVAL(*return_value); RETVAL_FALSE; @@ -1306,18 +1357,18 @@ static PHP_FUNCTION(tidy_get_release) static PHP_FUNCTION(tidy_get_opt_doc) { PHPTidyObj *obj; - char *optname, *optval; + char *optval, *optname; int optname_len; TidyOption opt; TIDY_SET_CONTEXT; if (object) { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &optname, &optname_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&", &optname, &optname_len) == FAILURE) { RETURN_FALSE; } } else { - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, NULL, "Os", &object, tidy_ce_doc, &optname, &optname_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, NULL, "Os&", &object, tidy_ce_doc, &optname, &optname_len) == FAILURE) { RETURN_FALSE; } } @@ -1342,7 +1393,7 @@ static PHP_FUNCTION(tidy_get_opt_doc) /* {{{ proto array tidy_get_config() - Get current Tidy configuarion */ + Get current Tidy configuration */ static PHP_FUNCTION(tidy_get_config) { TidyIterator itOpt; @@ -1363,7 +1414,7 @@ static PHP_FUNCTION(tidy_get_config) opt_value = php_tidy_get_opt_val(obj->ptdoc, opt, &optt TSRMLS_CC); switch (optt) { case TidyString: - add_assoc_string(return_value, opt_name, (char*)opt_value, 0); + add_assoc_string(return_value, opt_name, (char*)opt_value, 1); break; case TidyInteger: @@ -1400,7 +1451,7 @@ static PHP_FUNCTION(tidy_get_html_ver) } /* }}} */ -/* {{{ proto boolean tidy_is_xhtml() +/* {{{ proto bool tidy_is_xhtml() Indicates if the document is a XHTML document. */ static PHP_FUNCTION(tidy_is_xhtml) { @@ -1410,7 +1461,7 @@ static PHP_FUNCTION(tidy_is_xhtml) } /* }}} */ -/* {{{ proto boolean tidy_is_xml() +/* {{{ proto bool tidy_is_xml() Indicates if the document is a generic (non HTML/XHTML) XML document. */ static PHP_FUNCTION(tidy_is_xml) { @@ -1463,22 +1514,22 @@ static PHP_FUNCTION(tidy_config_count) /* {{{ proto mixed tidy_getopt(string option) Returns the value of the specified configuration option for the tidy document. */ static PHP_FUNCTION(tidy_getopt) -{ +{ PHPTidyObj *obj; char *optname; void *optval; int optname_len; TidyOption opt; TidyOptionType optt; - + TIDY_SET_CONTEXT; if (object) { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &optname, &optname_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&", &optname, &optname_len) == FAILURE) { RETURN_FALSE; } } else { - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, NULL, "Os", &object, tidy_ce_doc, &optname, &optname_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, NULL, "Os&", &object, tidy_ce_doc, &optname, &optname_len) == FAILURE) { RETURN_FALSE; } } @@ -1495,7 +1546,7 @@ static PHP_FUNCTION(tidy_getopt) optval = php_tidy_get_opt_val(obj->ptdoc, opt, &optt TSRMLS_CC); switch (optt) { case TidyString: - RETURN_STRING((char *)optval, 0); + RETURN_STRING((char *)optval, 1); break; case TidyInteger: @@ -1526,20 +1577,19 @@ static TIDY_DOC_METHOD(__construct) zend_bool use_include_path = 0; char *contents; zval **options = NULL; - + PHPTidyObj *obj; - TIDY_SET_CONTEXT; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sZsb", &inputfile, &input_len, - &options, &enc, &enc_len, &use_include_path) == FAILURE) { + TIDY_SET_CONTEXT; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sZsb", &inputfile, &input_len, &options, &enc, &enc_len, &use_include_path) == FAILURE) { RETURN_FALSE; } - + obj = (PHPTidyObj *)zend_object_store_get_object(object TSRMLS_CC); - + if (inputfile) { if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path, &contents_len TSRMLS_CC))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot Load '%s' into memory %s", inputfile, (use_include_path) ? "(Using include path)" : ""); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot Load '%s' into memory%s", inputfile, (use_include_path) ? " (Using include path)" : ""); return; } @@ -1564,19 +1614,18 @@ static TIDY_DOC_METHOD(parseFile) obj = (PHPTidyObj *)zend_object_store_get_object(object TSRMLS_CC); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|Zsb", &inputfile, &input_len, - &options, &enc, &enc_len, &use_include_path) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|Zsb", &inputfile, &input_len, &options, &enc, &enc_len, &use_include_path) == FAILURE) { RETURN_FALSE; } - + if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path, &contents_len TSRMLS_CC))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot Load '%s' into memory %s", inputfile, (use_include_path) ? "(Using include path)" : ""); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot Load '%s' into memory%s", inputfile, (use_include_path) ? " (Using include path)" : ""); RETURN_FALSE; } TIDY_APPLY_CONFIG_ZVAL(obj->ptdoc->doc, options); - if(php_tidy_parse_string(obj, contents, contents_len, enc TSRMLS_CC) == FAILURE) { + if (php_tidy_parse_string(obj, contents, contents_len, enc TSRMLS_CC) == FAILURE) { RETVAL_FALSE; } else { RETVAL_TRUE; @@ -1602,10 +1651,10 @@ static TIDY_DOC_METHOD(parseString) TIDY_APPLY_CONFIG_ZVAL(obj->ptdoc->doc, options); - if(php_tidy_parse_string(obj, input, input_len, enc TSRMLS_CC) == SUCCESS) { + if (php_tidy_parse_string(obj, input, input_len, enc TSRMLS_CC) == SUCCESS) { RETURN_TRUE; } - + RETURN_FALSE; } @@ -1642,7 +1691,7 @@ static PHP_FUNCTION(tidy_get_body) } /* }}} */ -/* {{{ proto boolean tidyNode::hasChildren() +/* {{{ proto bool tidyNode::hasChildren() Returns true if this node has children */ static TIDY_NODE_METHOD(hasChildren) { @@ -1656,7 +1705,7 @@ static TIDY_NODE_METHOD(hasChildren) } /* }}} */ -/* {{{ proto boolean tidyNode::hasSiblings() +/* {{{ proto bool tidyNode::hasSiblings() Returns true if this node has siblings */ static TIDY_NODE_METHOD(hasSiblings) { @@ -1670,7 +1719,7 @@ static TIDY_NODE_METHOD(hasSiblings) } /* }}} */ -/* {{{ proto boolean tidyNode::isComment() +/* {{{ proto bool tidyNode::isComment() Returns true if this node represents a comment */ static TIDY_NODE_METHOD(isComment) { @@ -1684,7 +1733,7 @@ static TIDY_NODE_METHOD(isComment) } /* }}} */ -/* {{{ proto boolean tidyNode::isHtml() +/* {{{ proto bool tidyNode::isHtml() Returns true if this node is part of a HTML document */ static TIDY_NODE_METHOD(isHtml) { @@ -1698,7 +1747,7 @@ static TIDY_NODE_METHOD(isHtml) } /* }}} */ -/* {{{ proto boolean tidyNode::isText() +/* {{{ proto bool tidyNode::isText() Returns true if this node represents text (no markup) */ static TIDY_NODE_METHOD(isText) { @@ -1712,7 +1761,7 @@ static TIDY_NODE_METHOD(isText) } /* }}} */ -/* {{{ proto boolean tidyNode::isJste() +/* {{{ proto bool tidyNode::isJste() Returns true if this node is JSTE */ static TIDY_NODE_METHOD(isJste) { @@ -1726,7 +1775,7 @@ static TIDY_NODE_METHOD(isJste) } /* }}} */ -/* {{{ proto boolean tidyNode::isAsp() +/* {{{ proto bool tidyNode::isAsp() Returns true if this node is ASP */ static TIDY_NODE_METHOD(isAsp) { @@ -1740,7 +1789,7 @@ static TIDY_NODE_METHOD(isAsp) } /* }}} */ -/* {{{ proto boolean tidyNode::isPhp() +/* {{{ proto bool tidyNode::isPhp() Returns true if this node is PHP */ static TIDY_NODE_METHOD(isPhp) { @@ -1763,7 +1812,7 @@ static TIDY_NODE_METHOD(getParent) TIDY_FETCH_ONLY_OBJECT; parent_node = tidyGetParent(obj->node); - if(parent_node) { + if (parent_node) { tidy_instanciate(tidy_ce_node, return_value TSRMLS_CC); newobj = (PHPTidyObj *) zend_object_store_get_object(return_value TSRMLS_CC); newobj->node = parent_node; @@ -1777,12 +1826,13 @@ static TIDY_NODE_METHOD(getParent) } /* }}} */ + /* {{{ proto void tidyNode::__construct() - __constructor for tidyNode. */ + __constructor for tidyNode. */ static TIDY_NODE_METHOD(__construct) { php_error_docref(NULL TSRMLS_CC, E_ERROR, "You should not create a tidyNode manually"); -} +} /* }}} */ static void _php_tidy_register_nodetypes(INIT_FUNC_ARGS) diff --git a/ext/zlib/CREDITS b/ext/zlib/CREDITS index c0a47dd293..a1773c463d 100644 --- a/ext/zlib/CREDITS +++ b/ext/zlib/CREDITS @@ -1,2 +1,2 @@ Zlib -Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade Nicoletti +Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade Nicoletti, Michael Wallner diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4 index 62e05fbd02..25c7f4f420 100644 --- a/ext/zlib/config0.m4 +++ b/ext/zlib/config0.m4 @@ -41,10 +41,17 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then *) ac_extra=-L$ZLIB_DIR/$PHP_LIBDIR ;; esac + AC_MSG_CHECKING([for zlib version >= 1.2.0.4]) + ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[[^0-9\.]]//g'` + AC_MSG_RESULT([$ZLIB_VERSION]) + if test `echo $ZLIB_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then + AC_MSG_ERROR([libz version greater or equal to 1.2.0.4 required]) + fi + PHP_CHECK_LIBRARY(z, gzgets, [ AC_DEFINE(HAVE_ZLIB,1,[ ]) ],[ - AC_MSG_ERROR(ZLIB extension requires zlib >= 1.0.9) + AC_MSG_ERROR(ZLIB extension requires gzgets in zlib) ],[ $ac_extra ]) diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index 790c695977..564c9e14f1 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -14,6 +14,7 @@ +----------------------------------------------------------------------+ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | | Stefan Röhrich <sr@linux.de> | + | Michael Wallner <mike@php.net> | +----------------------------------------------------------------------+ */ @@ -24,39 +25,50 @@ #include <zlib.h> +#define PHP_ZLIB_ENCODING_RAW -0xf +#define PHP_ZLIB_ENCODING_GZIP 0x1f +#define PHP_ZLIB_ENCODING_DEFLATE 0x0f + +#define PHP_ZLIB_ENCODING_ANY 0x2f + +#define PHP_ZLIB_OUTPUT_HANDLER_NAME "zlib output compression" +#define PHP_ZLIB_BUFFER_SIZE_GUESS(in_len) (((size_t) ((double) in_len * (double) 1.015)) + 10 + 8 + 4 + 1) + ZEND_BEGIN_MODULE_GLOBALS(zlib) /* variables for transparent gzip encoding */ int compression_coding; - z_stream stream; - uLong crc; - int ob_gzhandler_status; long output_compression; long output_compression_level; char *output_handler; -ZEND_END_MODULE_GLOBALS(zlib) - -PHPAPI ZEND_EXTERN_MODULE_GLOBALS(zlib) +ZEND_END_MODULE_GLOBALS(zlib); -extern php_stream_filter_factory php_zlib_filter_factory; -extern zend_module_entry php_zlib_module_entry; -#define zlib_module_ptr &php_zlib_module_entry +typedef struct _php_zlib_buffer { + char *data; + char *aptr; + size_t used; + size_t free; + size_t size; +} php_zlib_buffer; -int php_ob_gzhandler_check(TSRMLS_D); +typedef struct _php_zlib_context { + z_stream Z; + php_zlib_buffer buffer; +} php_zlib_context; php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC); +extern php_stream_ops php_stream_gzio_ops; extern php_stream_wrapper php_stream_gzip_wrapper; +extern php_stream_filter_factory php_zlib_filter_factory; +extern zend_module_entry php_zlib_module_entry; +#define zlib_module_ptr &php_zlib_module_entry +#define phpext_zlib_ptr zlib_module_ptr #ifdef ZTS -#define ZLIBG(v) TSRMG(zlib_globals_id, zend_zlib_globals *, v) +# define ZLIBG(v) TSRMG(zlib_globals_id, zend_zlib_globals *, v) #else -#define ZLIBG(v) (zlib_globals.v) +# define ZLIBG(v) (zlib_globals.v) #endif -#define phpext_zlib_ptr zlib_module_ptr - -#define CODING_GZIP 1 -#define CODING_DEFLATE 2 - #endif /* PHP_ZLIB_H */ /* diff --git a/ext/zlib/tests/005.phpt b/ext/zlib/tests/005.phpt index 84fc3b5f10..fb3795dccb 100644 --- a/ext/zlib/tests/005.phpt +++ b/ext/zlib/tests/005.phpt @@ -28,7 +28,7 @@ var_dump(gzuncompress("", 9)); var_dump(gzuncompress($data1)); var_dump(gzuncompress($data2)); -$data2{4} = 0; +$data2[4] = 0; var_dump(gzuncompress($data2)); echo "Done\n"; diff --git a/ext/zlib/tests/006.phpt b/ext/zlib/tests/006.phpt index 6a4e0f4e67..8c03ea068d 100644 --- a/ext/zlib/tests/006.phpt +++ b/ext/zlib/tests/006.phpt @@ -48,6 +48,8 @@ string(%d) "%a" Warning: gzinflate() expects at least 1 parameter, 0 given in %s on line %d NULL + +Warning: gzinflate(): data error in %s on line %d bool(false) Warning: gzinflate(): data error in %s on line %d diff --git a/ext/zlib/tests/007.phpt b/ext/zlib/tests/007.phpt index ec37b99de6..09207a583e 100644 --- a/ext/zlib/tests/007.phpt +++ b/ext/zlib/tests/007.phpt @@ -11,8 +11,8 @@ var_dump(gzencode("", -10)); var_dump(gzencode("", 100)); var_dump(gzencode("", 1, 100)); -var_dump(gzencode("", -1, 1)); -var_dump(gzencode("", 9, 2)); +var_dump(gzencode("", -1, ZLIB_ENCODING_GZIP)); +var_dump(gzencode("", 9, ZLIB_ENCODING_DEFLATE)); $string = "Light of my sun Light in this temple @@ -21,8 +21,8 @@ Lies in the darkness"; var_dump(gzencode($string, 9, 3)); -var_dump(gzencode($string, -1, 1)); -var_dump(gzencode($string, 9, 2)); +var_dump(gzencode($string, -1, ZLIB_ENCODING_GZIP)); +var_dump(gzencode($string, 9, ZLIB_ENCODING_DEFLATE)); echo "Done\n"; ?> @@ -33,18 +33,18 @@ NULL Warning: gzencode() expects at most 3 parameters, 4 given in %s on line %d NULL -Warning: gzencode(): compression level(-10) must be within -1..9 in %s on line %d +Warning: gzencode(): compression level (-10) must be within -1..9 in %s on line %d bool(false) -Warning: gzencode(): compression level(100) must be within -1..9 in %s on line %d +Warning: gzencode(): compression level (100) must be within -1..9 in %s on line %d bool(false) -Warning: gzencode(): encoding mode must be FORCE_GZIP or FORCE_DEFLATE in %s on line %d +Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d bool(false) string(%d) "%s" string(%d) "%s" -Warning: gzencode(): encoding mode must be FORCE_GZIP or FORCE_DEFLATE in %s on line %d +Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d bool(false) string(%d) "%s" string(%d) "%s" diff --git a/ext/zlib/tests/gzcompress_basic1.phpt b/ext/zlib/tests/gzcompress_basic1.phpt index dddeb1d55d..1506d0c1ee 100644 --- a/ext/zlib/tests/gzcompress_basic1.phpt +++ b/ext/zlib/tests/gzcompress_basic1.phpt @@ -8,7 +8,7 @@ if (!extension_loaded("zlib")) { ?> --FILE-- <?php -/* Prototype : string gzcompress(string data [, int level]) +/* Prototype : string gzcompress(string data [, int level, [int encoding]]) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: @@ -63,7 +63,7 @@ int(0) string(32) "c2e070f4320d1f674965eaab95b53d9c" int(0) -- Compression level 2 -- -string(32) "400a53d19ca337727f8cd362f5cd3ee0" +string(32) "36922f486410d08209d0d0d21b26030e" int(0) -- Compression level 3 -- string(32) "a441a2f5169bb303cd45b860a5a9dbf9" @@ -122,4 +122,4 @@ int(0) -- Testing with no specified compression level -- string(70) "789c735428ce4dccc951282e29cacc4b5728c95748cecf2d284a2d2ee6020087a509cb" -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/zlib/tests/gzcompress_error1.phpt b/ext/zlib/tests/gzcompress_error1.phpt index 7fa60b9003..9db0a56fa1 100644 --- a/ext/zlib/tests/gzcompress_error1.phpt +++ b/ext/zlib/tests/gzcompress_error1.phpt @@ -8,7 +8,7 @@ if (!extension_loaded("zlib")) { ?> --FILE-- <?php -/* Prototype : string gzcompress(string data [, int level]) +/* Prototype : string gzcompress(string data [, int level, [int encoding]]) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: @@ -28,26 +28,30 @@ var_dump( gzcompress() ); echo "\n-- Testing gzcompress() function with more than expected no. of arguments --\n"; $data = 'string_val'; $level = 2; +$encoding = ZLIB_ENCODING_RAW; $extra_arg = 10; -var_dump( gzcompress($data, $level, $extra_arg) ); +var_dump( gzcompress($data, $level, $encoding, $extra_arg) ); echo "\n-- Testing with incorrect compression level --\n"; $bad_level = 99; var_dump(gzcompress($data, $bad_level)); +echo "\n-- Testing with invalid encoding --\n"; +$data = 'string_val'; +$encoding = 99; +var_dump(gzcompress($data, $level, $encoding)); + +echo "\n-- Testing with incorrect parameters --\n"; + class Tester { function Hello() { echo "Hello\n"; } } -echo "\n-- Testing with incorrect parameters --\n"; $testclass = new Tester(); var_dump(gzcompress($testclass)); -var_dump(gzcompress($data, $testclass)); - - ?> ===Done=== --EXPECTF-- @@ -60,7 +64,7 @@ NULL -- Testing gzcompress() function with more than expected no. of arguments -- -Warning: gzcompress() expects at most 2 parameters, 3 given in %s on line %d +Warning: gzcompress() expects at most 3 parameters, 4 given in %s on line %d NULL -- Testing with incorrect compression level -- @@ -68,11 +72,13 @@ NULL Warning: gzcompress(): compression level (99) must be within -1..9 in %s on line %d bool(false) +-- Testing with invalid encoding -- + +Warning: gzcompress(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d +bool(false) + -- Testing with incorrect parameters -- Warning: gzcompress() expects parameter 1 to be string, object given in %s on line %d NULL - -Warning: gzcompress() expects parameter 2 to be long, object given in %s on line %d -NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/zlib/tests/gzcompress_variation1.phpt b/ext/zlib/tests/gzcompress_variation1.phpt index 04aac01085..7a8457c24f 100644 --- a/ext/zlib/tests/gzcompress_variation1.phpt +++ b/ext/zlib/tests/gzcompress_variation1.phpt @@ -8,7 +8,7 @@ if (!extension_loaded("zlib")) { ?> --FILE-- <?php -/* Prototype : string gzcompress(string data [, int level]) +/* Prototype : string gzcompress(string data [, int level, [int encoding]]) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: @@ -18,8 +18,6 @@ include(dirname(__FILE__) . '/data.inc'); echo "*** Testing gzcompress() : variation ***\n"; - - echo "\n-- Testing multiple compression --\n"; $output = gzcompress($data); var_dump( md5($output)); @@ -33,4 +31,4 @@ var_dump(md5(gzcompress($output))); -- Testing multiple compression -- string(32) "764809aef15bb34cb73ad49ecb600d99" string(32) "eba942bc2061f23ea8688cc5101872a4" -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/zlib/tests/gzdeflate_basic1.phpt b/ext/zlib/tests/gzdeflate_basic1.phpt index 823f320352..a2ae0f01da 100644 --- a/ext/zlib/tests/gzdeflate_basic1.phpt +++ b/ext/zlib/tests/gzdeflate_basic1.phpt @@ -8,7 +8,7 @@ if (!extension_loaded("zlib")) { ?> --FILE-- <?php -/* Prototype : proto string gzdeflate(string data [, int level]) +/* Prototype : string gzdeflate(string data [, int level, [int encoding]]) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: diff --git a/ext/zlib/tests/gzdeflate_error1.phpt b/ext/zlib/tests/gzdeflate_error1.phpt index 78491af9f1..8abd5bec25 100644 --- a/ext/zlib/tests/gzdeflate_error1.phpt +++ b/ext/zlib/tests/gzdeflate_error1.phpt @@ -8,7 +8,7 @@ if (!extension_loaded("zlib")) { ?> --FILE-- <?php -/* Prototype : string gzdeflate(string data [, int level]) +/* Prototype : string gzdeflate(string data [, int level, [int encoding]]) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: @@ -28,13 +28,18 @@ var_dump( gzdeflate() ); echo "\n-- Testing gzdeflate() function with more than expected no. of arguments --\n"; $data = 'string_val'; $level = 2; +$encoding = ZLIB_ENCODING_RAW; $extra_arg = 10; -var_dump( gzdeflate($data, $level, $extra_arg) ); +var_dump( gzdeflate($data, $level, $encoding, $extra_arg) ); echo "\n-- Testing with incorrect compression level --\n"; $bad_level = 99; var_dump(gzdeflate($data, $bad_level)); +echo "\n-- Testing with incorrect encoding --\n"; +$bad_encoding = 99; +var_dump(gzdeflate($data, $level, $bad_encoding)); + class Tester { function Hello() { echo "Hello\n"; @@ -58,7 +63,7 @@ NULL -- Testing gzdeflate() function with more than expected no. of arguments -- -Warning: gzdeflate() expects at most 2 parameters, 3 given in %s on line %d +Warning: gzdeflate() expects at most 3 parameters, 4 given in %s on line %d NULL -- Testing with incorrect compression level -- @@ -66,6 +71,11 @@ NULL Warning: gzdeflate(): compression level (99) must be within -1..9 in %s on line %d bool(false) +-- Testing with incorrect encoding -- + +Warning: gzdeflate(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d +bool(false) + -- Testing with incorrect parameters -- Warning: gzdeflate() expects parameter 1 to be string, object given in %s on line %d @@ -73,4 +83,4 @@ NULL Warning: gzdeflate() expects parameter 2 to be long, object given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/zlib/tests/gzdeflate_variation1.phpt b/ext/zlib/tests/gzdeflate_variation1.phpt index 75eb16e03d..bc2453d78c 100644 --- a/ext/zlib/tests/gzdeflate_variation1.phpt +++ b/ext/zlib/tests/gzdeflate_variation1.phpt @@ -18,8 +18,6 @@ include(dirname(__FILE__) . '/data.inc'); echo "*** Testing gzdeflate() : variation ***\n"; - - echo "\n-- Testing multiple compression --\n"; $output = gzdeflate($data); var_dump( md5($output)); diff --git a/ext/zlib/tests/gzencode_basic1.phpt b/ext/zlib/tests/gzencode_basic1.phpt index 9b3dcc8a38..3c0ec559e9 100644 --- a/ext/zlib/tests/gzencode_basic1.phpt +++ b/ext/zlib/tests/gzencode_basic1.phpt @@ -51,6 +51,13 @@ for($i = -1; $i < 10; $i++) { var_dump(md5($output)); } +// Calling gzencode() with mandatory arguments +echo "\n-- Testing with no specified compression level --\n"; +var_dump(bin2hex(gzencode($smallstring))); + +echo "\n-- Testing gzencode with mode specified --\n"; +var_dump(bin2hex(gzencode($smallstring, -1, FORCE_GZIP))); + ?> ===Done=== --EXPECTF-- @@ -58,9 +65,9 @@ for($i = -1; $i < 10; $i++) { -- Compression level -1 -- string(32) "d9ede02415ce91d21e5a94274e2b9c42" -- Compression level 0 -- -string(32) "67aaf60426bb2cbd86d7fe530cb12306" +string(32) "bbf32d5508e5f1f4e6d42790489dae15" -- Compression level 1 -- -string(32) "bce9c439cf767c1988ff4881b287d1ce" +string(32) "0bfaaa7a5a57f8fb533074fca6c85eeb" -- Compression level 2 -- string(32) "7ddbfed63a76c42808722b66f1c133fc" -- Compression level 3 -- @@ -76,13 +83,13 @@ string(32) "d9ede02415ce91d21e5a94274e2b9c42" -- Compression level 8 -- string(32) "d9ede02415ce91d21e5a94274e2b9c42" -- Compression level 9 -- -string(32) "d9ede02415ce91d21e5a94274e2b9c42" +string(32) "0f220a09e9895bcb3a1308d2bc99cfdf" -- Compression level -1 -- string(32) "f77bd31e1e4dd11d12828fb661a08010" -- Compression level 0 -- -string(32) "36220d650930849b67e8e0622f9bf270" +string(32) "9c5005db88490d6fe102ea2c233b2872" -- Compression level 1 -- -string(32) "f77bd31e1e4dd11d12828fb661a08010" +string(32) "d24ff7c4c20cef69b9c3abd603368db9" -- Compression level 2 -- string(32) "f77bd31e1e4dd11d12828fb661a08010" -- Compression level 3 -- @@ -98,5 +105,11 @@ string(32) "f77bd31e1e4dd11d12828fb661a08010" -- Compression level 8 -- string(32) "f77bd31e1e4dd11d12828fb661a08010" -- Compression level 9 -- -string(32) "f77bd31e1e4dd11d12828fb661a08010" -===Done===
\ No newline at end of file +string(32) "8849e9a1543c04b3f882b5ce20839ed2" + +-- Testing with no specified compression level -- +string(94) "1f8b08000000000000%c%c735428ce4dccc951282e29cacc4b5728c95748cecf2d284a2d2ee60200edc4e40b1b000000" + +-- Testing gzencode with mode specified -- +string(94) "1f8b08000000000000%c%c735428ce4dccc951282e29cacc4b5728c95748cecf2d284a2d2ee60200edc4e40b1b000000" +===Done=== diff --git a/ext/zlib/tests/gzencode_error1.phpt b/ext/zlib/tests/gzencode_error1.phpt index ed8c977477..9ecf4b8f08 100644 --- a/ext/zlib/tests/gzencode_error1.phpt +++ b/ext/zlib/tests/gzencode_error1.phpt @@ -71,12 +71,12 @@ NULL -- Testing with incorrect compression level -- -Warning: gzencode(): compression level(99) must be within -1..9 in %s on line %d +Warning: gzencode(): compression level (99) must be within -1..9 in %s on line %d bool(false) -- Testing with incorrect encoding_mode -- -Warning: gzencode(): encoding mode must be FORCE_GZIP or FORCE_DEFLATE in %s on line %d +Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d bool(false) -- Testing with incorrect parameters -- @@ -87,7 +87,7 @@ NULL Warning: gzencode() expects parameter 2 to be long, object given in %s on line %d NULL -Warning: gzencode(): encoding mode must be FORCE_GZIP or FORCE_DEFLATE in %s on line %d +Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d bool(false) Warning: gzencode() expects parameter 3 to be long, object given in %s on line %d @@ -95,4 +95,4 @@ NULL Warning: gzencode() expects parameter 2 to be long, string given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/zlib/tests/gzencode_variation1.phpt b/ext/zlib/tests/gzencode_variation1.phpt index 47e2097f5f..ef1d3a77f7 100644 --- a/ext/zlib/tests/gzencode_variation1.phpt +++ b/ext/zlib/tests/gzencode_variation1.phpt @@ -3,6 +3,10 @@ Test gzencode() function : variation --SKIPIF-- <?php +if( substr(PHP_OS, 0, 3) == "WIN" ) { + die("skip.. Do not run on Windows"); +} + if (!extension_loaded("zlib")) { print "skip - ZLIB extension not loaded"; } @@ -30,4 +34,4 @@ var_dump(bin2hex(gzencode($output))); -- Testing multiple compression -- string(3658) "1f8b0800000000000003010e07f1f81f8b08000000000000036d574d6fe4c80dbdeb57d4ad2f3dfe01eb83e1ec22980e309b4562c067b64449159754dafab0b6e7d7e73d96da1e4c72184c4b2ab2c8f7c847fa25baabba98dc1a8b2b7c38bb324b713ee37f757f56cdc5c7f5b17b9d152f923b157c5ae335e0b75fedd0e2d781c6b98ea3a6ee05affe1dfc3a6527f8f09c52dcb38ba38bb5249934d6ecfe1e53a9ab76ff4c342cf2a64ed2028349fc9a8b139755685352acb82b9fbb67f8bade5cdcb698e1fcec94b7ceba3cb897e806cfc8114350dd1ebbdfa35b62d2478b0056d23ed809b9b95d696d91ce2aa97c911e3fa539c43f84c887554a4d125c9e63ff96711cc08c0866263cb37a0bbe2122ae8f6baecb2284abfb4ddf916db8354cddeef37c1afe5fa02fc7afb3db34f5b3acbdf2eb905490d8f38d7468d253a323d5ebb903760d7944d3b2024e834a99ddce77669bdd823cfbb8e899d4ad4c799677452e6029e80023a03b2374005590641f7d3877df2ad09f3c0e82a54d6a5644fd63049a37ed4bc362016fd9f51264f1e5c630727421ae930b7ed416e93e47b7c71a400390361ffbecb7561bb98f69b5da289e91becc27f08b3b724cb8704f9144d366431d0cb870c56b205deaa2e17636063761a911039fb7e4bf9f06c4f0aecd2ec80e8b41831ca7515e31286166458ea3ef71f2ce7cde2ae269c96d60525724a9c9170b713ed5750758f3cd2a361fc8b288fc92358ce884692e8ea0fe59bd969a0da2eed5831b715749eaae7178f3ebd30fb88c92105f367cce2c882955dc6bf8eca0d5d57540b3092894743ba0fd5b2dad021836191f1afc0bba14dde1642cb0b1aa6879c38907dcefa0720082b801bec61417469219175267dfa047df35b0bd1332001c28cdfafd3bcabe91e74368cdd8d8478e494c190e7ee90c67f2bde288e68ab6b15e883c995be4f8feb6c6dda4278e4f38578ddbdc7be36788daf0c3cb1d1819c73822f7000a0d1813fa94153b572315e51343b536bc64977dff163cebfd8418773261f524017e251fccc60ae29a5770ae097594d52e9c1229d87ce967a36401c46b69945afb249d101c9d420ffa9a123e232c20e76467d5d169202a2dd4c582949e013e745df7958d4b0cc4fd4377a737cd4feea7974070000f314d423e0634cb9a618fdf5dc64fd422181fd59c9230c9f6f9d18dc8fc23e9cccbc7188733b04aa57de83ebea0be3633cff5fa1ff83269be7f44f5a8d84550cc703255fd345dd402034d0b3e11a73ec6e3d4a77f4f685b614329f1b3132ae7af33d02e1e55e291fa6574b758d1f0200e7423dbc852211818043a7c9ce80aa9d59fce0401959f5ea2cf71fde90824f8c9192dbe9d329db143794675ddcf257dd7755273b67340414e3ccad12e3f661f8aad9cf9957dc1275d10a51d3934fa81e68dc6768fb8ee23e373936c8e13feab8b0f50d227f7af76f561fb0950f3d099bbc316c3892a42fb36806d8660e800fa4f43fd4b962d2097d71933a54b77ff948677848eb17bb3a88b621682cfb3bbb49cf42fed6b3944124ad8358ca688aa44dd5f2144c7c9ab16f25b9aca9654ef357ec9ad55c40d324d6cc3d9e3920b863c231d31a95d937fb5520f9c816c79b7dcecc593fb9593cc05a51ebb1eeddd5b49eb437769738d0f64adc579d372b8b7f7c0208487ee3915ebf5766e148ebd77cf4e01f3ec285047011e55838968b6494d517fe29224777b24dd3ddf933101695b102e87db805eef291b74dcfd91628fb2a53f93dbd2968ef2e598746c9204f89fba1f0246fc671610a0591806e46a1346f77c40d910a47c5e20ffb23f003c04b648327a4ed98032c1965bd35bb0044f5344248f56fdb99aa61d6451d68e33489a83bffbe6573541b2da5f64681ea12090f778b2075374778810f73965fa3626a9d41f4df2f83f7c34658cec921b5a9bde49dd5007ec882b02adc514f81aa85898b5cc98e1b137733c0a8789b7f5648d2d231b80bf74978f25d61ce08a8abd11801fd8f995e066676307192ff7641f1cc6e0dee68565b8b22ac3889cd067bf732754a6b270af1044c6a8776811a4f6d8bd0477a9f516064201b920b92d7cd4dc7eee13e6b3eb3528a82f9abb3f388ebe6a8f871393461b73816ec54c99d604174bc5a6801de13908f86aea6a7d0fea107d682bcf1ec348b83872e6b8a316ecd02eb8f8dc86a609bf59a2dd03f1dfa4079436d55e24617be1a2854d008b2b2b1705e2078a7f3946318df1c24f6bf70d4b456eca286ec2b585b28262cc048a098c3e2d5f325a92bb36f691afdc14c822da1b116c9c1c07bb362eb0a04b78834c812134230ebf2044ac2e3c0e3ad00f848dc5010f3bf917ec2fc700b7bf26dacea8440620e04f90f4d97d6dd77cfde8a05c7d3930f1e5811fb8ec5c70964dcc8187ec90e32fdd6b64eec7586413b7d55bed65c4cce39a9b6c15e70e9da94e53fc904e6286f01f5b5562c94211befbc23507e01b2a3865e2f45b5d7b591f290087a5605b82495b4e393f31aa5b37211ec40241a746d903c5eebf117a4d3ddb0d00007b64cbc70e070000" -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/zlib/tests/gzencode_variation2-win32.phpt b/ext/zlib/tests/gzencode_variation2-win32.phpt new file mode 100644 index 0000000000..f664359e2a --- /dev/null +++ b/ext/zlib/tests/gzencode_variation2-win32.phpt @@ -0,0 +1,42 @@ +--TEST-- +Test gzencode() function : variation - verify header contents with all encoding modes +--XFAIL-- +Test will fail until bug #47178 resolved; missing gzip headers whne FORCE_DEFLATE specified +--SKIPIF-- +<?php + +if( substr(PHP_OS, 0, 3) != "WIN" ) { + die("skip.. only for Windows"); +} + +if (!extension_loaded("zlib")) { + print "skip - ZLIB extension not loaded"; +} +?> +--FILE-- +<?php +/* Prototype : string gzencode ( string $data [, int $level [, int $encoding_mode ]] ) + * Description: Gzip-compress a string + * Source code: ext/zlib/zlib.c + * Alias to functions: + */ + +echo "*** Testing gzencode() : variation ***\n"; + +$data = "A small string to encode\n"; + +echo "\n-- Testing with each encoding_mode --\n"; +var_dump(bin2hex(gzencode($data, -1))); +var_dump(bin2hex(gzencode($data, -1, FORCE_GZIP))); +var_dump(bin2hex(gzencode($data, -1, FORCE_DEFLATE))); + +?> +===DONE=== +--EXPECTF-- +*** Testing gzencode() : variation *** + +-- Testing with each encoding_mode -- +string(90) "1f8b080000000000000b735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200d7739de519000000" +string(90) "1f8b080000000000000b735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200d7739de519000000" +string(86) "1f8b080000000000000b789c735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200735808cd" +===DONE=== diff --git a/ext/zlib/tests/gzencode_variation2.phpt b/ext/zlib/tests/gzencode_variation2.phpt index 901cd53c19..e6fe7dd65c 100644 --- a/ext/zlib/tests/gzencode_variation2.phpt +++ b/ext/zlib/tests/gzencode_variation2.phpt @@ -1,8 +1,14 @@ --TEST-- Test gzencode() function : variation - verify header contents with all encoding modes +--XFAIL-- +Test will fail until bug #47178 resolved; missing gzip headers whne FORCE_DEFLATE specified --SKIPIF-- <?php +if( substr(PHP_OS, 0, 3) == "WIN" ) { + die("skip.. Do not run on Windows"); +} + if (!extension_loaded("zlib")) { print "skip - ZLIB extension not loaded"; } @@ -33,4 +39,4 @@ var_dump(bin2hex(gzencode($data, -1, FORCE_DEFLATE))); string(90) "1f8b0800000000000003735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200d7739de519000000" string(90) "1f8b0800000000000003735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200d7739de519000000" string(86) "1f8b0800000000000003789c735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200735808cd" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/zlib/tests/gzfile_variation10.phpt b/ext/zlib/tests/gzfile_variation10.phpt index 2a6d8915d0..71d0ca82d2 100644 --- a/ext/zlib/tests/gzfile_variation10.phpt +++ b/ext/zlib/tests/gzfile_variation10.phpt @@ -116,4 +116,4 @@ array(6) { string(39) "and I know that it descends down on me " } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/zlib/tests/gzfilegzreadfile.phpt b/ext/zlib/tests/gzfilegzreadfile.phpt index 2d6843ddd4..b6cc5f97e9 100644 --- a/ext/zlib/tests/gzfilegzreadfile.phpt +++ b/ext/zlib/tests/gzfilegzreadfile.phpt @@ -5,7 +5,7 @@ gzfile(), gzreadfile() if (!extension_loaded("zlib")) print "skip"; ?> --FILE-- <?php -$original = <<<EOD +$original = b<<<EOD blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah diff --git a/ext/zlib/tests/gzinflate-bug42663.phpt b/ext/zlib/tests/gzinflate-bug42663.phpt index dd53c78f4e..4f0ca9fa7f 100644 --- a/ext/zlib/tests/gzinflate-bug42663.phpt +++ b/ext/zlib/tests/gzinflate-bug42663.phpt @@ -5,8 +5,8 @@ Bug #42663 (gzinflate() try to allocate all memory with truncated $data) --FILE-- <?php // build a predictable string -$string = b''; -for($i=0; $i<30000; ++$i) $string .= (binary)$i . b' '; +$string = ''; +for($i=0; $i<30000; ++$i) $string .= $i . ' '; var_dump(strlen($string)); // deflate string $deflated = gzdeflate($string,9); @@ -15,9 +15,12 @@ var_dump(strlen($deflated)); $truncated = substr($deflated, 0, 65535); var_dump(strlen($truncated)); // inflate $truncated string (check if it will not eat all memory) -gzinflate($truncated); +var_dump(gzinflate($truncated)); ?> ---EXPECT-- +--EXPECTF-- int(168890) int(66743) int(65535) + +Warning: gzinflate(): data error in %s on line %d +bool(false) diff --git a/ext/zlib/tests/gzinflate_length.phpt b/ext/zlib/tests/gzinflate_length.phpt index 436025d13a..6e86d865ee 100644 --- a/ext/zlib/tests/gzinflate_length.phpt +++ b/ext/zlib/tests/gzinflate_length.phpt @@ -4,7 +4,7 @@ gzinflate() and $length argument <?php if (!extension_loaded("zlib")) print "skip"; ?> --FILE-- <?php -$original = b'aaaaaaaaaaaaaaa'; +$original = 'aaaaaaaaaaaaaaa'; $packed=gzdeflate($original); echo strlen($packed)." ".strlen($original)."\n"; $unpacked=gzinflate($packed, strlen($original)); diff --git a/ext/zlib/tests/gzopen_variation5.phpt b/ext/zlib/tests/gzopen_variation5.phpt index de505f7216..e7562e044e 100644 --- a/ext/zlib/tests/gzopen_variation5.phpt +++ b/ext/zlib/tests/gzopen_variation5.phpt @@ -36,7 +36,7 @@ rmdir($thisTestDir); function runtest() { $tmpfile = 'gzopen_variation5.tmp'; $h = gzopen($tmpfile, "w", true); - fwrite($h, "This is the test file"); + fwrite($h, b"This is the test file"); fclose($h); diff --git a/ext/zlib/tests/gzopen_variation8.phpt b/ext/zlib/tests/gzopen_variation8.phpt index bb0126227f..e7c83701a4 100644 --- a/ext/zlib/tests/gzopen_variation8.phpt +++ b/ext/zlib/tests/gzopen_variation8.phpt @@ -16,7 +16,7 @@ if (!extension_loaded("zlib")) { echo "*** Testing gzopen() : variation ***\n"; -$data = <<<EOT +$data = b<<<EOT Here is some plain text to be read and displayed. diff --git a/ext/zlib/tests/gzread_variation1.phpt b/ext/zlib/tests/gzread_variation1.phpt index 1f50d77126..dd0097f286 100644 --- a/ext/zlib/tests/gzread_variation1.phpt +++ b/ext/zlib/tests/gzread_variation1.phpt @@ -11,7 +11,7 @@ if (!extension_loaded("zlib")) { $filename = "temp.txt.gz"; $h = gzopen($filename, 'w'); -$str = "Here is the string to be written. "; +$str = b"Here is the string to be written. "; var_dump(gzread($h, 100)); gzwrite( $h, $str); var_dump(gzread($h, 100)); diff --git a/ext/zlib/tests/gzreadgzwrite.phpt b/ext/zlib/tests/gzreadgzwrite.phpt index 6d6729a72f..71d728b6ed 100644 --- a/ext/zlib/tests/gzreadgzwrite.phpt +++ b/ext/zlib/tests/gzreadgzwrite.phpt @@ -5,7 +5,7 @@ gzopen(), gzread(), gzwrite() if (!extension_loaded("zlib")) print "skip"; ?> --FILE-- <?php -$original = str_repeat("hallo php",4096); +$original = str_repeat(b"hallo php",4096); $filename = tempnam("/tmp", "phpt"); $fp = gzopen($filename, "wb"); @@ -15,7 +15,12 @@ var_dump(gztell($fp)); fclose($fp); $fp = gzopen($filename, "rb"); -$data = gzread($fp, strlen($original)); + +$data = ''; +while ($buf = gzread($fp, 8092)) { + $data .= $buf; +} + if ($data == $original) { echo "Strings are equal\n"; } else { diff --git a/ext/zlib/tests/gzreadgzwriteplain.phpt b/ext/zlib/tests/gzreadgzwriteplain.phpt index 7bb567d889..6a752b6212 100644 --- a/ext/zlib/tests/gzreadgzwriteplain.phpt +++ b/ext/zlib/tests/gzreadgzwriteplain.phpt @@ -5,7 +5,7 @@ gzopen(), gzread(), gzwrite() for non-compressed data if (!extension_loaded("zlib")) print "skip"; ?> --FILE-- <?php -$original = str_repeat("hallo php",4096); +$original = str_repeat(b"hallo php",4096); $filename = tempnam("/tmp", "phpt"); $fp = fopen($filename, "wb"); @@ -15,7 +15,12 @@ var_dump(ftell($fp)); fclose($fp); $fp = gzopen($filename, "rb"); -$data = gzread($fp, strlen($original)); + +$data = ''; +while ($buf = gzread($fp, 8192)) { + $data .= $buf; +} + if ($data == $original) { echo "Strings are equal\n"; } else { @@ -24,7 +29,11 @@ if ($data == $original) { } gzseek($fp, strlen($original) / 2); -$data = gzread($fp, strlen($original)); + +$data = ''; +while ($buf = gzread($fp, 8192)) { + $data .= $buf; +} var_dump(strlen($data)); if ($data == substr($original, strlen($original) / 2)) { diff --git a/ext/zlib/tests/gzuncompress_basic1.phpt b/ext/zlib/tests/gzuncompress_basic1.phpt index fa7f1759e6..203a375a06 100644 --- a/ext/zlib/tests/gzuncompress_basic1.phpt +++ b/ext/zlib/tests/gzuncompress_basic1.phpt @@ -27,7 +27,7 @@ var_dump(strcmp($data, gzuncompress($compressed))); $length = 3547; -echo "\n-- Calling gzuncompress() with max length of $length --\n"; +echo "\n-- Calling gzuncompress() with all max length of $length --\n"; echo "Result length is ". strlen(gzuncompress($compressed, $length)) . "\n"; ?> @@ -38,6 +38,6 @@ echo "Result length is ". strlen(gzuncompress($compressed, $length)) . "\n"; -- Basic decompress -- int(0) --- Calling gzuncompress() with max length of 3547 -- +-- Calling gzuncompress() with all max length of 3547 -- Result length is 3547 -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/zlib/tests/gzuncompress_error1.phpt b/ext/zlib/tests/gzuncompress_error1.phpt index 66e5b2ac43..f26a4f5dcd 100644 --- a/ext/zlib/tests/gzuncompress_error1.phpt +++ b/ext/zlib/tests/gzuncompress_error1.phpt @@ -14,8 +14,6 @@ if (!extension_loaded("zlib")) { * Alias to functions: */ - - echo "*** Testing gzuncompress() : error conditions ***\n"; // Zero arguments @@ -29,14 +27,12 @@ $length = 10; $extra_arg = 10; var_dump( gzuncompress($data, $length, $extra_arg) ); - echo "\n-- Testing with a buffer that is too small --\n"; $short_len = strlen($data) - 1; $compressed = gzcompress($data); var_dump(gzuncompress($compressed, $short_len)); - echo "\n-- Testing with incorrect arguments --\n"; var_dump(gzuncompress(123)); @@ -68,7 +64,7 @@ NULL -- Testing with a buffer that is too small -- -Warning: gzuncompress(): buffer error in %s on line %d +Warning: gzuncompress(): insufficient memory in %s on line %d bool(false) -- Testing with incorrect arguments -- @@ -81,4 +77,4 @@ NULL Warning: gzuncompress() expects parameter 2 to be long, string given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/zlib/tests/gzwrite_basic.phpt b/ext/zlib/tests/gzwrite_basic.phpt index 0d7521625d..4f76f32cd0 100644 --- a/ext/zlib/tests/gzwrite_basic.phpt +++ b/ext/zlib/tests/gzwrite_basic.phpt @@ -11,7 +11,7 @@ if (!extension_loaded("zlib")) { $filename = "temp.txt.gz"; $h = gzopen($filename, 'w'); -$str = "Here is the string to be written. "; +$str = b"Here is the string to be written. "; $length = 10; var_dump(gzwrite( $h, $str ) ); var_dump(gzwrite( $h, $str, $length ) ); diff --git a/ext/zlib/tests/gzwrite_variation1.phpt b/ext/zlib/tests/gzwrite_variation1.phpt index bd3778e366..ab6c2606b4 100644 --- a/ext/zlib/tests/gzwrite_variation1.phpt +++ b/ext/zlib/tests/gzwrite_variation1.phpt @@ -11,7 +11,7 @@ if (!extension_loaded("zlib")) { $filename = dirname(__FILE__)."/004.txt.gz"; $h = gzopen($filename, 'r'); -$str = "Here is the string to be written. "; +$str = b"Here is the string to be written. "; $length = 10; var_dump(gzwrite( $h, $str ) ); var_dump(gzread($h, 10)); diff --git a/ext/zlib/tests/ob_001.phpt b/ext/zlib/tests/ob_001.phpt new file mode 100644 index 0000000000..0b3cd1069d --- /dev/null +++ b/ext/zlib/tests/ob_001.phpt @@ -0,0 +1,19 @@ +--TEST-- +zlib.output_compression +--SKIPIF-- +<?php +if (!extension_loaded("zlib")) die("skip need ext/zlib"); +if (false === stristr(PHP_SAPI, "cgi")) die("skip need sapi/cgi"); +?> +--GET-- +a=b +--INI-- +zlib.output_compression=1 +--ENV-- +HTTP_ACCEPT_ENCODING=gzip +--FILE-- +<?php +echo "hi\n"; +?> +--EXPECTF-- + ‹%s diff --git a/ext/zlib/tests/ob_002.phpt b/ext/zlib/tests/ob_002.phpt new file mode 100644 index 0000000000..5601440eb8 --- /dev/null +++ b/ext/zlib/tests/ob_002.phpt @@ -0,0 +1,17 @@ +--TEST-- +zlib.output_compression +--SKIPIF-- +<?php +if (!extension_loaded("zlib")) die("skip need ext/zlib"); +?> +--INI-- +zlib.output_compression=1 +--ENV-- +HTTP_ACCEPT_ENCODING=gzip +--FILE-- +<?php +ini_set("zlib.output_compression", 0); +echo "hi\n"; +?> +--EXPECTF-- +hi diff --git a/ext/zlib/tests/ob_003.phpt b/ext/zlib/tests/ob_003.phpt new file mode 100644 index 0000000000..43dbb08969 --- /dev/null +++ b/ext/zlib/tests/ob_003.phpt @@ -0,0 +1,25 @@ +--TEST-- +zlib.output_compression +--SKIPIF-- +<?php +if (!extension_loaded("zlib")) die("skip need ext/zlib"); +if (false === stristr(PHP_SAPI, "cgi")) die("skip need sapi/cgi"); +?> +--INI-- +zlib.output_compression=0 +--ENV-- +HTTP_ACCEPT_ENCODING=gzip +--POST-- +dummy=42 +--FILE-- +<?php +ini_set("zlib.output_compression", 1); +echo "hi\n"; +?> +--EXPECTF-- +%s +Content-Encoding: gzip +Vary: Accept-Encoding +%s + + ‹%s diff --git a/ext/zlib/tests/ob_004.phpt b/ext/zlib/tests/ob_004.phpt new file mode 100644 index 0000000000..3d3be9df7b --- /dev/null +++ b/ext/zlib/tests/ob_004.phpt @@ -0,0 +1,25 @@ +--TEST-- +ob_gzhandler +--SKIPIF-- +<?php +if (!extension_loaded("zlib")) die("skip need ext/zlib"); +if (false === stristr(PHP_SAPI, "cgi")) die("skip need sapi/cgi"); +?> +--INI-- +zlib.output_compression=0 +--ENV-- +HTTP_ACCEPT_ENCODING=gzip +--POST-- +dummy=42 +--FILE-- +<?php +ob_start("ob_gzhandler"); +echo "hi\n"; +?> +--EXPECTF-- +%s +Content-Encoding: gzip +Vary: Accept-Encoding +%s + + ‹%s diff --git a/ext/zlib/tests/ob_005.phpt b/ext/zlib/tests/ob_005.phpt new file mode 100644 index 0000000000..c266cb71f3 --- /dev/null +++ b/ext/zlib/tests/ob_005.phpt @@ -0,0 +1,21 @@ +--TEST-- +ob_gzhandler +--SKIPIF-- +<?php +if (!extension_loaded("zlib")) die("skip need ext/zlib"); +if (false === stristr(PHP_SAPI, "cgi")) die("skip need sapi/cgi"); +?> +--INI-- +zlib.output_compression=0 +--ENV-- +HTTP_ACCEPT_ENCODING=gzip +--POST-- +dummy=42 +--FILE-- +<?php +ob_start("ob_gzhandler"); +ini_set("zlib.output_compression", 0); +echo "hi\n"; +?> +--EXPECTF-- +%shi diff --git a/ext/zlib/tests/readgzfile_variation10.phpt b/ext/zlib/tests/readgzfile_variation10.phpt index 29249a1f2b..7b4c2c77fc 100644 --- a/ext/zlib/tests/readgzfile_variation10.phpt +++ b/ext/zlib/tests/readgzfile_variation10.phpt @@ -64,4 +64,4 @@ Destiny who cares as it turns around and I know that it descends down on me int(176) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/zlib/tests/readgzfile_variation14.phpt b/ext/zlib/tests/readgzfile_variation14.phpt index 165bf59b89..ee0d6d6d4e 100644 --- a/ext/zlib/tests/readgzfile_variation14.phpt +++ b/ext/zlib/tests/readgzfile_variation14.phpt @@ -41,4 +41,4 @@ NULL Warning: readgzfile() expects parameter 2 to be long, string given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/zlib/tests/readgzfile_variation4.phpt b/ext/zlib/tests/readgzfile_variation4.phpt index cbc561c71d..ece84a990e 100644 --- a/ext/zlib/tests/readgzfile_variation4.phpt +++ b/ext/zlib/tests/readgzfile_variation4.phpt @@ -26,9 +26,18 @@ foreach ( $variation as $var ) { ?> ===DONE=== --EXPECTF-- +Warning: readgzfile(10.5): failed to open stream: No such file or directory in %s on line %d bool(false) + +Warning: readgzfile(-10.5): failed to open stream: No such file or directory in %s on line %d bool(false) + +Warning: readgzfile(123456789000): failed to open stream: No such file or directory in %s on line %d bool(false) + +Warning: readgzfile(-123456789000): failed to open stream: No such file or directory in %s on line %d bool(false) + +Warning: readgzfile(0.5): failed to open stream: No such file or directory in %s on line %d bool(false) ===DONE=== diff --git a/ext/zlib/tests/readgzfile_variation5.phpt b/ext/zlib/tests/readgzfile_variation5.phpt index dde0dabdd0..460e188930 100644 --- a/ext/zlib/tests/readgzfile_variation5.phpt +++ b/ext/zlib/tests/readgzfile_variation5.phpt @@ -25,8 +25,15 @@ foreach ( $variation as $var ) { ?> ===DONE=== --EXPECTF-- +Warning: readgzfile(0): failed to open stream: No such file or directory in %s on line %d bool(false) + +Warning: readgzfile(1): failed to open stream: No such file or directory in %s on line %d bool(false) + +Warning: readgzfile(12345): failed to open stream: No such file or directory in %s on line %d bool(false) + +Warning: readgzfile(-2345): failed to open stream: No such file or directory in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/zlib/tests/readgzfile_variation6.phpt b/ext/zlib/tests/readgzfile_variation6.phpt index 1beeca764b..69a4dc190a 100644 --- a/ext/zlib/tests/readgzfile_variation6.phpt +++ b/ext/zlib/tests/readgzfile_variation6.phpt @@ -43,6 +43,7 @@ foreach ( $variation as $var ) { } ?> --EXPECTF-- +Error: 2 - readgzfile(Class A object): failed to open stream: No such file or directory, %s(%d) bool(false) Error: 2 - readgzfile() expects parameter 1 to be string, object given, %s(%d) NULL
\ No newline at end of file diff --git a/ext/zlib/tests/readgzfile_variation7.phpt b/ext/zlib/tests/readgzfile_variation7.phpt index df244d3954..20162b5cb5 100644 --- a/ext/zlib/tests/readgzfile_variation7.phpt +++ b/ext/zlib/tests/readgzfile_variation7.phpt @@ -29,8 +29,15 @@ foreach ( $variation_array as $var ) { ?> ===DONE=== --EXPECTF-- +Warning: readgzfile(string): failed to open stream: No such file or directory in %s on line %d bool(false) + +Warning: readgzfile(string): failed to open stream: No such file or directory in %s on line %d bool(false) + +Warning: readgzfile(sTrInG): failed to open stream: No such file or directory in %s on line %d bool(false) + +Warning: readgzfile(hello world): failed to open stream: No such file or directory in %s on line %d bool(false) ===DONE=== diff --git a/ext/zlib/tests/zlib_filter_inflate2.phpt b/ext/zlib/tests/zlib_filter_inflate2.phpt index 4332d8e5e6..a2099b6f7a 100644 --- a/ext/zlib/tests/zlib_filter_inflate2.phpt +++ b/ext/zlib/tests/zlib_filter_inflate2.phpt @@ -6,7 +6,7 @@ zlib.inflate of gzip-encoded stream <?php /* $Id$ */ $a = gzopen(dirname(__FILE__) . '/test.txt.gz', 'w'); -fwrite($a, "This is quite the thing ain't it\n"); +fwrite($a, b"This is quite the thing ain't it\n"); fclose($a); $fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r'); @@ -38,4 +38,4 @@ fclose($fp); 2 This is quite the thing ain't it 3 -This is quite the thing ain't it
\ No newline at end of file +This is quite the thing ain't it diff --git a/ext/zlib/tests/zlib_scheme_copy_variation2.phpt b/ext/zlib/tests/zlib_scheme_copy_variation2.phpt index 0b56ec430a..576de944ce 100644 --- a/ext/zlib/tests/zlib_scheme_copy_variation2.phpt +++ b/ext/zlib/tests/zlib_scheme_copy_variation2.phpt @@ -8,7 +8,7 @@ if (!extension_loaded("zlib")) { ?> --FILE-- <?php -$org_data = <<<EOT +$org_data = b<<<EOT uncompressed contents of 004.txt.gz is: When you're taught through feelings Destiny flying high above diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 69c05bbb24..13d5bea483 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -16,201 +16,26 @@ | Stefan Röhrich <sr@linux.de> | | Zeev Suraski <zeev@zend.com> | | Jade Nicoletti <nicoletti@nns.ch> | + | Michael Wallner <mike@php.net> | +----------------------------------------------------------------------+ */ /* $Id$ */ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif #include "php.h" #include "SAPI.h" #include "php_ini.h" - -#include <stdlib.h> -#include <errno.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> - -#ifdef PHP_WIN32 -# define O_RDONLY _O_RDONLY -# include "win32/param.h" -#else -# include <sys/param.h> -/* #include <sys/uio.h> */ -#endif - -#include "ext/standard/head.h" -#include "safe_mode.h" -#include "ext/standard/php_standard.h" #include "ext/standard/info.h" -#include "php_zlib.h" -#include "fopen_wrappers.h" - -#if HAVE_PWD_H -# ifdef PHP_WIN32 -# include "win32/pwd.h" -# else -# include <pwd.h> -# endif -#endif - -#if defined(HAVE_UNISTD_H) && defined(PHP_WIN32) -# undef HAVE_UNISTD_H -#endif - -#ifdef COMPILE_DL_ZLIB -# ifndef PUTS -# define PUTS(a) php_printf("%s",a) -# endif -# ifndef PUTC -# define PUTC(a) PUTS(a) -# endif -# ifndef PHPWRITE -# define PHPWRITE(a,n) php_write((a),(n) TSRMLS_CC) -# endif -#endif - -/* Win32 needs some more memory */ -#ifdef PHP_WIN32 -# define PHP_ZLIB_MODIFIER 100 -#else -# define PHP_ZLIB_MODIFIER 1000 -#endif - -#define OS_CODE 0x03 /* FIXME */ -#define GZIP_HEADER_LENGTH 10 -#define GZIP_FOOTER_LENGTH 8 - -/* True globals, no need for thread safety */ -static const int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ - -static int php_zlib_output_compression_start(TSRMLS_D); - -static PHP_MINIT_FUNCTION(zlib); -static PHP_MSHUTDOWN_FUNCTION(zlib); -static PHP_RINIT_FUNCTION(zlib); -static PHP_MINFO_FUNCTION(zlib); -static PHP_FUNCTION(gzopen); -static PHP_FUNCTION(readgzfile); -static PHP_FUNCTION(gzfile); -static PHP_FUNCTION(gzcompress); -static PHP_FUNCTION(gzuncompress); -static PHP_FUNCTION(gzdeflate); -static PHP_FUNCTION(gzinflate); -static PHP_FUNCTION(gzencode); -static PHP_FUNCTION(ob_gzhandler); -static PHP_FUNCTION(zlib_get_coding_type); - -/* {{{ arginfo */ -ZEND_BEGIN_ARG_INFO_EX(arginfo_gzfile, 0, 0, 1) - ZEND_ARG_INFO(0, filename) - ZEND_ARG_INFO(0, use_include_path) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_gzopen, 0, 0, 2) - ZEND_ARG_INFO(0, filename) - ZEND_ARG_INFO(0, mode) - ZEND_ARG_INFO(0, use_include_path) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_readgzfile, 0, 0, 1) - ZEND_ARG_INFO(0, filename) - ZEND_ARG_INFO(0, use_include_path) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_gzcompress, 0, 0, 1) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, level) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_gzuncompress, 0, 0, 1) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, length) -ZEND_END_ARG_INFO() +#include "ext/standard/file.h" +#include "ext/standard/php_string.h" -ZEND_BEGIN_ARG_INFO_EX(arginfo_gzdeflate, 0, 0, 1) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, level) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_gzinflate, 0, 0, 1) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, length) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_zlib_get_coding_type, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_gzencode, 0, 0, 1) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, level) - ZEND_ARG_INFO(0, encoding_mode) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_ob_gzhandler, 0, 0, 2) - ZEND_ARG_INFO(0, str) - ZEND_ARG_INFO(0, mode) -ZEND_END_ARG_INFO() -/* }}} */ - -/* {{{ php_zlib_functions[] - */ -static const zend_function_entry php_zlib_functions[] = { - PHP_FE(readgzfile, arginfo_readgzfile) - PHP_FALIAS(gzrewind, rewind, NULL) - PHP_FALIAS(gzclose, fclose, NULL) - PHP_FALIAS(gzeof, feof, NULL) - PHP_FALIAS(gzgetc, fgetc, NULL) - PHP_FALIAS(gzgets, fgets, NULL) - PHP_FALIAS(gzgetss, fgetss, NULL) - PHP_FALIAS(gzread, fread, NULL) - PHP_FE(gzopen, arginfo_gzopen) - PHP_FALIAS(gzpassthru, fpassthru, NULL) - PHP_FALIAS(gzseek, fseek, NULL) - PHP_FALIAS(gztell, ftell, NULL) - PHP_FALIAS(gzwrite, fwrite, NULL) - PHP_FALIAS(gzputs, fwrite, NULL) - PHP_FE(gzfile, arginfo_gzfile) - PHP_FE(gzcompress, arginfo_gzcompress) - PHP_FE(gzuncompress, arginfo_gzuncompress) - PHP_FE(gzdeflate, arginfo_gzdeflate) - PHP_FE(gzinflate, arginfo_gzinflate) - PHP_FE(gzencode, arginfo_gzencode) - PHP_FE(ob_gzhandler, arginfo_ob_gzhandler) - PHP_FE(zlib_get_coding_type, arginfo_zlib_get_coding_type) - {NULL, NULL, NULL} -}; -/* }}} */ - -ZEND_DECLARE_MODULE_GLOBALS(zlib) - -/* {{{ php_zlib_module_entry - */ -zend_module_entry php_zlib_module_entry = { - STANDARD_MODULE_HEADER, - "zlib", - php_zlib_functions, - PHP_MINIT(zlib), - PHP_MSHUTDOWN(zlib), - PHP_RINIT(zlib), - NULL, - PHP_MINFO(zlib), - "1.1", - PHP_MODULE_GLOBALS(zlib), - NULL, - NULL, - NULL, - STANDARD_MODULE_PROPERTIES_EX -}; -/* }}} */ +#include "php_zlib.h" -#ifdef COMPILE_DL_ZLIB -ZEND_GET_MODULE(php_zlib) -#endif +ZEND_DECLARE_MODULE_GLOBALS(zlib); /* {{{ Memory management wrappers */ @@ -225,156 +50,403 @@ static void php_zlib_free(voidpf opaque, voidpf address) } /* }}} */ -/* {{{ OnUpdate_zlib_output_compression */ -static PHP_INI_MH(OnUpdate_zlib_output_compression) +/* {{{ php_zlib_output_conflict_check() */ +static int php_zlib_output_conflict_check(zval *handler_name TSRMLS_DC) { - int status, int_value; - char *ini_value; - - if (new_value == NULL) { - return FAILURE; + if (php_output_get_level(TSRMLS_C) > 0) { + PHP_OUTPUT_CONFLICT(PHP_ZLIB_OUTPUT_HANDLER_NAME, return FAILURE); + PHP_OUTPUT_CONFLICT("ob_gzhandler", return FAILURE); + PHP_OUTPUT_CONFLICT("mb_output_handler", return FAILURE); + PHP_OUTPUT_CONFLICT("URL-Rewriter", return FAILURE); } + return SUCCESS; +} +/* }}} */ - if (!strncasecmp(new_value, "off", sizeof("off"))) { - new_value = "0"; - new_value_length = sizeof("0"); - } else if (!strncasecmp(new_value, "on", sizeof("on"))) { - new_value = "1"; - new_value_length = sizeof("1"); - } +/* {{{ php_zlib_output_encoding() */ +static int php_zlib_output_encoding(TSRMLS_D) +{ + zval **enc; - int_value = zend_atoi(new_value, new_value_length); - ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 0); + if (!ZLIBG(compression_coding)) { + zend_is_auto_global(ZEND_STRL("_SERVER") TSRMLS_CC); - if (ini_value && *ini_value && int_value) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_CORE_ERROR, "Cannot use both zlib.output_compression and output_handler together!!"); - return FAILURE; + if (PG(http_globals)[TRACK_VARS_SERVER] && SUCCESS == zend_hash_find(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), (void *) &enc)) { + convert_to_string(*enc); + if (strstr(Z_STRVAL_PP(enc), "gzip")) { + ZLIBG(compression_coding) = PHP_ZLIB_ENCODING_GZIP; + } else if (strstr(Z_STRVAL_PP(enc), "deflate")) { + ZLIBG(compression_coding) = PHP_ZLIB_ENCODING_DEFLATE; + } + } } + return ZLIBG(compression_coding); +} +/* }}} */ - if (stage == PHP_INI_STAGE_RUNTIME && SG(headers_sent) && !SG(request_info).no_headers) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "Cannot change zlib.output_compression - headers already sent"); +/* {{{ php_zlib_output_handler() */ +static int php_zlib_output_handler(void **handler_context, php_output_context *output_context) +{ + php_zlib_context *ctx = *(php_zlib_context **) handler_context; + int flags = Z_SYNC_FLUSH; + PHP_OUTPUT_TSRMLS(output_context); + + if (!php_zlib_output_encoding(TSRMLS_C)) { + /* "Vary: Accept-Encoding" header sent along uncompressed content breaks caching in MSIE, + so let's just send it with successfully compressed content or unless the complete + buffer gets discarded, see http://bugs.php.net/40325; + + Test as follows: + Test as follows: + +Vary: $ HTTP_ACCEPT_ENCODING=gzip ./sapi/cgi/php <<<'<?php ob_start("ob_gzhandler"); echo "foo\n";' + +Vary: $ HTTP_ACCEPT_ENCODING= ./sapi/cgi/php <<<'<?php ob_start("ob_gzhandler"); echo "foo\n";' + -Vary: $ HTTP_ACCEPT_ENCODING=gzip ./sapi/cgi/php <<<'<?php ob_start("ob_gzhandler"); echo "foo\n"; ob_end_clean();' + -Vary: $ HTTP_ACCEPT_ENCODING= ./sapi/cgi/php <<<'<?php ob_start("ob_gzhandler"); echo "foo\n"; ob_end_clean();' + */ + if (output_context->op != (PHP_OUTPUT_HANDLER_START|PHP_OUTPUT_HANDLER_CLEAN|PHP_OUTPUT_HANDLER_FINAL)) { + sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"), 1, 0 TSRMLS_CC); + } return FAILURE; } - status = OnUpdateLong(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); - - if (stage == PHP_INI_STAGE_RUNTIME && int_value) { - status = php_zlib_output_compression_start(TSRMLS_C); + if (output_context->op & PHP_OUTPUT_HANDLER_START) { + /* start up */ + if (Z_OK != deflateInit2(&ctx->Z, ZLIBG(output_compression_level), Z_DEFLATED, ZLIBG(compression_coding), MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY)) { + return FAILURE; + } } - return status; + if (output_context->op & PHP_OUTPUT_HANDLER_CLEAN) { + /* free buffers */ + deflateEnd(&ctx->Z); + + if (output_context->op & PHP_OUTPUT_HANDLER_FINAL) { + /* discard */ + return SUCCESS; + } else { + /* restart */ + if (Z_OK != deflateInit2(&ctx->Z, ZLIBG(output_compression_level), Z_DEFLATED, ZLIBG(compression_coding), MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY)) { + return FAILURE; + } + ctx->buffer.used = 0; + } + } else { + if (output_context->in.used) { + /* append input */ + if (ctx->buffer.free < output_context->in.used) { + if (!(ctx->buffer.aptr = erealloc_recoverable(ctx->buffer.data, ctx->buffer.used + ctx->buffer.free + output_context->in.used))) { + deflateEnd(&ctx->Z); + return FAILURE; + } + ctx->buffer.data = ctx->buffer.aptr; + ctx->buffer.free += output_context->in.used; + } + memcpy(ctx->buffer.data + ctx->buffer.used, output_context->in.data, output_context->in.used); + ctx->buffer.free -= output_context->in.used; + ctx->buffer.used += output_context->in.used; + } + output_context->out.size = PHP_ZLIB_BUFFER_SIZE_GUESS(output_context->in.used); + output_context->out.data = emalloc(output_context->out.size); + output_context->out.free = 1; + output_context->out.used = 0; + + ctx->Z.avail_in = ctx->buffer.used; + ctx->Z.next_in = (Bytef *) ctx->buffer.data; + ctx->Z.avail_out = output_context->out.size; + ctx->Z.next_out = (Bytef *) output_context->out.data; + + if (output_context->op & PHP_OUTPUT_HANDLER_FINAL) { + flags = Z_FINISH; + } else if (output_context->op & PHP_OUTPUT_HANDLER_FLUSH) { + flags = Z_FULL_FLUSH; + } + + switch (deflate(&ctx->Z, flags)) { + case Z_OK: + if (flags == Z_FINISH) { + deflateEnd(&ctx->Z); + return FAILURE; + } + case Z_STREAM_END: + if (ctx->Z.avail_in) { + memmove(ctx->buffer.data, ctx->buffer.data + ctx->buffer.used - ctx->Z.avail_in, ctx->Z.avail_in); + } + ctx->buffer.free += ctx->buffer.used - ctx->Z.avail_in; + ctx->buffer.used = ctx->Z.avail_in; + output_context->out.used = output_context->out.size - ctx->Z.avail_out; + break; + default: + deflateEnd(&ctx->Z); + return FAILURE; + } + + php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS, &flags TSRMLS_CC); + + if (!(flags & PHP_OUTPUT_HANDLER_STARTED)) { + if (SG(headers_sent) || !ZLIBG(output_compression)) { + deflateEnd(&ctx->Z); + return FAILURE; + } + switch (ZLIBG(compression_coding)) { + case PHP_ZLIB_ENCODING_GZIP: + sapi_add_header_ex(ZEND_STRL("Content-Encoding: gzip"), 1, 1 TSRMLS_CC); + break; + case PHP_ZLIB_ENCODING_DEFLATE: + sapi_add_header_ex(ZEND_STRL("Content-Encoding: deflate"), 1, 1 TSRMLS_CC); + break; + default: + deflateEnd(&ctx->Z); + return FAILURE; + } + sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"), 1, 1 TSRMLS_CC); + php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC); + } + + if (output_context->op & PHP_OUTPUT_HANDLER_FINAL) { + deflateEnd(&ctx->Z); + } + } + return SUCCESS; } /* }}} */ -/* {{{ OnUpdate_zlib_output_compression_level */ -static PHP_INI_MH(OnUpdate_zlib_output_compression_level) +/* {{{ php_zlib_output_handler_dtor() */ +static void php_zlib_output_handler_dtor(void *opaq TSRMLS_DC) { - OnUpdateLong(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); + php_zlib_context *ctx = (php_zlib_context *) opaq; - return SUCCESS; + if (ctx) { + if (ctx->buffer.data) { + efree(ctx->buffer.data); + } + efree(ctx); + } } /* }}} */ -/* {{{ OnUpdate_zlib_output_handler */ -static PHP_INI_MH(OnUpdate_zlib_output_handler) +/* {{{ php_zlib_output_handler_init() */ +static php_output_handler *php_zlib_output_handler_init(zval *handler_name, size_t chunk_size, int flags TSRMLS_DC) { - if (stage == PHP_INI_STAGE_RUNTIME && SG(headers_sent) && !SG(request_info).no_headers) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "Cannot change zlib.output_handler - headers already sent"); - return FAILURE; - } + php_output_handler *h = NULL; + php_zlib_context *ctx; - OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); + if (!ZLIBG(output_compression)) { + ZLIBG(output_compression) = chunk_size ? chunk_size : PHP_OUTPUT_HANDLER_DEFAULT_SIZE; + } + if ((h = php_output_handler_create_internal(handler_name, php_zlib_output_handler, chunk_size, flags TSRMLS_CC))) { + ctx = (php_zlib_context *) ecalloc(1, sizeof(php_zlib_context)); + ctx->Z.zalloc = php_zlib_alloc; + ctx->Z.zfree = php_zlib_free; + php_output_handler_set_context(h, ctx, php_zlib_output_handler_dtor TSRMLS_CC); + } - return SUCCESS; + return h; } /* }}} */ +/* {{{ php_zlib_output_compression_start() */ +static void php_zlib_output_compression_start(TSRMLS_D) +{ + zval *zoh, *tmp; + php_output_handler *h; -PHP_INI_BEGIN() - STD_PHP_INI_BOOLEAN("zlib.output_compression", "0", PHP_INI_ALL, OnUpdate_zlib_output_compression, output_compression, zend_zlib_globals, zlib_globals) - STD_PHP_INI_ENTRY("zlib.output_compression_level", "-1", PHP_INI_ALL, OnUpdate_zlib_output_compression_level, output_compression_level, zend_zlib_globals, zlib_globals) - STD_PHP_INI_ENTRY("zlib.output_handler", "", PHP_INI_ALL, OnUpdate_zlib_output_handler, output_handler, zend_zlib_globals, zlib_globals) -PHP_INI_END() + switch (ZLIBG(output_compression)) { + case 0: + break; + case 1: + ZLIBG(output_compression) = PHP_OUTPUT_HANDLER_DEFAULT_SIZE; + /* break omitted intentionally */ + default: + MAKE_STD_ZVAL(tmp); + ZVAL_STRING(tmp, PHP_ZLIB_OUTPUT_HANDLER_NAME, 1); + if ( (h = php_zlib_output_handler_init(tmp, ZLIBG(output_compression), PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC)) && + (SUCCESS == php_output_handler_start(h TSRMLS_CC))) { + if (ZLIBG(output_handler) && *ZLIBG(output_handler)) { + MAKE_STD_ZVAL(zoh); + ZVAL_STRING(zoh, ZLIBG(output_handler), 1); + php_output_start_user(zoh, ZLIBG(output_compression), PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC); + zval_ptr_dtor(&zoh); + } + } + zval_ptr_dtor(&tmp); + break; + } +} +/* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ -static PHP_MINIT_FUNCTION(zlib) +/* {{{ php_zlib_encode() */ +static int php_zlib_encode(const char *in_buf, size_t in_len, char **out_buf, size_t *out_len, int encoding, int level TSRMLS_DC) { - php_register_url_stream_wrapper("compress.zlib", &php_stream_gzip_wrapper TSRMLS_CC); - php_stream_filter_register_factory("zlib.*", &php_zlib_filter_factory TSRMLS_CC); + int status; + z_stream Z; - REGISTER_LONG_CONSTANT("FORCE_GZIP", CODING_GZIP, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("FORCE_DEFLATE", CODING_DEFLATE, CONST_CS | CONST_PERSISTENT); + memset(&Z, 0, sizeof(z_stream)); + Z.zalloc = php_zlib_alloc; + Z.zfree = php_zlib_free; - REGISTER_INI_ENTRIES(); + if (Z_OK == (status = deflateInit2(&Z, level, Z_DEFLATED, encoding, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY))) { + *out_len = PHP_ZLIB_BUFFER_SIZE_GUESS(in_len); + *out_buf = emalloc(*out_len); - return SUCCESS; + Z.next_in = (Bytef *) in_buf; + Z.next_out = (Bytef *) *out_buf; + Z.avail_in = in_len; + Z.avail_out = *out_len; + + status = deflate(&Z, Z_FINISH); + deflateEnd(&Z); + + if (Z_STREAM_END == status) { + /* size buffer down to actual length */ + *out_buf = erealloc(*out_buf, Z.total_out + 1); + (*out_buf)[*out_len = Z.total_out] = '\0'; + return SUCCESS; + } else { + efree(*out_buf); + } + } + + *out_buf = NULL; + *out_len = 0; + + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); + return FAILURE; } /* }}} */ -/* {{{ PHP_RINIT_FUNCTION - */ -static PHP_RINIT_FUNCTION(zlib) +/* {{{ php_zlib_inflate_rounds() */ +static inline int php_zlib_inflate_rounds(z_stream *Z, size_t max, char **buf, size_t *len) { - ZLIBG(ob_gzhandler_status) = 0; - ZLIBG(compression_coding) = 0; + int status, round = 0; + php_zlib_buffer buffer = {NULL, NULL, 0, 0, 0}; - php_zlib_output_compression_start(TSRMLS_C); + *buf = NULL; + *len = 0; - return SUCCESS; + buffer.size = (max && (max < Z->avail_in)) ? max : Z->avail_in; + + do { + if ((max && (max <= buffer.used)) || !(buffer.aptr = erealloc_recoverable(buffer.data, buffer.size))) { + status = Z_MEM_ERROR; + } else { + buffer.data = buffer.aptr; + Z->avail_out = buffer.free = buffer.size - buffer.used; + Z->next_out = (Bytef *) buffer.data + buffer.used; +#if 0 + fprintf(stderr, "\n%3d: %3d PRIOR: size=%7lu,\tfree=%7lu,\tused=%7lu,\tavail_in=%7lu,\tavail_out=%7lu\n", round, status, buffer.size, buffer.free, buffer.used, Z->avail_in, Z->avail_out); +#endif + status = inflate(Z, Z_NO_FLUSH); + + buffer.used += buffer.free - Z->avail_out; + buffer.free = Z->avail_out; +#if 0 + fprintf(stderr, "%3d: %3d AFTER: size=%7lu,\tfree=%7lu,\tused=%7lu,\tavail_in=%7lu,\tavail_out=%7lu\n", round, status, buffer.size, buffer.free, buffer.used, Z->avail_in, Z->avail_out); +#endif + buffer.size += (buffer.size >> 3) + 1; + } + } while ((Z_BUF_ERROR == status || (Z_OK == status && Z->avail_in)) && ++round < 100); + + if (status == Z_STREAM_END) { + buffer.data = erealloc(buffer.data, buffer.used + 1); + buffer.data[buffer.used] = '\0'; + *buf = buffer.data; + *len = buffer.used; + } else { + if (buffer.data) { + efree(buffer.data); + } + /* HACK: See zlib/examples/zpipe.c inf() function for explanation. */ + /* This works as long as this function is not used for streaming. Required to catch very short invalid data. */ + status = (status == Z_OK) ? Z_DATA_ERROR : status; + } + return status; } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ -static PHP_MSHUTDOWN_FUNCTION(zlib) +/* {{{ php_zlib_decode() */ +static int php_zlib_decode(const char *in_buf, size_t in_len, char **out_buf, size_t *out_len, int encoding, size_t max_len TSRMLS_DC) { - php_unregister_url_stream_wrapper("zlib" TSRMLS_CC); - php_stream_filter_unregister_factory("zlib.*" TSRMLS_CC); + int status = Z_DATA_ERROR; + z_stream Z; + + memset(&Z, 0, sizeof(z_stream)); + Z.zalloc = php_zlib_alloc; + Z.zfree = php_zlib_free; + + if (in_len) { +retry_raw_inflate: + status = inflateInit2(&Z, encoding); + if (Z_OK == status) { + Z.next_in = (Bytef *) in_buf; + Z.avail_in = in_len; + + switch (status = php_zlib_inflate_rounds(&Z, max_len, out_buf, out_len)) { + case Z_STREAM_END: + inflateEnd(&Z); + return SUCCESS; + + case Z_DATA_ERROR: + /* raw deflated data? */ + if (PHP_ZLIB_ENCODING_ANY == encoding) { + inflateEnd(&Z); + encoding = PHP_ZLIB_ENCODING_RAW; + goto retry_raw_inflate; + } + } + inflateEnd(&Z); + } + } - UNREGISTER_INI_ENTRIES(); + *out_buf = NULL; + *out_len = 0; - return SUCCESS; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); + return FAILURE; } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ -static PHP_MINFO_FUNCTION(zlib) +/* {{{ proto string zlib_get_coding_type(void) + Returns the coding type used for output compression */ +static PHP_FUNCTION(zlib_get_coding_type) { - php_info_print_table_start(); - php_info_print_table_row(2, "ZLib Support", "enabled"); - php_info_print_table_row(2, "Stream Wrapper support", "compress.zlib://"); - php_info_print_table_row(2, "Stream Filter support", "zlib.inflate, zlib.deflate"); - php_info_print_table_row(2, "Compiled Version", ZLIB_VERSION); - php_info_print_table_row(2, "Linked Version", (char *) zlibVersion()); - php_info_print_table_end(); - - DISPLAY_INI_ENTRIES(); + if (zend_parse_parameters_none() == FAILURE) { + return; + } + switch (ZLIBG(compression_coding)) { + case PHP_ZLIB_ENCODING_GZIP: + RETURN_STRINGL("gzip", sizeof("gzip") - 1, 1); + case PHP_ZLIB_ENCODING_DEFLATE: + RETURN_STRINGL("deflate", sizeof("deflate") - 1, 1); + default: + RETURN_FALSE; + } } /* }}} */ /* {{{ proto array gzfile(string filename [, int use_include_path]) - Read und uncompress entire .gz-file into an array */ + Read and uncompress entire .gz-file into an array */ static PHP_FUNCTION(gzfile) { char *filename; int filename_len; - long flags = 0; - char *slashed, buf[8192]; + int flags = REPORT_ERRORS; + char *slashed, buf[8192] = {0}; register int i = 0; - int use_include_path = 0; + long use_include_path = 0; php_stream *stream; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &filename, &filename_len, &flags) == FAILURE) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &filename, &filename_len, &use_include_path)) { return; } - use_include_path = flags ? USE_PATH : 0; + if (use_include_path) { + flags |= USE_PATH; + } /* using a stream here is a bit more efficient (resource wise) than php_gzopen_wrapper */ - stream = php_stream_gzopen(NULL, filename, "rb", use_include_path | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, NULL STREAMS_CC TSRMLS_CC); - if (stream == NULL) { + stream = php_stream_gzopen(NULL, filename, "rb", flags, NULL, NULL STREAMS_CC TSRMLS_CC); + + if (!stream) { /* Error reporting is already done by stream code */ RETURN_FALSE; } @@ -383,12 +455,12 @@ static PHP_FUNCTION(gzfile) array_init(return_value); /* Now loop through the file and do the magic quotes thing if needed */ - memset(buf,0,sizeof(buf)); - + memset(buf, 0, sizeof(buf)); + while (php_stream_gets(stream, buf, sizeof(buf) - 1) != NULL) { if (PG(magic_quotes_runtime)) { int len; - + slashed = php_addslashes(buf, 0, &len, 0 TSRMLS_CC); /* 0 = don't free source string */ add_index_stringl(return_value, i++, slashed, len, 0); } else { @@ -403,19 +475,22 @@ static PHP_FUNCTION(gzfile) Open a .gz-file and return a .gz-file pointer */ static PHP_FUNCTION(gzopen) { - char *filename, *mode; + char *filename; + char *mode; int filename_len, mode_len; - long flags = 0; + int flags = REPORT_ERRORS; php_stream *stream; - int use_include_path = 0; + long use_include_path = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", &filename, &filename_len, &mode, &mode_len, &flags) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", &filename, &filename_len, &mode, &mode_len, &use_include_path) == FAILURE) { return; } - use_include_path = flags ? USE_PATH : 0; + if (use_include_path) { + flags |= USE_PATH; + } - stream = php_stream_gzopen(NULL, filename, mode, use_include_path | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, NULL STREAMS_CC TSRMLS_CC); + stream = php_stream_gzopen(NULL, filename, mode, flags, NULL, NULL STREAMS_CC TSRMLS_CC); if (!stream) { RETURN_FALSE; @@ -424,27 +499,27 @@ static PHP_FUNCTION(gzopen) } /* }}} */ -/* - * Read a file and write the ouput to stdout - */ /* {{{ proto int readgzfile(string filename [, int use_include_path]) Output a .gz-file */ static PHP_FUNCTION(readgzfile) { char *filename; int filename_len; - long flags = 0; + int flags = REPORT_ERRORS; php_stream *stream; int size; - int use_include_path = 0; + long use_include_path = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &filename, &filename_len, &flags) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &filename, &filename_len, &use_include_path) == FAILURE) { return; } - use_include_path = flags ? USE_PATH : 0; + if (use_include_path) { + flags |= USE_PATH; + } + + stream = php_stream_gzopen(NULL, filename, "rb", flags, NULL, NULL STREAMS_CC TSRMLS_CC); - stream = php_stream_gzopen(NULL, filename, "rb", use_include_path | ENFORCE_SAFE_MODE, NULL, NULL STREAMS_CC TSRMLS_CC); if (!stream) { RETURN_FALSE; } @@ -454,676 +529,350 @@ static PHP_FUNCTION(readgzfile) } /* }}} */ -/* {{{ proto string gzcompress(string data [, int level]) - Gzip-compress a string */ -static PHP_FUNCTION(gzcompress) -{ - int data_len, status; - long level = Z_DEFAULT_COMPRESSION; - unsigned long l2; - char *data, *s2; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &level) == FAILURE) { - return; - } - - if ((level < -1) || (level > 9)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "compression level (%ld) must be within -1..9", level); - RETURN_FALSE; - } - - l2 = data_len + (data_len / PHP_ZLIB_MODIFIER) + 15 + 1; /* room for \0 */ - s2 = (char *) emalloc(l2); - if (!s2) { - RETURN_FALSE; - } - - if (level >= 0) { - status = compress2(s2, &l2, data, data_len, level); - } else { - status = compress(s2, &l2, data, data_len); - } - - if (status == Z_OK) { - s2 = erealloc(s2, l2 + 1); - s2[l2] = '\0'; - RETURN_STRINGL(s2, l2, 0); - } else { - efree(s2); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); - RETURN_FALSE; - } +#define PHP_ZLIB_ENCODE_FUNC(name, default_encoding) \ +static PHP_FUNCTION(name) \ +{ \ + char *in_buf, *out_buf; \ + int in_len; \ + size_t out_len; \ + long level = -1; \ + long encoding = default_encoding; \ + if (default_encoding) { \ + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &in_buf, &in_len, &level, &encoding)) { \ + return; \ + } \ + } else { \ + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|l", &in_buf, &in_len, &encoding, &level)) { \ + return; \ + } \ + } \ + if (level < -1 || level > 9) { \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "compression level (%ld) must be within -1..9", level); \ + RETURN_FALSE; \ + } \ + switch (encoding) { \ + case PHP_ZLIB_ENCODING_RAW: \ + case PHP_ZLIB_ENCODING_GZIP: \ + case PHP_ZLIB_ENCODING_DEFLATE: \ + break; \ + default: \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE"); \ + RETURN_FALSE; \ + } \ + if (SUCCESS != php_zlib_encode(in_buf, in_len, &out_buf, &out_len, encoding, level TSRMLS_CC)) { \ + RETURN_FALSE; \ + } \ + RETURN_STRINGL(out_buf, out_len, 0); \ } -/* }}} */ - -/* {{{ proto string gzuncompress(string data [, int length]) - Unzip a gzip-compressed string */ -static PHP_FUNCTION(gzuncompress) -{ - int data_len, status; - unsigned int factor=1, maxfactor=16; - long limit = 0; - unsigned long plength=0, length; - char *data, *s1=NULL, *s2=NULL; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &limit) == FAILURE) { - return; - } - if (limit < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "length (%ld) must be greater or equal zero", limit); - RETURN_FALSE; - } - plength = limit; - - /* - zlib::uncompress() wants to know the output data length - if none was given as a parameter - we try from input length * 2 up to input length * 2^15 - doubling it whenever it wasn't big enough - that should be eneugh for all real life cases - */ - do { - length = plength ? plength : (unsigned long)data_len * (1 << factor++); - s2 = (char *) erealloc(s1, length); - status = uncompress(s2, &length, data, data_len); - s1 = s2; - } while ((status == Z_BUF_ERROR) && (!plength) && (factor < maxfactor)); - - if (status == Z_OK) { - s2 = erealloc(s2, length + 1); /* space for \0 */ - s2[ length ] = '\0'; - RETURN_STRINGL(s2, length, 0); - } else { - efree(s2); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); - RETURN_FALSE; - } +#define PHP_ZLIB_DECODE_FUNC(name, encoding) \ +static PHP_FUNCTION(name) \ +{ \ + char *in_buf, *out_buf; \ + int in_len; \ + size_t out_len; \ + long max_len = 0; \ + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &in_buf, &in_len, &max_len)) { \ + return; \ + } \ + if (max_len < 0) { \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "length (%ld) must be greater or equal zero", max_len); \ + RETURN_FALSE; \ + } \ + if (SUCCESS != php_zlib_decode(in_buf, in_len, &out_buf, &out_len, encoding, max_len TSRMLS_CC)) { \ + RETURN_FALSE; \ + } \ + RETURN_STRINGL(out_buf, out_len, 0); \ } -/* }}} */ - -/* {{{ proto string gzdeflate(string data [, int level]) - Gzip-compress a string */ -static PHP_FUNCTION(gzdeflate) -{ - int data_len,status; - long level = Z_DEFAULT_COMPRESSION; - z_stream stream; - char *data, *s2; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &level) == FAILURE) { - return; - } - - if ((level < -1) || (level > 9)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "compression level (%ld) must be within -1..9", level); - RETURN_FALSE; - } +/* {{{ proto binary zlib_encode(binary data, int encoding[, int level = -1]) + Compress data with the specified encoding */ +PHP_ZLIB_ENCODE_FUNC(zlib_encode, 0); +/* }}} */ - stream.data_type = Z_ASCII; - stream.zalloc = php_zlib_alloc; - stream.zfree = php_zlib_free; - stream.opaque = (voidpf) Z_NULL; +/* {{{ proto binary zlib_decode(binary data[, int max_decoded_len]) + Uncompress any raw/gzip/zlib encoded data */ +PHP_ZLIB_DECODE_FUNC(zlib_decode, PHP_ZLIB_ENCODING_ANY); +/* }}} */ - stream.next_in = (Bytef *) data; - stream.avail_in = data_len; +/* NOTE: The naming of these userland functions was quite unlucky */ - stream.avail_out = stream.avail_in + (stream.avail_in / PHP_ZLIB_MODIFIER) + 15 + 1; /* room for \0 */ +/* {{{ proto binary gzdeflate(binary data[, int level = -1[, int encoding = ZLIB_ENCODING_RAW]) + Encode data with the raw deflate encoding */ +PHP_ZLIB_ENCODE_FUNC(gzdeflate, PHP_ZLIB_ENCODING_RAW); +/* }}} */ +/* {{{ proto binary gzencode(binary data[, int level = -1[, int encoding = ZLIB_ENCODING_GZIP]) + Encode data with the gzip encoding */ +PHP_ZLIB_ENCODE_FUNC(gzencode, PHP_ZLIB_ENCODING_GZIP); +/* }}} */ +/* {{{ proto binary gzcompress(binary data[, int level = -1[, int encoding = ZLIB_ENCODING_DEFLATE]) + Encode data with the zlib encoding */ +PHP_ZLIB_ENCODE_FUNC(gzcompress, PHP_ZLIB_ENCODING_DEFLATE); +/* }}} */ +/* {{{ proto binary gzinflate(binary data[, int max_decoded_len]) + Decode raw deflate encoded data */ +PHP_ZLIB_DECODE_FUNC(gzinflate, PHP_ZLIB_ENCODING_RAW); +/* }}} */ +/* {{{ proto binary gzdecode(binary data[, int max_decoded_len]) + Decode gzip encoded data */ +PHP_ZLIB_DECODE_FUNC(gzdecode, PHP_ZLIB_ENCODING_GZIP); +/* }}} */ +/* {{{ proto binary gzuncompress(binary data[, int max_decoded_len]) + Decode zlib encoded data */ +PHP_ZLIB_DECODE_FUNC(gzuncompress, PHP_ZLIB_ENCODING_DEFLATE); +/* }}} */ - s2 = (char *) emalloc(stream.avail_out); - if (!s2) { - RETURN_FALSE; - } +#ifdef COMPILE_DL_ZLIB +ZEND_GET_MODULE(php_zlib) +#endif - stream.next_out = s2; +/* {{{ arginfo */ +ZEND_BEGIN_ARG_INFO(arginfo_zlib_get_coding_type, 0) +ZEND_END_ARG_INFO() - /* init with -MAX_WBITS disables the zlib internal headers */ - status = deflateInit2(&stream, level, Z_DEFLATED, -MAX_WBITS, MAX_MEM_LEVEL, 0); - if (status == Z_OK) { - status = deflate(&stream, Z_FINISH); - if (status != Z_STREAM_END) { - deflateEnd(&stream); - if (status == Z_OK) { - status = Z_BUF_ERROR; - } - } else { - status = deflateEnd(&stream); - } - } +ZEND_BEGIN_ARG_INFO_EX(arginfo_gzfile, 0, 0, 1) + ZEND_ARG_INFO(0, filename) + ZEND_ARG_INFO(0, use_include_path) +ZEND_END_ARG_INFO() - if (status == Z_OK) { - s2 = erealloc(s2,stream.total_out + 1); /* resize to buffer to the "right" size */ - s2[ stream.total_out ] = '\0'; - RETURN_STRINGL(s2, stream.total_out, 0); - } else { - efree(s2); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); - RETURN_FALSE; - } -} -/* }}} */ +ZEND_BEGIN_ARG_INFO_EX(arginfo_gzopen, 0, 0, 2) + ZEND_ARG_INFO(0, filename) + ZEND_ARG_INFO(0, mode) + ZEND_ARG_INFO(0, use_include_path) +ZEND_END_ARG_INFO() -/* {{{ proto string gzinflate(string data [, int length]) - Unzip a gzip-compressed string */ -static PHP_FUNCTION(gzinflate) -{ - int data_len, status; - unsigned int factor=1, maxfactor=16; - long limit = 0; - unsigned long plength=0, length; - char *data, *s1=NULL, *s2=NULL; - z_stream stream; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &limit) == FAILURE) { - return; - } +ZEND_BEGIN_ARG_INFO_EX(arginfo_readgzfile, 0, 0, 1) + ZEND_ARG_INFO(0, filename) + ZEND_ARG_INFO(0, use_include_path) +ZEND_END_ARG_INFO() - if (!data_len) { - RETURN_FALSE; - } +ZEND_BEGIN_ARG_INFO_EX(arginfo_zlib_encode, 0, 0, 2) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, encoding) + ZEND_ARG_INFO(0, level) +ZEND_END_ARG_INFO() - if (limit < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "length (%ld) must be greater or equal zero", limit); - RETURN_FALSE; - } - plength = limit; - - stream.zalloc = php_zlib_alloc; - stream.zfree = php_zlib_free; - stream.opaque = Z_NULL; - stream.avail_in = data_len + 1; /* there is room for \0 */ - stream.next_in = (Bytef *) data; - stream.total_out = 0; - - /* init with -MAX_WBITS disables the zlib internal headers */ - status = inflateInit2(&stream, -MAX_WBITS); - if (status != Z_OK) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); - RETURN_FALSE; - } +ZEND_BEGIN_ARG_INFO_EX(arginfo_zlib_decode, 0, 0, 1) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, max_decoded_len) +ZEND_END_ARG_INFO() - /* - stream.avail_out wants to know the output data length - if none was given as a parameter - we try from input length * 2 up to input length * 2^15 - doubling it whenever it wasn't big enough - that should be enaugh for all real life cases - */ - do { - length = plength ? plength : (unsigned long)data_len * (1 << factor++); - s2 = (char *) erealloc(s1, length); +ZEND_BEGIN_ARG_INFO_EX(arginfo_gzdeflate, 0, 0, 1) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, level) + ZEND_ARG_INFO(0, encoding) +ZEND_END_ARG_INFO() - if (!s2) { - if (s1) { - efree(s1); - } - inflateEnd(&stream); - RETURN_FALSE; - } - s1 = s2; +ZEND_BEGIN_ARG_INFO_EX(arginfo_gzencode, 0, 0, 1) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, level) + ZEND_ARG_INFO(0, encoding) +ZEND_END_ARG_INFO() - stream.next_out = (Bytef *) &s2[stream.total_out]; - stream.avail_out = length - stream.total_out; - status = inflate(&stream, Z_NO_FLUSH); +ZEND_BEGIN_ARG_INFO_EX(arginfo_gzcompress, 0, 0, 1) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, level) + ZEND_ARG_INFO(0, encoding) +ZEND_END_ARG_INFO() - } while ((Z_BUF_ERROR == status || (Z_OK == status && stream.avail_in)) && !plength && factor < maxfactor); +ZEND_BEGIN_ARG_INFO_EX(arginfo_gzinflate, 0, 0, 1) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, max_decoded_len) +ZEND_END_ARG_INFO() - inflateEnd(&stream); +ZEND_BEGIN_ARG_INFO_EX(arginfo_gzdecode, 0, 0, 1) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, max_decoded_len) +ZEND_END_ARG_INFO() - if ((plength && Z_OK == status) || factor >= maxfactor) { - status = Z_MEM_ERROR; - } +ZEND_BEGIN_ARG_INFO_EX(arginfo_gzuncompress, 0, 0, 1) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, max_decoded_len) +ZEND_END_ARG_INFO() +/* }}} */ - if (Z_STREAM_END == status || Z_OK == status) { - s2 = erealloc(s2, stream.total_out + 1); /* room for \0 */ - s2[ stream.total_out ] = '\0'; - RETURN_STRINGL(s2, stream.total_out, 0); - } else { - efree(s2); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); - RETURN_FALSE; - } -} +/* {{{ php_zlib_functions[] */ +static const zend_function_entry php_zlib_functions[] = { + PHP_FE(readgzfile, arginfo_readgzfile) + PHP_FALIAS(gzrewind, rewind, NULL) + PHP_FALIAS(gzclose, fclose, NULL) + PHP_FALIAS(gzeof, feof, NULL) + PHP_FALIAS(gzgetc, fgetc, NULL) + PHP_FALIAS(gzgets, fgets, NULL) + PHP_FALIAS(gzgetss, fgetss, NULL) + PHP_FALIAS(gzread, fread, NULL) + PHP_FE(gzopen, arginfo_gzopen) + PHP_FALIAS(gzpassthru, fpassthru, NULL) + PHP_FALIAS(gzseek, fseek, NULL) + PHP_FALIAS(gztell, ftell, NULL) + PHP_FALIAS(gzwrite, fwrite, NULL) + PHP_FALIAS(gzputs, fwrite, NULL) + PHP_FE(gzfile, NULL) + PHP_FE(gzcompress, arginfo_gzcompress) + PHP_FE(gzuncompress, arginfo_gzuncompress) + PHP_FE(gzdeflate, arginfo_gzdeflate) + PHP_FE(gzinflate, arginfo_gzinflate) + PHP_FE(gzencode, arginfo_gzencode) + PHP_FE(gzdecode, arginfo_gzdecode) + PHP_FE(zlib_encode, arginfo_zlib_encode) + PHP_FE(zlib_decode, arginfo_zlib_decode) + PHP_FE(zlib_get_coding_type, arginfo_zlib_get_coding_type) + {NULL, NULL, NULL} +}; /* }}} */ -/* {{{ proto string zlib_get_coding_type(void) - Returns the coding type used for output compression */ -static PHP_FUNCTION(zlib_get_coding_type) +/* {{{ OnUpdate_zlib_output_compression */ +static PHP_INI_MH(OnUpdate_zlib_output_compression) { - switch (ZLIBG(compression_coding)) { - case CODING_GZIP: - RETURN_STRINGL("gzip", sizeof("gzip") - 1, 1); + int status, int_value; + char *ini_value; - case CODING_DEFLATE: - RETURN_STRINGL("deflate", sizeof("deflate") - 1, 1); + if (new_value == NULL) { + return FAILURE; } - RETURN_FALSE; -} - -/* {{{ php_do_deflate - */ -static int php_do_deflate(uint str_length, Bytef **p_buffer, uint *p_buffer_len, zend_bool do_start, zend_bool do_end TSRMLS_DC) -{ - Bytef *buffer; - uInt prev_outlen, outlen; - int err; - int start_offset = ((do_start && ZLIBG(compression_coding) == CODING_GZIP) ? 10 : 0); - int end_offset = (do_end ? 8 : 0); - - outlen = (uint) (str_length + (str_length / PHP_ZLIB_MODIFIER) + 12 + 1); /* leave some room for a trailing \0 */ - if ((outlen + start_offset + end_offset) > *p_buffer_len) { - buffer = (Bytef *) emalloc(outlen + start_offset + end_offset); - } else { - buffer = *p_buffer; + if (!strncasecmp(new_value, "off", sizeof("off"))) { + new_value = "0"; + new_value_length = sizeof("0"); + } else if (!strncasecmp(new_value, "on", sizeof("on"))) { + new_value = "1"; + new_value_length = sizeof("1"); } - ZLIBG(stream).next_out = buffer + start_offset; - ZLIBG(stream).avail_out = outlen; - - err = deflate(&ZLIBG(stream), Z_SYNC_FLUSH); - while (err == Z_OK && !ZLIBG(stream).avail_out) { - prev_outlen = outlen; - outlen *= 3; - if ((outlen + start_offset + end_offset) > *p_buffer_len) { - buffer = erealloc(buffer, outlen + start_offset + end_offset); - } - - ZLIBG(stream).next_out = buffer + start_offset + prev_outlen; - ZLIBG(stream).avail_out = prev_outlen * 2; - - err = deflate(&ZLIBG(stream), Z_SYNC_FLUSH); - } + int_value = zend_atoi(new_value, new_value_length); + ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 0); - if (do_end) { - err = deflate(&ZLIBG(stream), Z_FINISH); - buffer[outlen + start_offset - ZLIBG(stream).avail_out] = '\0'; + if (ini_value && *ini_value && int_value) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_CORE_ERROR, "Cannot use both zlib.output_compression and output_handler together!!"); + return FAILURE; } - *p_buffer = buffer; - *p_buffer_len = outlen - ZLIBG(stream).avail_out; - - return err; -} -/* }}} */ - -/* {{{ php_deflate_string - */ -static int php_deflate_string(const char *str, uint str_length, char **newstr, uint *new_length, zend_bool do_start, zend_bool do_end TSRMLS_DC) -{ - int err; - - if (do_start) { - ZLIBG(stream).zalloc = php_zlib_alloc; - ZLIBG(stream).zfree = php_zlib_free; - ZLIBG(stream).opaque = Z_NULL; - - switch (ZLIBG(compression_coding)) { - case CODING_GZIP: - /* windowBits is passed < 0 to suppress zlib header & trailer */ - if (deflateInit2(&ZLIBG(stream), ZLIBG(output_compression_level), Z_DEFLATED, -MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY) != Z_OK) { - /* TODO: print out error */ - return FAILURE; - } - - ZLIBG(crc) = crc32(0L, Z_NULL, 0); - break; - - case CODING_DEFLATE: - if (deflateInit(&ZLIBG(stream), ZLIBG(output_compression_level)) != Z_OK) { - /* TODO: print out error */ - return FAILURE; - } - break; + if (stage == PHP_INI_STAGE_RUNTIME) { + status = php_output_get_status(TSRMLS_C); + if (status & PHP_OUTPUT_SENT) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "Cannot change zlib.output_compression - headers already sent"); + return FAILURE; + } else if ((status & PHP_OUTPUT_WRITTEN) && int_value) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "Cannot enable zlib.output_compression - there has already been output"); + return FAILURE; } } - ZLIBG(stream).next_in = (Bytef *) str; - ZLIBG(stream).avail_in = (uInt) str_length; + status = OnUpdateLong(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); - if (ZLIBG(compression_coding) == CODING_GZIP) { - ZLIBG(crc) = crc32(ZLIBG(crc), (const Bytef *) str, str_length); - } + if (stage == PHP_INI_STAGE_RUNTIME && int_value) { + zval tmp; - err = php_do_deflate(str_length, (Bytef **) newstr, new_length, do_start, do_end TSRMLS_CC); - /* TODO: error handling (err may be Z_STREAM_ERROR, Z_BUF_ERROR, ?) */ - - if (do_start && ZLIBG(compression_coding) == CODING_GZIP) { - /* Write a very simple .gz header: */ - (*newstr)[0] = gz_magic[0]; - (*newstr)[1] = gz_magic[1]; - (*newstr)[2] = Z_DEFLATED; - (*newstr)[3] = (*newstr)[4] = (*newstr)[5] = (*newstr)[6] = (*newstr)[7] = (*newstr)[8] = 0; - (*newstr)[9] = OS_CODE; - *new_length += 10; - } - if (do_end) { - if (ZLIBG(compression_coding) == CODING_GZIP) { - char *trailer = (*newstr) + (*new_length); - - /* write crc & stream.total_in in LSB order */ - trailer[0] = (char) ZLIBG(crc) & 0xFF; - trailer[1] = (char) (ZLIBG(crc) >> 8) & 0xFF; - trailer[2] = (char) (ZLIBG(crc) >> 16) & 0xFF; - trailer[3] = (char) (ZLIBG(crc) >> 24) & 0xFF; - trailer[4] = (char) ZLIBG(stream).total_in & 0xFF; - trailer[5] = (char) (ZLIBG(stream).total_in >> 8) & 0xFF; - trailer[6] = (char) (ZLIBG(stream).total_in >> 16) & 0xFF; - trailer[7] = (char) (ZLIBG(stream).total_in >> 24) & 0xFF; - trailer[8] = '\0'; - *new_length += 8; + INIT_PZVAL(&tmp); + ZVAL_STRING(&tmp, PHP_ZLIB_OUTPUT_HANDLER_NAME, 1); + if (!php_output_handler_started(&tmp TSRMLS_CC)) { + php_zlib_output_compression_start(TSRMLS_C); } - deflateEnd(&ZLIBG(stream)); + zval_dtor(&tmp); } - - return SUCCESS; + return status; } /* }}} */ -/* {{{ proto string gzencode(string data [, int level [, int encoding_mode]]) - GZ encode a string */ -static PHP_FUNCTION(gzencode) +/* {{{ OnUpdate_zlib_output_handler */ +static PHP_INI_MH(OnUpdate_zlib_output_handler) { - char *data, *s2; - int data_len; - long level = Z_DEFAULT_COMPRESSION, coding = CODING_GZIP; - int status; - z_stream stream; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &data, &data_len, &level, &coding) == FAILURE) { - return; - } - - if ((level < -1) || (level > 9)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "compression level(%ld) must be within -1..9", level); - RETURN_FALSE; - } - - if ((coding != CODING_GZIP) && (coding != CODING_DEFLATE)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "encoding mode must be FORCE_GZIP or FORCE_DEFLATE"); - RETURN_FALSE; - } - - stream.zalloc = php_zlib_alloc; - stream.zfree = php_zlib_free; - stream.opaque = Z_NULL; - - stream.next_in = (Bytef *) data; - stream.avail_in = data_len; - - stream.avail_out = stream.avail_in + (stream.avail_in / PHP_ZLIB_MODIFIER) + 15 + 1; /* room for \0 */ - s2 = (char *) emalloc(stream.avail_out + GZIP_HEADER_LENGTH + (coding == CODING_GZIP ? GZIP_FOOTER_LENGTH : 0)); - - /* add gzip file header */ - s2[0] = gz_magic[0]; - s2[1] = gz_magic[1]; - s2[2] = Z_DEFLATED; - s2[3] = s2[4] = s2[5] = s2[6] = s2[7] = s2[8] = 0; /* time set to 0 */ - s2[9] = OS_CODE; - - stream.next_out = &(s2[GZIP_HEADER_LENGTH]); - - switch (coding) { - case CODING_GZIP: - /* windowBits is passed < 0 to suppress zlib header & trailer */ - if ((status = deflateInit2(&stream, level, Z_DEFLATED, -MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY)) != Z_OK) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); - RETURN_FALSE; - } - - break; - case CODING_DEFLATE: - if ((status = deflateInit(&stream, level)) != Z_OK) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); - RETURN_FALSE; - } - break; - } - - status = deflate(&stream, Z_FINISH); - if (status != Z_STREAM_END) { - deflateEnd(&stream); - if (status == Z_OK) { - status = Z_BUF_ERROR; - } - } else { - status = deflateEnd(&stream); + if (stage == PHP_INI_STAGE_RUNTIME && (php_output_get_status(TSRMLS_C) & PHP_OUTPUT_SENT)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "Cannot change zlib.output_handler - headers already sent"); + return FAILURE; } - if (status == Z_OK) { - /* resize to buffer to the "right" size */ - s2 = erealloc(s2, stream.total_out + GZIP_HEADER_LENGTH + (coding == CODING_GZIP ? GZIP_FOOTER_LENGTH : 0) + 1); - - if (coding == CODING_GZIP) { - char *trailer = s2 + (stream.total_out + GZIP_HEADER_LENGTH); - uLong crc = crc32(0L, Z_NULL, 0); - - crc = crc32(crc, (const Bytef *) data, data_len); - - /* write crc & stream.total_in in LSB order */ - trailer[0] = (char) crc & 0xFF; - trailer[1] = (char) (crc >> 8) & 0xFF; - trailer[2] = (char) (crc >> 16) & 0xFF; - trailer[3] = (char) (crc >> 24) & 0xFF; - trailer[4] = (char) stream.total_in & 0xFF; - trailer[5] = (char) (stream.total_in >> 8) & 0xFF; - trailer[6] = (char) (stream.total_in >> 16) & 0xFF; - trailer[7] = (char) (stream.total_in >> 24) & 0xFF; - trailer[8] = '\0'; - } else { - s2[stream.total_out + GZIP_HEADER_LENGTH + (coding == CODING_GZIP ? GZIP_FOOTER_LENGTH : 0)] = '\0'; - } - RETURN_STRINGL(s2, stream.total_out + GZIP_HEADER_LENGTH + (coding == CODING_GZIP ? GZIP_FOOTER_LENGTH : 0), 0); - } else { - efree(s2); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); - RETURN_FALSE; - } + return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); } /* }}} */ -/* {{{ php_ob_gzhandler_check - */ -int php_ob_gzhandler_check(TSRMLS_D) -{ - /* check for wrong usages */ - if (OG(ob_nesting_level > 0)) { - if (php_ob_handler_used("ob_gzhandler" TSRMLS_CC)) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "output handler 'ob_gzhandler' cannot be used twice"); - return FAILURE; - } - if (php_ob_handler_used("mb_output_handler" TSRMLS_CC)) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "output handler 'ob_gzhandler' cannot be used after 'mb_output_handler'"); - return FAILURE; - } - if (php_ob_handler_used("URL-Rewriter" TSRMLS_CC)) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "output handler 'ob_gzhandler' cannot be used after 'URL-Rewriter'"); - return FAILURE; - } - if (php_ob_init_conflict("ob_gzhandler", "zlib output compression" TSRMLS_CC)) { - return FAILURE; - } - } - - return SUCCESS; -} - +/* {{{ INI */ +PHP_INI_BEGIN() + STD_PHP_INI_BOOLEAN("zlib.output_compression", "0", PHP_INI_ALL, OnUpdate_zlib_output_compression, output_compression, zend_zlib_globals, zlib_globals) + STD_PHP_INI_ENTRY("zlib.output_compression_level", "-1", PHP_INI_ALL, OnUpdateLong, output_compression_level, zend_zlib_globals, zlib_globals) + STD_PHP_INI_ENTRY("zlib.output_handler", "", PHP_INI_ALL, OnUpdate_zlib_output_handler, output_handler, zend_zlib_globals, zlib_globals) +PHP_INI_END() /* }}} */ -/* {{{ proto string ob_gzhandler(string str, int mode) - Encode str based on accept-encoding setting - designed to be called from ob_start() */ -static PHP_FUNCTION(ob_gzhandler) +/* {{{ PHP_MINIT_FUNCTION */ +static PHP_MINIT_FUNCTION(zlib) { - char *string; - int string_len; - long mode; - zval **a_encoding; - zend_bool return_original = 0; - zend_bool do_start, do_end; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &string, &string_len, &mode) == FAILURE) { - return; - } - - if (ZLIBG(ob_gzhandler_status) == -1) { - RETURN_FALSE; - } - - zend_is_auto_global("_SERVER", sizeof("_SERVER")-1 TSRMLS_CC); - - if (!PG(http_globals)[TRACK_VARS_SERVER] - || zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), (void **) &a_encoding) == FAILURE - ) { - ZLIBG(ob_gzhandler_status) = -1; - RETURN_FALSE; - } - - convert_to_string_ex(a_encoding); - if (php_memnstr(Z_STRVAL_PP(a_encoding), "gzip", 4, Z_STRVAL_PP(a_encoding) + Z_STRLEN_PP(a_encoding))) { - ZLIBG(compression_coding) = CODING_GZIP; - } else if (php_memnstr(Z_STRVAL_PP(a_encoding), "deflate", 7, Z_STRVAL_PP(a_encoding) + Z_STRLEN_PP(a_encoding))) { - ZLIBG(compression_coding) = CODING_DEFLATE; - } else { - ZLIBG(ob_gzhandler_status) = -1; - RETURN_FALSE; - } - - do_start = ((mode & PHP_OUTPUT_HANDLER_START) ? 1 : 0); - do_end = ((mode & PHP_OUTPUT_HANDLER_END) ? 1 : 0); - Z_STRVAL_P(return_value) = NULL; - Z_STRLEN_P(return_value) = 0; + php_register_url_stream_wrapper("compress.zlib", &php_stream_gzip_wrapper TSRMLS_CC); + php_stream_filter_register_factory("zlib.*", &php_zlib_filter_factory TSRMLS_CC); - if (php_deflate_string(string, string_len, &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), do_start, do_end TSRMLS_CC) == SUCCESS) { - Z_TYPE_P(return_value) = IS_STRING; - if (do_start) { - switch (ZLIBG(compression_coding)) { - case CODING_GZIP: - if (sapi_add_header("Content-Encoding: gzip", sizeof("Content-Encoding: gzip") - 1, 1) == FAILURE) { - return_original = 1; - } - if (sapi_add_header_ex("Vary: Accept-Encoding", sizeof("Vary: Accept-Encoding") - 1, 1, 0 TSRMLS_CC)==FAILURE) { - return_original = 1; - } - break; - case CODING_DEFLATE: - if (sapi_add_header("Content-Encoding: deflate", sizeof("Content-Encoding: deflate") - 1, 1) == FAILURE) { - return_original = 1; - } - if (sapi_add_header_ex("Vary: Accept-Encoding", sizeof("Vary: Accept-Encoding") - 1, 1, 0 TSRMLS_CC)==FAILURE) { - return_original = 1; - } - break; - default: - return_original = 1; - break; - } - } + PHP_OUTPUT_ALIAS_REGISTER("ob_gzhandler", php_zlib_output_handler_init); + PHP_OUTPUT_CONFLICT_REGISTER("ob_gzhandler", php_zlib_output_conflict_check); + PHP_OUTPUT_CONFLICT_REGISTER(PHP_ZLIB_OUTPUT_HANDLER_NAME, php_zlib_output_conflict_check); - if (return_original) { - zval_dtor(return_value); - } + REGISTER_LONG_CONSTANT("FORCE_GZIP", PHP_ZLIB_ENCODING_GZIP, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FORCE_DEFLATE", PHP_ZLIB_ENCODING_DEFLATE, CONST_CS|CONST_PERSISTENT); - } else { - return_original = 1; - } + REGISTER_LONG_CONSTANT("ZLIB_ENCODING_RAW", PHP_ZLIB_ENCODING_RAW, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("ZLIB_ENCODING_GZIP", PHP_ZLIB_ENCODING_GZIP, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("ZLIB_ENCODING_DEFLATE", PHP_ZLIB_ENCODING_DEFLATE, CONST_CS|CONST_PERSISTENT); + REGISTER_INI_ENTRIES(); - if (return_original) { - /* return the original string */ - RETURN_STRINGL(string, string_len, 1); - } + return SUCCESS; } /* }}} */ -/* {{{ php_gzip_output_handler - */ -static void php_gzip_output_handler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC) +/* {{{ PHP_MSHUTDOWN_FUNCTION */ +static PHP_MSHUTDOWN_FUNCTION(zlib) { - zend_bool do_start, do_end; + php_unregister_url_stream_wrapper("zlib" TSRMLS_CC); + php_stream_filter_unregister_factory("zlib.*" TSRMLS_CC); - if (!ZLIBG(output_compression) || SG(sapi_headers).http_response_code == 204 || SG(sapi_headers).http_response_code == 304) { - *handled_output = NULL; - } else { - do_start = (mode & PHP_OUTPUT_HANDLER_START ? 1 : 0); - do_end = (mode & PHP_OUTPUT_HANDLER_END ? 1 : 0); - - if (do_start) { - if (!SG(headers_sent) && !SG(request_info).no_headers) { - switch (ZLIBG(compression_coding)) { - case CODING_GZIP: - sapi_add_header_ex(ZEND_STRL("Content-Encoding: gzip"), 1, 1 TSRMLS_CC); - break; - case CODING_DEFLATE: - sapi_add_header_ex(ZEND_STRL("Content-Encoding: deflate"), 1, 1 TSRMLS_CC); - break; - } - sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"), 1, 0 TSRMLS_CC); - } else { - /* Disable compression if headers can not be set (Fix for bug #49816) */ - ZLIBG(output_compression) = 0; - *handled_output = NULL; - return; - } - } + UNREGISTER_INI_ENTRIES(); - if (php_deflate_string(output, output_len, handled_output, handled_output_len, do_start, do_end TSRMLS_CC) != SUCCESS) { - zend_error(E_ERROR, "Compression failed"); - } - } + return SUCCESS; } /* }}} */ -/* {{{ php_enable_output_compression - */ -static int php_enable_output_compression(int buffer_size TSRMLS_DC) +/* {{{ PHP_RINIT_FUNCTION */ +static PHP_RINIT_FUNCTION(zlib) { - zval **a_encoding; - - zend_is_auto_global("_SERVER", sizeof("_SERVER")-1 TSRMLS_CC); - - if (!PG(http_globals)[TRACK_VARS_SERVER] - || zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), (void **) &a_encoding) == FAILURE - ) { - return FAILURE; - } - - convert_to_string_ex(a_encoding); - - if (php_memnstr(Z_STRVAL_PP(a_encoding), "gzip", 4, Z_STRVAL_PP(a_encoding) + Z_STRLEN_PP(a_encoding))) { - ZLIBG(compression_coding) = CODING_GZIP; - } else if (php_memnstr(Z_STRVAL_PP(a_encoding), "deflate", 7, Z_STRVAL_PP(a_encoding) + Z_STRLEN_PP(a_encoding))) { - ZLIBG(compression_coding) = CODING_DEFLATE; - } else { - return FAILURE; - } + ZLIBG(compression_coding) = 0; - php_ob_set_internal_handler(php_gzip_output_handler, (uint)buffer_size, "zlib output compression", 0 TSRMLS_CC); + php_zlib_output_compression_start(TSRMLS_C); - if (ZLIBG(output_handler) && strlen(ZLIBG(output_handler))) { - php_start_ob_buffer_named(ZLIBG(output_handler), 0, 1 TSRMLS_CC); - } return SUCCESS; } /* }}} */ -/* {{{ php_zlib_output_compression_start() */ -static int php_zlib_output_compression_start(TSRMLS_D) +/* {{{ PHP_MINFO_FUNCTION */ +static PHP_MINFO_FUNCTION(zlib) { - switch (ZLIBG(output_compression)) { - case 0: - break; - case 1: - ZLIBG(output_compression) = 4096; - /* break omitted intentionally */ - default: - /* ZLIBG(compression_coding) should be 0 when zlib compression hasn't been started yet.. */ - if (ZLIBG(compression_coding) == 0) { - return php_enable_output_compression(ZLIBG(output_compression) TSRMLS_CC); - } - } - return SUCCESS; + php_info_print_table_start(); + php_info_print_table_header(2, "ZLib Support", "enabled"); + php_info_print_table_row(2, "Stream Wrapper", "compress.zlib://"); + php_info_print_table_row(2, "Stream Filter", "zlib.inflate, zlib.deflate"); + php_info_print_table_row(2, "Compiled Version", ZLIB_VERSION); + php_info_print_table_row(2, "Linked Version", (char *) zlibVersion()); + php_info_print_table_end(); + + DISPLAY_INI_ENTRIES(); } /* }}} */ +/* {{{ php_zlib_module_entry */ +zend_module_entry php_zlib_module_entry = { + STANDARD_MODULE_HEADER, + "zlib", + php_zlib_functions, + PHP_MINIT(zlib), + PHP_MSHUTDOWN(zlib), + PHP_RINIT(zlib), + NULL, + PHP_MINFO(zlib), + "2.0", + PHP_MODULE_GLOBALS(zlib), + NULL, + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX +}; +/* }}} */ + /* * Local variables: * tab-width: 4 diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c index 4990cf0e1a..0f6c056390 100644 --- a/ext/zlib/zlib_filter.c +++ b/ext/zlib/zlib_filter.c @@ -80,8 +80,11 @@ static php_stream_filter_status_t php_zlib_inflate_filter( while (buckets_in->head) { size_t bin = 0, desired; + bucket = buckets_in->head; + bucket = php_stream_bucket_make_writeable(buckets_in->head TSRMLS_CC); - while (bin < bucket->buflen) { + + while (bin < (unsigned int) bucket->buflen) { if (data->finished) { consumed += bucket->buflen; @@ -107,7 +110,6 @@ static php_stream_filter_status_t php_zlib_inflate_filter( desired -= data->strm.avail_in; /* desired becomes what we consumed this round through */ data->strm.next_in = data->inbuf; data->strm.avail_in = 0; - consumed += desired; bin += desired; if (data->strm.avail_out < data->outbuf_len) { @@ -123,7 +125,9 @@ static php_stream_filter_status_t php_zlib_inflate_filter( php_stream_bucket_delref(bucket TSRMLS_CC); return PSFS_PASS_ON; } + } + consumed += bucket->buflen; php_stream_bucket_delref(bucket TSRMLS_CC); } @@ -202,9 +206,11 @@ static php_stream_filter_status_t php_zlib_deflate_filter( while (buckets_in->head) { size_t bin = 0, desired; - bucket = php_stream_bucket_make_writeable(buckets_in->head TSRMLS_CC); + bucket = buckets_in->head; + + bucket = php_stream_bucket_make_writeable(bucket TSRMLS_CC); - while (bin < bucket->buflen) { + while (bin < (unsigned int) bucket->buflen) { desired = bucket->buflen - bin; if (desired > data->inbuf_len) { desired = data->inbuf_len; @@ -221,7 +227,6 @@ static php_stream_filter_status_t php_zlib_deflate_filter( desired -= data->strm.avail_in; /* desired becomes what we consumed this round through */ data->strm.next_in = data->inbuf; data->strm.avail_in = 0; - consumed += desired; bin += desired; if (data->strm.avail_out < data->outbuf_len) { @@ -235,6 +240,7 @@ static php_stream_filter_status_t php_zlib_deflate_filter( exit_status = PSFS_PASS_ON; } } + consumed += bucket->buflen; php_stream_bucket_delref(bucket TSRMLS_CC); } @@ -258,6 +264,7 @@ static php_stream_filter_status_t php_zlib_deflate_filter( if (bytes_consumed) { *bytes_consumed = consumed; } + return exit_status; } @@ -291,7 +298,7 @@ static php_stream_filter *php_zlib_filter_create(const char *filtername, zval *f /* Create this filter */ data = pecalloc(1, sizeof(php_zlib_filter_data), persistent); if (!data) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", sizeof(php_zlib_filter_data)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes", sizeof(php_zlib_filter_data)); return NULL; } @@ -303,14 +310,14 @@ static php_stream_filter *php_zlib_filter_create(const char *filtername, zval *f data->strm.avail_out = data->outbuf_len = data->inbuf_len = 2048; data->strm.next_in = data->inbuf = (Bytef *) pemalloc(data->inbuf_len, persistent); if (!data->inbuf) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", data->inbuf_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes", data->inbuf_len); pefree(data, persistent); return NULL; } data->strm.avail_in = 0; data->strm.next_out = data->outbuf = (Bytef *) pemalloc(data->outbuf_len, persistent); if (!data->outbuf) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", data->outbuf_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes", data->outbuf_len); pefree(data->inbuf, persistent); pefree(data, persistent); return NULL; @@ -409,7 +416,7 @@ factory_setlevel: } break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid filter parameter, ignored."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid filter parameter, ignored"); } } status = deflateInit2(&(data->strm), level, Z_DEFLATED, windowBits, memLevel, 0); diff --git a/ext/zlib/zlib_fopen_wrapper.c b/ext/zlib/zlib_fopen_wrapper.c index 8970c55a00..c8b4263927 100644 --- a/ext/zlib/zlib_fopen_wrapper.c +++ b/ext/zlib/zlib_fopen_wrapper.c @@ -96,7 +96,7 @@ static int php_gziop_flush(php_stream *stream TSRMLS_DC) return gzflush(self->gz_file, Z_SYNC_FLUSH); } -static php_stream_ops php_stream_gzio_ops = { +php_stream_ops php_stream_gzio_ops = { php_gziop_write, php_gziop_read, php_gziop_close, php_gziop_flush, "ZLIB", diff --git a/main/SAPI.c b/main/SAPI.c index 3e8abb2706..abf2897a71 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -532,8 +532,8 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC) int http_response_code; if (SG(headers_sent) && !SG(request_info).no_headers) { - char *output_start_filename = php_get_output_start_filename(TSRMLS_C); - int output_start_lineno = php_get_output_start_lineno(TSRMLS_C); + char *output_start_filename = php_output_get_start_filename(TSRMLS_C); + int output_start_lineno = php_output_get_start_lineno(TSRMLS_C); if (output_start_filename) { sapi_module.sapi_error(E_WARNING, "Cannot modify header information - headers already sent by (output started at %s:%d)", diff --git a/main/main.c b/main/main.c index 79138df20a..77dbfe6b89 100644 --- a/main/main.c +++ b/main/main.c @@ -167,7 +167,6 @@ static PHP_INI_MH(OnChangeMemoryLimit) } /* }}} */ - /* {{{ php_disable_functions */ static void php_disable_functions(TSRMLS_D) @@ -256,6 +255,99 @@ static PHP_INI_MH(OnUpdateTimeout) } /* }}} */ +#define PHP_INI_OPTION_HEADERS_SENT(option_name) \ + if (SG(headers_sent)) { \ + char *output_start_filename = php_output_get_start_filename(TSRMLS_C); \ + int output_start_lineno = php_output_get_start_lineno(TSRMLS_C); \ + if (output_start_filename) { \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Option " #option_name " cannot be changed after headers have been sent (output started at %s:%d)", \ + output_start_filename, output_start_lineno); \ + } else { \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Option " #option_name " cannot be changed after headers have been sent"); \ + } \ + return FAILURE; \ + } + +/* {{{ PHP_INI_MH + */ +static PHP_INI_MH(OnUpdateDefaultCharset) +{ + if (stage == PHP_INI_STAGE_RUNTIME && !SG(request_info).no_headers) { + sapi_header_line ctr = {0}; + int mimetype_len; + + PHP_INI_OPTION_HEADERS_SENT(default_charset) + + mimetype_len = SG(default_mimetype) ? strlen(SG(default_mimetype)) : 0; + + if (new_value_length) { + ctr.line = emalloc( sizeof("Content-type: ")-1 + mimetype_len + sizeof("; charset=")-1 + new_value_length + 1); + + memcpy(ctr.line, "Content-type: ", sizeof("Content-type: ")); + memcpy(ctr.line + sizeof("Content-type: ")-1, SG(default_mimetype), mimetype_len); + memcpy(ctr.line + sizeof("Content-type: ")-1 + mimetype_len, "; charset=", sizeof("; charset=")); + memcpy(ctr.line + sizeof("Content-type: ")-1 + mimetype_len + sizeof("; charset=")-1, new_value, new_value_length); + + ctr.line_len = sizeof("Content-type: ")-1 + mimetype_len + sizeof("; charset=")-1 + new_value_length; + } else { + ctr.line = emalloc( sizeof("Content-type: ")-1 + mimetype_len + 1); + + memcpy(ctr.line, "Content-type: ", sizeof("Content-type: ")); + memcpy(ctr.line + sizeof("Content-type: ")-1, SG(default_mimetype), mimetype_len); + + ctr.line_len = sizeof("Content-type: ")-1 + mimetype_len; + } + ctr.line[ctr.line_len] = 0; + + sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC); + efree(ctr.line); + } + + OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); + return SUCCESS; +} +/* }}} */ + +/* {{{ PHP_INI_MH + */ +static PHP_INI_MH(OnUpdateDefaultMimetype) +{ + if (stage == PHP_INI_STAGE_RUNTIME && !SG(request_info).no_headers) { + sapi_header_line ctr = {0}; + int charset_len; + + PHP_INI_OPTION_HEADERS_SENT(default_mimetype) + + charset_len = SG(default_charset) ? strlen(SG(default_charset)) : 0; + + if (charset_len) { + ctr.line = emalloc( sizeof("Content-type: ")-1 + new_value_length + sizeof("; charset=")-1 + charset_len + 1); + + memcpy(ctr.line, "Content-type: ", sizeof("Content-type: ")); + memcpy(ctr.line + sizeof("Content-type: ")-1, new_value, new_value_length); + memcpy(ctr.line + sizeof("Content-type: ")-1 + new_value_length, "; charset=", sizeof("; charset=")); + memcpy(ctr.line + sizeof("Content-type: ")-1 + new_value_length + sizeof("; charset=")-1, SG(default_charset), charset_len); + + ctr.line_len = sizeof("Content-type: ")-1 + new_value_length + sizeof("; charset=")-1 + new_value_length; + } else { + ctr.line = emalloc( sizeof("Content-type: ")-1 + new_value_length + 1); + + memcpy(ctr.line, "Content-type: ", sizeof("Content-type: ")); + memcpy(ctr.line + sizeof("Content-type: ")-1, new_value, new_value_length); + + ctr.line_len = sizeof("Content-type: ")-1 + new_value_length; + } + ctr.line[ctr.line_len] = 0; + + sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC); + efree(ctr.line); + } + + OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); + return SUCCESS; +} +/* }}} */ + /* {{{ php_get_display_errors_mode() helper function */ static int php_get_display_errors_mode(char *value, int value_length) @@ -282,7 +374,6 @@ static int php_get_display_errors_mode(char *value, int value_length) mode = PHP_DISPLAY_ERRORS_STDOUT; } } - return mode; } /* }}} */ @@ -358,7 +449,6 @@ static PHP_INI_MH(OnUpdateErrorLog) if (PG(open_basedir) && php_check_open_basedir(new_value TSRMLS_CC)) { return FAILURE; } - } OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); return SUCCESS; @@ -378,13 +468,13 @@ static PHP_INI_MH(OnUpdateMailLog) if (PG(open_basedir) && php_check_open_basedir(new_value TSRMLS_CC)) { return FAILURE; } - } OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); return SUCCESS; } /* }}} */ + /* {{{ PHP_INI_MH */ static PHP_INI_MH(OnChangeMailForceExtra) @@ -410,7 +500,7 @@ static PHP_INI_MH(OnChangeMailForceExtra) */ #ifndef PHP_SAFE_MODE_EXEC_DIR -# define PHP_SAFE_MODE_EXEC_DIR "" +# define PHP_SAFE_MODE_EXEC_DIR "" #endif /* Windows and Netware use the internal mail */ @@ -482,8 +572,8 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("auto_append_file", NULL, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateString, auto_append_file, php_core_globals, core_globals) STD_PHP_INI_ENTRY("auto_prepend_file", NULL, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateString, auto_prepend_file, php_core_globals, core_globals) STD_PHP_INI_ENTRY("doc_root", NULL, PHP_INI_SYSTEM, OnUpdateStringUnempty, doc_root, php_core_globals, core_globals) - STD_PHP_INI_ENTRY("default_charset", SAPI_DEFAULT_CHARSET, PHP_INI_ALL, OnUpdateString, default_charset, sapi_globals_struct,sapi_globals) - STD_PHP_INI_ENTRY("default_mimetype", SAPI_DEFAULT_MIMETYPE, PHP_INI_ALL, OnUpdateString, default_mimetype, sapi_globals_struct,sapi_globals) + STD_PHP_INI_ENTRY("default_charset", SAPI_DEFAULT_CHARSET, PHP_INI_ALL, OnUpdateDefaultCharset, default_charset, sapi_globals_struct,sapi_globals) + STD_PHP_INI_ENTRY("default_mimetype", SAPI_DEFAULT_MIMETYPE, PHP_INI_ALL, OnUpdateDefaultMimetype, default_mimetype, sapi_globals_struct,sapi_globals) STD_PHP_INI_ENTRY("error_log", NULL, PHP_INI_ALL, OnUpdateErrorLog, error_log, php_core_globals, core_globals) STD_PHP_INI_ENTRY("extension_dir", PHP_EXTENSION_DIR, PHP_INI_SYSTEM, OnUpdateStringUnempty, extension_dir, php_core_globals, core_globals) STD_PHP_INI_ENTRY("include_path", PHP_INCLUDE_PATH, PHP_INI_ALL, OnUpdateStringUnempty, include_path, php_core_globals, core_globals) @@ -645,11 +735,11 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c int buffer_len = 0; char *space = ""; char *class_name = ""; - char *function; int origin_len; + char *function = NULL; char *origin; char *message; - int is_function = 0; + char *stage = "Unknown"; /* get error text into buffer and escape for html if necessary */ buffer_len = vspprintf(&buffer, 0, format, args); @@ -663,9 +753,9 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c /* which function caused the problem if any at all */ if (php_during_module_startup()) { - function = "PHP Startup"; + stage = "PHP Startup"; } else if (php_during_module_shutdown()) { - function = "PHP Shutdown"; + stage = "PHP Shutdown"; } else if (EG(current_execute_data) && EG(current_execute_data)->opline && EG(current_execute_data)->opline->opcode == ZEND_INCLUDE_OR_EVAL @@ -673,42 +763,37 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c switch (EG(current_execute_data)->opline->op2.u.constant.value.lval) { case ZEND_EVAL: function = "eval"; - is_function = 1; break; case ZEND_INCLUDE: function = "include"; - is_function = 1; break; case ZEND_INCLUDE_ONCE: function = "include_once"; - is_function = 1; break; case ZEND_REQUIRE: function = "require"; - is_function = 1; break; case ZEND_REQUIRE_ONCE: function = "require_once"; - is_function = 1; break; default: - function = "Unknown"; + stage = "Unknown"; } } else { function = get_active_function_name(TSRMLS_C); if (!function || !strlen(function)) { - function = "Unknown"; + stage = "Unknown"; + function = NULL; } else { - is_function = 1; class_name = get_active_class_name(&space TSRMLS_CC); } } /* if we still have memory then format the origin */ - if (is_function) { + if (function) { origin_len = spprintf(&origin, 0, "%s%s%s(%s)", class_name, space, function, params); } else { - origin_len = spprintf(&origin, 0, "%s", function); + origin_len = spprintf(&origin, 0, "%s", stage); } if (PG(html_errors)) { @@ -725,7 +810,7 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c } /* no docref given but function is known (the default) */ - if (!docref && is_function) { + if (!docref && function) { int doclen; if (space[0] == '\0') { doclen = spprintf(&docref_buf, 0, "function.%s", function); @@ -742,7 +827,7 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c * - we show erroes in html mode OR * - the user wants to see the links anyway */ - if (docref && is_function && (PG(html_errors) || strlen(PG(docref_root)))) { + if (docref && function && (PG(html_errors) || strlen(PG(docref_root)))) { if (strncmp(docref, "http://", 7)) { /* We don't have 'http://' so we use docref_root */ @@ -795,6 +880,7 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c } if (EG(active_symbol_table)) { zval *tmp; + ALLOC_INIT_ZVAL(tmp); ZVAL_STRINGL(tmp, buffer, buffer_len, 1); zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) &tmp, sizeof(zval *), NULL); @@ -850,7 +936,8 @@ PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, #ifdef PHP_WIN32 #define PHP_WIN32_ERROR_MSG_BUFFER_SIZE 512 -PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2 TSRMLS_DC) { +PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2 TSRMLS_DC) +{ if (error == 0) { php_error_docref2(NULL TSRMLS_CC, param1, param2, E_WARNING, "%s", strerror(errno)); } else { @@ -1001,6 +1088,9 @@ static void php_error_cb(int type, const char *error_filename, const uint error_ php_log_err(log_buffer TSRMLS_CC); efree(log_buffer); } +<<<<<<< .mine + if (PG(display_errors) && ((module_initialized && !PG(during_request_startup)) || (PG(display_startup_errors)))) { +======= if (PG(display_errors) && ((module_initialized && !PG(during_request_startup)) @@ -1010,6 +1100,7 @@ static void php_error_cb(int type, const char *error_filename, const uint error_ ) ) { +>>>>>>> .r294302 if (PG(xmlrpc_errors)) { php_printf("<?xml version=\"1.0\"?><methodResponse><fault><value><struct><member><name>faultCode</name><value><int>%ld</int></value></member><member><name>faultString</name><value><string>%s:%s in %s on line %d</string></value></member></struct></value></fault></methodResponse>", PG(xmlrpc_error_number), error_type_str, buffer, error_filename, error_lineno); } else { @@ -1105,19 +1196,18 @@ static void php_error_cb(int type, const char *error_filename, const uint error_ efree(buffer); return; } - if (PG(track_errors) && module_initialized) { if (!EG(active_symbol_table)) { zend_rebuild_symbol_table(TSRMLS_C); } if (EG(active_symbol_table)) { zval *tmp; + ALLOC_INIT_ZVAL(tmp); ZVAL_STRINGL(tmp, buffer, buffer_len, 1); zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) & tmp, sizeof(zval *), NULL); } } - efree(buffer); } /* }}} */ @@ -1280,11 +1370,11 @@ static void php_message_handler_for_zend(long message, void *data TSRMLS_DC) snprintf(memory_leak_buf, 512, "Last leak repeated %ld time%s\n", leak_count, (leak_count>1?"s":"")); } -# if defined(PHP_WIN32) +# if defined(PHP_WIN32) OutputDebugString(memory_leak_buf); -# else +# else fprintf(stderr, "%s", memory_leak_buf); -# endif +# endif } #endif break; @@ -1294,11 +1384,11 @@ static void php_message_handler_for_zend(long message, void *data TSRMLS_DC) char memory_leak_buf[512]; snprintf(memory_leak_buf, 512, "=== Total %d memory leaks detected ===\n", *((zend_uint *) data)); -# if defined(PHP_WIN32) +# if defined(PHP_WIN32) OutputDebugString(memory_leak_buf); -# else +# else fprintf(stderr, "%s", memory_leak_buf); -# endif +# endif } #endif break; @@ -1317,24 +1407,24 @@ static void php_message_handler_for_zend(long message, void *data TSRMLS_DC) } else { snprintf(memory_leak_buf, sizeof(memory_leak_buf), "[null] Script: '%s'\n", SAFE_FILENAME(SG(request_info).path_translated)); } -# if defined(PHP_WIN32) +# if defined(PHP_WIN32) OutputDebugString(memory_leak_buf); -# else +# else fprintf(stderr, "%s", memory_leak_buf); -# endif +#endif } break; } } /* }}} */ - -void php_on_timeout(int seconds TSRMLS_DC) +void php_on_timeout(int seconds TSRMLS_DC) /* {{{ */ { PG(connection_status) |= PHP_CONNECTION_TIMEOUT; zend_set_timeout(EG(timeout_seconds), 1); if(PG(exit_on_timeout)) sapi_terminate_process(TSRMLS_C); } +/* }}} */ #if PHP_SIGCHILD /* {{{ sigchld_handler @@ -1353,7 +1443,7 @@ static int php_start_sapi(TSRMLS_D) { int retval = SUCCESS; - if(!SG(sapi_started)) { + if (!SG(sapi_started)) { zend_try { PG(during_request_startup) = 1; @@ -1423,15 +1513,16 @@ int php_request_startup(TSRMLS_D) } if (PG(output_handler) && PG(output_handler)[0]) { - php_start_ob_buffer_named(PG(output_handler), 0, 1 TSRMLS_CC); + zval *oh; + + MAKE_STD_ZVAL(oh); + ZVAL_STRING(oh, PG(output_handler), 1); + php_output_start_user(oh, 0, PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC); + zval_ptr_dtor(&oh); } else if (PG(output_buffering)) { - if (PG(output_buffering)>1) { - php_start_ob_buffer(NULL, PG(output_buffering), 1 TSRMLS_CC); - } else { - php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC); - } + php_output_start_user(NULL, PG(output_buffering) > 1 ? PG(output_buffering) : 0, PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC); } else if (PG(implicit_flush)) { - php_start_implicit_flush(TSRMLS_C); + php_output_set_implicit_flush(1 TSRMLS_CC); } /* We turn this off in php_execute_script() */ @@ -1467,7 +1558,6 @@ int php_request_startup(TSRMLS_D) zend_try { PG(during_request_startup) = 1; - php_output_activate(TSRMLS_C); if (PG(expose_php)) { sapi_add_header(SAPI_PHP_VERSION_HEADER, sizeof(SAPI_PHP_VERSION_HEADER)-1, 1); } @@ -1590,14 +1680,22 @@ void php_request_shutdown(void *dummy) /* 3. Flush all output buffers */ zend_try { zend_bool send_buffer = SG(request_info).headers_only ? 0 : 1; + if (CG(unclean_shutdown) && PG(last_error_type) == E_ERROR && - OG(ob_nesting_level) && !OG(active_ob_buffer).chunk_size && PG(memory_limit) < zend_memory_usage(1 TSRMLS_CC)) { + PG(memory_limit) < zend_memory_usage(1 TSRMLS_CC) + ) { send_buffer = 0; } - php_end_ob_buffers(send_buffer TSRMLS_CC); + + if (!send_buffer) { + php_output_discard_all(TSRMLS_C); + } else { + php_output_end_all(TSRMLS_C); + } + php_output_deactivate(TSRMLS_C); } zend_end_try(); - /* 4. Send the set HTTP headers (note: This must be done AFTER php_end_ob_buffers() !!) */ + /* 4. Send the set HTTP headers (note: This must be done AFTER php_output_discard_all() / php_output_end_all() !!) */ zend_try { sapi_send_headers(TSRMLS_C); } zend_end_try(); @@ -1679,12 +1777,12 @@ PHPAPI void php_com_initialize(TSRMLS_D) } /* }}} */ -/* {{{ php_body_write_wrapper +/* {{{ php_output_wrapper */ -static int php_body_write_wrapper(const char *str, uint str_length) +static int php_output_wrapper(const char *str, uint str_length) { TSRMLS_FETCH(); - return php_body_write(str, str_length TSRMLS_CC); + return php_output_write(str, str_length TSRMLS_CC); } /* }}} */ @@ -1837,7 +1935,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod zuf.error_function = php_error_cb; zuf.printf_function = php_printf; - zuf.write_function = php_body_write_wrapper; + zuf.write_function = php_output_wrapper; zuf.fopen_function = php_fopen_wrapper_for_zend; zuf.message_handler = php_message_handler_for_zend; zuf.block_interruptions = sapi_module.block_interruptions; @@ -1913,18 +2011,18 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod le_index_ptr = zend_register_list_destructors_ex(NULL, NULL, "index pointer", 0); /* Register constants */ - REGISTER_MAIN_STRINGL_CONSTANT("PHP_VERSION", PHP_VERSION, sizeof(PHP_VERSION)-1, CONST_PERSISTENT | CONST_CS); - REGISTER_MAIN_LONG_CONSTANT("PHP_MAJOR_VERSION", PHP_MAJOR_VERSION, CONST_PERSISTENT | CONST_CS); - REGISTER_MAIN_LONG_CONSTANT("PHP_MINOR_VERSION", PHP_MINOR_VERSION, CONST_PERSISTENT | CONST_CS); - REGISTER_MAIN_LONG_CONSTANT("PHP_RELEASE_VERSION", PHP_RELEASE_VERSION, CONST_PERSISTENT | CONST_CS); - REGISTER_MAIN_STRINGL_CONSTANT("PHP_EXTRA_VERSION", PHP_EXTRA_VERSION, sizeof(PHP_EXTRA_VERSION) - 1, CONST_PERSISTENT | CONST_CS); - REGISTER_MAIN_LONG_CONSTANT("PHP_VERSION_ID", PHP_VERSION_ID, CONST_PERSISTENT | CONST_CS); #ifdef ZTS REGISTER_MAIN_LONG_CONSTANT("PHP_ZTS", 1, CONST_PERSISTENT | CONST_CS); #else REGISTER_MAIN_LONG_CONSTANT("PHP_ZTS", 0, CONST_PERSISTENT | CONST_CS); #endif + REGISTER_MAIN_LONG_CONSTANT("PHP_MAJOR_VERSION", PHP_MAJOR_VERSION, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT("PHP_MINOR_VERSION", PHP_MINOR_VERSION, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT("PHP_RELEASE_VERSION", PHP_RELEASE_VERSION, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_EXTRA_VERSION", PHP_EXTRA_VERSION, sizeof(PHP_EXTRA_VERSION) - 1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT("PHP_VERSION_ID", PHP_VERSION_ID, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("PHP_DEBUG", PHP_DEBUG, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_VERSION", PHP_VERSION, sizeof(PHP_VERSION)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_OS", php_os, strlen(php_os), CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_SAPI", sapi_module.name, strlen(sapi_module.name), CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("DEFAULT_INCLUDE_PATH", PHP_INCLUDE_PATH, sizeof(PHP_INCLUDE_PATH)-1, CONST_PERSISTENT | CONST_CS); @@ -2149,17 +2247,22 @@ void php_module_shutdown(TSRMLS_D) #ifndef ZTS zend_ini_shutdown(TSRMLS_C); shutdown_memory_manager(CG(unclean_shutdown), 1 TSRMLS_CC); - core_globals_dtor(&core_globals TSRMLS_CC); - gc_globals_dtor(TSRMLS_C); #else zend_ini_global_shutdown(TSRMLS_C); - ts_free_id(core_globals_id); #endif + php_output_shutdown(); php_shutdown_temporary_directory(); module_initialized = 0; +#ifndef ZTS + core_globals_dtor(&core_globals TSRMLS_CC); + gc_globals_dtor(TSRMLS_C); +#else + ts_free_id(core_globals_id); +#endif + #if defined(PHP_WIN32) && defined(_MSC_VER) && (_MSC_VER >= 1400) if (old_invalid_parameter_handler == NULL) { _set_invalid_parameter_handler(old_invalid_parameter_handler); @@ -2320,7 +2423,7 @@ PHPAPI void php_handle_aborted_connection(void) TSRMLS_FETCH(); PG(connection_status) = PHP_CONNECTION_ABORTED; - php_output_set_status(0 TSRMLS_CC); + php_output_set_status(PHP_OUTPUT_DISABLED TSRMLS_CC); if (!PG(ignore_user_abort)) { zend_bailout(); @@ -2338,7 +2441,7 @@ PHPAPI int php_handle_auth_data(const char *auth TSRMLS_DC) char *pass; char *user; - user = php_base64_decode(auth + 6, strlen(auth) - 6, NULL); + user = (char*)php_base64_decode((unsigned char*)auth + 6, strlen(auth) - 6, NULL); if (user) { pass = strchr(user, ':'); if (pass) { diff --git a/main/output.c b/main/output.c index bee6ef8aa8..e6074e12ba 100644 --- a/main/output.c +++ b/main/output.c @@ -1,4 +1,4 @@ -/* +/* +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ @@ -15,775 +15,1288 @@ | Authors: Zeev Suraski <zeev@zend.com> | | Thies C. Arntzen <thies@thieso.net> | | Marcus Boerger <helly@php.net> | + | New API: Michael Wallner <mike@php.net> | +----------------------------------------------------------------------+ */ /* $Id$ */ +#ifndef PHP_OUTPUT_DEBUG +# define PHP_OUTPUT_DEBUG 0 +#endif +#ifndef PHP_OUTPUT_NOINLINE +# define PHP_OUTPUT_NOINLINE 0 +#endif + #include "php.h" #include "ext/standard/head.h" -#include "ext/standard/basic_functions.h" #include "ext/standard/url_scanner_ex.h" -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) -#include "ext/zlib/php_zlib.h" -#endif #include "SAPI.h" +#include "zend_stack.h" +#include "php_output.h" -#define OB_DEFAULT_HANDLER_NAME "default output handler" - -/* output functions */ -static int php_b_body_write(const char *str, uint str_length TSRMLS_DC); +ZEND_DECLARE_MODULE_GLOBALS(output); -static int php_ob_init(uint initial_size, uint block_size, zval *output_handler, uint chunk_size, zend_bool erase TSRMLS_DC); -static void php_ob_append(const char *text, uint text_length TSRMLS_DC); -#if 0 -static void php_ob_prepend(const char *text, uint text_length); +#if PHP_OUTPUT_NOINLINE || PHP_OUTPUT_DEBUG +# undef inline +# define inline #endif -#ifdef ZTS -int output_globals_id; -#else -php_output_globals output_globals; -#endif +/* {{{ aliases, conflict and reverse conflict hash tables */ +static HashTable php_output_handler_aliases; +static HashTable php_output_handler_conflicts; +static HashTable php_output_handler_reverse_conflicts; +/* }}} */ + +/* {{{ forward declarations */ +static inline int php_output_lock_error(int op TSRMLS_DC); +static inline void php_output_op(int op, const char *str, size_t len TSRMLS_DC); + +#define php_output_handler_init(n, cs, f) php_output_handler_init_ex((n), (cs), (f) TSRMLS_CC) +static inline php_output_handler *php_output_handler_init_ex(zval *name, size_t chunk_size, int flags TSRMLS_DC); +static inline php_output_handler_status_t php_output_handler_op(php_output_handler *handler, php_output_context *context); +static inline int php_output_handler_append(php_output_handler *handler, const php_output_buffer *buf TSRMLS_DC); +static inline zval *php_output_handler_status(php_output_handler *handler, zval *entry); + +static inline php_output_context *php_output_context_init(php_output_context *context, int op TSRMLS_DC); +static inline void php_output_context_reset(php_output_context *context); +static inline void php_output_context_swap(php_output_context *context); +static inline void php_output_context_dtor(php_output_context *context); + +static inline int php_output_stack_pop(int flags TSRMLS_DC); + +static int php_output_stack_apply_op(void *h, void *c); +static int php_output_stack_apply_clean(void *h, void *c); +static int php_output_stack_apply_list(void *h, void *z); +static int php_output_stack_apply_status(void *h, void *z); -/* {{{ php_default_output_func */ -PHPAPI int php_default_output_func(const char *str, uint str_len TSRMLS_DC) +static int php_output_handler_compat_func(void **handler_context, php_output_context *output_context); +static int php_output_handler_default_func(void **handler_context, php_output_context *output_context); +static int php_output_handler_devnull_func(void **handler_context, php_output_context *output_context); +/* }}} */ + +/* {{{ static void php_output_init_globals(zend_output_globals *G) + Initialize the module globals on MINIT */ +static inline void php_output_init_globals(zend_output_globals *G) { - fwrite(str, 1, str_len, stderr); -/* See http://support.microsoft.com/kb/190351 */ -#ifdef PHP_WIN32 - fflush(stderr); -#endif - return str_len; + memset(G, 0, sizeof(*G)); } /* }}} */ -/* {{{ php_output_init_globals */ -static void php_output_init_globals(php_output_globals *output_globals_p TSRMLS_DC) +/* {{{ void php_output_startup(void) + Set up module globals and initalize the conflict and reverse conflict hash tables */ +PHPAPI void php_output_startup(void) { - OG(php_body_write) = php_default_output_func; - OG(php_header_write) = php_default_output_func; - OG(implicit_flush) = 0; - OG(output_start_filename) = NULL; - OG(output_start_lineno) = 0; + ZEND_INIT_MODULE_GLOBALS(output, php_output_init_globals, NULL); + zend_hash_init(&php_output_handler_aliases, 0, NULL, NULL, 1); + zend_hash_init(&php_output_handler_conflicts, 0, NULL, NULL, 1); + zend_hash_init(&php_output_handler_reverse_conflicts, 0, NULL, (void (*)(void *)) zend_hash_destroy, 1); } /* }}} */ +/* {{{ void php_output_shutdown(void) + Destroy module globals and the conflict and reverse conflict hash tables */ +PHPAPI void php_output_shutdown(void) +{ + zend_hash_destroy(&php_output_handler_aliases); + zend_hash_destroy(&php_output_handler_conflicts); + zend_hash_destroy(&php_output_handler_reverse_conflicts); +} +/* }}} */ -/* {{{ php_output_startup - Start output layer */ -PHPAPI void php_output_startup(void) +/* {{{ SUCCESS|FAILURE php_output_activate(TSRMLS_D) + Reset output globals and setup the output handler stack */ +PHPAPI int php_output_activate(TSRMLS_D) { #ifdef ZTS - ts_allocate_id(&output_globals_id, sizeof(php_output_globals), (ts_allocate_ctor) php_output_init_globals, NULL); -#else - php_output_init_globals(&output_globals TSRMLS_CC); + memset((*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(output_globals_id)], 0, sizeof(zend_output_globals)); +#else + memset(&output_globals, 0, sizeof(zend_output_globals)); #endif + + OG(handlers) = emalloc(sizeof(zend_stack)); + if (SUCCESS != zend_stack_init(OG(handlers))) { + return FAILURE; + } + + MAKE_STD_ZVAL(OG(default_output_handler_name)); + ZVAL_STRINGL(OG(default_output_handler_name), "default output handler", sizeof("default output handler")-1, 1); + MAKE_STD_ZVAL(OG(devnull_output_handler_name)); + ZVAL_STRINGL(OG(devnull_output_handler_name), "null output handler", sizeof("null output handler")-1, 1); + + return SUCCESS; } /* }}} */ - -/* {{{ php_output_activate - Initilize output global for activation */ -PHPAPI void php_output_activate(TSRMLS_D) +/* {{{ void php_output_deactivate(TSRMLS_D) + Destroy the output handler stack */ +PHPAPI void php_output_deactivate(TSRMLS_D) { - OG(php_body_write) = php_ub_body_write; - OG(php_header_write) = sapi_module.ub_write; - OG(ob_nesting_level) = 0; - OG(ob_lock) = 0; - OG(disable_output) = 0; - OG(output_start_filename) = NULL; - OG(output_start_lineno) = 0; + php_output_handler **handler = NULL; + + OG(active) = NULL; + OG(running) = NULL; + + /* release all output handlers */ + if (OG(handlers)) { + while (SUCCESS == zend_stack_top(OG(handlers), (void *) &handler)) { + php_output_handler_free(handler TSRMLS_CC); + zend_stack_del_top(OG(handlers)); + } + zend_stack_destroy(OG(handlers)); + efree(OG(handlers)); + OG(handlers) = NULL; + } + + if (OG(default_output_handler_name)) { + zval_ptr_dtor(&OG(default_output_handler_name)); + OG(default_output_handler_name) = NULL; + } + if (OG(devnull_output_handler_name)) { + zval_ptr_dtor(&OG(devnull_output_handler_name)); + OG(devnull_output_handler_name) = NULL; + } } /* }}} */ +/* {{{ void php_output_register_constants() */ +PHPAPI void php_output_register_constants(TSRMLS_D) +{ + REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_START", PHP_OUTPUT_HANDLER_START, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_WRITE", PHP_OUTPUT_HANDLER_WRITE, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_FLUSH", PHP_OUTPUT_HANDLER_FLUSH, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_CLEAN", PHP_OUTPUT_HANDLER_CLEAN, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_FINAL", PHP_OUTPUT_HANDLER_FINAL, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_CONT", PHP_OUTPUT_HANDLER_WRITE, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_END", PHP_OUTPUT_HANDLER_FINAL, CONST_CS | CONST_PERSISTENT); + + REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_CLEANABLE", PHP_OUTPUT_HANDLER_CLEANABLE, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_FLUSHABLE", PHP_OUTPUT_HANDLER_FLUSHABLE, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_REMOVABLE", PHP_OUTPUT_HANDLER_REMOVABLE, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_STDFLAGS", PHP_OUTPUT_HANDLER_STDFLAGS, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_STARTED", PHP_OUTPUT_HANDLER_STARTED, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_DISABLED", PHP_OUTPUT_HANDLER_DISABLED, CONST_CS | CONST_PERSISTENT); +} +/* }}} */ -/* {{{ php_output_set_status - Toggle output status. Do NOT use in application code, only in SAPIs where appropriate. */ -PHPAPI void php_output_set_status(zend_bool status TSRMLS_DC) +/* {{{ void php_output_set_status(int status TSRMLS_DC) + Used by SAPIs to disable output */ +PHPAPI void php_output_set_status(int status TSRMLS_DC) { - OG(disable_output) = !status; + OG(flags) = status & 0xf; } /* }}} */ -/* {{{ php_output_register_constants */ -void php_output_register_constants(TSRMLS_D) +/* {{{ int php_output_get_status(TSRMLS_C) + Get output control status */ +PHPAPI int php_output_get_status(TSRMLS_D) { - REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_START", PHP_OUTPUT_HANDLER_START, CONST_CS | CONST_PERSISTENT); - REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_CONT", PHP_OUTPUT_HANDLER_CONT, CONST_CS | CONST_PERSISTENT); - REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_END", PHP_OUTPUT_HANDLER_END, CONST_CS | CONST_PERSISTENT); + return OG(flags) + | (OG(active) ? PHP_OUTPUT_ACTIVE : 0) + | (OG(running)? PHP_OUTPUT_LOCKED : 0); } /* }}} */ +/* {{{ zval *php_output_get_default_handler_name(TSRMLS_C) */ +PHPAPI zval *php_output_get_default_handler_name(TSRMLS_D) +{ + return OG(default_output_handler_name); +} +/* }}} */ -/* {{{ php_body_write - * Write body part */ -PHPAPI int php_body_write(const char *str, uint str_length TSRMLS_DC) +/* {{{ zval *php_output_get_devnull_handler_name(TSRMLS_C) */ +PHPAPI zval *php_output_get_devnull_handler_name(TSRMLS_D) { - return OG(php_body_write)(str, str_length TSRMLS_CC); + return OG(devnull_output_handler_name); } /* }}} */ -/* {{{ php_header_write - * Write HTTP header */ -PHPAPI int php_header_write(const char *str, uint str_length TSRMLS_DC) +/* {{{ int php_output_write_unbuffered(const char *str, size_t len TSRMLS_DC) + Unbuffered write */ +PHPAPI int php_output_write_unbuffered(const char *str, size_t len TSRMLS_DC) { - if (OG(disable_output)) { + if (OG(flags) & PHP_OUTPUT_DISABLED) { return 0; - } else { - return OG(php_header_write)(str, str_length TSRMLS_CC); } + return sapi_module.ub_write(str, len TSRMLS_CC); } /* }}} */ -/* {{{ php_start_ob_buffer - * Start output buffering */ -PHPAPI int php_start_ob_buffer(zval *output_handler, uint chunk_size, zend_bool erase TSRMLS_DC) +/* {{{ int php_output_write(const char *str, size_t len TSRMLS_DC) + Buffered write */ +PHPAPI int php_output_write(const char *str, size_t len TSRMLS_DC) { - uint initial_size, block_size; - - if (OG(ob_lock)) { - if (SG(headers_sent) && !SG(request_info).headers_only) { - OG(php_body_write) = php_ub_body_write_no_header; - } else { - OG(php_body_write) = php_ub_body_write; - } - OG(ob_nesting_level) = 0; - php_error_docref("ref.outcontrol" TSRMLS_CC, E_ERROR, "Cannot use output buffering in output buffering display handlers"); - return FAILURE; + if (OG(flags) & PHP_OUTPUT_DISABLED) { + return 0; } - if (chunk_size > 0) { - if (chunk_size==1) { - chunk_size = 4096; + php_output_op(PHP_OUTPUT_HANDLER_WRITE, str, len TSRMLS_CC); + return (int) len; +} +/* }}} */ + +/* {{{ SUCCESS|FAILURE php_output_flush(TSRMLS_D) + Flush the most recent output handlers buffer */ +PHPAPI int php_output_flush(TSRMLS_D) +{ + php_output_context context; + + if (OG(active) && (OG(active)->flags & PHP_OUTPUT_HANDLER_FLUSHABLE)) { + php_output_context_init(&context, PHP_OUTPUT_HANDLER_FLUSH TSRMLS_CC); + php_output_handler_op(OG(active), &context); + if (context.out.data && context.out.used) { + zend_stack_del_top(OG(handlers)); + php_output_write(context.out.data, context.out.used TSRMLS_CC); + zend_stack_push(OG(handlers), &OG(active), sizeof(php_output_handler *)); } - initial_size = (chunk_size*3/2); - block_size = chunk_size/2; - } else { - initial_size = 40*1024; - block_size = 10*1024; + php_output_context_dtor(&context); + return SUCCESS; } - return php_ob_init(initial_size, block_size, output_handler, chunk_size, erase TSRMLS_CC); + return FAILURE; } /* }}} */ -/* {{{ php_start_ob_buffer_named - * Start output buffering */ -PHPAPI int php_start_ob_buffer_named(const char *output_handler_name, uint chunk_size, zend_bool erase TSRMLS_DC) +/* {{{ void php_output_flush_all(TSRMLS_C) + Flush all output buffers subsequently */ +PHPAPI void php_output_flush_all(TSRMLS_D) { - zval *output_handler; - int result; - - ALLOC_INIT_ZVAL(output_handler); - Z_STRLEN_P(output_handler) = strlen(output_handler_name); /* this can be optimized */ - Z_STRVAL_P(output_handler) = estrndup(output_handler_name, Z_STRLEN_P(output_handler)); - Z_TYPE_P(output_handler) = IS_STRING; - result = php_start_ob_buffer(output_handler, chunk_size, erase TSRMLS_CC); - zval_dtor(output_handler); - FREE_ZVAL(output_handler); - return result; + if (OG(active)) { + php_output_op(PHP_OUTPUT_HANDLER_FLUSH, NULL, 0 TSRMLS_CC); + } } /* }}} */ -/* {{{ php_end_ob_buffer - * End output buffering (one level) */ -PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS_DC) +/* {{{ SUCCESS|FAILURE php_output_clean(TSRMLS_D) + Cleans the most recent output handlers buffer if the handler is cleanable */ +PHPAPI int php_output_clean(TSRMLS_D) { - char *final_buffer=NULL; - unsigned int final_buffer_length=0; - zval *alternate_buffer=NULL; - char *to_be_destroyed_buffer, *to_be_destroyed_handler_name; - char *to_be_destroyed_handled_output[2] = { 0, 0 }; - int status; - php_ob_buffer *prev_ob_buffer_p=NULL; - php_ob_buffer orig_ob_buffer; - - if (OG(ob_nesting_level)==0) { - return; - } - status = 0; - if (!OG(active_ob_buffer).status & PHP_OUTPUT_HANDLER_START) { - /* our first call */ - status |= PHP_OUTPUT_HANDLER_START; - } - if (just_flush) { - status |= PHP_OUTPUT_HANDLER_CONT; - } else { - status |= PHP_OUTPUT_HANDLER_END; - } + php_output_context context; + + if (OG(active) && (OG(active)->flags & PHP_OUTPUT_HANDLER_CLEANABLE)) { + OG(active)->buffer.used = 0; + php_output_context_init(&context, PHP_OUTPUT_HANDLER_CLEAN TSRMLS_CC); + php_output_handler_op(OG(active), &context); + php_output_context_dtor(&context); + return SUCCESS; + } + return FAILURE; +} +/* }}} */ -#if 0 - { - FILE *fp; - fp = fopen("/tmp/ob_log", "a"); - fprintf(fp, "NestLevel: %d ObStatus: %d HandlerName: %s\n", OG(ob_nesting_level), status, OG(active_ob_buffer).handler_name); - fclose(fp); - } -#endif +/* {{{ void php_output_clean_all(TSRMLS_D) + Cleans all output handler buffers, without regard whether the handler is cleanable */ +PHPAPI void php_output_clean_all(TSRMLS_D) +{ + php_output_context context; - if (OG(active_ob_buffer).internal_output_handler) { - final_buffer = OG(active_ob_buffer).internal_output_handler_buffer; - final_buffer_length = OG(active_ob_buffer).internal_output_handler_buffer_size; - OG(active_ob_buffer).internal_output_handler(OG(active_ob_buffer).buffer, OG(active_ob_buffer).text_length, &final_buffer, &final_buffer_length, status TSRMLS_CC); - } else if (OG(active_ob_buffer).output_handler) { - zval **params[2]; - zval *orig_buffer; - zval *z_status; - - ALLOC_INIT_ZVAL(orig_buffer); - ZVAL_STRINGL(orig_buffer, OG(active_ob_buffer).buffer, OG(active_ob_buffer).text_length, 1); - - ALLOC_INIT_ZVAL(z_status); - ZVAL_LONG(z_status, status); - - params[0] = &orig_buffer; - params[1] = &z_status; - OG(ob_lock) = 1; - - if (call_user_function_ex(CG(function_table), NULL, OG(active_ob_buffer).output_handler, &alternate_buffer, 2, params, 1, NULL TSRMLS_CC)==SUCCESS) { - if (alternate_buffer && !(Z_TYPE_P(alternate_buffer)==IS_BOOL && Z_BVAL_P(alternate_buffer)==0)) { - convert_to_string_ex(&alternate_buffer); - final_buffer = Z_STRVAL_P(alternate_buffer); - final_buffer_length = Z_STRLEN_P(alternate_buffer); - } - } - OG(ob_lock) = 0; - if (!just_flush) { - zval_ptr_dtor(&OG(active_ob_buffer).output_handler); - } - zval_ptr_dtor(&orig_buffer); - zval_ptr_dtor(&z_status); + if (OG(active)) { + php_output_context_init(&context, PHP_OUTPUT_HANDLER_CLEAN TSRMLS_CC); + zend_stack_apply_with_argument(OG(handlers), ZEND_STACK_APPLY_TOPDOWN, php_output_stack_apply_clean, &context); } +} - if (!final_buffer) { - final_buffer = OG(active_ob_buffer).buffer; - final_buffer_length = OG(active_ob_buffer).text_length; +/* {{{ SUCCESS|FAILURE php_output_end(TSRMLS_D) + Finalizes the most recent output handler at pops it off the stack if the handler is removable */ +PHPAPI int php_output_end(TSRMLS_D) +{ + if (php_output_stack_pop(PHP_OUTPUT_POP_TRY TSRMLS_CC)) { + return SUCCESS; } + return FAILURE; +} +/* }}} */ - if (OG(ob_nesting_level)==1) { /* end buffering */ - if (SG(headers_sent) && !SG(request_info).headers_only) { - OG(php_body_write) = php_ub_body_write_no_header; - } else { - OG(php_body_write) = php_ub_body_write; - } - } +/* {{{ void php_output_end_all(TSRMLS_D) + Finalizes all output handlers and ends output buffering without regard whether a handler is removable */ +PHPAPI void php_output_end_all(TSRMLS_D) +{ + while (OG(active) && php_output_stack_pop(PHP_OUTPUT_POP_FORCE TSRMLS_CC)); +} +/* }}} */ - to_be_destroyed_buffer = OG(active_ob_buffer).buffer; - to_be_destroyed_handler_name = OG(active_ob_buffer).handler_name; - if (OG(active_ob_buffer).internal_output_handler - && (final_buffer != OG(active_ob_buffer).internal_output_handler_buffer) - && (final_buffer != OG(active_ob_buffer).buffer)) { - to_be_destroyed_handled_output[0] = final_buffer; +/* {{{ SUCCESS|FAILURE php_output_discard(TSRMLS_D) + Discards the most recent output handlers buffer and pops it off the stack if the handler is removable */ +PHPAPI int php_output_discard(TSRMLS_D) +{ + if (php_output_stack_pop(PHP_OUTPUT_POP_DISCARD|PHP_OUTPUT_POP_TRY TSRMLS_CC)) { + return SUCCESS; } + return FAILURE; +} +/* }}} */ - if (!just_flush) { - if (OG(active_ob_buffer).internal_output_handler) { - to_be_destroyed_handled_output[1] = OG(active_ob_buffer).internal_output_handler_buffer; - } - } - if (OG(ob_nesting_level)>1) { /* restore previous buffer */ - zend_stack_top(&OG(ob_buffers), (void **) &prev_ob_buffer_p); - orig_ob_buffer = OG(active_ob_buffer); - OG(active_ob_buffer) = *prev_ob_buffer_p; - zend_stack_del_top(&OG(ob_buffers)); - if (!just_flush && OG(ob_nesting_level)==2) { /* destroy the stack */ - zend_stack_destroy(&OG(ob_buffers)); - } +/* {{{ void php_output_discard_all(TSRMLS_D) + Discard all output handlers and buffers without regard whether a handler is removable */ +PHPAPI void php_output_discard_all(TSRMLS_D) +{ + while (OG(active)) { + php_output_stack_pop(PHP_OUTPUT_POP_DISCARD|PHP_OUTPUT_POP_FORCE TSRMLS_CC); } - OG(ob_nesting_level)--; +} +/* }}} */ - if (send_buffer) { - if (just_flush) { /* if flush is called prior to proper end, ensure presence of NUL */ - final_buffer[final_buffer_length] = '\0'; - } - OG(php_body_write)(final_buffer, final_buffer_length TSRMLS_CC); +/* {{{ int php_output_get_level(TSRMLS_D) + Get output buffering level, ie. how many output handlers the stack contains */ +PHPAPI int php_output_get_level(TSRMLS_D) +{ + return OG(active) ? zend_stack_count(OG(handlers)) : 0; +} +/* }}} */ + +/* {{{ SUCCESS|FAILURE php_output_get_contents(zval *z TSRMLS_DC) + Get the contents of the active output handlers buffer */ +PHPAPI int php_output_get_contents(zval *p TSRMLS_DC) +{ + if (OG(active)) { + ZVAL_STRINGL(p, OG(active)->buffer.data, OG(active)->buffer.used, 1); + return SUCCESS; + } else { + ZVAL_NULL(p); + return FAILURE; } +} - if (just_flush) { /* we restored the previous ob, return to the current */ - if (prev_ob_buffer_p) { - zend_stack_push(&OG(ob_buffers), &OG(active_ob_buffer), sizeof(php_ob_buffer)); - OG(active_ob_buffer) = orig_ob_buffer; - } - OG(ob_nesting_level)++; +/* {{{ SUCCESS|FAILURE php_output_get_length(zval *z TSRMLS_DC) + Get the length of the active output handlers buffer */ +PHPAPI int php_output_get_length(zval *p TSRMLS_DC) +{ + if (OG(active)) { + ZVAL_LONG(p, OG(active)->buffer.used); + return SUCCESS; + } else { + ZVAL_NULL(p); + return FAILURE; } +} +/* }}} */ - if (alternate_buffer) { - zval_ptr_dtor(&alternate_buffer); +/* {{{ SUCCESS|FAILURE php_output_handler_start_default(TSRMLS_D) + Start a "default output handler" */ +PHPAPI int php_output_start_default(TSRMLS_D) +{ + php_output_handler *handler; + + handler = php_output_handler_create_internal(OG(default_output_handler_name), php_output_handler_default_func, 0, PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC); + if (SUCCESS == php_output_handler_start(handler TSRMLS_CC)) { + return SUCCESS; } + php_output_handler_free(&handler TSRMLS_CC); + return FAILURE; +} +/* }}} */ - if (status & PHP_OUTPUT_HANDLER_END) { - efree(to_be_destroyed_handler_name); +/* {{{ SUCCESS|FAILURE php_output_handler_start_devnull(TSRMLS_D) + Start a "null output handler" */ +PHPAPI int php_output_start_devnull(TSRMLS_D) +{ + php_output_handler *handler; + + handler = php_output_handler_create_internal(OG(devnull_output_handler_name), php_output_handler_devnull_func, PHP_OUTPUT_HANDLER_DEFAULT_SIZE, 0 TSRMLS_CC); + if (SUCCESS == php_output_handler_start(handler TSRMLS_CC)) { + return SUCCESS; } - if (!just_flush) { - efree(to_be_destroyed_buffer); + php_output_handler_free(&handler TSRMLS_CC); + return FAILURE; +} +/* }}} */ + +/* {{{ SUCCESS|FAILURE php_output_start_user(zval *handler, size_t chunk_size, int flags TSRMLS_DC) + Start a user level output handler */ +PHPAPI int php_output_start_user(zval *output_handler, size_t chunk_size, int flags TSRMLS_DC) +{ + php_output_handler *handler; + + if (output_handler) { + handler = php_output_handler_create_user(output_handler, chunk_size, flags TSRMLS_CC); } else { - OG(active_ob_buffer).text_length = 0; - OG(active_ob_buffer).status |= PHP_OUTPUT_HANDLER_START; - OG(php_body_write) = php_b_body_write; + handler = php_output_handler_create_internal(OG(default_output_handler_name), php_output_handler_default_func, chunk_size, flags TSRMLS_CC); } - if (to_be_destroyed_handled_output[0]) { - efree(to_be_destroyed_handled_output[0]); - } - if (to_be_destroyed_handled_output[1]) { - efree(to_be_destroyed_handled_output[1]); + if (SUCCESS == php_output_handler_start(handler TSRMLS_CC)) { + return SUCCESS; } + php_output_handler_free(&handler TSRMLS_CC); + return FAILURE; } /* }}} */ -/* {{{ php_end_ob_buffers - * End output buffering (all buffers) */ -PHPAPI void php_end_ob_buffers(zend_bool send_buffer TSRMLS_DC) +/* {{{ SUCCESS|FAILURE php_output_start_internal(zval *name, php_output_handler_func_t handler, size_t chunk_size, int flags TSRMLS_DC) + Start an internal output handler that does not have to maintain a non-global state */ +PHPAPI int php_output_start_internal(zval *name, php_output_handler_func_t output_handler, size_t chunk_size, int flags TSRMLS_DC) { - while (OG(ob_nesting_level)!=0) { - php_end_ob_buffer(send_buffer, 0 TSRMLS_CC); + php_output_handler *handler; + + handler = php_output_handler_create_internal(name, php_output_handler_compat_func, chunk_size, flags TSRMLS_CC); + php_output_handler_set_context(handler, output_handler, NULL TSRMLS_CC); + if (SUCCESS == php_output_handler_start(handler TSRMLS_CC)) { + return SUCCESS; } + php_output_handler_free(&handler TSRMLS_CC); + return FAILURE; } /* }}} */ -/* {{{ php_start_implicit_flush - */ -PHPAPI void php_start_implicit_flush(TSRMLS_D) +/* {{{ php_output_handler *php_output_handler_create_user(zval *handler, size_t chunk_size, int flags TSRMLS_DC) + Create a user level output handler */ +PHPAPI php_output_handler *php_output_handler_create_user(zval *output_handler, size_t chunk_size, int flags TSRMLS_DC) { - OG(implicit_flush)=1; + zval *handler_name = NULL; + char *tmp_name = NULL; + php_output_handler *handler = NULL; + php_output_handler_alias_ctor_t *alias = NULL; + php_output_handler_user_func_t *user = NULL; + + switch (Z_TYPE_P(output_handler)) { + case IS_NULL: + handler = php_output_handler_create_internal(OG(default_output_handler_name), php_output_handler_default_func, chunk_size, flags TSRMLS_CC); + break; + case IS_STRING: + if (Z_STRLEN_P(output_handler) && (alias = php_output_handler_alias(output_handler TSRMLS_CC))) { + handler = (*alias)(output_handler, chunk_size, flags TSRMLS_CC); + break; + } + default: + user = ecalloc(1, sizeof(php_output_handler_user_func_t)); + MAKE_STD_ZVAL(handler_name); + if (SUCCESS == zend_fcall_info_init(output_handler, 0, &user->fci, &user->fcc, &tmp_name, NULL TSRMLS_CC)) { + ZVAL_STRING(handler_name, tmp_name, 1); + handler = php_output_handler_init(handler_name, chunk_size, (flags & ~0xf) | PHP_OUTPUT_HANDLER_USER); + Z_ADDREF_P(output_handler); + user->zoh = output_handler; + handler->func.user = user; + } else { + /* TODO(helly) log the rror? */ + efree(user); + } + if (tmp_name) { + efree(tmp_name); + } + zval_ptr_dtor(&handler_name); + } + + return handler; } /* }}} */ -/* {{{ php_end_implicit_flush - */ -PHPAPI void php_end_implicit_flush(TSRMLS_D) +/* {{{ php_output_handler *php_output_handler_create_internal(zval *name, php_output_handler_context_func_t handler, size_t chunk_size, int flags TSRMLS_DC) + Create an internal output handler that can maintain a non-global state */ +PHPAPI php_output_handler *php_output_handler_create_internal(zval *name, php_output_handler_context_func_t output_handler, size_t chunk_size, int flags TSRMLS_DC) { - OG(implicit_flush)=0; + php_output_handler *handler; + + handler = php_output_handler_init(name, chunk_size, (flags & ~0xf) | PHP_OUTPUT_HANDLER_INTERNAL); + handler->func.internal = output_handler; + + return handler; } -/* }}} */ -/* {{{ php_ob_set_internal_handler - */ -PHPAPI void php_ob_set_internal_handler(php_output_handler_func_t internal_output_handler, uint buffer_size, char *handler_name, zend_bool erase TSRMLS_DC) +/* {{{ void php_output_handler_set_context(php_output_handler *handler, void *opaq, void (*dtor)(void* TSRMLS_DC) TSRMLS_DC) + Set the context/state of an output handler. Calls the dtor of the previous context if there is one */ +PHPAPI void php_output_handler_set_context(php_output_handler *handler, void *opaq, void (*dtor)(void* TSRMLS_DC) TSRMLS_DC) { - if (OG(ob_nesting_level)==0 || OG(active_ob_buffer).internal_output_handler || strcmp(OG(active_ob_buffer).handler_name, OB_DEFAULT_HANDLER_NAME)) { - php_start_ob_buffer(NULL, buffer_size, erase TSRMLS_CC); + if (handler->dtor && handler->opaq) { + handler->dtor(handler->opaq TSRMLS_CC); } + handler->dtor = dtor; + handler->opaq = opaq; +} +/* }}} */ - OG(active_ob_buffer).internal_output_handler = internal_output_handler; - OG(active_ob_buffer).internal_output_handler_buffer = (char *) emalloc(buffer_size); - OG(active_ob_buffer).internal_output_handler_buffer_size = buffer_size; - if (OG(active_ob_buffer).handler_name) { - efree(OG(active_ob_buffer).handler_name); +/* {{{ SUCCESS|FAILURE php_output_handler_start(php_output_handler *handler TSRMLS_DC) + Starts the set up output handler and pushes it on top of the stack. Checks for any conflicts regarding the output handler to start */ +PHPAPI int php_output_handler_start(php_output_handler *handler TSRMLS_DC) +{ + HashPosition pos; + HashTable *rconflicts; + php_output_handler_conflict_check_t *conflict; + + if (php_output_lock_error(PHP_OUTPUT_HANDLER_START TSRMLS_CC) || !handler) { + return FAILURE; + } + if (SUCCESS == zend_hash_find(&php_output_handler_conflicts, Z_STRVAL_P(handler->name), Z_STRLEN_P(handler->name)+1, (void *) &conflict)) { + if (SUCCESS != (*conflict)(handler->name TSRMLS_CC)) { + return FAILURE; + } } - OG(active_ob_buffer).handler_name = estrdup(handler_name); - OG(active_ob_buffer).erase = erase; + if (SUCCESS == zend_hash_find(&php_output_handler_reverse_conflicts, Z_STRVAL_P(handler->name), Z_STRLEN_P(handler->name)+1, (void *) &rconflicts)) { + for ( zend_hash_internal_pointer_reset_ex(rconflicts, &pos); + zend_hash_get_current_data_ex(rconflicts, (void *) &conflict, &pos) == SUCCESS; + zend_hash_move_forward_ex(rconflicts, &pos)) { + if (SUCCESS != (*conflict)(handler->name TSRMLS_CC)) { + return FAILURE; + } + } + } + /* zend_stack_push never returns SUCCESS but FAILURE or stack level */ + if (FAILURE == (handler->level = zend_stack_push(OG(handlers), &handler, sizeof(php_output_handler *)))) { + return FAILURE; + } + OG(active) = handler; + return SUCCESS; } /* }}} */ -/* - * Output buffering - implementation - */ - -/* {{{ php_ob_allocate - */ -static inline void php_ob_allocate(uint text_length TSRMLS_DC) +/* {{{ int php_output_handler_started(zval *name TSRMLS_DC) + Check whether a certain output handler is in use */ +PHPAPI int php_output_handler_started(zval *name TSRMLS_DC) { - uint new_len = OG(active_ob_buffer).text_length + text_length; - - if (OG(active_ob_buffer).size < new_len) { - uint buf_size = OG(active_ob_buffer).size; - while (buf_size <= new_len) { - buf_size += OG(active_ob_buffer).block_size; + php_output_handler **handlers; + int i, count = php_output_get_level(TSRMLS_C); + + if (count) { + handlers = *(php_output_handler ***) zend_stack_base(OG(handlers)); + + for (i = 0; i < count; ++i) { + if (!zend_binary_zval_strcmp(handlers[i]->name, name)) { + return 1; + } } - - OG(active_ob_buffer).buffer = (char *) erealloc(OG(active_ob_buffer).buffer, buf_size+1); - OG(active_ob_buffer).size = buf_size; } - OG(active_ob_buffer).text_length = new_len; + + return 0; } /* }}} */ -/* {{{ php_ob_init_conflict - * Returns 1 if handler_set is already used and generates error message - */ -PHPAPI int php_ob_init_conflict(char *handler_new, char *handler_set TSRMLS_DC) +/* {{{ int php_output_handler_conflict(zval *handler_new, zval *handler_old TSRMLS_DC) + Check whether a certain handler is in use and issue a warning that the new handler would conflict with the already used one */ +PHPAPI int php_output_handler_conflict(zval *handler_new, zval *handler_set TSRMLS_DC) { - if (php_ob_handler_used(handler_set TSRMLS_CC)) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "output handler '%s' conflicts with '%s'", handler_new, handler_set); + if (php_output_handler_started(handler_set TSRMLS_CC)) { + if (zend_binary_zval_strcmp(handler_new, handler_set)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "output handler '%s' conflicts with '%s'", Z_STRVAL_P(handler_new), Z_STRVAL_P(handler_set)); + } else { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "output handler '%s' cannot be used twice", Z_STRVAL_P(handler_new)); + } return 1; } return 0; } /* }}} */ -/* {{{ php_ob_init_named - */ -static int php_ob_init_named(uint initial_size, uint block_size, char *handler_name, zval *output_handler, uint chunk_size, zend_bool erase TSRMLS_DC) +/* {{{ SUCCESS|FAILURE php_output_handler_conflict_register(zval *name, php_output_handler_conflict_check_t check_func TSRMLS_DC) + Register a conflict checking function on MINIT */ +PHPAPI int php_output_handler_conflict_register(zval *name, php_output_handler_conflict_check_t check_func TSRMLS_DC) { - php_ob_buffer tmp_buf; - - if (output_handler && !zend_is_callable(output_handler, 0, NULL TSRMLS_CC)) { + if (!EG(current_module)) { + zend_error(E_ERROR, "Cannot register an output handler conflict outside of MINIT"); return FAILURE; } + return zend_hash_update(&php_output_handler_conflicts, Z_STRVAL_P(name), Z_STRLEN_P(name)+1, &check_func, sizeof(php_output_handler_conflict_check_t *), NULL); +} +/* }}} */ + +/* {{{ SUCCESS|FAILURE php_output_handler_reverse_conflict_register(zval *name, php_output_handler_conflict_check_t check_func TSRMLS_DC) + Register a reverse conflict checking function on MINIT */ +PHPAPI int php_output_handler_reverse_conflict_register(zval *name, php_output_handler_conflict_check_t check_func TSRMLS_DC) +{ + HashTable rev, *rev_ptr = NULL; - tmp_buf.block_size = block_size; - tmp_buf.size = initial_size; - tmp_buf.buffer = (char *) emalloc(initial_size+1); - tmp_buf.text_length = 0; - tmp_buf.output_handler = output_handler; - tmp_buf.chunk_size = chunk_size; - tmp_buf.status = 0; - tmp_buf.internal_output_handler = NULL; - tmp_buf.internal_output_handler_buffer = NULL; - tmp_buf.internal_output_handler_buffer_size = 0; - tmp_buf.handler_name = estrdup(handler_name&&handler_name[0]?handler_name:OB_DEFAULT_HANDLER_NAME); - tmp_buf.erase = erase; - - if (OG(ob_nesting_level)>0) { -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - if (!strncmp(handler_name, "ob_gzhandler", sizeof("ob_gzhandler")) && php_ob_gzhandler_check(TSRMLS_C)) { + if (!EG(current_module)) { + zend_error(E_ERROR, "Cannot register a reverse output handler conflict outside of MINIT"); + return FAILURE; + } + if (SUCCESS == zend_hash_find(&php_output_handler_reverse_conflicts, Z_STRVAL_P(name), Z_STRLEN_P(name)+1, (void *) &rev_ptr)) { + return zend_hash_next_index_insert(rev_ptr, &check_func, sizeof(php_output_handler_conflict_check_t *), NULL); + } else { + zend_hash_init(&rev, 1, NULL, NULL, 1); + if (SUCCESS != zend_hash_next_index_insert(&rev, &check_func, sizeof(php_output_handler_conflict_check_t *), NULL)) { + zend_hash_destroy(&rev); return FAILURE; } -#endif - if (OG(ob_nesting_level)==1) { /* initialize stack */ - zend_stack_init(&OG(ob_buffers)); + if (SUCCESS != zend_hash_update(&php_output_handler_reverse_conflicts, Z_STRVAL_P(name), Z_STRLEN_P(name)+1, &rev, sizeof(HashTable), NULL)) { + zend_hash_destroy(&rev); + return FAILURE; } - zend_stack_push(&OG(ob_buffers), &OG(active_ob_buffer), sizeof(php_ob_buffer)); + return SUCCESS; } - OG(ob_nesting_level)++; - OG(active_ob_buffer) = tmp_buf; - OG(php_body_write) = php_b_body_write; - return SUCCESS; } /* }}} */ -/* {{{ php_ob_handler_from_string - * Create zval output handler from string - */ -static zval* php_ob_handler_from_string(const char *handler_name, int len TSRMLS_DC) +/* {{{ php_output_handler_alias_ctor_t php_output_handler_alias(zval *name TSRMLS_DC) + Get an internal output handler for a user handler if it exists */ +PHPAPI php_output_handler_alias_ctor_t *php_output_handler_alias(zval *name TSRMLS_DC) { - zval *output_handler; - - ALLOC_INIT_ZVAL(output_handler); - Z_STRLEN_P(output_handler) = len; - Z_STRVAL_P(output_handler) = estrndup(handler_name, len); - Z_TYPE_P(output_handler) = IS_STRING; - return output_handler; + php_output_handler_alias_ctor_t *func = NULL; + + zend_hash_find(&php_output_handler_aliases, Z_STRVAL_P(name), Z_STRLEN_P(name)+1, (void *) &func); + return func; } /* }}} */ -/* {{{ php_ob_init - */ -static int php_ob_init(uint initial_size, uint block_size, zval *output_handler, uint chunk_size, zend_bool erase TSRMLS_DC) +/* {{{ SUCCESS|FAILURE php_output_handler_alias_register(zval *name, php_output_handler_alias_ctor_t func TSRMLS_DC) + Registers an internal output handler as alias for a user handler */ +PHPAPI int php_output_handler_alias_register(zval *name, php_output_handler_alias_ctor_t func TSRMLS_DC) { - int result = FAILURE, handler_len, len; - char *handler_name, *next_handler_name; - HashPosition pos; - zval **tmp; - zval *handler_zval; - - if (output_handler && output_handler->type == IS_STRING) { - handler_name = Z_STRVAL_P(output_handler); - handler_len = Z_STRLEN_P(output_handler); - - result = SUCCESS; - if (handler_len && handler_name[0] != '\0') { - while ((next_handler_name=strchr(handler_name, ',')) != NULL) { - len = next_handler_name-handler_name; - next_handler_name = estrndup(handler_name, len); - handler_zval = php_ob_handler_from_string(next_handler_name, len TSRMLS_CC); - result = php_ob_init_named(initial_size, block_size, next_handler_name, handler_zval, chunk_size, erase TSRMLS_CC); - if (result != SUCCESS) { - zval_dtor(handler_zval); - FREE_ZVAL(handler_zval); - } - handler_name += len+1; - handler_len -= len+1; - efree(next_handler_name); - } - } - if (result == SUCCESS) { - handler_zval = php_ob_handler_from_string(handler_name, handler_len TSRMLS_CC); - result = php_ob_init_named(initial_size, block_size, handler_name, handler_zval, chunk_size, erase TSRMLS_CC); - if (result != SUCCESS) { - zval_dtor(handler_zval); - FREE_ZVAL(handler_zval); - } - } - } else if (output_handler && output_handler->type == IS_ARRAY) { - /* do we have array(object,method) */ - if (zend_is_callable(output_handler, 0, &handler_name TSRMLS_CC)) { - SEPARATE_ZVAL(&output_handler); - Z_ADDREF_P(output_handler); - result = php_ob_init_named(initial_size, block_size, handler_name, output_handler, chunk_size, erase TSRMLS_CC); - efree(handler_name); - } else { - efree(handler_name); - /* init all array elements recursively */ - zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(output_handler), &pos); - while (zend_hash_get_current_data_ex(Z_ARRVAL_P(output_handler), (void **)&tmp, &pos) == SUCCESS) { - result = php_ob_init(initial_size, block_size, *tmp, chunk_size, erase TSRMLS_CC); - if (result == FAILURE) { - break; - } - zend_hash_move_forward_ex(Z_ARRVAL_P(output_handler), &pos); - } - } - } else if (output_handler && output_handler->type == IS_OBJECT) { - /* do we have callable object */ - if (zend_is_callable(output_handler, 0, &handler_name TSRMLS_CC)) { - SEPARATE_ZVAL(&output_handler); - Z_ADDREF_P(output_handler); - result = php_ob_init_named(initial_size, block_size, handler_name, output_handler, chunk_size, erase TSRMLS_CC); - efree(handler_name); - } else { - efree(handler_name); - php_error_docref(NULL TSRMLS_CC, E_ERROR, "No method name given: use ob_start(array($object,'method')) to specify instance $object and the name of a method of class %s to use as output handler", Z_OBJCE_P(output_handler)->name); - result = FAILURE; - } - } else { - result = php_ob_init_named(initial_size, block_size, OB_DEFAULT_HANDLER_NAME, NULL, chunk_size, erase TSRMLS_CC); + if (!EG(current_module)) { + zend_error(E_ERROR, "Cannot register an output handler alias outside of MINIT"); + return FAILURE; } - return result; + return zend_hash_update(&php_output_handler_aliases, Z_STRVAL_P(name), Z_STRLEN_P(name)+1, &func, sizeof(php_output_handler_alias_ctor_t *), NULL); } /* }}} */ -/* {{{ php_ob_list_each - */ -static int php_ob_list_each(php_ob_buffer *ob_buffer, zval *ob_handler_array) +/* {{{ SUCCESS|FAILURE php_output_handler_hook(php_output_handler_hook_t type, void *arg TSMRLS_DC) + Output handler hook for output handler functions to check/modify the current handlers abilities */ +PHPAPI int php_output_handler_hook(php_output_handler_hook_t type, void *arg TSRMLS_DC) { - add_next_index_string(ob_handler_array, ob_buffer->handler_name, 1); - return 0; + if (OG(running)) { + switch (type) { + case PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ: + *(void ***) arg = &OG(running)->opaq; + return SUCCESS; + case PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS: + *(int *) arg = OG(running)->flags; + return SUCCESS; + case PHP_OUTPUT_HANDLER_HOOK_GET_LEVEL: + *(int *) arg = OG(running)->level; + case PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE: + OG(running)->flags &= ~(PHP_OUTPUT_HANDLER_REMOVABLE|PHP_OUTPUT_HANDLER_CLEANABLE); + return SUCCESS; + case PHP_OUTPUT_HANDLER_HOOK_DISABLE: + OG(running)->flags |= PHP_OUTPUT_HANDLER_DISABLED; + return SUCCESS; + default: + break; + } + } + return FAILURE; } /* }}} */ -/* {{{ proto false|array ob_list_handlers() - * List all output_buffers in an array - */ -PHP_FUNCTION(ob_list_handlers) +/* {{{ void php_output_handler_dtor(php_output_handler *handler TSRMLS_DC) + Destroy an output handler */ +PHPAPI void php_output_handler_dtor(php_output_handler *handler TSRMLS_DC) { - if (zend_parse_parameters_none() == FAILURE) { - return; + zval_ptr_dtor(&handler->name); + STR_FREE(handler->buffer.data); + if (handler->flags & PHP_OUTPUT_HANDLER_USER) { + zval_ptr_dtor(&handler->func.user->zoh); + efree(handler->func.user); } - - array_init(return_value); - if (OG(ob_nesting_level)) { - if (OG(ob_nesting_level)>1) { - zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *element, void *)) php_ob_list_each, return_value); - } - php_ob_list_each(&OG(active_ob_buffer), return_value); + if (handler->dtor && handler->opaq) { + handler->dtor(handler->opaq TSRMLS_CC); } + memset(handler, 0, sizeof(*handler)); } /* }}} */ -/* {{{ php_ob_used_each - * Sets handler_name to NULL is found - */ -static int php_ob_handler_used_each(php_ob_buffer *ob_buffer, char **handler_name) +/* {{{ void php_output_handler_free(php_output_handler **handler TSMRLS_DC) + Destroy and free an output handler */ +PHPAPI void php_output_handler_free(php_output_handler **h TSRMLS_DC) { - if (!strcmp(ob_buffer->handler_name, *handler_name)) { - *handler_name = NULL; - return 1; + if (*h) { + php_output_handler_dtor(*h TSRMLS_CC); + efree(*h); + *h = NULL; } - return 0; } /* }}} */ -/* {{{ php_ob_used - * returns 1 if given handler_name is used as output_handler - */ -PHPAPI int php_ob_handler_used(char *handler_name TSRMLS_DC) +/* void php_output_set_implicit_flush(int enabled TSRMLS_DC) + Enable or disable implicit flush */ +PHPAPI void php_output_set_implicit_flush(int flush TSRMLS_DC) { - char *tmp = handler_name; - - if (OG(ob_nesting_level)) { - if (!strcmp(OG(active_ob_buffer).handler_name, handler_name)) { - return 1; - } - if (OG(ob_nesting_level)>1) { - zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *element, void *)) php_ob_handler_used_each, &tmp); - } + if (flush) { + OG(flags) |= PHP_OUTPUT_IMPLICITFLUSH; + } else { + OG(flags) &= ~PHP_OUTPUT_IMPLICITFLUSH; } - return tmp ? 0 : 1; } /* }}} */ -/* {{{ php_ob_append - */ -static inline void php_ob_append(const char *text, uint text_length TSRMLS_DC) +/* {{{ char *php_output_get_start_filename(TSRMLS_D) + Get the file name where output has started */ +PHPAPI char *php_output_get_start_filename(TSRMLS_D) { - char *target; - int original_ob_text_length; + return OG(output_start_filename); +} +/* }}} */ - original_ob_text_length=OG(active_ob_buffer).text_length; +/* {{{ int php_output_get_start_lineno(TSRMLS_D) + Get the line number where output has started */ +PHPAPI int php_output_get_start_lineno(TSRMLS_D) +{ + return OG(output_start_lineno); +} +/* }}} */ - php_ob_allocate(text_length TSRMLS_CC); - target = OG(active_ob_buffer).buffer+original_ob_text_length; - memcpy(target, text, text_length); - target[text_length]=0; +/* {{{ static int php_output_lock_error(int op TSRMLS_DC) + Checks whether an unallowed operation is attempted from within the output handler and issues a fatal error */ +static inline int php_output_lock_error(int op TSRMLS_DC) +{ + /* if there's no ob active, ob has been stopped */ + if (op && OG(active) && OG(running)) { + /* fatal error */ + php_output_deactivate(TSRMLS_C); + php_error_docref("ref.outcontrol" TSRMLS_CC, E_ERROR, "Cannot use output buffering in output buffering display handlers"); + return 1; + } + return 0; +} +/* }}} */ - /* If implicit_flush is On or chunked buffering, send contents to next buffer and return. */ - if (OG(active_ob_buffer).chunk_size - && OG(active_ob_buffer).text_length >= OG(active_ob_buffer).chunk_size) { - - php_end_ob_buffer(1, 1 TSRMLS_CC); - return; +/* {{{ static php_output_context *php_output_context_init(php_output_context *context, int op TSRMLS_DC) + Initialize a new output context */ +static inline php_output_context *php_output_context_init(php_output_context *context, int op TSRMLS_DC) +{ + if (!context) { + context = emalloc(sizeof(php_output_context)); } + + memset(context, 0, sizeof(php_output_context)); + TSRMLS_SET_CTX(context->tsrm_ls); + context->op = op; + + return context; } /* }}} */ -#if 0 -static inline void php_ob_prepend(const char *text, uint text_length) +/* {{{ static void php_output_context_reset(php_output_context *context) + Reset an output context */ +static inline void php_output_context_reset(php_output_context *context) { - char *p, *start; - TSRMLS_FETCH(); + int op = context->op; + php_output_context_dtor(context); + memset(context, 0, sizeof(php_output_context)); + context->op = op; +} +/* }}} */ - php_ob_allocate(text_length TSRMLS_CC); +/* {{{ static void php_output_context_swap(php_output_context *context) + Swap output contexts buffers */ +static inline void php_output_context_swap(php_output_context *context) +{ + if (context->in.free && context->in.data) { + efree(context->in.data); + } + context->in.data = context->out.data; + context->in.used = context->out.used; + context->in.free = context->out.free; + context->in.size = context->out.size; + context->out.data = NULL; + context->out.used = 0; + context->out.size = 0; +} +/* }}} */ - /* php_ob_allocate() may change OG(ob_buffer), so we can't initialize p&start earlier */ - p = OG(ob_buffer)+OG(ob_text_length); - start = OG(ob_buffer); +/* {{{ static void php_output_context_pass(php_output_context *context) + Pass input to output buffer */ +static inline void php_output_context_pass(php_output_context *context) +{ + context->out.data = context->in.data; + context->out.used = context->in.used; + context->out.size = context->in.size; + context->out.free = context->in.free; + context->in.data = NULL; + context->in.used = 0; + context->in.size = 0; +} +/* }}} */ - while (--p>=start) { - p[text_length] = *p; +/* {{{ static void php_output_context_dtor(php_output_context *context) + Destroy the contents of an output context */ +static inline void php_output_context_dtor(php_output_context *context) +{ + if (context->in.free && context->in.data) { + efree(context->in.data); + context->in.data = NULL; + } + if (context->out.free && context->out.data) { + efree(context->out.data); + context->out.data = NULL; } - memcpy(OG(ob_buffer), text, text_length); - OG(ob_buffer)[OG(active_ob_buffer).text_length]=0; } -#endif +/* }}} */ +/* {{{ static php_output_handler *php_output_handler_init(zval *name, size_t chunk_size, int flags) + Allocates and initializes a php_output_handler structure */ +static inline php_output_handler *php_output_handler_init_ex(zval *name, size_t chunk_size, int flags TSRMLS_DC) +{ + php_output_handler *handler; + + handler = ecalloc(1, sizeof(php_output_handler)); + Z_ADDREF_P(name); + handler->name = name; + handler->size = chunk_size; + handler->flags = flags; + handler->buffer.size = PHP_OUTPUT_HANDLER_INITBUF_SIZE(chunk_size); + handler->buffer.data = emalloc(handler->buffer.size); + + return handler; +} +/* }}} */ -/* {{{ php_ob_get_buffer - * Return the current output buffer */ -PHPAPI int php_ob_get_buffer(zval *p TSRMLS_DC) +/* {{{ static int php_output_handler_appen(php_output_handler *handler, const php_output_buffer *buf TSRMLS_DC) + Appends input to the output handlers buffer and indicates whether the buffer does not have to be processed by the output handler */ +static inline int php_output_handler_append(php_output_handler *handler, const php_output_buffer *buf TSRMLS_DC) { - if (OG(ob_nesting_level)==0) { - return FAILURE; + if (buf->used) { + OG(flags) |= PHP_OUTPUT_WRITTEN; + /* store it away */ + if ((handler->buffer.size - handler->buffer.used) <= buf->used) { + size_t grow_int = PHP_OUTPUT_HANDLER_INITBUF_SIZE(handler->size); + size_t grow_buf = PHP_OUTPUT_HANDLER_INITBUF_SIZE(buf->used - (handler->buffer.size - handler->buffer.used)); + size_t grow_max = MAX(grow_int, grow_buf); + + handler->buffer.data = erealloc(handler->buffer.data, handler->buffer.size + grow_max); + handler->buffer.size += grow_max; + } + memcpy(handler->buffer.data + handler->buffer.used, buf->data, buf->used); + handler->buffer.used += buf->used; + + /* chunked buffering */ + if (handler->size && (handler->buffer.used >= handler->size)) { + /* store away errors and/or any intermediate output */ + return OG(running) ? 1 : 0; + } } - ZVAL_STRINGL(p, OG(active_ob_buffer).buffer, OG(active_ob_buffer).text_length, 1); - return SUCCESS; + return 1; } /* }}} */ -/* {{{ php_ob_get_length - * Return the size of the current output buffer */ -PHPAPI int php_ob_get_length(zval *p TSRMLS_DC) +/* {{{ static php_output_handler_status_t php_output_handler_op(php_output_handler *handler, php_output_context *context) + Output handler operation dispatcher, applying context op to the php_output_handler handler */ +static inline php_output_handler_status_t php_output_handler_op(php_output_handler *handler, php_output_context *context) { - if (OG(ob_nesting_level) == 0) { - return FAILURE; + php_output_handler_status_t status; + int original_op = context->op; + PHP_OUTPUT_TSRMLS(context); + +#if PHP_OUTPUT_DEBUG + fprintf(stderr, ">>> op(%d, " + "handler=%p, " + "name=%s, " + "flags=%d, " + "buffer.data=%s, " + "buffer.used=%zu, " + "buffer.size=%zu, " + "in.data=%s, " + "in.used=%zu)\n", + context->op, + handler, + Z_STRVAL_P(handler->name), + handler->flags, + handler->buffer.used?handler->buffer.data:"", + handler->buffer.used, + handler->buffer.size, + context->in.used?context->in.data:"", + context->in.used + ); +#endif + + if (php_output_lock_error(context->op TSRMLS_CC)) { + /* fatal error */ + return PHP_OUTPUT_HANDLER_FAILURE; } - ZVAL_LONG(p, OG(active_ob_buffer).text_length); - return SUCCESS; + + /* storable? */ + if (php_output_handler_append(handler, &context->in TSRMLS_CC) && !context->op) { + status = PHP_OUTPUT_HANDLER_NO_DATA; + } else { + /* need to start? */ + if (!(handler->flags & PHP_OUTPUT_HANDLER_STARTED)) { + context->op |= PHP_OUTPUT_HANDLER_START; + } + + OG(running) = handler; + if (handler->flags & PHP_OUTPUT_HANDLER_USER) { + zval *retval = NULL, *ob_data, *ob_mode; + + MAKE_STD_ZVAL(ob_data); + ZVAL_STRINGL(ob_data, handler->buffer.data, handler->buffer.used, 1); + MAKE_STD_ZVAL(ob_mode); + ZVAL_LONG(ob_mode, (long) context->op); + zend_fcall_info_argn(&handler->func.user->fci TSRMLS_CC, 2, &ob_data, &ob_mode); + +#define PHP_OUTPUT_USER_SUCCESS(retval) (retval && !(Z_TYPE_P(retval) == IS_BOOL && Z_BVAL_P(retval)==0)) + if (SUCCESS == zend_fcall_info_call(&handler->func.user->fci, &handler->func.user->fcc, &retval, NULL TSRMLS_CC) && PHP_OUTPUT_USER_SUCCESS(retval)) { + /* user handler may have returned TRUE */ + status = PHP_OUTPUT_HANDLER_NO_DATA; + if (Z_TYPE_P(retval) != IS_BOOL) { + convert_to_string_ex(&retval); + if (Z_STRLEN_P(retval)) { + context->out.data = estrndup(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); + context->out.used = Z_STRLEN_P(retval); + context->out.free = 1; + status = PHP_OUTPUT_HANDLER_SUCCESS; + } + } + } else { + /* call failed, pass internal buffer along */ + status = PHP_OUTPUT_HANDLER_FAILURE; + } + + zend_fcall_info_argn(&handler->func.user->fci TSRMLS_CC, 0); + zval_ptr_dtor(&ob_data); + zval_ptr_dtor(&ob_mode); + if (retval) { + zval_ptr_dtor(&retval); + } + + } else { + + context->in.data = handler->buffer.data; + context->in.used = handler->buffer.used; + context->in.free = 0; + + if (SUCCESS == handler->func.internal(&handler->opaq, context)) { + if (context->out.used) { + status = PHP_OUTPUT_HANDLER_SUCCESS; + } else { + status = PHP_OUTPUT_HANDLER_NO_DATA; + } + } else { + status = PHP_OUTPUT_HANDLER_FAILURE; + } + } + handler->flags |= PHP_OUTPUT_HANDLER_STARTED; + OG(running) = NULL; + } + + switch (status) { + case PHP_OUTPUT_HANDLER_FAILURE: + /* disable this handler */ + handler->flags |= PHP_OUTPUT_HANDLER_DISABLED; + /* discard any output */ + if (context->out.data && context->out.free) { + efree(context->out.data); + } + /* returns handlers buffer */ + context->out.data = handler->buffer.data; + context->out.used = handler->buffer.used; + context->out.free = 1; + handler->buffer.data = NULL; + handler->buffer.used = 0; + handler->buffer.size = 0; + break; + case PHP_OUTPUT_HANDLER_SUCCESS: + /* no more buffered data */ + handler->buffer.used = 0; + break; + case PHP_OUTPUT_HANDLER_NO_DATA: + /* handler ate all */ + php_output_context_reset(context); + break; + } + + context->op = original_op; + return status; } /* }}} */ -/* - * Wrapper functions - implementation - */ +/* {{{ static void php_output_op(int op, const char *str, size_t len TSRMLS_DC) + Output op dispatcher, passes input and output handlers output through the output handler stack until it gets written to the SAPI */ +static inline void php_output_op(int op, const char *str, size_t len TSRMLS_DC) +{ + php_output_context context; + php_output_handler **active; + int obh_cnt; + + if (php_output_lock_error(op TSRMLS_CC)) { + return; + } + + php_output_context_init(&context, op TSRMLS_CC); + + /* + * broken up for better performance: + * - apply op to the one active handler; note that OG(active) might be popped off the stack on a flush + * - or apply op to the handler stack + */ + if (OG(active) && (obh_cnt = zend_stack_count(OG(handlers)))) { + context.in.data = (char *) str; + context.in.used = len; + + if (obh_cnt > 1) { + zend_stack_apply_with_argument(OG(handlers), ZEND_STACK_APPLY_TOPDOWN, php_output_stack_apply_op, &context); + } else if ((SUCCESS == zend_stack_top(OG(handlers), (void *) &active)) && (!((*active)->flags & PHP_OUTPUT_HANDLER_DISABLED))) { + php_output_handler_op(*active, &context); + } else { + php_output_context_pass(&context); + } + } else { + context.out.data = (char *) str; + context.out.used = len; + } + + if (context.out.data && context.out.used) { +#if PHP_OUTPUT_DEBUG + fprintf(stderr, "::: sapi_write('%s', %zu)\n", context.out.data, context.out.used); +#endif + if (!SG(headers_sent) && php_header(TSRMLS_C)) { + if (zend_is_compiling(TSRMLS_C)) { + OG(output_start_filename) = zend_get_compiled_filename(TSRMLS_C); + OG(output_start_lineno) = zend_get_compiled_lineno(TSRMLS_C); + } else if (zend_is_executing(TSRMLS_C)) { + OG(output_start_filename) = zend_get_executed_filename(TSRMLS_C); + OG(output_start_lineno) = zend_get_executed_lineno(TSRMLS_C); + } +#if PHP_OUTPUT_DEBUG + fprintf(stderr, "!!! output started at: %s (%d)\n", OG(output_start_filename), OG(output_start_lineno)); +#endif + } + sapi_module.ub_write(context.out.data, context.out.used TSRMLS_CC); + if (OG(flags) & PHP_OUTPUT_IMPLICITFLUSH) { + sapi_flush(TSRMLS_C); + } + OG(flags) |= PHP_OUTPUT_SENT; + } + php_output_context_dtor(&context); +} +/* }}} */ -/* buffered output function */ -static int php_b_body_write(const char *str, uint str_length TSRMLS_DC) +/* {{{ static int php_output_stack_apply_op(void *h, void *c) + Operation callback for the stack apply function */ +static int php_output_stack_apply_op(void *h, void *c) { - php_ob_append(str, str_length TSRMLS_CC); - return str_length; + int was_disabled; + php_output_handler_status_t status; + php_output_handler *handler = *(php_output_handler **) h; + php_output_context *context = (php_output_context *) c; + + if ((was_disabled = (handler->flags & PHP_OUTPUT_HANDLER_DISABLED))) { + status = PHP_OUTPUT_HANDLER_FAILURE; + } else { + status = php_output_handler_op(handler, context); + } + + /* + * handler ate all => break + * handler returned data or failed resp. is disabled => continue + */ + switch (status) { + case PHP_OUTPUT_HANDLER_NO_DATA: + return 1; + + case PHP_OUTPUT_HANDLER_SUCCESS: + /* swap contexts buffers, unless this is the last handler in the stack */ + if (handler->level) { + php_output_context_swap(context); + } + return 0; + + case PHP_OUTPUT_HANDLER_FAILURE: + default: + if (was_disabled) { + /* pass input along, if it's the last handler in the stack */ + if (!handler->level) { + php_output_context_pass(context); + } + } else { + /* swap buffers, unless this is the last handler */ + if (handler->level) { + php_output_context_swap(context); + } + } + return 0; + } } +/* }}} */ -/* {{{ php_ub_body_write_no_header - */ -PHPAPI int php_ub_body_write_no_header(const char *str, uint str_length TSRMLS_DC) +/* {{{ static int php_output_stack_apply_clean(void *h, void *c) + Clean callback for the stack apply function */ +static int php_output_stack_apply_clean(void *h, void *c) { - int result; + php_output_handler *handler = *(php_output_handler **) h; + php_output_context *context = (php_output_context *) c; + + handler->buffer.used = 0; + php_output_handler_op(handler, context); + php_output_context_reset(context); + return 0; +} +/* }}} */ - if (OG(disable_output)) { - return 0; - } +/* {{{ static int php_output_stack_apply_list(void *h, void *z) + List callback for the stack apply function */ +static int php_output_stack_apply_list(void *h, void *z) +{ + php_output_handler *handler = *(php_output_handler **) h; + zval *array = (zval *) z; + + Z_ADDREF_P(handler->name); + add_next_index_zval(array, handler->name); + return 0; +} +/* }}} */ - result = OG(php_header_write)(str, str_length TSRMLS_CC); +/* {{{ static int php_output_stack_apply_status(void *h, void *z) + Status callback for the stack apply function */ +static int php_output_stack_apply_status(void *h, void *z) +{ + php_output_handler *handler = *(php_output_handler **) h; + zval *array = (zval *) z; + + add_next_index_zval(array, php_output_handler_status(handler, NULL)); + + return 0; +} +/* }}} */ - if (OG(implicit_flush)) { - sapi_flush(TSRMLS_C); +/* {{{ static zval *php_output_handler_status(php_output_handler *handler, zval *entry) + Returns an array with the status of the output handler */ +static inline zval *php_output_handler_status(php_output_handler *handler, zval *entry) +{ + if (!entry) { + MAKE_STD_ZVAL(entry); + array_init(entry); } - - return result; + + Z_ADDREF_P(handler->name); + add_assoc_zval(entry, "name", handler->name); + add_assoc_long(entry, "type", (long) (handler->flags & 0xf)); + add_assoc_long(entry, "flags", (long) handler->flags); + add_assoc_long(entry, "level", (long) handler->level); + add_assoc_long(entry, "chunk_size", (long) handler->size); + add_assoc_long(entry, "buffer_size", (long) handler->buffer.size); + add_assoc_long(entry, "buffer_used", (long) handler->buffer.used); + + return entry; } /* }}} */ -/* {{{ php_ub_body_write - */ -PHPAPI int php_ub_body_write(const char *str, uint str_length TSRMLS_DC) +/* {{{ static int php_output_stack_pop(int flags TSRMLS_DC) + Pops an output handler off the stack */ +static inline int php_output_stack_pop(int flags TSRMLS_DC) { - int result = 0; - - if (SG(request_info).headers_only) { - if(SG(headers_sent)) { - return 0; + php_output_context context; + php_output_handler **current, *orphan = OG(active); + + if (!orphan) { + if (!(flags & PHP_OUTPUT_POP_SILENT)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to %s buffer. No buffer to %s", (flags&PHP_OUTPUT_POP_DISCARD)?"discard":"send", (flags&PHP_OUTPUT_POP_DISCARD)?"discard":"send"); + } + return 0; + } else if (!(flags & PHP_OUTPUT_POP_FORCE) && !(orphan->flags & PHP_OUTPUT_HANDLER_REMOVABLE)) { + if (!(flags & PHP_OUTPUT_POP_SILENT)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to %s buffer of %s (%d)", (flags&PHP_OUTPUT_POP_DISCARD)?"discard":"send", Z_STRVAL_P(orphan->name), orphan->level); + } + return 0; + } else { + php_output_context_init(&context, PHP_OUTPUT_HANDLER_FINAL TSRMLS_CC); + + /* don't run the output handler if it's disabled */ + if (!(orphan->flags & PHP_OUTPUT_HANDLER_DISABLED)) { + /* didn't it start yet? */ + if (!(orphan->flags & PHP_OUTPUT_HANDLER_STARTED)) { + context.op |= PHP_OUTPUT_HANDLER_START; + } + /* signal that we're cleaning up */ + if (flags & PHP_OUTPUT_POP_DISCARD) { + context.op |= PHP_OUTPUT_HANDLER_CLEAN; + orphan->buffer.used = 0; + } + php_output_handler_op(orphan, &context); } - php_header(TSRMLS_C); - zend_bailout(); - } - if (php_header(TSRMLS_C)) { - if (zend_is_compiling(TSRMLS_C)) { - OG(output_start_filename) = zend_get_compiled_filename(TSRMLS_C); - OG(output_start_lineno) = zend_get_compiled_lineno(TSRMLS_C); - } else if (zend_is_executing(TSRMLS_C)) { - OG(output_start_filename) = zend_get_executed_filename(TSRMLS_C); - OG(output_start_lineno) = zend_get_executed_lineno(TSRMLS_C); + + /* pop it off the stack */ + zend_stack_del_top(OG(handlers)); + if (SUCCESS == zend_stack_top(OG(handlers), (void *) ¤t)) { + OG(active) = *current; + } else { + OG(active) = NULL; } + + /* pass output along */ + if (context.out.data && context.out.used && !(flags & PHP_OUTPUT_POP_DISCARD)) { + php_output_write(context.out.data, context.out.used TSRMLS_CC); + } + + /* destroy the handler (after write!) */ + php_output_handler_free(&orphan TSRMLS_CC); + php_output_context_dtor(&context); + + return 1; + } +} +/* }}} */ - OG(php_body_write) = php_ub_body_write_no_header; - result = php_ub_body_write_no_header(str, str_length TSRMLS_CC); +/* {{{ static SUCCESS|FAILURE php_output_handler_compat_func(void *ctx, php_output_context *) + php_output_handler_context_func_t for php_output_handler_func_t output handlers */ +static int php_output_handler_compat_func(void **handler_context, php_output_context *output_context) +{ + php_output_handler_func_t func = *(php_output_handler_func_t *) handler_context; + PHP_OUTPUT_TSRMLS(output_context); + + if (func) { + func(output_context->in.data, output_context->in.used, &output_context->out.data, &output_context->out.used, output_context->op TSRMLS_CC); + output_context->out.free = 1; + return SUCCESS; } + return FAILURE; +} +/* }}} */ + +/* {{{ static SUCCESS|FAILURE php_output_handler_default_func(void *ctx, php_output_context *) + Default output handler */ +static int php_output_handler_default_func(void **handler_context, php_output_context *output_context) +{ + output_context->out.data = output_context->in.data; + output_context->out.used = output_context->in.used; + output_context->out.free = output_context->in.free; + output_context->in.data = NULL; + output_context->in.used = 0; + output_context->in.free = 0; + return SUCCESS; +} +/* }}} */ - return result; +/* {{{ static SUCCESS|FAILURE php_output_handler_devnull_func(void *ctx, php_output_context *) + Null output handler */ +static int php_output_handler_devnull_func(void **handler_context, php_output_context *output_context) +{ + return SUCCESS; } /* }}} */ /* - * HEAD support + * USERLAND (nearly 1:1 of old output.c) */ -/* {{{ proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) +/* {{{ proto bool ob_start([string|array user_function [, int chunk_size [, int flags]]]) U Turn on Output Buffering (specifying an optional output handler). */ PHP_FUNCTION(ob_start) { - zval *output_handler=NULL; - long chunk_size=0; - zend_bool erase=1; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|zlb", &output_handler, &chunk_size, &erase) == FAILURE) { - return; + zval *output_handler = NULL; + long chunk_size = 0; + long flags = PHP_OUTPUT_HANDLER_STDFLAGS; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z/ll", &output_handler, &chunk_size, &flags)) { + RETURN_FALSE; } - - if (chunk_size < 0) + if (chunk_size < 0) { chunk_size = 0; - - if (php_start_ob_buffer(output_handler, chunk_size, erase TSRMLS_CC)==FAILURE) { + } + + if (SUCCESS != php_output_start_user(output_handler, chunk_size, flags TSRMLS_CC)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to create buffer"); RETURN_FALSE; } RETURN_TRUE; } /* }}} */ -/* {{{ proto bool ob_flush(void) +/* {{{ proto bool ob_flush(void) U Flush (send) contents of the output buffer. The last buffer content is sent to next buffer */ PHP_FUNCTION(ob_flush) { if (zend_parse_parameters_none() == FAILURE) { return; } - - if (!OG(ob_nesting_level)) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to flush buffer. No buffer to flush."); + + if (!OG(active)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to flush buffer. No buffer to flush"); RETURN_FALSE; } - - if (!OG(active_ob_buffer).status && !OG(active_ob_buffer).erase) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to flush buffer %s.", OG(active_ob_buffer).handler_name); + if (SUCCESS != php_output_flush(TSRMLS_C)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to flush buffer of %s (%d)", Z_STRVAL_P(OG(active)->name), OG(active)->level); RETURN_FALSE; } - - php_end_ob_buffer(1, 1 TSRMLS_CC); RETURN_TRUE; } /* }}} */ -/* {{{ proto bool ob_clean(void) +/* {{{ proto bool ob_clean(void) U Clean (delete) the current output buffer */ PHP_FUNCTION(ob_clean) { @@ -791,22 +1304,19 @@ PHP_FUNCTION(ob_clean) return; } - if (!OG(ob_nesting_level)) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer. No buffer to delete."); + if (!OG(active)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer. No buffer to delete"); RETURN_FALSE; } - - if (!OG(active_ob_buffer).status && !OG(active_ob_buffer).erase) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer %s.", OG(active_ob_buffer).handler_name); + if (SUCCESS != php_output_clean(TSRMLS_C)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer of %s (%d)", Z_STRVAL_P(OG(active)->name), OG(active)->level); RETURN_FALSE; } - - php_end_ob_buffer(0, 1 TSRMLS_CC); RETURN_TRUE; } /* }}} */ -/* {{{ proto bool ob_end_flush(void) +/* {{{ proto bool ob_end_flush(void) U Flush (send) the output buffer, and delete current output buffer */ PHP_FUNCTION(ob_end_flush) { @@ -814,238 +1324,156 @@ PHP_FUNCTION(ob_end_flush) return; } - if (!OG(ob_nesting_level)) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete and flush buffer. No buffer to delete or flush."); + if (!OG(active)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete and flush buffer. No buffer to delete or flush"); RETURN_FALSE; } - if (OG(ob_nesting_level) && !OG(active_ob_buffer).status && !OG(active_ob_buffer).erase) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer %s.", OG(active_ob_buffer).handler_name); - RETURN_FALSE; - } - - php_end_ob_buffer(1, 0 TSRMLS_CC); - RETURN_TRUE; + RETURN_BOOL(SUCCESS == php_output_end(TSRMLS_C)); } /* }}} */ -/* {{{ proto bool ob_end_clean(void) +/* {{{ proto bool ob_end_clean(void) U Clean the output buffer, and delete current output buffer */ PHP_FUNCTION(ob_end_clean) { if (zend_parse_parameters_none() == FAILURE) { return; } - - if (!OG(ob_nesting_level)) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer. No buffer to delete."); - RETURN_FALSE; - } - if (OG(ob_nesting_level) && !OG(active_ob_buffer).status && !OG(active_ob_buffer).erase) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer %s.", OG(active_ob_buffer).handler_name); + + if (!OG(active)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer. No buffer to delete"); RETURN_FALSE; } - - php_end_ob_buffer(0, 0 TSRMLS_CC); - RETURN_TRUE; + RETURN_BOOL(SUCCESS == php_output_discard(TSRMLS_C)); } /* }}} */ -/* {{{ proto bool ob_get_flush(void) +/* {{{ proto bool ob_get_flush(void) U Get current buffer contents, flush (send) the output buffer, and delete current output buffer */ PHP_FUNCTION(ob_get_flush) { if (zend_parse_parameters_none() == FAILURE) { return; } - - /* get contents */ - if (php_ob_get_buffer(return_value TSRMLS_CC)==FAILURE) { + + if (SUCCESS != php_output_get_contents(return_value TSRMLS_CC)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete and flush buffer. No buffer to delete or flush"); RETURN_FALSE; } - /* error checks */ - if (!OG(ob_nesting_level)) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete and flush buffer. No buffer to delete or flush."); - zval_dtor(return_value); - RETURN_FALSE; + if (SUCCESS != php_output_end(TSRMLS_C)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer of %s (%d)", Z_STRVAL_P(OG(active)->name), OG(active)->level); } - if (OG(ob_nesting_level) && !OG(active_ob_buffer).status && !OG(active_ob_buffer).erase) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer %s.", OG(active_ob_buffer).handler_name); - zval_dtor(return_value); - RETURN_FALSE; - } - /* flush */ - php_end_ob_buffer(1, 0 TSRMLS_CC); } /* }}} */ -/* {{{ proto bool ob_get_clean(void) +/* {{{ proto bool ob_get_clean(void) U Get current buffer contents and delete current output buffer */ PHP_FUNCTION(ob_get_clean) { if (zend_parse_parameters_none() == FAILURE) { return; } - /* get contents */ - if (php_ob_get_buffer(return_value TSRMLS_CC)==FAILURE) { - RETURN_FALSE; - } - /* error checks */ - if (!OG(ob_nesting_level)) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer. No buffer to delete."); - zval_dtor(return_value); + + if (SUCCESS != php_output_get_contents(return_value TSRMLS_CC)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer. No buffer to delete"); RETURN_FALSE; } - if (OG(ob_nesting_level) && !OG(active_ob_buffer).status && !OG(active_ob_buffer).erase) { - php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer %s.", OG(active_ob_buffer).handler_name); - zval_dtor(return_value); - RETURN_FALSE; + if (SUCCESS != php_output_discard(TSRMLS_C)) { + php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer of %s (%d)", Z_STRVAL_P(OG(active)->name), OG(active)->level); } - /* delete buffer */ - php_end_ob_buffer(0, 0 TSRMLS_CC); } /* }}} */ -/* {{{ proto string ob_get_contents(void) +/* {{{ proto string ob_get_contents(void) U Return the contents of the output buffer */ PHP_FUNCTION(ob_get_contents) { if (zend_parse_parameters_none() == FAILURE) { return; } - - if (php_ob_get_buffer(return_value TSRMLS_CC)==FAILURE) { + if (SUCCESS != php_output_get_contents(return_value TSRMLS_CC)) { RETURN_FALSE; } } /* }}} */ -/* {{{ proto int ob_get_level(void) +/* {{{ proto int ob_get_level(void) U Return the nesting level of the output buffer */ PHP_FUNCTION(ob_get_level) { if (zend_parse_parameters_none() == FAILURE) { return; } - - RETURN_LONG (OG(ob_nesting_level)); + RETURN_LONG(php_output_get_level(TSRMLS_C)); } /* }}} */ -/* {{{ proto int ob_get_length(void) +/* {{{ proto int ob_get_length(void) U Return the length of the output buffer */ PHP_FUNCTION(ob_get_length) { if (zend_parse_parameters_none() == FAILURE) { return; } - - if (php_ob_get_length(return_value TSRMLS_CC)==FAILURE) { + if (SUCCESS != php_output_get_length(return_value TSRMLS_CC)) { RETURN_FALSE; } } /* }}} */ -/* {{{ int php_ob_buffer_status(php_ob_buffer *ob_buffer, zval *result) */ -static int php_ob_buffer_status(php_ob_buffer *ob_buffer, zval *result) +/* {{{ proto false|array ob_list_handlers() U + * List all output_buffers in an array + */ +PHP_FUNCTION(ob_list_handlers) { - zval *elem; + if (zend_parse_parameters_none() == FAILURE) { + return; + } - MAKE_STD_ZVAL(elem); - array_init(elem); + array_init(return_value); - add_assoc_long(elem, "chunk_size", ob_buffer->chunk_size); - if (!ob_buffer->chunk_size) { - add_assoc_long(elem, "size", ob_buffer->size); - add_assoc_long(elem, "block_size", ob_buffer->block_size); - } - if (ob_buffer->internal_output_handler) { - add_assoc_long(elem, "type", PHP_OUTPUT_HANDLER_INTERNAL); - add_assoc_long(elem, "buffer_size", ob_buffer->internal_output_handler_buffer_size); - } - else { - add_assoc_long(elem, "type", PHP_OUTPUT_HANDLER_USER); + if (!OG(active)) { + return; } - add_assoc_long(elem, "status", ob_buffer->status); - add_assoc_string(elem, "name", ob_buffer->handler_name, 1); - add_assoc_bool(elem, "del", ob_buffer->erase); - add_next_index_zval(result, elem); - - return SUCCESS; + + zend_stack_apply_with_argument(OG(handlers), ZEND_STACK_APPLY_BOTTOMUP, php_output_stack_apply_list, return_value); } /* }}} */ - -/* {{{ proto false|array ob_get_status([bool full_status]) +/* {{{ proto false|array ob_get_status([bool full_status]) U Return the status of the active or all output buffers */ PHP_FUNCTION(ob_get_status) { zend_bool full_status = 0; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &full_status) == FAILURE ) { - return; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &full_status)) { + RETURN_FALSE; } - + if (!OG(active)) { + RETURN_FALSE; + } + array_init(return_value); - if (full_status) { - if (OG(ob_nesting_level)>1) { - zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *elem, void *))php_ob_buffer_status, return_value); - } - if (OG(ob_nesting_level)>0 && php_ob_buffer_status(&OG(active_ob_buffer), return_value)==FAILURE) { - RETURN_FALSE; - } - } else if (OG(ob_nesting_level)>0) { - add_assoc_long(return_value, "level", OG(ob_nesting_level)); - if (OG(active_ob_buffer).internal_output_handler) { - add_assoc_long(return_value, "type", PHP_OUTPUT_HANDLER_INTERNAL); - } else { - add_assoc_long(return_value, "type", PHP_OUTPUT_HANDLER_USER); - } - add_assoc_long(return_value, "status", OG(active_ob_buffer).status); - add_assoc_string(return_value, "name", OG(active_ob_buffer).handler_name, 1); - add_assoc_bool(return_value, "del", OG(active_ob_buffer).erase); + zend_stack_apply_with_argument(OG(handlers), ZEND_STACK_APPLY_BOTTOMUP, php_output_stack_apply_status, return_value); + } else { + php_output_handler_status(OG(active), return_value); } } /* }}} */ - -/* {{{ proto void ob_implicit_flush([int flag]) +/* {{{ proto void ob_implicit_flush([int flag]) U Turn implicit flush on/off and is equivalent to calling flush() after every output call */ PHP_FUNCTION(ob_implicit_flush) { long flag = 1; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flag) == FAILURE) { - return; - } - - if (flag) { - php_start_implicit_flush(TSRMLS_C); - } else { - php_end_implicit_flush(TSRMLS_C); + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flag)) { + php_output_set_implicit_flush(flag TSRMLS_CC); } } /* }}} */ - -/* {{{ char *php_get_output_start_filename(TSRMLS_D) - Return filename start output something */ -PHPAPI char *php_get_output_start_filename(TSRMLS_D) -{ - return OG(output_start_filename); -} -/* }}} */ - - -/* {{{ char *php_get_output_start_lineno(TSRMLS_D) - Return line number start output something */ -PHPAPI int php_get_output_start_lineno(TSRMLS_D) -{ - return OG(output_start_lineno); -} -/* }}} */ - - /* {{{ proto bool output_reset_rewrite_vars(void) Reset(clear) URL rewriter values */ PHP_FUNCTION(output_reset_rewrite_vars) @@ -1058,7 +1486,6 @@ PHP_FUNCTION(output_reset_rewrite_vars) } /* }}} */ - /* {{{ proto bool output_add_rewrite_var(string name, string value) Add URL rewriter values */ PHP_FUNCTION(output_add_rewrite_var) @@ -1067,7 +1494,7 @@ PHP_FUNCTION(output_add_rewrite_var) int name_len, value_len; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name, &name_len, &value, &value_len) == FAILURE) { - return; + RETURN_FALSE; } if (php_url_scanner_add_var(name, name_len, value, value_len, 1 TSRMLS_CC) == SUCCESS) { diff --git a/main/php.h b/main/php.h index e858e3c424..85fda8c706 100644 --- a/main/php.h +++ b/main/php.h @@ -386,20 +386,7 @@ END_EXTERN_C() /* Output support */ #include "main/php_output.h" -#define PHPWRITE(str, str_len) php_body_write((str), (str_len) TSRMLS_CC) -#define PUTS(str) do { \ - const char *__str = (str); \ - php_body_write(__str, strlen(__str) TSRMLS_CC); \ -} while (0) - -#define PUTC(c) (php_body_write(&(c), 1 TSRMLS_CC), (c)) -#define PHPWRITE_H(str, str_len) php_header_write((str), (str_len) TSRMLS_CC) -#define PUTS_H(str) do { \ - const char *__str = (str); \ - php_header_write(__str, strlen(__str) TSRMLS_CC); \ -} while (0) - -#define PUTC_H(c) (php_header_write(&(c), 1 TSRMLS_CC), (c)) + #include "php_streams.h" #include "php_memory_streams.h" diff --git a/main/php_logos.c b/main/php_logos.c index 5350fb888b..43b50a3e30 100644 --- a/main/php_logos.c +++ b/main/php_logos.c @@ -85,7 +85,7 @@ int php_info_logos(const char *logo_string TSRMLS_DC) content_header[len] = '\0'; sapi_add_header(content_header, len, 0); - PHPWRITE(logo_image->data, logo_image->size); + PHPWRITE((char*)logo_image->data, logo_image->size); return 1; } diff --git a/main/php_output.h b/main/php_output.h index f340ba4931..96190cffe7 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -12,7 +12,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Author: Zeev Suraski <zeev@zend.com> | + | Author: Michael Wallner <mike@php.net> | +----------------------------------------------------------------------+ */ @@ -21,35 +21,265 @@ #ifndef PHP_OUTPUT_H #define PHP_OUTPUT_H +#define PHP_OUTPUT_NEWAPI 1 + +/* handler ops */ +#define PHP_OUTPUT_HANDLER_WRITE 0x00 /* standard passthru */ +#define PHP_OUTPUT_HANDLER_START 0x01 /* start */ +#define PHP_OUTPUT_HANDLER_CLEAN 0x02 /* restart */ +#define PHP_OUTPUT_HANDLER_FLUSH 0x04 /* pass along as much as possible */ +#define PHP_OUTPUT_HANDLER_FINAL 0x08 /* finalize */ +#define PHP_OUTPUT_HANDLER_CONT PHP_OUTPUT_HANDLER_WRITE +#define PHP_OUTPUT_HANDLER_END PHP_OUTPUT_HANDLER_FINAL + +/* handler types */ +#define PHP_OUTPUT_HANDLER_INTERNAL 0x0000 +#define PHP_OUTPUT_HANDLER_USER 0x0001 + +/* handler ability flags */ +#define PHP_OUTPUT_HANDLER_CLEANABLE 0x0010 +#define PHP_OUTPUT_HANDLER_FLUSHABLE 0x0020 +#define PHP_OUTPUT_HANDLER_REMOVABLE 0x0040 +#define PHP_OUTPUT_HANDLER_STDFLAGS 0x0070 + +/* handler status flags */ +#define PHP_OUTPUT_HANDLER_STARTED 0x1000 +#define PHP_OUTPUT_HANDLER_DISABLED 0x2000 + +/* handler op return values */ +typedef enum _php_output_handler_status_t { + PHP_OUTPUT_HANDLER_FAILURE, + PHP_OUTPUT_HANDLER_SUCCESS, + PHP_OUTPUT_HANDLER_NO_DATA, +} php_output_handler_status_t; + +/* php_output_stack_pop() flags */ +#define PHP_OUTPUT_POP_TRY 0x000 +#define PHP_OUTPUT_POP_FORCE 0x001 +#define PHP_OUTPUT_POP_DISCARD 0x010 +#define PHP_OUTPUT_POP_SILENT 0x100 + +/* real global flags */ +#define PHP_OUTPUT_IMPLICITFLUSH 0x01 +#define PHP_OUTPUT_DISABLED 0x02 +#define PHP_OUTPUT_WRITTEN 0x04 +#define PHP_OUTPUT_SENT 0x08 +/* supplementary flags for php_output_get_status() */ +#define PHP_OUTPUT_ACTIVE 0x10 +#define PHP_OUTPUT_LOCKED 0x20 + +/* handler hooks */ +typedef enum _php_output_handler_hook_t { + PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, + PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS, + PHP_OUTPUT_HANDLER_HOOK_GET_LEVEL, + PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, + PHP_OUTPUT_HANDLER_HOOK_DISABLE, + /* unused */ + PHP_OUTPUT_HANDLER_HOOK_LAST, +} php_output_handler_hook_t; + +#define PHP_OUTPUT_HANDLER_INITBUF_SIZE(s) \ +( (s) ? \ + (s) + PHP_OUTPUT_HANDLER_ALIGNTO_SIZE - ((s) % (PHP_OUTPUT_HANDLER_ALIGNTO_SIZE)) : \ + PHP_OUTPUT_HANDLER_DEFAULT_SIZE \ +) +#define PHP_OUTPUT_HANDLER_ALIGNTO_SIZE 0x1000 +#define PHP_OUTPUT_HANDLER_DEFAULT_SIZE 0x4000 + +typedef struct _php_output_buffer { + char *data; + size_t size; + size_t used; + uint free:1; + uint _res:31; +} php_output_buffer; + +typedef struct _php_output_context { + int op; + php_output_buffer in; + php_output_buffer out; +#ifdef ZTS + void ***tsrm_ls; +#endif +} php_output_context; + +#define PHP_OUTPUT_TSRMLS(ctx) TSRMLS_FETCH_FROM_CTX((ctx)->tsrm_ls) + +/* old-style, stateless callback */ typedef void (*php_output_handler_func_t)(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC); +/* new-style, opaque context callback */ +typedef int (*php_output_handler_context_func_t)(void **handler_context, php_output_context *output_context); +/* output handler context dtor */ +typedef void (*php_output_handler_context_dtor_t)(void *opaq TSRMLS_DC); +/* conflict check callback */ +typedef int (*php_output_handler_conflict_check_t)(zval *handler_name TSRMLS_DC); +/* ctor for aliases */ +typedef struct _php_output_handler *(*php_output_handler_alias_ctor_t)(zval *handler_name, size_t chunk_size, int flags TSRMLS_DC); + +typedef struct _php_output_handler_user_func_t { + zend_fcall_info fci; + zend_fcall_info_cache fcc; + zval *zoh; +} php_output_handler_user_func_t; + +typedef struct _php_output_handler { + zval *name; + int flags; + int level; + size_t size; + php_output_buffer buffer; + + void *opaq; + void (*dtor)(void *opaq TSRMLS_DC); + + union { + php_output_handler_user_func_t *user; + php_output_handler_context_func_t internal; + } func; +} php_output_handler; + +ZEND_BEGIN_MODULE_GLOBALS(output) + int flags; + zend_stack *handlers; + php_output_handler *active; + php_output_handler *running; + char *output_start_filename; + int output_start_lineno; + zval *default_output_handler_name; + zval *devnull_output_handler_name; +ZEND_END_MODULE_GLOBALS(output); + +/* there should not be a need to use OG() from outside of output.c */ +#ifdef ZTS +# define OG(v) TSRMG(output_globals_id, zend_output_globals *, v) +#else +# define OG(v) (output_globals.v) +#endif + +/* convenience macros */ +#define PHPWRITE(str, str_len) php_output_write((str), (str_len) TSRMLS_CC) +#define PHPWRITE_H(str, str_len) php_output_write_unbuffered((str), (str_len) TSRMLS_CC) + +#define PUTC(c) (php_output_write(&(c), 1 TSRMLS_CC), (c)) +#define PUTC_H(c) (php_output_write_unbuffered(&(c), 1 TSRMLS_CC), (c)) + +#define PUTS(str) do { \ + const char *__str = (str); \ + php_output_write(__str, strlen(__str) TSRMLS_CC); \ +} while (0) +#define PUTS_H(str) do { \ + const char *__str = (str); \ + php_output_write_unbuffered(__str, strlen(__str) TSRMLS_CC); \ +} while (0) + BEGIN_EXTERN_C() +#define php_output_tearup() \ + php_output_startup(); \ + php_output_activate(TSRMLS_C) +#define php_output_teardown() \ + php_output_end_all(TSRMLS_C); \ + php_output_deactivate(TSRMLS_C); \ + php_output_shutdown() + +/* MINIT */ PHPAPI void php_output_startup(void); -PHPAPI void php_output_activate(TSRMLS_D); -PHPAPI void php_output_set_status(zend_bool status TSRMLS_DC); +/* MSHUTDOWN */ +PHPAPI void php_output_shutdown(void); + PHPAPI void php_output_register_constants(TSRMLS_D); -PHPAPI int php_default_output_func(const char *str, uint str_len TSRMLS_DC); -PHPAPI int php_ub_body_write(const char *str, uint str_length TSRMLS_DC); -PHPAPI int php_ub_body_write_no_header(const char *str, uint str_length TSRMLS_DC); -PHPAPI int php_body_write(const char *str, uint str_length TSRMLS_DC); -PHPAPI int php_header_write(const char *str, uint str_length TSRMLS_DC); -PHPAPI int php_start_ob_buffer(zval *output_handler, uint chunk_size, zend_bool erase TSRMLS_DC); -PHPAPI int php_start_ob_buffer_named(const char *output_handler_name, uint chunk_size, zend_bool erase TSRMLS_DC); -PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS_DC); -PHPAPI void php_end_ob_buffers(zend_bool send_buffer TSRMLS_DC); -PHPAPI int php_ob_get_buffer(zval *p TSRMLS_DC); -PHPAPI int php_ob_get_length(zval *p TSRMLS_DC); -PHPAPI void php_start_implicit_flush(TSRMLS_D); -PHPAPI void php_end_implicit_flush(TSRMLS_D); -PHPAPI char *php_get_output_start_filename(TSRMLS_D); -PHPAPI int php_get_output_start_lineno(TSRMLS_D); -PHPAPI void php_ob_set_internal_handler(php_output_handler_func_t internal_output_handler, uint buffer_size, char *handler_name, zend_bool erase TSRMLS_DC); -PHPAPI int php_ob_handler_used(char *handler_name TSRMLS_DC); -PHPAPI int php_ob_init_conflict(char *handler_new, char *handler_set TSRMLS_DC); -PHPAPI int php_ob_get_buffer(zval *p TSRMLS_DC); -PHPAPI int php_ob_get_length(zval *p TSRMLS_DC); + +/* RINIT */ +PHPAPI int php_output_activate(TSRMLS_D); +/* RSHUTDOWN */ +PHPAPI void php_output_deactivate(TSRMLS_D); + +PHPAPI zval *php_output_get_default_handler_name(TSRMLS_D); +PHPAPI zval *php_output_get_devnull_handler_name(TSRMLS_D); + +PHPAPI void php_output_set_status(int status TSRMLS_DC); +PHPAPI int php_output_get_status(TSRMLS_D); +PHPAPI void php_output_set_implicit_flush(int flush TSRMLS_DC); +PHPAPI char *php_output_get_start_filename(TSRMLS_D); +PHPAPI int php_output_get_start_lineno(TSRMLS_D); + +PHPAPI int php_output_write_unbuffered(const char *str, size_t len TSRMLS_DC); +PHPAPI int php_output_write(const char *str, size_t len TSRMLS_DC); + +PHPAPI int php_output_flush(TSRMLS_D); +PHPAPI void php_output_flush_all(TSRMLS_D); +PHPAPI int php_output_clean(TSRMLS_D); +PHPAPI void php_output_clean_all(TSRMLS_D); +PHPAPI int php_output_end(TSRMLS_D); +PHPAPI void php_output_end_all(TSRMLS_D); +PHPAPI int php_output_discard(TSRMLS_D); +PHPAPI void php_output_discard_all(TSRMLS_D); + +PHPAPI int php_output_get_contents(zval *p TSRMLS_DC); +PHPAPI int php_output_get_length(zval *p TSRMLS_DC); +PHPAPI int php_output_get_level(TSRMLS_D); + +PHPAPI int php_output_start_default(TSRMLS_D); +PHPAPI int php_output_start_devnull(TSRMLS_D); + +PHPAPI int php_output_start_user(zval *output_handler, size_t chunk_size, int flags TSRMLS_DC); +PHPAPI int php_output_start_internal(zval *name, php_output_handler_func_t output_handler, size_t chunk_size, int flags TSRMLS_DC); + +PHPAPI php_output_handler *php_output_handler_create_user(zval *handler, size_t chunk_size, int flags TSRMLS_DC); +PHPAPI php_output_handler *php_output_handler_create_internal(zval *name, php_output_handler_context_func_t handler, size_t chunk_size, int flags TSRMLS_DC); + +PHPAPI void php_output_handler_set_context(php_output_handler *handler, void *opaq, void (*dtor)(void* TSRMLS_DC) TSRMLS_DC); +PHPAPI int php_output_handler_start(php_output_handler *handler TSRMLS_DC); +PHPAPI int php_output_handler_started(zval *name TSRMLS_DC); +PHPAPI int php_output_handler_hook(php_output_handler_hook_t type, void *arg TSRMLS_DC); +PHPAPI void php_output_handler_dtor(php_output_handler *handler TSRMLS_DC); +PHPAPI void php_output_handler_free(php_output_handler **handler TSRMLS_DC); + +PHPAPI int php_output_handler_conflict(zval *handler_new, zval *handler_set TSRMLS_DC); +PHPAPI int php_output_handler_conflict_register(zval *handler_name, php_output_handler_conflict_check_t check_func TSRMLS_DC); +PHPAPI int php_output_handler_reverse_conflict_register(zval *handler_name, php_output_handler_conflict_check_t check_func TSRMLS_DC); + +#define PHP_OUTPUT_CONFLICT_REGISTER(name, func) \ +{ \ + zval tmp_z; \ + char *tmp_s = (name); \ + INIT_PZVAL(&tmp_z); \ + ZVAL_STRING(&tmp_z, tmp_s, 1); \ + php_output_handler_conflict_register(&tmp_z, func TSRMLS_CC); \ + zval_dtor(&tmp_z); \ +} + +#define PHP_OUTPUT_CONFLICT(check_name, action) \ +{ \ + int tmp_i; \ + zval tmp_z; \ + char *tmp_s = (check_name); \ + INIT_PZVAL(&tmp_z); \ + ZVAL_STRING(&tmp_z, tmp_s, 1); \ + tmp_i = php_output_handler_conflict(handler_name, &tmp_z TSRMLS_CC); \ + zval_dtor(&tmp_z); \ + if (tmp_i) { \ + action; \ + } \ +} + +PHPAPI php_output_handler_alias_ctor_t *php_output_handler_alias(zval *handler_name TSRMLS_DC); +PHPAPI int php_output_handler_alias_register(zval *handler_name, php_output_handler_alias_ctor_t func TSRMLS_DC); + +#define PHP_OUTPUT_ALIAS_REGISTER(name, func) \ +{ \ + zval tmp_z; \ + char *tmp_s = (name); \ + INIT_PZVAL(&tmp_z); \ + ZVAL_STRING(&tmp_z, tmp_s, 1); \ + php_output_handler_alias_register(&tmp_z, func TSRMLS_CC); \ + zval_dtor(&tmp_z); \ +} + END_EXTERN_C() + PHP_FUNCTION(ob_start); PHP_FUNCTION(ob_flush); PHP_FUNCTION(ob_clean); @@ -64,51 +294,16 @@ PHP_FUNCTION(ob_get_status); PHP_FUNCTION(ob_implicit_flush); PHP_FUNCTION(ob_list_handlers); -typedef struct _php_ob_buffer { - char *buffer; - uint size; - uint text_length; - int block_size; - uint chunk_size; - int status; - zval *output_handler; - php_output_handler_func_t internal_output_handler; - char *internal_output_handler_buffer; - uint internal_output_handler_buffer_size; - char *handler_name; - zend_bool erase; -} php_ob_buffer; - -typedef struct _php_output_globals { - int (*php_body_write)(const char *str, uint str_length TSRMLS_DC); /* string output */ - int (*php_header_write)(const char *str, uint str_length TSRMLS_DC); /* unbuffer string output */ - php_ob_buffer active_ob_buffer; - unsigned char implicit_flush; - char *output_start_filename; - int output_start_lineno; - zend_stack ob_buffers; - int ob_nesting_level; - zend_bool ob_lock; - zend_bool disable_output; -} php_output_globals; - -#ifdef ZTS -#define OG(v) TSRMG(output_globals_id, php_output_globals *, v) -ZEND_API extern int output_globals_id; -#else -#define OG(v) (output_globals.v) -ZEND_API extern php_output_globals output_globals; -#endif - -#define PHP_OUTPUT_HANDLER_START (1<<0) -#define PHP_OUTPUT_HANDLER_CONT (1<<1) -#define PHP_OUTPUT_HANDLER_END (1<<2) - -#define PHP_OUTPUT_HANDLER_INTERNAL 0 -#define PHP_OUTPUT_HANDLER_USER 1 - PHP_FUNCTION(output_add_rewrite_var); PHP_FUNCTION(output_reset_rewrite_vars); +#endif -#endif /* PHP_OUTPUT_H */ +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ diff --git a/sapi/apache/libpre.c b/sapi/apache/libpre.c index 2b89307e5d..ec2b57b174 100644 --- a/sapi/apache/libpre.c +++ b/sapi/apache/libpre.c @@ -33,7 +33,7 @@ #ifdef __GNUC__ -#include <string.h> /* memset */ +#include <string.h> /* memset */ extern char _edata, _end ; /* end of DATA (start of BSS), end of BSS */ #endif @@ -41,15 +41,15 @@ int _lib_start() { /* printf("Inside _lib_start\n");*/ #ifdef __GNUC__ - memset (&_edata, 0, &_end - &_edata); + memset (&_edata, 0, &_end - &_edata); #endif - return 0; + return 0; } int _lib_stop() { /* printf("Inside _lib_stop\n");*/ - return 0; + return 0; } #endif /* NETWARE */ diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c index 9711e3fa70..815fd48f6f 100644 --- a/sapi/apache/mod_php5.c +++ b/sapi/apache/mod_php5.c @@ -95,7 +95,7 @@ static void php_save_umask(void) static int sapi_apache_ub_write(const char *str, uint str_length TSRMLS_DC) { int ret=0; - + if (SG(server_context)) { ret = rwrite(str, str_length, (request_rec *) SG(server_context)); } @@ -137,7 +137,7 @@ static int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC) if (!SG(read_post_bytes) && !ap_should_client_block(r)) { return total_read_bytes; } - + handler = signal(SIGPIPE, SIG_IGN); while (total_read_bytes<count_bytes) { hard_timeout("Read POST information", r); /* start timeout timer */ @@ -148,7 +148,7 @@ static int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC) } total_read_bytes += read_bytes; } - signal(SIGPIPE, handler); + signal(SIGPIPE, handler); return total_read_bytes; } /* }}} */ @@ -332,15 +332,15 @@ static void php_apache_request_shutdown(void *dummy) { TSRMLS_FETCH(); - php_output_set_status(0 TSRMLS_CC); + php_output_set_status(PHP_OUTPUT_DISABLED TSRMLS_CC); if (AP(in_request)) { AP(in_request) = 0; php_request_shutdown(dummy); } - SG(server_context) = NULL; - /* - * The server context (request) is NOT invalid by the time - * run_cleanups() is called + SG(server_context) = NULL; + /* + * The server context (request) is NOT invalid by the time + * run_cleanups() is called */ } /* }}} */ @@ -349,7 +349,7 @@ static void php_apache_request_shutdown(void *dummy) */ static int php_apache_sapi_activate(TSRMLS_D) { - request_rec *r = (request_rec *) SG(server_context); + request_rec *r = (request_rec *) SG(server_context); /* * For the Apache module version, this bit of code registers a cleanup @@ -357,7 +357,7 @@ static int php_apache_sapi_activate(TSRMLS_D) * We need this because at any point in our code we can be interrupted * and that may happen before we have had time to free our memory. * The php_request_shutdown function needs to free all outstanding allocated - * memory. + * memory. */ block_alarms(); register_cleanup(r->pool, NULL, php_apache_request_shutdown, php_request_shutdown_for_exec); @@ -401,7 +401,7 @@ static int sapi_apache_get_fd(int *nfd TSRMLS_DC) int fd; fd = r->connection->client->fd; - + if (fd >= 0) { if (nfd) *nfd = fd; return SUCCESS; @@ -416,9 +416,9 @@ static int sapi_apache_get_fd(int *nfd TSRMLS_DC) static int sapi_apache_force_http_10(TSRMLS_D) { request_rec *r = SG(server_context); - + r->proto_num = HTTP_VERSION(1,0); - + return SUCCESS; } /* }}} */ @@ -464,7 +464,7 @@ static void sapi_apache_child_terminate(TSRMLS_D) static sapi_module_struct apache_sapi_module = { "apache", /* name */ "Apache", /* pretty name */ - + php_apache_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ @@ -579,8 +579,8 @@ static int php_apache_alter_ini_entries(php_per_dir_entry *per_dir_entry TSRMLS_ */ static char *php_apache_get_default_mimetype(request_rec *r TSRMLS_DC) { - char *mimetype; + if (SG(default_mimetype) || SG(default_charset)) { /* Assume output will be of the default MIME type. Individual scripts may change this later. */ @@ -628,7 +628,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename) if (per_dir_conf) { zend_hash_apply((HashTable *) per_dir_conf, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC); } - + /* If PHP parser engine has been turned off with an "engine off" * directive, then decline to handle this request */ @@ -696,9 +696,8 @@ static int send_parsed_php(request_rec * r) { int result = send_php(r, 0, NULL); TSRMLS_FETCH(); - - ap_table_setn(r->notes, "mod_php_memory_usage", - ap_psprintf(r->pool, "%lu", zend_memory_peak_usage(1 TSRMLS_CC))); + + ap_table_setn(r->notes, "mod_php_memory_usage", ap_psprintf(r->pool, "%lu", zend_memory_peak_usage(1 TSRMLS_CC))); return result; } @@ -860,7 +859,7 @@ static CONST_PREFIX char *php_apache_flag_handler_ex(cmd_parms *cmd, HashTable * bool_val[0] = '0'; } bool_val[1] = 0; - + return php_apache_value_handler_ex(cmd, conf, arg1, bool_val, mode); } /* }}} */ @@ -926,7 +925,7 @@ static void apache_php_module_shutdown_wrapper(void) #if MODULE_MAGIC_NUMBER >= 19970728 /* This function is only called on server exit if the apache API - * child_exit handler exists, so shutdown globally + * child_exit handler exists, so shutdown globally */ sapi_shutdown(); #endif diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c index 8faa6f34f0..e2055ccb48 100644 --- a/sapi/apache/php_apache.c +++ b/sapi/apache/php_apache.c @@ -93,8 +93,6 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_apache_reset_timeout, 0) ZEND_END_ARG_INFO() - - const zend_function_entry apache_functions[] = { PHP_FE(virtual, arginfo_apache_virtual) PHP_FE(apache_request_headers, arginfo_apache_request_headers) @@ -110,7 +108,6 @@ const zend_function_entry apache_functions[] = { {NULL, NULL, NULL} }; - PHP_INI_BEGIN() STD_PHP_INI_ENTRY("xbithack", "0", PHP_INI_ALL, OnUpdateLong, xbithack, php_apache_info_struct, php_apache_info) STD_PHP_INI_ENTRY("engine", "1", PHP_INI_ALL, OnUpdateLong, engine, php_apache_info_struct, php_apache_info) @@ -118,14 +115,11 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("child_terminate", "0", PHP_INI_ALL, OnUpdateLong, terminate_child, php_apache_info_struct, php_apache_info) PHP_INI_END() - - static void php_apache_globals_ctor(php_apache_info_struct *apache_globals TSRMLS_DC) { apache_globals->in_request = 0; } - static PHP_MINIT_FUNCTION(apache) { #ifdef ZTS @@ -137,7 +131,6 @@ static PHP_MINIT_FUNCTION(apache) return SUCCESS; } - static PHP_MSHUTDOWN_FUNCTION(apache) { UNREGISTER_INI_ENTRIES(); @@ -146,13 +139,13 @@ static PHP_MSHUTDOWN_FUNCTION(apache) zend_module_entry apache_module_entry = { STANDARD_MODULE_HEADER, - "apache", - apache_functions, - PHP_MINIT(apache), - PHP_MSHUTDOWN(apache), - NULL, - NULL, - PHP_MINFO(apache), + "apache", + apache_functions, + PHP_MINIT(apache), + PHP_MSHUTDOWN(apache), + NULL, + NULL, + PHP_MINFO(apache), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; @@ -178,7 +171,6 @@ PHP_MINFO_FUNCTION(apache) serv = ((request_rec *) SG(server_context))->server; - php_info_print_table_start(); #ifdef PHP_WIN32 @@ -196,7 +188,7 @@ PHP_MINFO_FUNCTION(apache) if (apv && *apv) { php_info_print_table_row(2, "Apache Version", apv); - } + } #ifdef APACHE_RELEASE snprintf(output_buf, sizeof(output_buf), "%d", APACHE_RELEASE); @@ -222,7 +214,7 @@ PHP_MINFO_FUNCTION(apache) php_info_print_table_row(2, "Server Root", server_root); strcpy(modulenames, ""); - for(modp = top_module; modp; modp = modp->next) { + for (modp = top_module; modp; modp = modp->next) { strlcpy(name, modp->name, sizeof(name)); if ((p = strrchr(name, '.'))) { *p='\0'; /* Cut off ugly .c extensions on module names */ @@ -248,14 +240,14 @@ PHP_MINFO_FUNCTION(apache) r = ((request_rec *) SG(server_context)); arr = table_elts(r->subprocess_env); elts = (table_entry *)arr->elts; - + SECTION("Apache Environment"); - php_info_print_table_start(); + php_info_print_table_start(); php_info_print_table_header(2, "Variable", "Value"); for (i=0; i < arr->nelts; i++) { php_info_print_table_row(2, elts[i].key, elts[i].val); } - php_info_print_table_end(); + php_info_print_table_end(); } { @@ -263,7 +255,7 @@ PHP_MINFO_FUNCTION(apache) table_entry *env; int i; request_rec *r; - + r = ((request_rec *) SG(server_context)); SECTION("HTTP Headers Information"); php_info_print_table_start(); @@ -279,7 +271,7 @@ PHP_MINFO_FUNCTION(apache) php_info_print_table_colspan_header(2, "HTTP Response Headers"); env_arr = table_elts(r->headers_out); env = (table_entry *)env_arr->elts; - for(i = 0; i < env_arr->nelts; ++i) { + for (i = 0; i < env_arr->nelts; ++i) { if (env[i].key) { php_info_print_table_row(2, env[i].key, env[i].val); } @@ -353,34 +345,37 @@ PHP_FUNCTION(virtual) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &filename, &filename_len) == FAILURE) { return; } - + if (!(rr = sub_req_lookup_uri (filename, ((request_rec *) SG(server_context))))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - URI lookup failed", filename); - if (rr) + if (rr) { destroy_sub_req (rr); + } RETURN_FALSE; } if (rr->status != 200) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - error finding URI", filename); - if (rr) + if (rr) { destroy_sub_req (rr); + } RETURN_FALSE; } - php_end_ob_buffers(1 TSRMLS_CC); + php_output_end_all(TSRMLS_C); php_header(TSRMLS_C); if (run_sub_req(rr)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - request execution failed", filename); - if (rr) + if (rr) { destroy_sub_req (rr); + } RETURN_FALSE; } - if (rr) + if (rr) { destroy_sub_req (rr); - + } RETURN_TRUE; } /* }}} */ @@ -409,7 +404,7 @@ PHP_FUNCTION(apache_request_headers) if (add_assoc_string(return_value, tenv[i].key, (tenv[i].val==NULL) ? "" : tenv[i].val, 1)==FAILURE) { RETURN_FALSE; } - } + } } /* }}} */ @@ -446,8 +441,10 @@ PHP_FUNCTION(apache_setenv) return; } - while(top) { - if(r->prev) r = r->prev; + while (top) { + if (r->prev) { + r = r->prev; + } else break; } @@ -480,16 +477,16 @@ PHP_FUNCTION(apache_lookup_uri) add_property_string(return_value,"the_request", rr->the_request, 1); } if (rr->status_line) { - add_property_string(return_value,"status_line", (char *)rr->status_line, 1); + add_property_string(return_value,"status_line", (char *)rr->status_line, 1); } if (rr->method) { - add_property_string(return_value,"method", (char *)rr->method, 1); + add_property_string(return_value,"method", (char *)rr->method, 1); } if (rr->content_type) { add_property_string(return_value,"content_type", (char *)rr->content_type, 1); } if (rr->handler) { - add_property_string(return_value,"handler", (char *)rr->handler, 1); + add_property_string(return_value,"handler", (char *)rr->handler, 1); } if (rr->uri) { add_property_string(return_value,"uri", rr->uri, 1); @@ -519,11 +516,11 @@ PHP_FUNCTION(apache_lookup_uri) if (rr->unparsed_uri) { add_property_string(return_value,"unparsed_uri", rr->unparsed_uri, 1); } - if(rr->mtime) { + if (rr->mtime) { add_property_long(return_value,"mtime", rr->mtime); } #endif - if(rr->request_time) { + if (rr->request_time) { add_property_long(return_value,"request_time", rr->request_time); } @@ -546,7 +543,7 @@ PHP_FUNCTION(apache_exec_uri) return; } - if(!(rr = ap_sub_req_lookup_uri(filename, ((request_rec *) SG(server_context))))) { + if (!(rr = ap_sub_req_lookup_uri(filename, ((request_rec *) SG(server_context))))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "URI lookup failed", filename); RETURN_FALSE; } @@ -576,16 +573,16 @@ PHP_FUNCTION(apache_get_modules) { int n; char *p; - + array_init(return_value); - + for (n = 0; ap_loaded_modules[n]; ++n) { char *s = (char *) ap_loaded_modules[n]->name; if ((p = strchr(s, '.'))) { add_next_index_stringl(return_value, s, (p - s), 1); } else { add_next_index_string(return_value, s, 1); - } + } } } /* }}} */ diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c index 895463b2e7..1d58c0b5db 100644 --- a/sapi/apache/sapi_apache.c +++ b/sapi/apache/sapi_apache.c @@ -27,7 +27,7 @@ */ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) { - int retval = OK; + int retval = OK; zend_file_handle file_handle; if (php_request_startup(TSRMLS_C) == FAILURE) { @@ -35,7 +35,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) } /* sending a file handle to another dll is not working so let zend open it. */ - + if (display_source_mode) { zend_syntax_highlighter_ini syntax_highlighter_ini; @@ -54,11 +54,11 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) } AP(in_request) = 0; - + zend_try { php_request_shutdown(NULL); } zend_end_try(); - + return retval; } /* }}} */ diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index 32f6b57182..3b275d3a81 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -91,7 +91,7 @@ PHP_FUNCTION(virtual) } /* Flush everything. */ - php_end_ob_buffers(1 TSRMLS_CC); + php_output_end_all(TSRMLS_C); php_header(TSRMLS_C); /* Ensure that the ap_r* layer for the main request is flushed, to diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c index 7b6d18de9a..1d8bed4671 100644 --- a/sapi/apache_hooks/mod_php5.c +++ b/sapi/apache_hooks/mod_php5.c @@ -53,10 +53,9 @@ static void php_child_exit_handler(server_rec *s, pool *p); #define CONST_PREFIX #endif - typedef struct _sapi_stack { - int top, max, persistent; - void **elements; + int top, max, persistent; + void **elements; } sapi_stack; typedef struct _php_per_dir_config { @@ -76,7 +75,6 @@ typedef struct _php_per_server_config { sapi_stack requires; } php_per_server_config; - static CONST_PREFIX char *php_apache_value_handler_ex(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2, int mode); static CONST_PREFIX char *php_apache_value_handler(cmd_parms *cmd, php_per_dir_config *conf, char *arg1, char *arg2); static CONST_PREFIX char *php_apache_admin_value_handler(cmd_parms *cmd, php_per_dir_config *conf, char *arg1, char *arg2); @@ -108,67 +106,67 @@ typedef struct _php_per_dir_entry { */ /* This code is ripped part and parcel from zend_stack.[ch]. Assuming that the - patch supporting zend_stack_init_ex is applied, all but the bottom two + patch supporting zend_stack_init_ex is applied, all but the bottom two module-specific iterators will be removed */ int sapi_stack_init_ex(sapi_stack *stack, int persistent) { - stack->top = 0; - stack->persistent = persistent; - stack->elements = (void **) pemalloc(sizeof(void **) * STACK_BLOCK_SIZE, persistent); - if (!stack->elements) { - return FAILURE; - } else { - stack->max = STACK_BLOCK_SIZE; - return SUCCESS; - } + stack->top = 0; + stack->persistent = persistent; + stack->elements = (void **) pemalloc(sizeof(void **) * STACK_BLOCK_SIZE, persistent); + if (!stack->elements) { + return FAILURE; + } else { + stack->max = STACK_BLOCK_SIZE; + return SUCCESS; + } } + int sapi_stack_push(sapi_stack *stack, void *element) { - if (stack->top >= stack->max) { /* we need to allocate more memory */ - stack->elements = (void **) perealloc(stack->elements, - (sizeof(void **) * (stack->max += STACK_BLOCK_SIZE)), stack->persistent); - if (!stack->elements) { - return FAILURE; - } + if (stack->top >= stack->max) { /* we need to allocate more memory */ + stack->elements = (void **) perealloc(stack->elements, (sizeof(void **) * (stack->max += STACK_BLOCK_SIZE)), stack->persistent); + if (!stack->elements) { + return FAILURE; } - stack->elements[stack->top] = (void *) element; - return stack->top++; + } + stack->elements[stack->top] = (void *) element; + return stack->top++; } -void* sapi_stack_pop(sapi_stack *stack) { - if(stack->top == 0) { + +void* sapi_stack_pop(sapi_stack *stack) +{ + if (stack->top == 0) { return NULL; - } - else { + } else { return stack->elements[--stack->top]; } } int sapi_stack_destroy(sapi_stack *stack) { - return SUCCESS; + return SUCCESS; } int sapi_stack_apply_with_argument_all(sapi_stack *stack, int type, int (*apply_function)(void *element, void *arg), void *arg) { - int i, retval; - - switch (type) { - case ZEND_STACK_APPLY_TOPDOWN: - for (i=stack->top-1; i>=0; i--) { - retval = apply_function(stack->elements[i], arg); - } - break; - case ZEND_STACK_APPLY_BOTTOMUP: - for (i=0; i<stack->top; i++) { - retval = apply_function(stack->elements[i], arg); - } - break; - } - return retval; -} + int i, retval; + switch (type) { + case ZEND_STACK_APPLY_TOPDOWN: + for (i=stack->top-1; i>=0; i--) { + retval = apply_function(stack->elements[i], arg); + } + break; + case ZEND_STACK_APPLY_BOTTOMUP: + for (i=0; i<stack->top; i++) { + retval = apply_function(stack->elements[i], arg); + } + break; + } + return retval; +} int sapi_stack_apply_with_argument_stop_if_equals(sapi_stack *stack, int type, int (*apply_function)(void *element, void *arg), void *arg, int stopval) { @@ -224,7 +222,7 @@ void php_handler_stack_destroy(sapi_stack *stack) free(ph); } } -/* }}} */ +/* }}} */ /* {{{ php_save_umask */ @@ -240,7 +238,7 @@ static void php_save_umask(void) static int sapi_apache_ub_write(const char *str, uint str_length TSRMLS_DC) { int ret=0; - + if (SG(server_context)) { ret = rwrite(str, str_length, (request_rec *) SG(server_context)); } @@ -282,7 +280,7 @@ static int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC) if (!SG(read_post_bytes) && !ap_should_client_block(r)) { return total_read_bytes; } - + handler = signal(SIGPIPE, SIG_IGN); while (total_read_bytes<count_bytes) { hard_timeout("Read POST information", r); /* start timeout timer */ @@ -293,7 +291,7 @@ static int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC) } total_read_bytes += read_bytes; } - signal(SIGPIPE, handler); + signal(SIGPIPE, handler); return total_read_bytes; } /* }}} */ @@ -312,7 +310,8 @@ static int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_head { char *header_name, *header_content, *p; request_rec *r = (request_rec *) SG(server_context); - if(!r) { + + if (!r) { return 0; } @@ -363,15 +362,15 @@ static int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_head */ static int sapi_apache_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) { - if(SG(server_context) == NULL) { /* server_context is not here anymore */ + if (SG(server_context) == NULL) { /* server_context is not here anymore */ return SAPI_HEADER_SEND_FAILED; } ((request_rec *) SG(server_context))->status = SG(sapi_headers).http_response_code; /* check that we haven't sent headers already, we use our own - * headers_sent since we may send headers at anytime + * headers_sent since we may send headers at anytime */ - if(!AP(headers_sent)) { + if (!AP(headers_sent)) { send_http_header((request_rec *) SG(server_context)); AP(headers_sent) = 1; } @@ -455,15 +454,16 @@ static void php_apache_log_message(char *message) static void php_apache_request_shutdown(void *dummy) { TSRMLS_FETCH(); + AP(current_hook) = AP_CLEANUP; - php_output_set_status(0 TSRMLS_CC); + php_output_set_status(PHP_OUTPUT_DISABLED TSRMLS_CC); SG(server_context) = NULL; /* The server context (request) is invalid by the time run_cleanups() is called */ - if(SG(sapi_started)) { + if (SG(sapi_started)) { php_request_shutdown(dummy); SG(sapi_started) = 0; } AP(in_request) = 0; - if(AP(setup_env)) { + if (AP(setup_env)) { AP(setup_env) = 0; } AP(current_hook) = AP_WAITING_FOR_REQUEST; @@ -475,7 +475,7 @@ static void php_apache_request_shutdown(void *dummy) */ static int php_apache_sapi_activate(TSRMLS_D) { - request_rec *r = (request_rec *) SG(server_context); + request_rec *r = (request_rec *) SG(server_context); /* * For the Apache module version, this bit of code registers a cleanup @@ -483,7 +483,7 @@ static int php_apache_sapi_activate(TSRMLS_D) * We need this because at any point in our code we can be interrupted * and that may happen before we have had time to free our memory. * The php_request_shutdown function needs to free all outstanding allocated - * memory. + * memory. */ block_alarms(); register_cleanup(r->pool, NULL, php_apache_request_shutdown, php_request_shutdown_for_exec); @@ -519,7 +519,7 @@ static char *php_apache_getenv(char *name, size_t name_len TSRMLS_DC) static sapi_module_struct apache_sapi_module = { "apache", /* name */ "Apache", /* pretty name */ - + php_apache_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ @@ -560,7 +560,6 @@ static sapi_module_struct apache_sapi_module = { NULL, /* exe location */ 0, /* ini ignore */ NULL - }; /* }}} */ @@ -598,20 +597,20 @@ static void init_request_info(TSRMLS_D) SG(request_info).auth_password = NULL; if (authorization && !auth_type(r)) { - if (!strcasecmp(getword(r->pool, &authorization, ' '), "Basic")) { - tmp = uudecode(r->pool, authorization); - tmp_user = getword_nulls_nc(r->pool, &tmp, ':'); - if (tmp_user) { - r->connection->user = pstrdup(r->connection->pool, tmp_user); - r->connection->ap_auth_type = "Basic"; - SG(request_info).auth_user = estrdup(tmp_user); - } - if (tmp) { - SG(request_info).auth_password = estrdup(tmp); - } - } else if (!strcasecmp(getword(r->pool, &authorization, ' '), "Digest")) { - r->connection->ap_auth_type = "Digest"; - SG(request_info).auth_digest = estrdup(authorization); + if (!strcasecmp(getword(r->pool, &authorization, ' '), "Basic")) { + tmp = uudecode(r->pool, authorization); + tmp_user = getword_nulls_nc(r->pool, &tmp, ':'); + if (tmp_user) { + r->connection->user = pstrdup(r->connection->pool, tmp_user); + r->connection->ap_auth_type = "Basic"; + SG(request_info).auth_user = estrdup(tmp_user); + } + if (tmp) { + SG(request_info).auth_password = estrdup(tmp); + } + } else if (!strcasecmp(getword(r->pool, &authorization, ' '), "Digest")) { + r->connection->ap_auth_type = "Digest"; + SG(request_info).auth_digest = estrdup(authorization); } } } @@ -630,8 +629,8 @@ static int php_apache_alter_ini_entries(php_per_dir_entry *per_dir_entry TSRMLS_ */ static char *php_apache_get_default_mimetype(request_rec *r TSRMLS_DC) { - char *mimetype; + if (SG(default_mimetype) || SG(default_charset)) { /* Assume output will be of the default MIME type. Individual scripts may change this later. */ @@ -653,6 +652,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename) int retval; php_per_dir_config *per_dir_conf; TSRMLS_FETCH(); + if (AP(in_request)) { zend_file_handle fh; @@ -724,16 +724,16 @@ static int send_php(request_rec *r, int display_source_mode, char *filename) hard_timeout("send", r); SG(server_context) = r; - + php_save_umask(); - if(!AP(setup_env)) { + if (!AP(setup_env)) { AP(setup_env) = 1; add_common_vars(r); add_cgi_vars(r); } init_request_info(TSRMLS_C); apache_php_module_main(r, display_source_mode TSRMLS_CC); - + /* Done, restore umask, turn off timeout, close file and return */ php_restore_umask(); kill_timeout(r); @@ -749,9 +749,8 @@ static int send_parsed_php(request_rec * r) { int result = send_php(r, 0, NULL); TSRMLS_FETCH(); - - ap_table_setn(r->notes, "mod_php_memory_usage", - ap_psprintf(r->pool, "%u", zend_memory_peak_usage(1 TSRMLS_CC))); + + ap_table_setn(r->notes, "mod_php_memory_usage", ap_psprintf(r->pool, "%u", zend_memory_peak_usage(1 TSRMLS_CC))); return result; } @@ -765,7 +764,6 @@ static int send_parsed_php_source(request_rec * r) } /* }}} */ - /* {{{ destroy_per_dir_entry */ static void destroy_per_dir_entry(php_per_dir_entry *per_dir_entry) @@ -821,7 +819,7 @@ static void php_destroy_per_server_info(php_per_server_config *conf) /* {{{ php_destroy_per_dir_info */ -static void php_destroy_per_dir_info(php_per_dir_config *conf) +static void php_destroy_per_dir_info(php_per_dir_config *conf) { zend_hash_destroy(conf->ini_settings); php_handler_stack_destroy(&conf->response_handlers); @@ -843,20 +841,19 @@ static void *php_create_server(pool *p, char *dummy) php_per_server_config *conf; conf = (php_per_server_config *) malloc(sizeof(php_per_server_config)); register_cleanup(p, (void *) conf, (void (*)(void *)) php_destroy_per_server_info, (void (*)(void *)) php_destroy_per_server_info); - + sapi_stack_init_ex(&conf->requires, 1); sapi_stack_init_ex(&conf->uri_handlers, 1); return conf; } - /* }}} */ - /* {{{ php_create_dir */ static void *php_create_dir(pool *p, char *dummy) { php_per_dir_config *conf; + conf = (php_per_dir_config *) malloc(sizeof(php_per_dir_config)); conf->ini_settings = (HashTable *) malloc(sizeof(HashTable)); zend_hash_init_ex(conf->ini_settings, 5, NULL, (void (*)(void *)) destroy_per_dir_entry, 1, 0); @@ -869,10 +866,9 @@ static void *php_create_dir(pool *p, char *dummy) sapi_stack_init_ex(&conf->logger_handlers, 1); sapi_stack_init_ex(&conf->post_read_handlers, 1); register_cleanup(p, (void *) conf, (void (*)(void *)) php_destroy_per_dir_info, (void (*)(void *)) php_destroy_per_dir_info); - + return conf; } - /* }}} */ /* {{{ php_merge_dir @@ -991,7 +987,7 @@ static CONST_PREFIX char *php_set_dir_handler(php_per_dir_config *conf, char *ar return NULL; } -/* {{{ php_set_uri_handler +/* {{{ php_set_uri_handler */ static CONST_PREFIX char *php_set_uri_handler(cmd_parms *cmd, void *dummy, char *arg1) { @@ -1018,7 +1014,7 @@ static CONST_PREFIX char *php_set_header_handler_code(cmd_parms *cmd, php_per_di } /* }}} */ -/* {{{ php_set_auth_handler +/* {{{ php_set_auth_handler */ static CONST_PREFIX char *php_set_auth_handler(cmd_parms *cmd, php_per_dir_config *conf, char *arg1) { @@ -1028,7 +1024,6 @@ static CONST_PREFIX char *php_set_auth_handler_code(cmd_parms *cmd, php_per_dir_ { return php_set_dir_handler(conf, arg1, AP_AUTHENTICATION, AP_HANDLER_TYPE_METHOD); } - /* }}} */ /* {{{ php_set_access_handler @@ -1041,7 +1036,6 @@ static CONST_PREFIX char *php_set_access_handler_code(cmd_parms *cmd, php_per_di { return php_set_dir_handler(conf, arg1, AP_ACCESS_CONTROL, AP_HANDLER_TYPE_METHOD); } - /* }}} */ /* {{{ php_set_type_handler @@ -1054,7 +1048,6 @@ static CONST_PREFIX char *php_set_type_handler_code(cmd_parms *cmd, php_per_dir_ { return php_set_dir_handler(conf, arg1, AP_TYPE_CHECKING, AP_HANDLER_TYPE_METHOD); } - /* }}} */ /* {{{ php_set_fixup_handler @@ -1079,8 +1072,7 @@ static CONST_PREFIX char *php_set_logger_handler_code(cmd_parms *cmd, php_per_di { return php_set_dir_handler(conf, arg1, AP_LOGGING, AP_HANDLER_TYPE_METHOD); } - -/* }}} */ +/* }}} */ /* {{{ php_set_post_read_handler */ @@ -1092,13 +1084,10 @@ static CONST_PREFIX char *php_set_post_read_handler_code(cmd_parms *cmd, php_per { return php_set_dir_handler(conf, arg1, AP_POST_READ, AP_HANDLER_TYPE_METHOD); } - - /* }}} */ /* {{{ php_set_require */ - static CONST_PREFIX char *php_set_require(cmd_parms *cmd, void *dummy, char *arg1) { return php_set_server_handler(cmd->server, arg1, 0, AP_HANDLER_TYPE_FILE); @@ -1116,7 +1105,7 @@ static CONST_PREFIX char *php_set_response_handler_code(cmd_parms *cmd, php_per_ return php_set_dir_handler(conf, arg1, AP_RESPONSE, AP_HANDLER_TYPE_METHOD); } /* }}} */ - + /* {{{ php_apache_value_handler */ static CONST_PREFIX char *php_apache_value_handler(cmd_parms *cmd, php_per_dir_config *conf, char *arg1, char *arg2) @@ -1145,7 +1134,7 @@ static CONST_PREFIX char *php_apache_flag_handler_ex(cmd_parms *cmd, HashTable * bool_val[0] = '0'; } bool_val[1] = 0; - + return php_apache_value_handler_ex(cmd, conf, arg1, bool_val, mode); } /* }}} */ @@ -1193,7 +1182,7 @@ static int php_xbithack_handler(request_rec * r) if (conf) { zend_hash_apply((HashTable *) conf->ini_settings, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC); } - if(!AP(xbithack)) { + if (!AP(xbithack)) { r->allowed |= (1 << METHODS) - 1; zend_try { zend_ini_deactivate(TSRMLS_C); @@ -1213,7 +1202,7 @@ static void apache_php_module_shutdown_wrapper(void) #if MODULE_MAGIC_NUMBER >= 19970728 /* This function is only called on server exit if the apache API - * child_exit handler exists, so shutdown globally + * child_exit handler exists, so shutdown globally */ sapi_shutdown(); #endif @@ -1267,10 +1256,9 @@ static int php_run_hook(php_handler *handler, request_rec *r) { zval *ret = NULL; php_per_dir_config *conf; - TSRMLS_FETCH(); - if(!AP(apache_config_loaded)) { + if (!AP(apache_config_loaded)) { conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module); if (conf) zend_hash_apply((HashTable *)conf->ini_settings, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC); @@ -1296,16 +1284,16 @@ static int php_run_hook(php_handler *handler, request_rec *r) } return HTTP_INTERNAL_SERVER_ERROR; } - static int php_uri_translation(request_rec *r) -{ +{ php_per_server_config *conf; TSRMLS_FETCH(); + AP(current_hook) = AP_URI_TRANS; conf = (php_per_server_config *) get_module_config(r->server->module_config, &php5_module); - return sapi_stack_apply_with_argument_stop_if_equals(&conf->uri_handlers, - ZEND_STACK_APPLY_BOTTOMUP, + return sapi_stack_apply_with_argument_stop_if_equals(&conf->uri_handlers, + ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *element, void *)) php_run_hook, r, OK); } @@ -1313,6 +1301,7 @@ static int php_header_hook(request_rec *r) { php_per_dir_config *conf; TSRMLS_FETCH(); + AP(current_hook) = AP_HEADER_PARSE; conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module); return sapi_stack_apply_with_argument_stop_if_http_error(&conf->headers_handlers, @@ -1324,10 +1313,11 @@ static int php_auth_hook(request_rec *r) { php_per_dir_config *conf; TSRMLS_FETCH(); + AP(current_hook) = AP_AUTHENTICATION; conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module); - return sapi_stack_apply_with_argument_stop_if_equals(&conf->auth_handlers, - ZEND_STACK_APPLY_BOTTOMUP, + return sapi_stack_apply_with_argument_stop_if_equals(&conf->auth_handlers, + ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *element, void *)) php_run_hook, r, OK); } @@ -1336,6 +1326,7 @@ static int php_access_hook(request_rec *r) php_per_dir_config *conf; int status = DECLINED; TSRMLS_FETCH(); + AP(current_hook) = AP_ACCESS_CONTROL; conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module); status = sapi_stack_apply_with_argument_stop_if_http_error(&conf->access_handlers, @@ -1349,6 +1340,7 @@ static int php_type_hook(request_rec *r) { php_per_dir_config *conf; TSRMLS_FETCH(); + AP(current_hook) = AP_TYPE_CHECKING; conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module); return sapi_stack_apply_with_argument_stop_if_equals(&conf->type_handlers, @@ -1361,6 +1353,7 @@ static int php_fixup_hook(request_rec *r) { php_per_dir_config *conf; TSRMLS_FETCH(); + AP(current_hook) = AP_FIXUP; conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module); return sapi_stack_apply_with_argument_stop_if_http_error(&conf->fixup_handlers, @@ -1373,6 +1366,7 @@ static int php_logger_hook(request_rec *r) { php_per_dir_config *conf; TSRMLS_FETCH(); + AP(current_hook) = AP_LOGGING; conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module); return sapi_stack_apply_with_argument_stop_if_http_error(&conf->logger_handlers, @@ -1380,15 +1374,16 @@ static int php_logger_hook(request_rec *r) (int (*)(void *element, void *)) php_run_hook, r); } - + static int php_post_read_hook(request_rec *r) { php_per_dir_config *conf; php_per_server_config *svr; TSRMLS_FETCH(); + AP(current_hook) = AP_POST_READ; svr = get_module_config(r->server->module_config, &php5_module); - if(ap_is_initial_req(r)) { + if (ap_is_initial_req(r)) { sapi_stack_apply_with_argument_all(&svr->requires, ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *element, void *)) php_run_hook, r); } conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module); @@ -1401,6 +1396,7 @@ static int php_response_handler(request_rec *r) { php_per_dir_config *conf; TSRMLS_FETCH(); + AP(current_hook) = AP_RESPONSE; conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module); return sapi_stack_apply_with_argument_all(&conf->response_handlers, ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *element, void *)) php_run_hook, r); @@ -1413,7 +1409,7 @@ handler_rec php_handlers[] = {"application/x-httpd-php", send_parsed_php}, {"application/x-httpd-php-source", send_parsed_php_source}, {"text/html", php_xbithack_handler}, - {"php-script", php_response_handler}, + {"php-script", php_response_handler}, {NULL} }; /* }}} */ diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c index 3e0c9f0a35..fe142c9a17 100644 --- a/sapi/apache_hooks/php_apache.c +++ b/sapi/apache_hooks/php_apache.c @@ -110,7 +110,6 @@ static void php_apache_globals_ctor(php_apache_info_struct *apache_globals TSRML apache_globals->in_request = 0; } - #define APREQ_GET_THIS(ZVAL) if (NULL == (ZVAL = getThis())) { \ php_error(E_WARNING, "%s(): underlying ApacheRequest object missing", \ get_active_function_name(TSRMLS_C)); \ @@ -162,7 +161,6 @@ zval *php_apache_request_new(request_rec *r) { zval *req; zval *addr; - TSRMLS_FETCH(); MAKE_STD_ZVAL(addr); @@ -201,7 +199,6 @@ static void apache_request_read_string_slot(int offset, INTERNAL_FUNCTION_PARAME } /* }}} */ - /* {{{ apache_request_string_slot() */ static void apache_request_string_slot(int offset, INTERNAL_FUNCTION_PARAMETERS) @@ -286,7 +283,6 @@ static void apache_request_int_slot(int offset, INTERNAL_FUNCTION_PARAMETERS) } /* }}} */ - /* {{{ access string slots of request rec */ @@ -338,7 +334,6 @@ PHP_FUNCTION(apache_request_boundary) } /* }}} */ - /* {{{ proto string ApacheRequest::content_type([string new_type]) */ PHP_FUNCTION(apache_request_content_type) @@ -424,7 +419,6 @@ PHP_FUNCTION(apache_request_assbackwards) } /* }}} */ - /* {{{ proto int ApacheRequest::proxyreq([int new_proxyreq]) */ PHP_FUNCTION(apache_request_proxyreq) @@ -441,7 +435,6 @@ PHP_FUNCTION(apache_request_chunked) } /* }}} */ - /* {{{ proto int ApacheRequest::header_only() */ PHP_FUNCTION(apache_request_header_only) @@ -553,25 +546,21 @@ PHP_FUNCTION(apache_request_read_body) } /* }}} */ - /* }}} access int slots of request_rec */ - /* {{{ proto array apache_request_headers_in() - * fetch all incoming request headers - */ + Fetch all incoming request headers */ PHP_FUNCTION(apache_request_headers_in) { zval *id; request_rec *r; - + APREQ_GET_REQUEST(id, r); apache_table_to_zval(r->headers_in, 0, return_value); } /* }}} */ - /* {{{ add_header_to_table */ static void add_header_to_table(table *t, INTERNAL_FUNCTION_PARAMETERS) @@ -582,7 +571,6 @@ static void add_header_to_table(table *t, INTERNAL_FUNCTION_PARAMETERS) char *string_key; uint string_key_len; ulong num_key; - zend_bool replace = 0; HashPosition pos; @@ -646,18 +634,15 @@ static void add_header_to_table(table *t, INTERNAL_FUNCTION_PARAMETERS) RETURN_FALSE; } } - /* }}} */ - /* {{{ proto array apache_request_headers_out([{string name|array list} [, string value [, bool replace = false]]]) - * fetch all outgoing request headers - */ + Fetch all outgoing request headers */ PHP_FUNCTION(apache_request_headers_out) { zval *id; request_rec *r; - + APREQ_GET_REQUEST(id, r); if (ZEND_NUM_ARGS() > 0) { @@ -668,15 +653,13 @@ PHP_FUNCTION(apache_request_headers_out) } /* }}} */ - /* {{{ proto array apache_request_err_headers_out([{string name|array list} [, string value [, bool replace = false]]]) - * fetch all headers that go out in case of an error or a subrequest - */ + Fetch all headers that go out in case of an error or a subrequest */ PHP_FUNCTION(apache_request_err_headers_out) { zval *id; request_rec *r; - + APREQ_GET_REQUEST(id, r); if (ZEND_NUM_ARGS() > 0) { @@ -687,7 +670,6 @@ PHP_FUNCTION(apache_request_err_headers_out) } /* }}} */ - /* {{{ proxy functions for the ap_* functions family */ @@ -755,7 +737,6 @@ PHP_FUNCTION(apache_request_update_mtime) } /* }}} */ - /* {{{ proto void apache_request_set_etag() */ PHP_FUNCTION(apache_request_set_etag) @@ -843,7 +824,6 @@ PHP_FUNCTION(apache_request_satisfies) } /* }}} */ - /* {{{ proto bool apache_request_is_initial_req() */ PHP_FUNCTION(apache_request_is_initial_req) @@ -934,12 +914,12 @@ PHP_FUNCTION(apache_request_basic_auth_pw) long status; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zpw) == FAILURE) { - return; + return; } if (!PZVAL_IS_REF(zpw)) { - zend_error(E_WARNING, "Parameter wasn't passed by reference"); - RETURN_NULL(); + zend_error(E_WARNING, "Parameter wasn't passed by reference"); + RETURN_NULL(); } APREQ_GET_REQUEST(id, r); @@ -955,129 +935,128 @@ PHP_FUNCTION(apache_request_basic_auth_pw) } /* }}} */ - /* http_protocol.h */ PHP_FUNCTION(apache_request_send_http_header) { - zval *id; - request_rec *r; - char *type = NULL; - int typelen; + zval *id; + request_rec *r; + char *type = NULL; + int typelen; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &type, &typelen) == FAILURE) { - return; + return; } - APREQ_GET_REQUEST(id, r); - if(type) { - r->content_type = pstrdup(r->pool, type); - } - ap_send_http_header(r); - SG(headers_sent) = 1; - AP(headers_sent) = 1; - RETURN_TRUE; + APREQ_GET_REQUEST(id, r); + if (type) { + r->content_type = pstrdup(r->pool, type); + } + ap_send_http_header(r); + SG(headers_sent) = 1; + AP(headers_sent) = 1; + RETURN_TRUE; } PHP_FUNCTION(apache_request_basic_http_header) { - zval *id; - request_rec *r; + zval *id; + request_rec *r; if (zend_parse_parameters_none() == FAILURE) { return; } - APREQ_GET_REQUEST(id, r); + APREQ_GET_REQUEST(id, r); - ap_basic_http_header((request_rec *)SG(server_context)); - SG(headers_sent) = 1; - AP(headers_sent) = 1; - RETURN_TRUE; + ap_basic_http_header((request_rec *)SG(server_context)); + SG(headers_sent) = 1; + AP(headers_sent) = 1; + RETURN_TRUE; } PHP_FUNCTION(apache_request_send_http_trace) { - zval *id; - request_rec *r; + zval *id; + request_rec *r; if (zend_parse_parameters_none() == FAILURE) { return; } - - APREQ_GET_REQUEST(id, r); - ap_send_http_trace((request_rec *)SG(server_context)); - SG(headers_sent) = 1; - AP(headers_sent) = 1; - RETURN_TRUE; + APREQ_GET_REQUEST(id, r); + + ap_send_http_trace((request_rec *)SG(server_context)); + SG(headers_sent) = 1; + AP(headers_sent) = 1; + RETURN_TRUE; } PHP_FUNCTION(apache_request_send_http_options) { - zval *id; - request_rec *r; + zval *id; + request_rec *r; if (zend_parse_parameters_none() == FAILURE) { return; } - APREQ_GET_REQUEST(id, r); + APREQ_GET_REQUEST(id, r); - ap_send_http_options((request_rec *)SG(server_context)); - SG(headers_sent) = 1; - AP(headers_sent) = 1; - RETURN_TRUE; + ap_send_http_options((request_rec *)SG(server_context)); + SG(headers_sent) = 1; + AP(headers_sent) = 1; + RETURN_TRUE; } PHP_FUNCTION(apache_request_send_error_response) { - zval *id; - request_rec *r; + zval *id; + request_rec *r; long rec = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &rec) == FAILURE) { return; } - APREQ_GET_REQUEST(id, r); + APREQ_GET_REQUEST(id, r); ap_send_error_response(r, (int) rec); - RETURN_TRUE; + RETURN_TRUE; } PHP_FUNCTION(apache_request_set_content_length) { long length; - zval *id; - request_rec *r; + zval *id; + request_rec *r; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &length) == FAILURE) { return; } - APREQ_GET_REQUEST(id, r); + APREQ_GET_REQUEST(id, r); - ap_set_content_length(r, length); - RETURN_TRUE; + ap_set_content_length(r, length); + RETURN_TRUE; } PHP_FUNCTION(apache_request_set_keepalive) { - zval *id; - request_rec *r; + zval *id; + request_rec *r; if (zend_parse_parameters_none() == FAILURE) { return; } - - APREQ_GET_REQUEST(id, r); - ap_set_keepalive(r); - RETURN_TRUE; + + APREQ_GET_REQUEST(id, r); + ap_set_keepalive(r); + RETURN_TRUE; } /* This stuff should use streams or however this is implemented now -PHP_FUNCTION(apache_request_send_fd) +PHP_FUNCTION(apache_request_send_fd) { } @@ -1089,26 +1068,26 @@ PHP_FUNCTION(apache_request_send_fd_length) /* These are for overriding default output behaviour */ PHP_FUNCTION(apache_request_rputs) { - char *buffer; + char *buffer; int buffer_len; - zval *id; - request_rec *r; + zval *id; + request_rec *r; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &buffer, &buffer_len) == FAILURE) { return; } - APREQ_GET_REQUEST(id, r); - ap_rwrite(buffer, buffer_len, (request_rec*)SG(server_context)); + APREQ_GET_REQUEST(id, r); + ap_rwrite(buffer, buffer_len, (request_rec*)SG(server_context)); } -/* This stuff would be useful for custom POST handlers, +/* This stuff would be useful for custom POST handlers, which should be supported. Probably by not using sapi_activate at all inside a phpResponseHandler and instead using a builtin composed of the below calls as a apache_read_request_body() and allow people to custom craft their own. - + PHP_FUNCTION(apache_request_setup_client_block) { } @@ -1132,165 +1111,154 @@ PHP_FUNCTION(apache_request_discard_request_body) */ PHP_FUNCTION(apache_request_log_error) { - zval *id; + zval *id; char *z_errstr; int z_errstr_len; - long facility = APLOG_ERR; - request_rec *r; + long facility = APLOG_ERR; + request_rec *r; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &z_errstr, &z_errstr_len, &facility) == FAILURE) { return; } - APREQ_GET_REQUEST(id, r); + APREQ_GET_REQUEST(id, r); ap_log_error(APLOG_MARK, (int) facility, r->server, "%s", z_errstr); - RETURN_TRUE; + RETURN_TRUE; } /* }}} */ /* http_main.h */ /* {{{ proto object apache_request_sub_req_lookup_uri(string uri) - Returns sub-request for the specified uri. You would - need to run it yourself with run() -*/ + Returns sub-request for the specified uri. You would need to run it yourself with run() */ PHP_FUNCTION(apache_request_sub_req_lookup_uri) { - zval *id; + zval *id; char *file; int file_len; - request_rec *r, *sub_r; + request_rec *r, *sub_r; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &file, &file_len) == FAILURE) { return; } - APREQ_GET_REQUEST(id, r); - sub_r = ap_sub_req_lookup_uri(file, r); + APREQ_GET_REQUEST(id, r); + sub_r = ap_sub_req_lookup_uri(file, r); - if (!sub_r) { - RETURN_FALSE; - } - return_value = php_apache_request_new(sub_r); + if (!sub_r) { + RETURN_FALSE; + } + return_value = php_apache_request_new(sub_r); } /* }}} */ /* {{{ proto object apache_request_sub_req_lookup_file(string file) - Returns sub-request for the specified file. You would - need to run it yourself with run(). -*/ + Returns sub-request for the specified file. You would need to run it yourself with run(). */ PHP_FUNCTION(apache_request_sub_req_lookup_file) { - zval *id; + zval *id; char *file; int file_len; - request_rec *r, *sub_r; + request_rec *r, *sub_r; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &file, &file_len) == FAILURE) { return; } - APREQ_GET_REQUEST(id, r); + APREQ_GET_REQUEST(id, r); - sub_r = ap_sub_req_lookup_file(file, r); + sub_r = ap_sub_req_lookup_file(file, r); - if (!sub_r) { - RETURN_FALSE; - } - return_value = php_apache_request_new(sub_r); + if (!sub_r) { + RETURN_FALSE; + } + return_value = php_apache_request_new(sub_r); } /* }}} */ /* {{{ proto object apache_request_sub_req_method_uri(string method, string uri) - Returns sub-request for the specified file. You would - need to run it yourself with run(). -*/ + Returns sub-request for the specified file. You would need to run it yourself with run(). */ PHP_FUNCTION(apache_request_sub_req_method_uri) { - zval *id; + zval *id; char *file, *method; int file_len, method_len; - request_rec *r, *sub_r; + request_rec *r, *sub_r; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &method, &method_len, &file, &file_len) == FAILURE) { return; } - APREQ_GET_REQUEST(id, r); + APREQ_GET_REQUEST(id, r); - sub_r = ap_sub_req_method_uri(method, file, r); + sub_r = ap_sub_req_method_uri(method, file, r); - if (!sub_r) { - RETURN_FALSE; - } - return_value = php_apache_request_new(sub_r); + if (!sub_r) { + RETURN_FALSE; + } + return_value = php_apache_request_new(sub_r); } /* }}} */ /* {{{ proto long apache_request_run() - This is a wrapper for ap_sub_run_req and ap_destory_sub_req. It takes - sub_request, runs it, destroys it, and returns it's status. -*/ + This is a wrapper for ap_sub_run_req and ap_destory_sub_req. It takes sub_request, runs it, destroys it, and returns it's status. */ PHP_FUNCTION(apache_request_run) { - zval *id; - request_rec *r; - int status; + zval *id; + request_rec *r; + int status; - if (zend_parse_parameters_none() == FAILURE) { - return; + if (zend_parse_parameters_none() == FAILURE) { + return; } - APREQ_GET_REQUEST(id, r); - if (!r || ap_is_initial_req(r)) { - RETURN_FALSE; + APREQ_GET_REQUEST(id, r); + if (!r || ap_is_initial_req(r)) { + RETURN_FALSE; } - status = ap_run_sub_req(r); - ap_destroy_sub_req(r); - RETURN_LONG(status); + status = ap_run_sub_req(r); + ap_destroy_sub_req(r); + RETURN_LONG(status); } /* }}} */ PHP_FUNCTION(apache_request_internal_redirect) { - zval *id; + zval *id; char *new_uri; int new_uri_len; - request_rec *r; + request_rec *r; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &new_uri, &new_uri_len) == FAILURE) { return; } - APREQ_GET_REQUEST(id, r); + APREQ_GET_REQUEST(id, r); - ap_internal_redirect(new_uri, r); + ap_internal_redirect(new_uri, r); } PHP_FUNCTION(apache_request_send_header_field) { char *fieldname, *fieldval; int fieldname_len, fieldval_len; - zval *id; - request_rec *r; + zval *id; + request_rec *r; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &fieldname, &fieldname_len, &fieldval, &fieldval_len) == FAILURE) { return; } - APREQ_GET_REQUEST(id, r); + APREQ_GET_REQUEST(id, r); - ap_send_header_field(r, fieldname, fieldval); - SG(headers_sent) = 1; - AP(headers_sent) = 1; + ap_send_header_field(r, fieldname, fieldval); + SG(headers_sent) = 1; + AP(headers_sent) = 1; } - - - /* }}} */ /* {{{ php_apache_request_class_functions */ -const static zend_function_entry php_apache_request_class_functions[] = { +static const zend_function_entry php_apache_request_class_functions[] = { /* string slots */ PHP_FALIAS(args, apache_request_args, NULL) PHP_FALIAS(boundary, apache_request_boundary, NULL) @@ -1329,7 +1297,6 @@ const static zend_function_entry php_apache_request_class_functions[] = { PHP_FALIAS(headers_out, apache_request_headers_out, NULL) PHP_FALIAS(err_headers_out, apache_request_err_headers_out, NULL) - /* proxy functions for the ap_* functions family */ #undef auth_name #undef auth_type @@ -1371,24 +1338,23 @@ const static zend_function_entry php_apache_request_class_functions[] = { PHP_FALIAS(update_mtime, apache_request_update_mtime, NULL) PHP_FALIAS(send_http_header, apache_request_send_http_header, NULL) PHP_FALIAS(basic_http_header, apache_request_basic_http_header, NULL) - PHP_FALIAS(send_header_field, apache_request_send_header_field, NULL) + PHP_FALIAS(send_header_field, apache_request_send_header_field, NULL) PHP_FALIAS(send_http_trace, apache_request_send_http_trace, NULL) PHP_FALIAS(send_http_options, apache_request_send_http_trace, NULL) PHP_FALIAS(send_error_response, apache_request_send_error_response, NULL) - PHP_FALIAS(set_content_length, apache_request_set_content_length, NULL) - PHP_FALIAS(set_keepalive, apache_request_set_keepalive, NULL) - PHP_FALIAS(rputs, apache_request_rputs, NULL) - PHP_FALIAS(log_error, apache_request_log_error, NULL) - PHP_FALIAS(lookup_uri, apache_request_sub_req_lookup_uri, NULL) - PHP_FALIAS(lookup_file, apache_request_sub_req_lookup_file, NULL) - PHP_FALIAS(method_uri, apache_request_sub_req_method_uri, NULL) - PHP_FALIAS(run, apache_request_run, NULL) - PHP_FALIAS(internal_redirect, apache_request_internal_redirect, NULL) + PHP_FALIAS(set_content_length, apache_request_set_content_length, NULL) + PHP_FALIAS(set_keepalive, apache_request_set_keepalive, NULL) + PHP_FALIAS(rputs, apache_request_rputs, NULL) + PHP_FALIAS(log_error, apache_request_log_error, NULL) + PHP_FALIAS(lookup_uri, apache_request_sub_req_lookup_uri, NULL) + PHP_FALIAS(lookup_file, apache_request_sub_req_lookup_file, NULL) + PHP_FALIAS(method_uri, apache_request_sub_req_method_uri, NULL) + PHP_FALIAS(run, apache_request_run, NULL) + PHP_FALIAS(internal_redirect, apache_request_internal_redirect, NULL) { NULL, NULL, NULL } }; /* }}} */ - static PHP_MINIT_FUNCTION(apache) { zend_class_entry ce; @@ -1400,7 +1366,6 @@ static PHP_MINIT_FUNCTION(apache) #endif REGISTER_INI_ENTRIES(); - le_apachereq = zend_register_list_destructors_ex(php_apache_request_free, NULL, "ApacheRequest", module_number); INIT_OVERLOADED_CLASS_ENTRY(ce, "ApacheRequest", php_apache_request_class_functions, NULL, NULL, NULL); apacherequest_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); @@ -1414,53 +1379,53 @@ static PHP_MINIT_FUNCTION(apache) REGISTER_LONG_CONSTANT("REDIRECT", REDIRECT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("BAD_REQUEST", BAD_REQUEST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("NOT_FOUND", NOT_FOUND, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_CONTINUE", HTTP_CONTINUE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_SWITCHING_PROTOCOLS", HTTP_SWITCHING_PROTOCOLS, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_PROCESSING", HTTP_PROCESSING, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_OK", HTTP_OK, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_CREATED", HTTP_CREATED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_ACCEPTED", HTTP_ACCEPTED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_NON_AUTHORITATIVE", HTTP_NON_AUTHORITATIVE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_NO_CONTENT", HTTP_NO_CONTENT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_RESET_CONTENT", HTTP_RESET_CONTENT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_PARTIAL_CONTENT", HTTP_PARTIAL_CONTENT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_MULTI_STATUS", HTTP_MULTI_STATUS, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_MULTIPLE_CHOICES", HTTP_MULTIPLE_CHOICES, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_MOVED_PERMANENTLY", HTTP_MOVED_PERMANENTLY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_MOVED_TEMPORARILY", HTTP_MOVED_TEMPORARILY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_SEE_OTHER", HTTP_SEE_OTHER, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_NOT_MODIFIED", HTTP_NOT_MODIFIED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_USE_PROXY", HTTP_USE_PROXY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_TEMPORARY_REDIRECT", HTTP_TEMPORARY_REDIRECT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_BAD_REQUEST", HTTP_BAD_REQUEST, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_UNAUTHORIZED", HTTP_UNAUTHORIZED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_PAYMENT_REQUIRED", HTTP_PAYMENT_REQUIRED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_FORBIDDEN", HTTP_FORBIDDEN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_NOT_FOUND", HTTP_NOT_FOUND, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_METHOD_NOT_ALLOWED", HTTP_METHOD_NOT_ALLOWED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_NOT_ACCEPTABLE", HTTP_NOT_ACCEPTABLE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_PROXY_AUTHENTICATION_REQUIRED", HTTP_PROXY_AUTHENTICATION_REQUIRED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_REQUEST_TIME_OUT", HTTP_REQUEST_TIME_OUT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_CONFLICT", HTTP_CONFLICT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_GONE", HTTP_GONE, CONST_CS | CONST_PERSISTENT);REGISTER_LONG_CONSTANT("HTTP_LENGTH_REQUIRED", HTTP_LENGTH_REQUIRED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_PRECONDITION_FAILED", HTTP_PRECONDITION_FAILED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_REQUEST_ENTITY_TOO_LARGE", HTTP_REQUEST_ENTITY_TOO_LARGE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_REQUEST_URI_TOO_LARGE", HTTP_REQUEST_URI_TOO_LARGE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_UNSUPPORTED_MEDIA_TYPE", HTTP_UNSUPPORTED_MEDIA_TYPE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_RANGE_NOT_SATISFIABLE", HTTP_RANGE_NOT_SATISFIABLE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_EXPECTATION_FAILED", HTTP_EXPECTATION_FAILED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_UNPROCESSABLE_ENTITY", HTTP_UNPROCESSABLE_ENTITY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_LOCKED", HTTP_LOCKED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_FAILED_DEPENDENCY", HTTP_FAILED_DEPENDENCY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_INTERNAL_SERVER_ERROR", HTTP_INTERNAL_SERVER_ERROR, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_NOT_IMPLEMENTED", HTTP_NOT_IMPLEMENTED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_BAD_GATEWAY", HTTP_BAD_GATEWAY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_SERVICE_UNAVAILABLE", HTTP_SERVICE_UNAVAILABLE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_GATEWAY_TIME_OUT", HTTP_GATEWAY_TIME_OUT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_VERSION_NOT_SUPPORTED", HTTP_VERSION_NOT_SUPPORTED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_VARIANT_ALSO_VARIES", HTTP_VARIANT_ALSO_VARIES, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_INSUFFICIENT_STORAGE", HTTP_INSUFFICIENT_STORAGE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_NOT_EXTENDED", HTTP_NOT_EXTENDED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_CONTINUE", HTTP_CONTINUE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_SWITCHING_PROTOCOLS", HTTP_SWITCHING_PROTOCOLS, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_PROCESSING", HTTP_PROCESSING, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_OK", HTTP_OK, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_CREATED", HTTP_CREATED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_ACCEPTED", HTTP_ACCEPTED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_NON_AUTHORITATIVE", HTTP_NON_AUTHORITATIVE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_NO_CONTENT", HTTP_NO_CONTENT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_RESET_CONTENT", HTTP_RESET_CONTENT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_PARTIAL_CONTENT", HTTP_PARTIAL_CONTENT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_MULTI_STATUS", HTTP_MULTI_STATUS, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_MULTIPLE_CHOICES", HTTP_MULTIPLE_CHOICES, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_MOVED_PERMANENTLY", HTTP_MOVED_PERMANENTLY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_MOVED_TEMPORARILY", HTTP_MOVED_TEMPORARILY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_SEE_OTHER", HTTP_SEE_OTHER, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_NOT_MODIFIED", HTTP_NOT_MODIFIED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_USE_PROXY", HTTP_USE_PROXY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_TEMPORARY_REDIRECT", HTTP_TEMPORARY_REDIRECT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_BAD_REQUEST", HTTP_BAD_REQUEST, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_UNAUTHORIZED", HTTP_UNAUTHORIZED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_PAYMENT_REQUIRED", HTTP_PAYMENT_REQUIRED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_FORBIDDEN", HTTP_FORBIDDEN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_NOT_FOUND", HTTP_NOT_FOUND, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_METHOD_NOT_ALLOWED", HTTP_METHOD_NOT_ALLOWED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_NOT_ACCEPTABLE", HTTP_NOT_ACCEPTABLE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_PROXY_AUTHENTICATION_REQUIRED", HTTP_PROXY_AUTHENTICATION_REQUIRED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_REQUEST_TIME_OUT", HTTP_REQUEST_TIME_OUT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_CONFLICT", HTTP_CONFLICT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_GONE", HTTP_GONE, CONST_CS | CONST_PERSISTENT);REGISTER_LONG_CONSTANT("HTTP_LENGTH_REQUIRED", HTTP_LENGTH_REQUIRED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_PRECONDITION_FAILED", HTTP_PRECONDITION_FAILED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_REQUEST_ENTITY_TOO_LARGE", HTTP_REQUEST_ENTITY_TOO_LARGE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_REQUEST_URI_TOO_LARGE", HTTP_REQUEST_URI_TOO_LARGE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_UNSUPPORTED_MEDIA_TYPE", HTTP_UNSUPPORTED_MEDIA_TYPE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_RANGE_NOT_SATISFIABLE", HTTP_RANGE_NOT_SATISFIABLE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_EXPECTATION_FAILED", HTTP_EXPECTATION_FAILED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_UNPROCESSABLE_ENTITY", HTTP_UNPROCESSABLE_ENTITY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_LOCKED", HTTP_LOCKED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_FAILED_DEPENDENCY", HTTP_FAILED_DEPENDENCY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_INTERNAL_SERVER_ERROR", HTTP_INTERNAL_SERVER_ERROR, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_NOT_IMPLEMENTED", HTTP_NOT_IMPLEMENTED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_BAD_GATEWAY", HTTP_BAD_GATEWAY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_SERVICE_UNAVAILABLE", HTTP_SERVICE_UNAVAILABLE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_GATEWAY_TIME_OUT", HTTP_GATEWAY_TIME_OUT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_VERSION_NOT_SUPPORTED", HTTP_VERSION_NOT_SUPPORTED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_VARIANT_ALSO_VARIES", HTTP_VARIANT_ALSO_VARIES, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_INSUFFICIENT_STORAGE", HTTP_INSUFFICIENT_STORAGE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("HTTP_NOT_EXTENDED", HTTP_NOT_EXTENDED, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("APLOG_EMERG", APLOG_EMERG, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("APLOG_ALERT", APLOG_ALERT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("APLOG_CRIT", APLOG_CRIT, CONST_CS | CONST_PERSISTENT); @@ -1496,17 +1461,16 @@ static PHP_MINIT_FUNCTION(apache) REGISTER_LONG_CONSTANT("REQUEST_CHUNKED_ERROR", REQUEST_CHUNKED_ERROR, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("REQUEST_CHUNKED_DECHUNK", REQUEST_CHUNKED_DECHUNK, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("REQUEST_CHUNKED_PASS", REQUEST_CHUNKED_PASS, CONST_CS | CONST_PERSISTENT); - + /* resolve types for remote_host() */ REGISTER_LONG_CONSTANT("REMOTE_HOST", REMOTE_HOST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("REMOTE_NAME", REMOTE_NAME, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("REMOTE_NOLOOKUP", REMOTE_NOLOOKUP, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("REMOTE_DOUBLE_REV", REMOTE_DOUBLE_REV, CONST_CS | CONST_PERSISTENT); - + return SUCCESS; } - static PHP_MSHUTDOWN_FUNCTION(apache) { UNREGISTER_INI_ENTRIES(); @@ -1515,13 +1479,13 @@ static PHP_MSHUTDOWN_FUNCTION(apache) zend_module_entry apache_module_entry = { STANDARD_MODULE_HEADER, - "apache", - apache_functions, - PHP_MINIT(apache), - PHP_MSHUTDOWN(apache), - NULL, - NULL, - PHP_MINFO(apache), + "apache", + apache_functions, + PHP_MINIT(apache), + PHP_MSHUTDOWN(apache), + NULL, + NULL, + PHP_MINFO(apache), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES }; @@ -1591,7 +1555,6 @@ PHP_MINFO_FUNCTION(apache) serv = ((request_rec *) SG(server_context))->server; - php_info_print_table_start(); #ifdef PHP_WIN32 @@ -1659,14 +1622,14 @@ PHP_MINFO_FUNCTION(apache) r = ((request_rec *) SG(server_context)); arr = table_elts(r->subprocess_env); elts = (table_entry *)arr->elts; - + SECTION("Apache Environment"); - php_info_print_table_start(); + php_info_print_table_start(); php_info_print_table_header(2, "Variable", "Value"); for (i=0; i < arr->nelts; i++) { php_info_print_table_row(2, elts[i].key, elts[i].val); } - php_info_print_table_end(); + php_info_print_table_end(); } { @@ -1674,7 +1637,7 @@ PHP_MINFO_FUNCTION(apache) table_entry *env; int i; request_rec *r; - + r = ((request_rec *) SG(server_context)); SECTION("HTTP Headers Information"); php_info_print_table_start(); @@ -1708,8 +1671,7 @@ PHP_MINFO_FUNCTION(apache) * that you'd parse through Apache (for .phtml files, you'd probably * want to use <?Include>. This only works when PHP is compiled * as an Apache module, since it uses the Apache API for doing - * sub requests. - */ + * sub requests. */ PHP_FUNCTION(virtual) { char *filename; @@ -1722,47 +1684,50 @@ PHP_FUNCTION(virtual) if (!(rr = sub_req_lookup_uri (filename, ((request_rec *) SG(server_context))))) { php_error(E_WARNING, "Unable to include '%s' - URI lookup failed", filename); - if (rr) + if (rr) { destroy_sub_req (rr); + } RETURN_FALSE; } if (rr->status != 200) { php_error(E_WARNING, "Unable to include '%s' - error finding URI", filename); - if (rr) + if (rr) { destroy_sub_req (rr); + } RETURN_FALSE; } - php_end_ob_buffers(1 TSRMLS_CC); + php_output_end_all(TSRMLS_C); php_header(TSRMLS_C); if (run_sub_req(rr)) { php_error(E_WARNING, "Unable to include '%s' - request execution failed", filename); - if (rr) + if (rr) { destroy_sub_req (rr); + } RETURN_FALSE; - } + } - if (rr) + if (rr) { destroy_sub_req (rr); + } RETURN_TRUE; } /* }}} */ - /* {{{ apache_table_to_zval(table *, int safe_mode, zval *return_value) Fetch all HTTP request headers */ static void apache_table_to_zval(table *t, int safe_mode, zval *return_value) { - array_header *env_arr; - table_entry *tenv; - int i; - - array_init(return_value); - env_arr = table_elts(t); - tenv = (table_entry *)env_arr->elts; - for (i = 0; i < env_arr->nelts; ++i) { + array_header *env_arr; + table_entry *tenv; + int i; + + array_init(return_value); + env_arr = table_elts(t); + tenv = (table_entry *)env_arr->elts; + for (i = 0; i < env_arr->nelts; ++i) { if (!tenv[i].key || (safe_mode && !strncasecmp(tenv[i].key, "authorization", 13))) { continue; @@ -1770,12 +1735,11 @@ static void apache_table_to_zval(table *t, int safe_mode, zval *return_value) if (add_assoc_string(return_value, tenv[i].key, (tenv[i].val==NULL) ? "" : tenv[i].val, 1)==FAILURE) { RETURN_FALSE; } - } + } } /* }}} */ - /* {{{ proto array getallheaders(void) */ /* Alias for apache_request_headers() */ @@ -1786,8 +1750,8 @@ static void apache_table_to_zval(table *t, int safe_mode, zval *return_value) PHP_FUNCTION(apache_request_headers) { if (zend_parse_parameters_none() == FAILURE) { - return; - } + return; + } apache_table_to_zval(((request_rec *)SG(server_context))->headers_in, PG(safe_mode), return_value); } @@ -1798,8 +1762,8 @@ PHP_FUNCTION(apache_request_headers) PHP_FUNCTION(apache_response_headers) { if (zend_parse_parameters_none() == FAILURE) { - return; - } + return; + } apache_table_to_zval(((request_rec *) SG(server_context))->headers_out, 0, return_value); } @@ -1814,11 +1778,11 @@ PHP_FUNCTION(apache_setenv) char *var = NULL, *val = NULL; request_rec *r = (request_rec *) SG(server_context); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|b", &var, &var_len, &val, &val_len, &top) == FAILURE) { - RETURN_FALSE; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|b", &var, &var_len, &val, &val_len, &top) == FAILURE) { + RETURN_FALSE; } - while(top) { + while (top) { if (r->prev) { r = r->prev; } @@ -1842,7 +1806,7 @@ PHP_FUNCTION(apache_lookup_uri) return; } - if(!(rr = sub_req_lookup_uri(filename, ((request_rec *) SG(server_context))))) { + if (!(rr = sub_req_lookup_uri(filename, ((request_rec *) SG(server_context))))) { php_error(E_WARNING, "URI lookup failed", filename); RETURN_FALSE; } @@ -1854,16 +1818,16 @@ PHP_FUNCTION(apache_lookup_uri) add_property_string(return_value,"the_request", rr->the_request, 1); } if (rr->status_line) { - add_property_string(return_value,"status_line", (char *)rr->status_line, 1); + add_property_string(return_value,"status_line", (char *)rr->status_line, 1); } if (rr->method) { - add_property_string(return_value,"method", (char *)rr->method, 1); + add_property_string(return_value,"method", (char *)rr->method, 1); } if (rr->content_type) { add_property_string(return_value,"content_type", (char *)rr->content_type, 1); } if (rr->handler) { - add_property_string(return_value,"handler", (char *)rr->handler, 1); + add_property_string(return_value,"handler", (char *)rr->handler, 1); } if (rr->uri) { add_property_string(return_value,"uri", rr->uri, 1); @@ -1892,11 +1856,11 @@ PHP_FUNCTION(apache_lookup_uri) if (rr->unparsed_uri) { add_property_string(return_value,"unparsed_uri", rr->unparsed_uri, 1); } - if(rr->mtime) { + if (rr->mtime) { add_property_long(return_value,"mtime", rr->mtime); } #endif - if(rr->request_time) { + if (rr->request_time) { add_property_long(return_value,"request_time", rr->request_time); } @@ -1904,7 +1868,6 @@ PHP_FUNCTION(apache_lookup_uri) } /* }}} */ - #if 0 This function is most likely a bad idea. Just playing with it for now. @@ -1919,7 +1882,7 @@ PHP_FUNCTION(apache_exec_uri) } convert_to_string_ex(filename); - if(!(rr = ap_sub_req_lookup_uri((*filename)->value.str.val, ((request_rec *) SG(server_context))))) { + if (!(rr = ap_sub_req_lookup_uri((*filename)->value.str.val, ((request_rec *) SG(server_context))))) { php_error(E_WARNING, "URI lookup failed", (*filename)->value.str.val); RETURN_FALSE; } @@ -1948,16 +1911,16 @@ PHP_FUNCTION(apache_get_modules) { int n; char *p; - + array_init(return_value); - + for (n = 0; ap_loaded_modules[n]; ++n) { char *s = (char *) ap_loaded_modules[n]->name; if ((p = strchr(s, '.'))) { add_next_index_stringl(return_value, s, (p - s), 1); } else { add_next_index_string(return_value, s, 1); - } + } } } /* }}} */ diff --git a/sapi/apache_hooks/sapi_apache.c b/sapi/apache_hooks/sapi_apache.c index 5c9fbb7816..82440e4a1b 100644 --- a/sapi/apache_hooks/sapi_apache.c +++ b/sapi/apache_hooks/sapi_apache.c @@ -34,7 +34,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) } /* sending a file handle to another dll is not working so let zend open it. */ - + if (display_source_mode) { zend_syntax_highlighter_ini syntax_highlighter_ini; @@ -53,7 +53,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) (void) php_execute_script(&file_handle TSRMLS_CC); } AP(in_request) = 0; - + return (OK); } /* }}} */ @@ -64,59 +64,58 @@ int apache_php_module_hook(request_rec *r, php_handler *handler, zval **ret TSRM { zend_file_handle file_handle; zval *req; - char *tmp; + char *tmp; #if PHP_SIGCHILD signal(SIGCHLD, sigchld_handler); #endif - if(AP(current_hook) == AP_RESPONSE) { - if (php_request_startup_for_hook(TSRMLS_C) == FAILURE) - return FAILURE; - } - else { - if (php_request_startup_for_hook(TSRMLS_C) == FAILURE) - return FAILURE; - } + if (AP(current_hook) == AP_RESPONSE) { + if (php_request_startup_for_hook(TSRMLS_C) == FAILURE) { + return FAILURE; + } + } else { + if (php_request_startup_for_hook(TSRMLS_C) == FAILURE) { + return FAILURE; + } + } req = php_apache_request_new(r); - if(PG(register_globals)) { - php_register_variable_ex("request", req, NULL TSRMLS_CC); - } - else { - php_register_variable_ex("request", req, PG(http_globals)[TRACK_VARS_SERVER] TSRMLS_CC); - } - switch(handler->type) { - case AP_HANDLER_TYPE_FILE: - php_register_variable("PHP_SELF_HOOK", handler->name, PG(http_globals)[TRACK_VARS_SERVER] TSRMLS_CC); - memset(&file_handle, 0, sizeof(file_handle)); - file_handle.type = ZEND_HANDLE_FILENAME; - file_handle.filename = handler->name; - (void) php_execute_simple_script(&file_handle, ret TSRMLS_CC); - break; - case AP_HANDLER_TYPE_METHOD: - if( (tmp = strstr(handler->name, "::")) != NULL && *(tmp+2) != '\0' ) { - zval *class; - zval *method; - *tmp = '\0'; - ALLOC_ZVAL(class); - ZVAL_STRING(class, handler->name, 1); - ALLOC_ZVAL(method); - ZVAL_STRING(method, tmp +2, 1); - *tmp = ':'; - call_user_function_ex(EG(function_table), &class, method, ret, 0, NULL, 0, NULL TSRMLS_CC); - zval_dtor(class); - zval_dtor(method); - } - else { - php_error(E_ERROR, "Unable to call %s - not a Class::Method\n", handler->name); - /* not a class::method */ - } - break; - default: - /* not a valid type */ - assert(0); - break; - } + if (PG(register_globals)) { + php_register_variable_ex("request", req, NULL TSRMLS_CC); + } else { + php_register_variable_ex("request", req, PG(http_globals)[TRACK_VARS_SERVER] TSRMLS_CC); + } + switch(handler->type) { + case AP_HANDLER_TYPE_FILE: + php_register_variable("PHP_SELF_HOOK", handler->name, PG(http_globals)[TRACK_VARS_SERVER] TSRMLS_CC); + memset(&file_handle, 0, sizeof(file_handle)); + file_handle.type = ZEND_HANDLE_FILENAME; + file_handle.filename = handler->name; + (void) php_execute_simple_script(&file_handle, ret TSRMLS_CC); + break; + case AP_HANDLER_TYPE_METHOD: + if ( (tmp = strstr(handler->name, "::")) != NULL && *(tmp+2) != '\0' ) { + zval *class; + zval *method; + *tmp = '\0'; + ALLOC_ZVAL(class); + ZVAL_STRING(class, handler->name, 1); + ALLOC_ZVAL(method); + ZVAL_STRING(method, tmp +2, 1); + *tmp = ':'; + call_user_function_ex(EG(function_table), &class, method, ret, 0, NULL, 0, NULL TSRMLS_CC); + zval_dtor(class); + zval_dtor(method); + } else { + php_error(E_ERROR, "Unable to call %s - not a Class::Method\n", handler->name); + /* not a class::method */ + } + break; + default: + /* not a valid type */ + assert(0); + break; + } zval_dtor(req); AP(in_request) = 0; diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 90158fb616..4eeb75627d 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -1634,9 +1634,8 @@ int main(int argc, char *argv[]) * in case some server does something different than above */ (!CGIG(redirect_status_env) || !getenv(CGIG(redirect_status_env))) ) { - zend_try { - SG(sapi_headers).http_response_code = 400; - PUTS("<b>Security Alert!</b> The PHP CGI cannot be accessed directly.\n\n\ + SG(sapi_headers).http_response_code = 400; + PUTS("<b>Security Alert!</b> The PHP CGI cannot be accessed directly.\n\n\ <p>This PHP CGI binary was compiled with force-cgi-redirect enabled. This\n\ means that a page will only be served up if the REDIRECT_STATUS CGI variable is\n\ set, e.g. via an Apache Action directive.</p>\n\ @@ -1645,8 +1644,6 @@ manual page for CGI security</a>.</p>\n\ <p>For more information about changing this behaviour or re-enabling this webserver,\n\ consult the installation file that came with this distribution, or visit \n\ <a href=\"http://php.net/install.windows\">the manual page</a>.</p>\n"); - } zend_catch { - } zend_end_try(); #if defined(ZTS) && !defined(PHP_DEBUG) /* XXX we're crashing here in msvc6 debug builds at * php_message_handler_for_zend:839 because @@ -1809,11 +1806,9 @@ consult the installation file that came with this distribution, or visit \n\ case '?': fcgi_shutdown(); no_headers = 1; - php_output_startup(); - php_output_activate(TSRMLS_C); SG(headers_sent) = 1; php_cgi_usage(argv[0]); - php_end_ob_buffers(1 TSRMLS_CC); + php_output_end_all(TSRMLS_C); exit_status = 0; goto out; } @@ -1887,15 +1882,13 @@ consult the installation file that came with this distribution, or visit \n\ if (script_file) { efree(script_file); } - php_output_startup(); - php_output_activate(TSRMLS_C); SG(headers_sent) = 1; php_printf("[PHP Modules]\n"); print_modules(TSRMLS_C); php_printf("\n[Zend Modules]\n"); print_extensions(TSRMLS_C); php_printf("\n"); - php_end_ob_buffers(1 TSRMLS_CC); + php_output_end_all(TSRMLS_C); exit_status = 0; goto out; @@ -2042,16 +2035,13 @@ consult the installation file that came with this distribution, or visit \n\ */ if (cgi || fastcgi || SG(request_info).path_translated) { if (php_fopen_primary_script(&file_handle TSRMLS_CC) == FAILURE) { - zend_try { - if (errno == EACCES) { - SG(sapi_headers).http_response_code = 403; - PUTS("Access denied.\n"); - } else { - SG(sapi_headers).http_response_code = 404; - PUTS("No input file specified.\n"); - } - } zend_catch { - } zend_end_try(); + if (errno == EACCES) { + SG(sapi_headers).http_response_code = 403; + PUTS("Access denied.\n"); + } else { + SG(sapi_headers).http_response_code = 404; + PUTS("No input file specified.\n"); + } /* we want to serve more requests if this is fastcgi * so cleanup and continue, request shutdown is * handled later */ @@ -2114,7 +2104,7 @@ consult the installation file that came with this distribution, or visit \n\ if (open_file_for_scanning(&file_handle TSRMLS_CC) == SUCCESS) { zend_strip(TSRMLS_C); zend_file_handle_dtor(&file_handle TSRMLS_CC); - php_end_ob_buffers(1 TSRMLS_CC); + php_output_teardown(); } return SUCCESS; break; @@ -2129,7 +2119,7 @@ consult the installation file that came with this distribution, or visit \n\ goto fastcgi_request_done; } zend_file_handle_dtor(&file_handle TSRMLS_CC); - php_end_ob_buffers(1 TSRMLS_CC); + php_output_teardown(); } return SUCCESS; } @@ -2140,6 +2130,7 @@ consult the installation file that came with this distribution, or visit \n\ open_file_for_scanning(&file_handle TSRMLS_CC); zend_indent(); zend_file_handle_dtor(&file_handle TSRMLS_CC); + php_output_teardown(); return SUCCESS; break; #endif diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 635445e92f..e5dcfa1e71 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -797,7 +797,7 @@ int main(int argc, char *argv[]) } request_started = 1; php_cli_usage(argv[0]); - php_end_ob_buffers(1 TSRMLS_CC); + php_output_end_all(TSRMLS_C); exit_status=0; goto out; @@ -807,7 +807,7 @@ int main(int argc, char *argv[]) } request_started = 1; php_print_info(0xFFFFFFFF TSRMLS_CC); - php_end_ob_buffers(1 TSRMLS_CC); + php_output_end_all(TSRMLS_C); exit_status=0; goto out; @@ -821,7 +821,7 @@ int main(int argc, char *argv[]) php_printf("\n[Zend Modules]\n"); print_extensions(TSRMLS_C); php_printf("\n"); - php_end_ob_buffers(1 TSRMLS_CC); + php_output_end_all(TSRMLS_C); exit_status=0; goto out; @@ -844,7 +844,7 @@ int main(int argc, char *argv[]) #endif get_zend_version() ); - php_end_ob_buffers(1 TSRMLS_CC); + php_output_end_all(TSRMLS_C); exit_status=0; goto out; diff --git a/sapi/cli/tests/007.phpt b/sapi/cli/tests/007.phpt index 12fddee01d..ca0200ec7b 100644 --- a/sapi/cli/tests/007.phpt +++ b/sapi/cli/tests/007.phpt @@ -32,8 +32,8 @@ class test { /* {{{ */ file_put_contents($filename, $code); -var_dump(`$php -n -w "$filename"`); -var_dump(`$php -n -w "wrong"`); +var_dump(`"$php" -n -w "$filename"`); +var_dump(`"$php" -n -w "wrong"`); var_dump(`echo "<?php /* comment */ class test {\n // comment \n function foo() {} } ?>" | $php -n -w`); @unlink($filename); @@ -45,8 +45,8 @@ string(81) " <?php class test { public $var = "test"; private $pri; function foo() { } } ?> " -Could not open input file: wrong -NULL +string(33) "Could not open input file: wrong +" string(43) "<?php class test { function foo() {} } ?> " Done diff --git a/sapi/cli/tests/008.phpt b/sapi/cli/tests/008.phpt index a833043096..1f77a5bb2f 100644 --- a/sapi/cli/tests/008.phpt +++ b/sapi/cli/tests/008.phpt @@ -26,8 +26,8 @@ var_dump(test::$pri); file_put_contents($filename, $code); -var_dump(`$php -n -f "$filename"`); -var_dump(`$php -n -f "wrong"`); +var_dump(`"$php" -n -f "$filename"`); +var_dump(`"$php" -n -f "wrong"`); @unlink($filename); @@ -38,6 +38,6 @@ string(%d) " Fatal error: Cannot access private property test::$pri in %s on line %d " -Could not open input file: wrong -NULL +string(33) "Could not open input file: wrong +" Done diff --git a/sapi/cli/tests/009.phpt b/sapi/cli/tests/009.phpt index a881a0730e..33f859fb38 100644 --- a/sapi/cli/tests/009.phpt +++ b/sapi/cli/tests/009.phpt @@ -13,8 +13,8 @@ var_dump(`$php -n -r "echo hello;" -a`); echo "Done\n"; ?> --EXPECTF-- -Either execute direct code, process stdin or use a file. -NULL -Either execute direct code, process stdin or use a file. -NULL +string(57) "Either execute direct code, process stdin or use a file. +" +string(57) "Either execute direct code, process stdin or use a file. +" Done diff --git a/sapi/cli/tests/011.phpt b/sapi/cli/tests/011.phpt index ef49666d3a..6154693517 100644 --- a/sapi/cli/tests/011.phpt +++ b/sapi/cli/tests/011.phpt @@ -49,8 +49,8 @@ echo "Done\n"; --EXPECTF-- string(%d) "No syntax errors detected in %s011.test.php " -Could not open input file: some.unknown -NULL +string(40) "Could not open input file: some.unknown +" string(%d) " Parse error: %s expecting %s{%s in %s on line %d Errors parsing %s011.test.php diff --git a/sapi/cli/tests/012.phpt b/sapi/cli/tests/012.phpt index 137e0bd781..c1e4f6a63a 100644 --- a/sapi/cli/tests/012.phpt +++ b/sapi/cli/tests/012.phpt @@ -19,20 +19,20 @@ var_dump(`"$php" -n -r '' -r ''`); echo "Done\n"; ?> --EXPECTF-- -You can use -R or -F only once. -NULL -You can use -R or -F only once. -NULL -You can use -R or -F only once. -NULL -You can use -R or -F only once. -NULL -You can use -f only once. -NULL -You can use -B only once. -NULL -You can use -E only once. -NULL -You can use -r only once. -NULL +string(32) "You can use -R or -F only once. +" +string(32) "You can use -R or -F only once. +" +string(32) "You can use -R or -F only once. +" +string(32) "You can use -R or -F only once. +" +string(26) "You can use -f only once. +" +string(26) "You can use -B only once. +" +string(26) "You can use -E only once. +" +string(26) "You can use -r only once. +" Done diff --git a/sapi/cli/tests/014.phpt b/sapi/cli/tests/014.phpt index b20478a03d..e8c5203f67 100644 --- a/sapi/cli/tests/014.phpt +++ b/sapi/cli/tests/014.phpt @@ -39,6 +39,6 @@ string(1478) "<code><span style="color: #000000"> <br /><span style="color: #0000BB"><?php<br />$test </span><span style="color: #007700">= </span><span style="color: #DD0000">"var"</span><span style="color: #007700">; </span><span style="color: #FF8000">//var<br />/* test class */<br /></span><span style="color: #007700">class </span><span style="color: #0000BB">test </span><span style="color: #007700">{<br /> private </span><span style="color: #0000BB">$var </span><span style="color: #007700">= array();<br /><br /> public static function </span><span style="color: #0000BB">foo</span><span style="color: #007700">(</span><span style="color: #0000BB">Test $arg</span><span style="color: #007700">) {<br /> echo </span><span style="color: #DD0000">"hello"</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);<br /> }<br />}<br /><br /></span><span style="color: #0000BB">$o </span><span style="color: #007700">= new </span><span style="color: #0000BB">test</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?><br /></span> </span> </code>" -Could not open input file: unknown -NULL +string(35) "Could not open input file: unknown +" Done diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c index 11724c425c..b55713ed22 100644 --- a/sapi/milter/php_milter.c +++ b/sapi/milter/php_milter.c @@ -823,7 +823,7 @@ ZEND_END_ARG_INFO() /* {{{ milter_functions[] */ -const static zend_function_entry milter_functions[] = { +static const zend_function_entry milter_functions[] = { PHP_FE(smfi_setflags, arginfo_smfi_setflags) PHP_FE(smfi_settimeout, arginfo_smfi_settimeout) PHP_FE(smfi_getsymval, arginfo_smfi_getsymval) @@ -1040,11 +1040,10 @@ int main(int argc, char *argv[]) while ((c=ap_php_getopt(argc, argv, OPTSTRING))!=-1) { switch (c) { case '?': - php_output_startup(); - php_output_activate(TSRMLS_C); + php_output_tearup(); SG(headers_sent) = 1; php_milter_usage(argv[0]); - php_end_ob_buffers(1 TSRMLS_CC); + php_output_teardown(); exit(1); break; } @@ -1088,11 +1087,10 @@ int main(int argc, char *argv[]) case 'h': /* help & quit */ case '?': - php_output_startup(); - php_output_activate(TSRMLS_C); + php_output_tearup(); SG(headers_sent) = 1; php_milter_usage(argv[0]); - php_end_ob_buffers(1 TSRMLS_CC); + php_output_teardown(); exit(1); break; @@ -1112,7 +1110,7 @@ int main(int argc, char *argv[]) SG(headers_sent) = 1; SG(request_info).no_headers = 1; php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); - php_end_ob_buffers(1 TSRMLS_CC); + php_output_teardown(); exit(1); break; diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c index 8d8363c01c..bf8aa0afd5 100644 --- a/sapi/nsapi/nsapi.c +++ b/sapi/nsapi/nsapi.c @@ -347,7 +347,7 @@ PHP_FUNCTION(nsapi_virtual) php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include uri '%s' - Sub-requests do not work with zlib.output_compression", uri); RETURN_FALSE; } else { - php_end_ob_buffers(1 TSRMLS_CC); + php_output_end_all(TSRMLS_C); php_header(TSRMLS_C); /* do the sub-request */ diff --git a/tests/output/bug46897.phpt b/tests/output/bug46897.phpt index 6cfb102531..8fe80bcb65 100644 --- a/tests/output/bug46897.phpt +++ b/tests/output/bug46897.phpt @@ -18,10 +18,10 @@ echo 'Done'; ?> --EXPECTF-- [callback:1]Attempt to flush unerasable buffer - should fail... -Notice: ob_flush(): failed to flush buffer callback. in %s on line %d +Notice: ob_flush(): failed to flush buffer of callback (0) in %s on line %d bool(false) string(%d) "Attempt to flush unerasable buffer - should fail... -Notice: ob_flush(): failed to flush buffer callback. in %s on line %d +Notice: ob_flush(): failed to flush buffer of callback (0) in %s on line %d bool(false) " Done diff --git a/tests/output/ob_011.phpt b/tests/output/ob_011.phpt index a90fd56f83..35b0388339 100644 --- a/tests/output/ob_011.phpt +++ b/tests/output/ob_011.phpt @@ -1,7 +1,5 @@ --TEST-- output buffering - fatalism ---XFAIL-- -This test will fail until the fix in revision r214155 is backported from php 6 --FILE-- <?php function obh($s) diff --git a/tests/output/ob_013.phpt b/tests/output/ob_013.phpt index ce5b5e5455..e96de46a4b 100644 --- a/tests/output/ob_013.phpt +++ b/tests/output/ob_013.phpt @@ -37,67 +37,69 @@ Array ) Array ( - [level] => 5 - [type] => 1 - [status] => 1 [name] => d - [del] => 1 + [type] => 1 + [flags] => 4209 + [level] => 4 + [chunk_size] => %d + [buffer_size] => 16384 + [buffer_used] => 96 ) Array ( [0] => Array ( - [chunk_size] => 0 - [size] => 40960 - [block_size] => 10240 - [type] => 1 - [status] => 0 [name] => default output handler - [del] => 1 + [type] => 0 + [flags] => 112 + [level] => 0 + [chunk_size] => %d + [buffer_size] => 16384 + [buffer_used] => 0 ) [1] => Array ( - [chunk_size] => 0 - [size] => 40960 - [block_size] => 10240 - [type] => 1 - [status] => 0 [name] => a - [del] => 1 + [type] => 1 + [flags] => 113 + [level] => 1 + [chunk_size] => %d + [buffer_size] => 16384 + [buffer_used] => 0 ) [2] => Array ( - [chunk_size] => 0 - [size] => 40960 - [block_size] => 10240 - [type] => 1 - [status] => 0 [name] => b - [del] => 1 + [type] => 1 + [flags] => 113 + [level] => 2 + [chunk_size] => %d + [buffer_size] => 16384 + [buffer_used] => 0 ) [3] => Array ( - [chunk_size] => 0 - [size] => 40960 - [block_size] => 10240 - [type] => 1 - [status] => 0 [name] => c - [del] => 1 + [type] => 1 + [flags] => 113 + [level] => 3 + [chunk_size] => %d + [buffer_size] => 16384 + [buffer_used] => 4 ) [4] => Array ( - [chunk_size] => 0 - [size] => 40960 - [block_size] => 10240 - [type] => 1 - [status] => 1 [name] => d - [del] => 1 + [type] => 1 + [flags] => 4209 + [level] => 4 + [chunk_size] => %d + [buffer_size] => 16384 + [buffer_used] => %d ) -)
\ No newline at end of file +) diff --git a/tests/output/ob_017.phpt b/tests/output/ob_017.phpt index fc50e2f4ad..070df603fc 100644 --- a/tests/output/ob_017.phpt +++ b/tests/output/ob_017.phpt @@ -24,11 +24,11 @@ yes! yes! Array ( - [0] => 3: yes - [1] => 2: ! + [0] => 1: yes + [1] => 4: ! - [2] => 2: no - [3] => 2: yes! + [2] => 2: + [3] => 0: yes! - [4] => 4: no -)
\ No newline at end of file + [4] => 10: +) diff --git a/tests/output/ob_clean_basic_001.phpt b/tests/output/ob_clean_basic_001.phpt index c93bea3588..afaa7e2f4a 100644 --- a/tests/output/ob_clean_basic_001.phpt +++ b/tests/output/ob_clean_basic_001.phpt @@ -29,8 +29,8 @@ echo "Done"; -- Testing ob_clean() function with Zero arguments -- -Notice: ob_clean(): failed to delete buffer. No buffer to delete. in %s on line 12 +Notice: ob_clean(): failed to delete buffer. No buffer to delete in %s on line 12 bool(false) string(61) "bool(true) Ensure the buffer is still active after the clean." -Done
\ No newline at end of file +Done diff --git a/tests/output/ob_end_clean_basic_001.phpt b/tests/output/ob_end_clean_basic_001.phpt index 0b694e36ca..54e840bdbd 100644 --- a/tests/output/ob_end_clean_basic_001.phpt +++ b/tests/output/ob_end_clean_basic_001.phpt @@ -21,11 +21,11 @@ var_dump(ob_end_clean()); ?> --EXPECTF-- -Notice: ob_end_clean(): failed to delete buffer. No buffer to delete. in %s on line 7 +Notice: ob_end_clean(): failed to delete buffer. No buffer to delete in %s on line 7 bool(false) bool(true) bool(true) -Notice: ob_end_clean(): failed to delete buffer. No buffer to delete. in %s on line 16 +Notice: ob_end_clean(): failed to delete buffer. No buffer to delete in %s on line 16 bool(false) diff --git a/tests/output/ob_end_flush_basic_001.phpt b/tests/output/ob_end_flush_basic_001.phpt index 7515face06..cba7802761 100644 --- a/tests/output/ob_end_flush_basic_001.phpt +++ b/tests/output/ob_end_flush_basic_001.phpt @@ -30,12 +30,12 @@ echo "Done"; -- Testing ob_end_flush() function with Zero arguments -- -Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush. in %s on line 12 +Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush in %s on line 12 bool(false) bool(true) Hello bool(true) -Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush. in %s on line 21 +Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush in %s on line 21 bool(false) -Done
\ No newline at end of file +Done diff --git a/tests/output/ob_flush_basic_001.phpt b/tests/output/ob_flush_basic_001.phpt index 91fb695266..57de5e31ad 100644 --- a/tests/output/ob_flush_basic_001.phpt +++ b/tests/output/ob_flush_basic_001.phpt @@ -30,10 +30,10 @@ echo "Done"; -- Testing ob_flush() function with Zero arguments -- -Notice: ob_flush(): failed to flush buffer. No buffer to flush. in %s on line 12 +Notice: ob_flush(): failed to flush buffer. No buffer to flush in %s on line 12 bool(false) This should get flushed. bool(true) Ensure the buffer is still active after the flush. bool(true) -Done
\ No newline at end of file +Done diff --git a/tests/output/ob_get_clean_basic_001.phpt b/tests/output/ob_get_clean_basic_001.phpt index 07673dfac4..b57ddab5e3 100644 --- a/tests/output/ob_get_clean_basic_001.phpt +++ b/tests/output/ob_get_clean_basic_001.phpt @@ -14,5 +14,6 @@ echo "Hello World"; var_dump(ob_get_clean()); ?> --EXPECTF-- +Notice: ob_get_clean(): failed to delete buffer. No buffer to delete in %s on line 7 bool(false) string(11) "Hello World"
\ No newline at end of file diff --git a/tests/output/ob_get_level_basic_001.phpt b/tests/output/ob_get_level_basic_001.phpt index 78217e4a45..65f3291355 100644 --- a/tests/output/ob_get_level_basic_001.phpt +++ b/tests/output/ob_get_level_basic_001.phpt @@ -42,6 +42,6 @@ int(2) int(1) int(0) -Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush. in %s on line 26 +Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush in %s on line 26 int(0) -Done
\ No newline at end of file +Done diff --git a/tests/output/ob_get_status.phpt b/tests/output/ob_get_status.phpt index a6a3498ca3..95807293b5 100644 --- a/tests/output/ob_get_status.phpt +++ b/tests/output/ob_get_status.phpt @@ -15,20 +15,19 @@ var_dump($status); array(1) { [0]=> array(7) { + ["name"]=> + string(22) "default output handler" + ["type"]=> + int(0) + ["flags"]=> + int(112) + ["level"]=> + int(0) ["chunk_size"]=> int(0) - ["size"]=> - int(40960) - ["block_size"]=> - int(10240) - ["type"]=> - int(1) - ["status"]=> + ["buffer_size"]=> + int(16384) + ["buffer_used"]=> int(0) - ["name"]=> - string(22) "default output handler" - ["del"]=> - bool(true) } } - diff --git a/tests/output/ob_start_basic_004.phpt b/tests/output/ob_start_basic_004.phpt index 39d3aadc49..16f09e8a9a 100644 --- a/tests/output/ob_start_basic_004.phpt +++ b/tests/output/ob_start_basic_004.phpt @@ -1,12 +1,12 @@ --TEST-- -ob_start() chunk_size: confirm buffer is flushed after any output call that causes its length to equal or exceed chunk_size. +ob_start() chunk_size: confirm buffer is flushed after any output call that causes its length to equal or exceed chunk_size. --FILE-- <?php /* * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c */ - +// In HEAD, $chunk_size value of 1 should not have any special behaviour (http://marc.info/?l=php-internals&m=123476465621346&w=2). function callback($string) { global $callback_invocations; $callback_invocations++; @@ -40,7 +40,15 @@ f[call:1; len:8]12345678 f[call:1; len:8]12345678 ----( chunk_size: 1, output append size: 1 )---- -f[call:1; len:8]12345678 +f[call:1; len:1]1 +f[call:2; len:1]2 +f[call:3; len:1]3 +f[call:4; len:1]4 +f[call:5; len:1]5 +f[call:6; len:1]6 +f[call:7; len:1]7 +f[call:8; len:1]8 +f[call:9; len:0] ----( chunk_size: 2, output append size: 1 )---- f[call:1; len:2]12 @@ -85,7 +93,9 @@ f[call:1; len:8]12345678 f[call:1; len:8]12345678 ----( chunk_size: 1, output append size: 4 )---- -f[call:1; len:8]12345678 +f[call:1; len:4]1234 +f[call:2; len:4]5678 +f[call:3; len:0] ----( chunk_size: 2, output append size: 4 )---- f[call:1; len:4]1234 diff --git a/tests/output/ob_start_basic_006.phpt b/tests/output/ob_start_basic_006.phpt index e24ebd61c3..ff7a0cd9eb 100644 --- a/tests/output/ob_start_basic_006.phpt +++ b/tests/output/ob_start_basic_006.phpt @@ -1,5 +1,5 @@ --TEST-- -ob_start(): multiple buffer initialization with a single call, using arrays. +ob_start(): ensure multiple buffer initialization with a single call using arrays is not supported on PHP6 (http://bugs.php.net/42641) --FILE-- <?php /* @@ -72,46 +72,37 @@ var_dump(ob_start(array('f', 'C::g', array(array($c, "g"), array($c, "h"))))); checkAndClean(); ?> --EXPECTF-- - ---> Test arrays: -f[call:1; len:34] - bool(true) + +Notice: ob_start(): failed to create buffer in %s on line 44 +bool(false) Array ( - [0] => f ) -f[call:3; len:68] - f[call:2; len:47] - bool(true) +Notice: ob_start(): failed to create buffer in %s on line 47 +bool(false) Array ( - [0] => f - [1] => f ) - -f[call:5; len:150] - C::g[call:2; len:125] - f[call:4; len:103] - C::g[call:1; len:79] - bool(true) +Notice: ob_start(): failed to create buffer in %s on line 50 +bool(false) Array ( - [0] => f - [1] => C::g - [2] => f - [3] => C::g ) - - - -f[call:6; len:35] - bool(false) +Notice: ob_start(): failed to create buffer in %s on line 53 +bool(false) Array ( - [0] => f ) -f[call:7; len:35] - bool(false) +Notice: ob_start(): failed to create buffer in %s on line 56 +bool(false) Array ( - [0] => f ) - C::h[call:1; len:37; id:originalID] - bool(true) Array ( @@ -124,11 +115,9 @@ Array [0] => C::h ) -f[call:8; len:175] - C::g[call:4; len:150] - C::g[call:3; len:125] - C::h[call:3; len:82; id:changedIDagain] - bool(true) + +Notice: ob_start(): failed to create buffer in %s on line 68 +bool(false) Array ( - [0] => f - [1] => C::g - [2] => C::g - [3] => C::h -)
\ No newline at end of file +) diff --git a/tests/output/ob_start_basic_unerasable_002.phpt b/tests/output/ob_start_basic_unerasable_002.phpt index 2ffcbb9dc1..21db1f326c 100644 --- a/tests/output/ob_start_basic_unerasable_002.phpt +++ b/tests/output/ob_start_basic_unerasable_002.phpt @@ -21,13 +21,13 @@ var_dump(ob_get_level()); --EXPECTF-- [callback:1]All of the following calls will fail to clean/remove the topmost buffer: -Notice: ob_clean(): failed to delete buffer callback. in %s on line 11 +Notice: ob_clean(): failed to delete buffer of callback (0) in %s on line 11 bool(false) -Notice: ob_end_clean(): failed to delete buffer callback. in %s on line 12 +Notice: ob_end_clean(): failed to discard buffer of callback (0) in %s on line 12 bool(false) -Notice: ob_end_flush(): failed to delete buffer callback. in %s on line 13 +Notice: ob_end_flush(): failed to send buffer of callback (0) in %s on line 13 bool(false) The OB nesting will still be 1 level deep: int(1)
\ No newline at end of file diff --git a/tests/output/ob_start_basic_unerasable_003.phpt b/tests/output/ob_start_basic_unerasable_003.phpt index d201414533..6eb6418388 100644 --- a/tests/output/ob_start_basic_unerasable_003.phpt +++ b/tests/output/ob_start_basic_unerasable_003.phpt @@ -10,12 +10,13 @@ function callback($string) { ob_start('callback', 0, false); -echo "This call will fail to obtain the content, since it is also requesting a clean:\n"; +echo "This call will obtain the content, but will not clean the buffer."; $str = ob_get_clean(); var_dump($str); ?> --EXPECTF-- -[callback:1]This call will fail to obtain the content, since it is also requesting a clean: +[callback:1]This call will obtain the content, but will not clean the buffer. +Notice: ob_get_clean(): failed to discard buffer of callback (0) in %s on line 11 -Notice: ob_get_clean(): failed to delete buffer callback. in %s on line 11 -bool(false)
\ No newline at end of file +Notice: ob_get_clean(): failed to delete buffer of callback (0) in %s on line 11 +string(65) "This call will obtain the content, but will not clean the buffer."
\ No newline at end of file diff --git a/tests/output/ob_start_basic_unerasable_004.phpt b/tests/output/ob_start_basic_unerasable_004.phpt index 6669856d67..62d9756e3f 100644 --- a/tests/output/ob_start_basic_unerasable_004.phpt +++ b/tests/output/ob_start_basic_unerasable_004.phpt @@ -10,12 +10,13 @@ function callback($string) { ob_start('callback', 0, false); -echo "This call will fail to flush and fail to obtain the content:\n"; +echo "This call will obtain the content, but will not flush the buffer."; $str = ob_get_flush(); var_dump($str); ?> --EXPECTF-- -[callback:1]This call will fail to flush and fail to obtain the content: +[callback:1]This call will obtain the content, but will not flush the buffer. +Notice: ob_get_flush(): failed to send buffer of callback (0) in %s on line 11 -Notice: ob_get_flush(): failed to delete buffer callback. in %s on line 11 -bool(false) +Notice: ob_get_flush(): failed to delete buffer of callback (0) in %s on line 11 +string(65) "This call will obtain the content, but will not flush the buffer."
\ No newline at end of file diff --git a/tests/output/ob_start_basic_unerasable_005.phpt b/tests/output/ob_start_basic_unerasable_005.phpt index 7be71e5aa8..2c52f00c24 100644 --- a/tests/output/ob_start_basic_unerasable_005.phpt +++ b/tests/output/ob_start_basic_unerasable_005.phpt @@ -17,9 +17,9 @@ var_dump(ob_get_contents()); ?> --EXPECTF-- [callback:1]Attempt to flush unerasable buffer - should fail... -Notice: ob_flush(): failed to flush buffer callback. in %s on line 11 +Notice: ob_flush(): failed to flush buffer of callback (0) in %s on line 11 bool(false) string(%d) "Attempt to flush unerasable buffer - should fail... -Notice: ob_flush(): failed to flush buffer callback. in %s on line 11 +Notice: ob_flush(): failed to flush buffer of callback (0) in %s on line 11 bool(false) " diff --git a/tests/output/ob_start_error_001.phpt b/tests/output/ob_start_error_001.phpt index ca028018bd..0f6daf3295 100644 --- a/tests/output/ob_start_error_001.phpt +++ b/tests/output/ob_start_error_001.phpt @@ -30,19 +30,22 @@ var_dump(ob_start("justPrint", 0, "this should be a bool")); ?> --EXPECTF-- - - Too many arguments Warning: ob_start() expects at most 3 parameters, 4 given in %s on line 17 -NULL +bool(false) - Arg 1 wrong type -bool(true) + +Notice: ob_start(): failed to create buffer in %s on line 20 +bool(false) - Arg 2 wrong type Warning: ob_start() expects parameter 2 to be long, string given in %s on line 23 -NULL +bool(false) - Arg 3 wrong type -bool(true)
\ No newline at end of file + +Warning: ob_start() expects parameter 3 to be long, string given in %s on line 26 +bool(false) diff --git a/tests/output/ob_start_error_002.phpt b/tests/output/ob_start_error_002.phpt index aca2ad9d2c..822aeb434b 100644 --- a/tests/output/ob_start_error_002.phpt +++ b/tests/output/ob_start_error_002.phpt @@ -20,8 +20,15 @@ var_dump(ob_start("no")); echo "done" ?> --EXPECTF-- +Notice: ob_start(): failed to create buffer in %s on line 13 bool(false) + +Notice: ob_start(): failed to create buffer in %s on line 14 bool(false) + +Notice: ob_start(): failed to create buffer in %s on line 15 bool(false) + +Notice: ob_start(): failed to create buffer in %s on line 16 bool(false) done
\ No newline at end of file diff --git a/tests/output/ob_start_error_003.phpt b/tests/output/ob_start_error_003.phpt index ce2a2495d9..7bb88b41a1 100644 --- a/tests/output/ob_start_error_003.phpt +++ b/tests/output/ob_start_error_003.phpt @@ -15,4 +15,6 @@ var_dump(ob_start(array($c))); echo "done" ?> --EXPECTF-- -Catchable fatal error: Object of class C could not be converted to string in %s on line 11
\ No newline at end of file +Notice: ob_start(): failed to create buffer in %s on line 11 +bool(false) +done
\ No newline at end of file diff --git a/tests/output/ob_start_error_004.phpt b/tests/output/ob_start_error_004.phpt index ec6d44d091..aeb5be98b0 100644 --- a/tests/output/ob_start_error_004.phpt +++ b/tests/output/ob_start_error_004.phpt @@ -15,4 +15,6 @@ var_dump(ob_start(array($c, 'f'))); echo "done" ?> --EXPECTF-- -Catchable fatal error: Object of class C could not be converted to string in %s on line 11
\ No newline at end of file +Notice: ob_start(): failed to create buffer in %s on line 11 +bool(false) +done
\ No newline at end of file |