diff options
Diffstat (limited to 'ext')
60 files changed, 1769 insertions, 1662 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index f3f15d7c3f..9ab771889a 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -112,6 +112,11 @@ 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) @@ -127,6 +132,7 @@ 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) @@ -208,10 +214,6 @@ 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 */ @@ -276,9 +278,6 @@ 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; } /* }}} */ @@ -313,60 +312,6 @@ 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) { @@ -406,7 +351,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 } @@ -437,7 +382,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); @@ -483,21 +428,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; @@ -564,7 +509,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; @@ -583,7 +528,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; @@ -726,12 +671,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; @@ -763,7 +708,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)) { @@ -848,7 +793,7 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pretval, if (cd2 != (iconv_t)NULL) { iconv_close(cd2); - } + } return err; } @@ -1033,7 +978,7 @@ static php_iconv_err_t _php_iconv_strpos(unsigned int *pretval, if (ndl_buf) { efree(ndl_buf); } - + iconv_close(cd); return err; @@ -1286,7 +1231,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; @@ -1363,7 +1308,7 @@ out: } if (encoded != NULL) { efree(encoded); - } + } if (buf != NULL) { efree(buf); } @@ -1421,7 +1366,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 */ @@ -1461,7 +1406,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 */ @@ -1572,7 +1517,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)) { @@ -1780,7 +1725,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 */ @@ -2205,7 +2150,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; @@ -2246,7 +2191,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", @@ -2314,14 +2259,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); } @@ -2342,7 +2287,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; @@ -2363,6 +2308,58 @@ 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) @@ -2491,7 +2488,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; @@ -2787,7 +2784,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 b948318cf6..0ef856c9bf 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_output_get_start_filename(TSRMLS_C); - int output_start_lineno = php_output_get_start_lineno(TSRMLS_C); + char *output_start_filename = php_get_output_start_filename(TSRMLS_C); + int output_start_lineno = php_get_output_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_output_get_start_filename(TSRMLS_C); - int output_start_lineno = php_output_get_start_lineno(TSRMLS_C); + char *output_start_filename = php_get_output_start_filename(TSRMLS_C); + int output_start_lineno = php_get_output_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 bd351a0a2f..ff430cabd5 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_output_start_default(TSRMLS_C) != SUCCESS) { + if (php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC) != 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_output_discard(TSRMLS_C); + php_end_ob_buffer(0, 0 TSRMLS_CC); 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_output_discard(TSRMLS_C); + php_end_ob_buffer(0, 0 TSRMLS_CC); 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_output_discard(TSRMLS_C); + php_end_ob_buffer(0, 0 TSRMLS_CC); 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_output_discard(TSRMLS_C); + php_end_ob_buffer(0, 0 TSRMLS_CC); 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_output_discard(TSRMLS_C); + php_end_ob_buffer(0, 0 TSRMLS_CC); 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_output_discard(TSRMLS_C); + php_end_ob_buffer(0, 0 TSRMLS_CC); 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_output_discard(TSRMLS_C); + php_end_ob_buffer(0, 0 TSRMLS_CC); 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_output_discard(TSRMLS_C); + php_end_ob_buffer(0, 0 TSRMLS_CC); 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_output_discard(TSRMLS_C); + php_end_ob_buffer(0, 0 TSRMLS_CC); if (doc_return) { /* xmlDocDumpMemoryEnc(doc_return, &buf, &size, XML_CHAR_ENCODING_UTF8); */ @@ -2039,14 +2039,39 @@ PHP_METHOD(SoapServer, handle) xmlFreeDoc(doc_return); - if (zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0)) { - sapi_add_header("Connection: close", sizeof("Connection: close")-1, 1); - } else { + 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); - 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); @@ -2185,22 +2210,47 @@ 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); } - php_write(buf, size TSRMLS_CC); + 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); + } xmlFreeDoc(doc_return); - xmlFree(buf); zend_clear_exception(TSRMLS_C); } @@ -2363,11 +2413,11 @@ static void soap_error_handler(int error_num, const char *error_filename, const } /* Get output buffer and send as fault detials */ - if (php_output_get_length(&outbuflen TSRMLS_CC) != FAILURE && Z_LVAL(outbuflen) != 0) { + if (php_ob_get_length(&outbuflen TSRMLS_CC) != FAILURE && Z_LVAL(outbuflen) != 0) { ALLOC_INIT_ZVAL(outbuf); - php_output_get_contents(outbuf TSRMLS_CC); + php_ob_get_buffer(outbuf TSRMLS_CC); } - php_output_discard(TSRMLS_C); + php_end_ob_buffer(0, 0 TSRMLS_CC); } INIT_ZVAL(fault_obj); diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 02b661ca5d..38c608f670 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, ret; + int filename_len; zend_syntax_highlighter_ini syntax_highlighter_ini; zend_bool i = 0; @@ -5154,23 +5154,32 @@ PHP_FUNCTION(highlight_file) } if (i) { - php_output_start_default(TSRMLS_C); + php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC); } php_get_highlight_struct(&syntax_highlighter_ini); - ret = highlight_file(filename, &syntax_highlighter_ini TSRMLS_CC); - - if (ret == FAILURE) { + if (highlight_file(filename, &syntax_highlighter_ini TSRMLS_CC) == FAILURE) { if (i) { - php_output_end(TSRMLS_C); + int res = php_ob_get_buffer(return_value 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); + } + } } RETURN_FALSE; } if (i) { - php_output_get_contents(return_value TSRMLS_CC); - php_output_discard(TSRMLS_C); + php_ob_get_buffer (return_value TSRMLS_CC); + php_end_ob_buffer (0, 0 TSRMLS_CC); } else { RETURN_TRUE; } @@ -5190,26 +5199,25 @@ 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_output_get_contents(return_value TSRMLS_CC); - php_output_discard(TSRMLS_C); + php_ob_get_buffer(return_value TSRMLS_CC); + php_end_ob_buffer(0, 0 TSRMLS_CC); } /* }}} */ @@ -5229,7 +5237,7 @@ PHP_FUNCTION(highlight_string) convert_to_string_ex(expr); if (i) { - php_output_start_default(TSRMLS_C); + php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC); } EG(error_reporting) = E_ERROR; @@ -5242,7 +5250,7 @@ PHP_FUNCTION(highlight_string) efree(hicompiled_string_description); EG(error_reporting) = old_error_reporting; if (i) { - php_output_end(TSRMLS_C); + php_end_ob_buffer (1, 0 TSRMLS_CC); } RETURN_FALSE; } @@ -5251,8 +5259,8 @@ PHP_FUNCTION(highlight_string) EG(error_reporting) = old_error_reporting; if (i) { - php_output_get_contents(return_value TSRMLS_CC); - php_output_discard(TSRMLS_C); + php_ob_get_buffer (return_value TSRMLS_CC); + php_end_ob_buffer (0, 0 TSRMLS_CC); } else { RETURN_TRUE; } @@ -5509,14 +5517,14 @@ PHP_FUNCTION(print_r) } if (do_return) { - php_output_start_default(TSRMLS_C); + php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC); } zend_print_zval_r(var, 0 TSRMLS_CC); if (do_return) { - php_output_get_contents(return_value TSRMLS_CC); - php_output_discard(TSRMLS_C); + php_ob_get_buffer (return_value TSRMLS_CC); + php_end_ob_buffer (0, 0 TSRMLS_CC); } else { RETURN_TRUE; } diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 7e770abd1d..5850026e17 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -139,10 +139,8 @@ PHPAPI int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_ } if (type == 1) { - int ob_level; - PHPWRITE(buf, bufl); - if ((php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_LEVEL, &ob_level TSRMLS_CC) == SUCCESS) && ob_level < 1) { + if (OG(ob_nesting_level) < 1) { sapi_flush(TSRMLS_C); } } else if (type == 2) { diff --git a/ext/standard/head.c b/ext/standard/head.c index d8d5bce72e..ac8c9b1a72 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,10 +72,9 @@ 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: "); @@ -168,7 +167,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]]]]]]) @@ -230,8 +229,8 @@ PHP_FUNCTION(headers_sent) return; if (SG(headers_sent)) { - line = php_output_get_start_lineno(TSRMLS_C); - file = php_output_get_start_filename(TSRMLS_C); + line = php_get_output_start_lineno(TSRMLS_C); + file = php_get_output_start_filename(TSRMLS_C); } switch(ZEND_NUM_ARGS()) { diff --git a/ext/standard/info.c b/ext/standard/info.c index 792fd0834b..a1e2b1edff 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -38,15 +38,16 @@ #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 @@ -60,7 +61,7 @@ ZEND_EXTERN_MODULE_GLOBALS(iconv) #endif #define SECTION(name) if (!sapi_module.phpinfo_as_text) { \ - php_info_print("<h2>" name "</h2>\n"); \ + PUTS("<h2>" name "</h2>\n"); \ } else { \ php_info_print_table_start(); \ php_info_print_table_header(1, name); \ @@ -70,99 +71,29 @@ 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_print_html_esc(const char *str, int len) /* {{{ */ + +static int php_info_write_wrapper(const char *str, uint str_length) { int new_len, written; - 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; -} -/* }}} */ + char *elem_esc; -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; -} -/* }}} */ -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)); - } -} -/* }}} */ + elem_esc = php_escape_html_entities((unsigned char *)str, str_length, &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC); -static int php_info_print(const char *str) /* {{{ */ -{ - TSRMLS_FETCH(); - return php_output_write(str, strlen(str) TSRMLS_CC); -} -/* }}} */ + written = php_body_write(elem_esc, new_len TSRMLS_CC); -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; + efree(elem_esc); - 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"); - } + return written; } -/* }}} */ + 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_info_printf("<h2><a name=\"module_%s\">%s</a></h2>\n", zend_module->name, zend_module->name); + php_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); @@ -178,9 +109,9 @@ PHPAPI void php_info_print_module(zend_module_entry *zend_module TSRMLS_DC) /* { } } else { if (!sapi_module.phpinfo_as_text) { - php_info_printf("<tr><td>%s</td></tr>\n", zend_module->name); + php_printf("<tr><td>%s</td></tr>\n", zend_module->name); } else { - php_info_printf("%s\n", zend_module->name); + php_printf("%s\n", zend_module->name); } } } @@ -220,66 +151,70 @@ 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) { - php_info_print("<tr>"); - php_info_print("<td class=\"e\">"); + PUTS("<tr>"); + PUTS("<td class=\"e\">"); + } - php_info_print(name); - php_info_print("[\""); + PUTS(name); + PUTS("[\""); 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_print_html_esc(string_key, string_len-1); + php_info_html_esc_write(string_key, string_len - 1 TSRMLS_CC); } else { - php_info_print(string_key); - } + PHPWRITE(string_key, string_len - 1); + } break; case HASH_KEY_IS_LONG: - php_info_printf("%ld", num_key); + php_printf("%ld", num_key); break; } - php_info_print("\"]"); + PUTS("\"]"); if (!sapi_module.phpinfo_as_text) { - php_info_print("</td><td class=\"v\">"); + PUTS("</td><td class=\"v\">"); } else { - php_info_print(" => "); + PUTS(" => "); } if (Z_TYPE_PP(tmp) == IS_ARRAY) { if (!sapi_module.phpinfo_as_text) { - 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>"); + PUTS("<pre>"); + zend_print_zval_r_ex((zend_write_func_t) php_info_write_wrapper, *tmp, 0 TSRMLS_CC); + PUTS("</pre>"); } else { zend_print_zval_r(*tmp, 0 TSRMLS_CC); } - } else { + } else if (Z_TYPE_PP(tmp) != IS_STRING) { 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); - } + 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)); + } } if (!sapi_module.phpinfo_as_text) { - php_info_print("</td></tr>\n"); + PUTS("</td></tr>\n"); } else { - php_info_print("\n"); - } + PUTS("\n"); + } zend_hash_move_forward(Z_ARRVAL_PP(data)); } } @@ -290,9 +225,21 @@ static void php_print_gpcse_array(char *name, uint name_length TSRMLS_DC) */ void php_info_print_style(TSRMLS_D) { - php_info_printf("<style type=\"text/css\">\n"); + php_printf("<style type=\"text/css\">\n"); php_info_print_css(TSRMLS_C); - php_info_printf("</style>\n"); + 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); } /* }}} */ @@ -301,13 +248,13 @@ void php_info_print_style(TSRMLS_D) PHPAPI char *php_info_html_esc(char *string TSRMLS_DC) { int new_len; - return php_escape_html_entities(string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC); + return php_escape_html_entities((unsigned char *)string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC); } /* }}} */ + #ifdef PHP_WIN32 /* {{{ */ - char* php_get_windows_name() { OSVERSIONINFOEX osvi; @@ -402,9 +349,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) { @@ -630,18 +577,54 @@ PHPAPI char *php_get_uname(char mode) } /* }}} */ + /* {{{ php_print_info_htmlhead */ PHPAPI void php_print_info_htmlhead(TSRMLS_D) { - 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"); + +/*** 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_style(TSRMLS_C); - 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"); + 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"); } /* }}} */ @@ -667,8 +650,8 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) if (!sapi_module.phpinfo_as_text) { php_print_info_htmlhead(TSRMLS_C); } else { - php_info_print("phpinfo()\n"); - } + PUTS("phpinfo()\n"); + } if (flag & PHP_INFO_GENERAL) { char *zend_version = get_zend_version(); @@ -682,17 +665,21 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) } if (expose_php && !sapi_module.phpinfo_as_text) { - php_info_print("<a href=\"http://www.php.net/\"><img border=\"0\" src=\""); - php_info_print_request_uri(TSRMLS_C); - php_info_print("?="); + 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("?="); logo_guid = php_logo_guid(); - php_info_print(logo_guid); + PUTS(logo_guid); efree(logo_guid); - php_info_print("\" alt=\"PHP Logo\" /></a>"); + PUTS("\" alt=\"PHP Logo\" /></a>"); } if (!sapi_module.phpinfo_as_text) { - php_info_printf("<h1 class=\"p\">PHP Version %s</h1>\n", PHP_VERSION); + php_printf("<h1 class=\"p\">PHP Version %s</h1>\n", PHP_VERSION); } else { php_info_print_table_row(2, "PHP Version", PHP_VERSION); } @@ -762,24 +749,139 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) #else php_info_print_table_row(2, "IPv6 Support", "disabled" ); #endif - - 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); + { + 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_table_end(); /* Zend Engine */ php_info_print_box_start(0); if (expose_php && !sapi_module.phpinfo_as_text) { - 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("<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("This program makes use of the Zend Scripting Language Engine:"); - php_info_print(!sapi_module.phpinfo_as_text?"<br />":"\n"); + PUTS("This program makes use of the Zend Scripting Language Engine:"); + PUTS(!sapi_module.phpinfo_as_text?"<br />":"\n"); if (sapi_module.phpinfo_as_text) { - php_info_print(zend_version); + PUTS(zend_version); } else { zend_html_puts(zend_version, strlen(zend_version) TSRMLS_CC); } @@ -789,11 +891,15 @@ 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(); - 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"); + 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"); } zend_ini_sort_entries(TSRMLS_C); @@ -801,7 +907,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) { - php_info_print("<h1>Configuration</h1>\n"); + PUTS("<h1>Configuration</h1>\n"); } else { SECTION("Configuration"); } @@ -881,108 +987,103 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) if (!sapi_module.phpinfo_as_text) { SECTION("PHP License"); php_info_print_box_start(0); - 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"); + 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_box_end(); } else { - 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"); + 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"); } } if (!sapi_module.phpinfo_as_text) { - php_info_print("</div></body></html>"); + PUTS("</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_info_print("<table border=\"0\" cellpadding=\"3\" width=\"600\">\n"); + php_printf("<table border=\"0\" cellpadding=\"3\" width=\"600\">\n"); } else { - php_info_print("\n"); + php_printf("\n"); } } -/* }}} */ -PHPAPI void php_info_print_table_end(void) /* {{{ */ +PHPAPI void php_info_print_table_end(void) { if (!sapi_module.phpinfo_as_text) { - php_info_print("</table><br />\n"); + php_printf("</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_info_print("<tr class=\"h\"><td>\n"); + php_printf("<tr class=\"h\"><td>\n"); } } else { if (!sapi_module.phpinfo_as_text) { - php_info_print("<tr class=\"v\"><td>\n"); + php_printf("<tr class=\"v\"><td>\n"); } else { - php_info_print("\n"); + php_printf("\n"); } } } -/* }}} */ -PHPAPI void php_info_print_box_end(void) /* {{{ */ +PHPAPI void php_info_print_box_end(void) { if (!sapi_module.phpinfo_as_text) { - php_info_print("</td></tr>\n"); + php_printf("</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_info_print("<hr />\n"); + php_printf("<hr />\n"); } else { - php_info_print("\n\n _______________________________________________________________________\n\n"); + php_printf("\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_info_printf("<tr class=\"h\"><th colspan=\"%d\">%s</th></tr>\n", num_cols, header ); + php_printf("<tr class=\"h\"><th colspan=\"%d\">%s</th></tr>\n", num_cols, header ); } else { spaces = (74 - strlen(header)); - php_info_printf("%*s%s%*s\n", (int)(spaces/2), " ", header, (int)(spaces/2), " "); + php_printf("%*s%s%*s\n", (int)(spaces/2), " ", header, (int)(spaces/2), " "); } } -/* }}} */ /* {{{ php_info_print_table_header */ @@ -992,9 +1093,11 @@ 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_info_print("<tr class=\"h\">"); + php_printf("<tr class=\"h\">"); } for (i=0; i<num_cols; i++) { row_element = va_arg(row_elements, char *); @@ -1002,21 +1105,21 @@ PHPAPI void php_info_print_table_header(int num_cols, ...) row_element = " "; } if (!sapi_module.phpinfo_as_text) { - php_info_print("<th>"); - php_info_print(row_element); - php_info_print("</th>"); + PUTS("<th>"); + PUTS(row_element); + PUTS("</th>"); } else { - php_info_print(row_element); + PUTS(row_element); if (i < num_cols-1) { - php_info_print(" => "); + PUTS(" => "); } else { - php_info_print("\n"); - } - } + PUTS("\n"); + } + } } if (!sapi_module.phpinfo_as_text) { - php_info_print("</tr>\n"); - } + php_printf("</tr>\n"); + } va_end(row_elements); } @@ -1029,41 +1132,49 @@ 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_info_print("<tr>"); + php_printf("<tr>"); } for (i=0; i<num_cols; i++) { if (!sapi_module.phpinfo_as_text) { - php_info_printf("<td class=\"%s\">", + php_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) { - php_info_print( "<i>no value</i>" ); + PUTS( "<i>no value</i>" ); } else { - php_info_print( " " ); + PUTS( " " ); } } else { if (!sapi_module.phpinfo_as_text) { - php_info_print_html_esc(row_element, strlen(row_element)); + elem_esc = php_info_html_esc(row_element TSRMLS_CC); + PUTS(elem_esc); + efree(elem_esc); } else { - php_info_print(row_element); + PUTS(row_element); if (i < num_cols-1) { - php_info_print(" => "); + PUTS(" => "); } } } if (!sapi_module.phpinfo_as_text) { - php_info_print(" </td>"); + php_printf(" </td>"); } else if (i == (num_cols - 1)) { - php_info_print("\n"); + PUTS("\n"); } } if (!sapi_module.phpinfo_as_text) { - php_info_print("</tr>\n"); + php_printf("</tr>\n"); } } /* }}} */ @@ -1127,9 +1238,9 @@ PHP_FUNCTION(phpinfo) } /* Andale! Andale! Yee-Hah! */ - php_output_start_default(TSRMLS_C); + php_start_ob_buffer(NULL, 4096, 0 TSRMLS_CC); php_print_info(flag TSRMLS_CC); - php_output_end(TSRMLS_C); + php_end_ob_buffer(1, 0 TSRMLS_CC); RETURN_TRUE; } @@ -1140,18 +1251,20 @@ PHP_FUNCTION(phpinfo) Return the current PHP version */ PHP_FUNCTION(phpversion) { - char *ext_name = NULL; - int ext_name_len = 0; + zval **arg; + const char *version; + int argc = ZEND_NUM_ARGS(); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &ext_name, &ext_name_len) == FAILURE) { - return; - } - - if (!ext_name) { + if (argc == 0) { RETURN_STRING(PHP_VERSION, 1); } else { - const char *version; - version = zend_get_module_version(ext_name); + 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)); + if (version == NULL) { RETURN_FALSE; } @@ -1175,6 +1288,7 @@ PHP_FUNCTION(phpcredits) } /* }}} */ + /* {{{ php_logo_guid */ PHPAPI char *php_logo_guid(void) @@ -1202,6 +1316,7 @@ 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; } @@ -1214,6 +1329,7 @@ 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; } @@ -1269,7 +1385,6 @@ 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 1d3538120d..db666c5a6a 100644 --- a/ext/standard/tests/general_functions/ob_get_flush_error.phpt +++ b/ext/standard/tests/general_functions/ob_get_flush_error.phpt @@ -26,7 +26,5 @@ 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 20828f4fcd..7da94c3596 100644 --- a/ext/standard/tests/general_functions/phpinfo.phpt +++ b/ext/standard/tests/general_functions/phpinfo.phpt @@ -37,7 +37,6 @@ 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 c073695dbd..905734918a 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 Tue Dec 8 14:00:51 2009 */ +/* Generated by re2c 0.13.5 on Mon Jul 27 02:20:40 2009 */ #line 1 "ext/standard/url_scanner_ex.re" /* +----------------------------------------------------------------------+ - | PHP Version 6 | + | PHP Version 5 | +----------------------------------------------------------------------+ | 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 | PHP_OUTPUT_HANDLER_FLUSH | PHP_OUTPUT_HANDLER_FINAL) ? 1 : 0) TSRMLS_CC); + *handled_output = url_adapt_ext(output, output_len, &len, (zend_bool) (mode & (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) TSRMLS_CC); if (sizeof(uint) < sizeof(size_t)) { if (len > UINT_MAX) len = UINT_MAX; @@ -1024,15 +1024,11 @@ 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_output_start_internal(ob_name, php_url_scanner_output_handler, 0, PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC); + php_ob_set_internal_handler(php_url_scanner_output_handler, 0, "URL-Rewriter", 1 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 cb248b448f..888bb0667a 100644 --- a/ext/standard/url_scanner_ex.re +++ b/ext/standard/url_scanner_ex.re @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 6 | + | PHP Version 5 | +----------------------------------------------------------------------+ | 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 | PHP_OUTPUT_HANDLER_FLUSH | PHP_OUTPUT_HANDLER_FINAL) ? 1 : 0) TSRMLS_CC); + *handled_output = url_adapt_ext(output, output_len, &len, (zend_bool) (mode & (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) TSRMLS_CC); if (sizeof(uint) < sizeof(size_t)) { if (len > UINT_MAX) len = UINT_MAX; @@ -462,15 +462,11 @@ 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_output_start_internal(ob_name, php_url_scanner_output_handler, 0, PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC); + php_ob_set_internal_handler(php_url_scanner_output_handler, 0, "URL-Rewriter", 1 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 8f3381743d..de321060f8 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -453,14 +453,14 @@ PHP_FUNCTION(var_export) } if (return_output) { - php_output_start_default(TSRMLS_C); + php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC); } php_var_export(&var, 1 TSRMLS_CC); if (return_output) { - php_output_get_contents(return_value TSRMLS_CC); - php_output_discard(TSRMLS_C); + php_ob_get_buffer (return_value TSRMLS_CC); + php_end_ob_buffer (0, 0 TSRMLS_CC); } } /* }}} */ diff --git a/ext/tidy/php_tidy.h b/ext/tidy/php_tidy.h index 45d81ea064..90a3e095d2 100644 --- a/ext/tidy/php_tidy.h +++ b/ext/tidy/php_tidy.h @@ -36,7 +36,6 @@ 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 1dc968852a..dfc15d97f0 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -43,10 +43,8 @@ /* {{{ 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; \ @@ -60,7 +58,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; \ @@ -68,25 +66,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 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; \ - } \ - } \ - } + 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; \ + } \ + } \ + } #define REGISTER_TIDY_CLASS(classname, name, parent, __flags) \ { \ @@ -123,16 +121,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) \ { \ @@ -151,27 +149,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; @@ -189,16 +187,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; }; /* }}} */ @@ -219,10 +217,6 @@ 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); @@ -252,6 +246,8 @@ 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); @@ -276,8 +272,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) -STD_PHP_INI_ENTRY("tidy.clean_output", "0", PHP_INI_USER, php_tidy_set_clean_output, clean_output, zend_tidy_globals, tidy_globals) +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) PHP_INI_END() /* {{{ arginfo */ @@ -287,7 +283,8 @@ 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(arginfo_tidy_get_error_buffer, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_error_buffer, 0, 0, 0) + ZEND_ARG_INFO(0, detailed) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_output, 0) @@ -372,6 +369,11 @@ 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[] = { @@ -379,21 +381,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 @@ -401,6 +403,7 @@ 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} }; @@ -499,7 +502,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; @@ -545,7 +548,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; } @@ -562,7 +565,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; @@ -575,35 +578,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); - tidyBufAttach(&buf, (byte *) data, data_len); + tidyBufAppend(&buf, data, data_len); if (tidyParseBuffer(doc, &buf) < 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errbuf->bp); @@ -614,19 +617,20 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_fil tidyBufInit(&output); tidySaveBuffer (doc, &output); - FIX_BUFFER(&output); - RETVAL_STRINGL((char *) output.bp, output.size ? output.size-1 : 0, 1); + 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); @@ -640,7 +644,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, (void*) &data, PHP_STREAM_COPY_ALL, 0)) == 0) { + if ((*len = (int) php_stream_copy_to_mem(stream, &data, PHP_STREAM_COPY_ALL, 0)) == 0) { data = estrdup(""); *len = 0; } @@ -669,15 +673,16 @@ 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) { @@ -685,6 +690,11 @@ 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; @@ -707,6 +717,9 @@ 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); @@ -762,7 +775,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, 1); + ZVAL_STRINGL(out, (char*)output.bp, output.size ? output.size-1 : 0, TRUE); tidyBufFree(&output); break; @@ -796,10 +809,8 @@ 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; @@ -812,23 +823,24 @@ 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, 1); + ZVAL_STRINGL(temp, (char*)output.bp, output.size-1, TRUE); 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); } } @@ -847,7 +859,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 ? buf.size-1 : 0); + ADD_PROPERTY_STRINGL(obj->std.properties, value, buf.bp, buf.size-1); tidyBufFree(&buf); ADD_PROPERTY_STRING(obj->std.properties, name, tidyNodeGetName(obj->node)); @@ -862,7 +874,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)); } @@ -988,55 +1000,49 @@ 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; + char *opt_name = NULL; 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)) { - - 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: + + if(zend_hash_get_current_key(ht_options, &opt_name, &opt_indx, FALSE) == FAILURE) { php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not retrieve key from option array"); return FAILURE; } - _php_tidy_set_tidy_opt(doc, opt_name, *opt_val TSRMLS_CC); - if (clear_str) { - efree(opt_name); + if(opt_name) { + _php_tidy_set_tidy_opt(doc, opt_name, *opt_val TSRMLS_CC); + opt_name = NULL; } + } - + 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); - tidyBufAttach(&buf, (byte *) string, len); + tidyBufAppend(&buf, 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; @@ -1044,11 +1050,6 @@ 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); @@ -1059,19 +1060,16 @@ 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) { - zval *name; - - MAKE_STD_ZVAL(name); - ZVAL_STRING(name, "ob_tidyhandler", 1); - php_tidy_clean_output_start(name TSRMLS_CC); - zval_ptr_dtor(&name); + 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."); + } + } return SUCCESS; } @@ -1093,148 +1091,97 @@ static PHP_MINFO_FUNCTION(tidy) DISPLAY_INI_ENTRIES(); } -static PHP_INI_MH(php_tidy_set_clean_output) +static PHP_FUNCTION(ob_tidyhandler) { - 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); - } - - if (stage == PHP_INI_STAGE_RUNTIME) { - status = php_output_get_status(TSRMLS_C); + char *input; + int input_len; + long mode; + TidyBuffer errbuf; + TidyDoc doc; - 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 (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &input, &input_len, &mode) == FAILURE) { + return; } - status = OnUpdateBool(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); - - if (stage == PHP_INI_STAGE_RUNTIME && value) { - zval *tmp; + doc = tidyCreate(); + tidyBufInit(&errbuf); - 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); - } + tidyOptSetBool(doc, TidyForceOutput, yes); + tidyOptSetBool(doc, TidyMark, no); - return status; -} + if (tidySetErrorBuffer(doc, &errbuf) != 0) { + tidyRelease(doc); + tidyBufFree(&errbuf); -/* - * NOTE: tidy does not support iterative/cumulative parsing, so chunk-sized output handler is not possible - */ + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not set Tidy error buffer"); + } -static void php_tidy_clean_output_start(zval *name TSRMLS_DC) -{ - php_output_handler *h; + TIDY_SET_DEFAULT_CONFIG(doc); - 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); - } -} + 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); -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); -} + tidySaveBuffer(doc, &output); + RETVAL_STRINGL((char*)output.bp, output.size ? output.size-1 : 0, 1); -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(&output); } - - tidyRelease(doc); - tidyBufFree(&errbuf); + + tidyBufFree(&buf); + } else { + RETVAL_NULL(); } - return status; + tidyRelease(doc); + tidyBufFree(&errbuf); } -/* {{{ proto bool tidy_parse_string(string input [, mixed config_options [, string encoding]]) U +/* {{{ proto bool tidy_parse_string(string input [, mixed config_options [, string encoding]]) Parse a document stored in a string */ static PHP_FUNCTION(tidy_parse_string) { - char *input; - char *enc = NULL; - int input_len, enc_len; + char *input, *enc = NULL; + int input_len, enc_len = 0; 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); - RETVAL_FALSE; + RETURN_FALSE; } + } /* }}} */ -/* {{{ proto string tidy_get_error_buffer() +/* {{{ proto string tidy_get_error_buffer([boolean detailed]) 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; } @@ -1250,8 +1197,9 @@ static PHP_FUNCTION(tidy_get_output) tidyBufInit(&output); tidySaveBuffer(obj->ptdoc->doc, &output); - FIX_BUFFER(&output); - RETVAL_STRINGL((char *) output.bp, output.size ? output.size-1 : 0, 1); + + RETVAL_STRINGL((char*)output.bp, output.size ? output.size-1 : 0, 1); + tidyBufFree(&output); } /* }}} */ @@ -1265,10 +1213,11 @@ 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; } @@ -1276,13 +1225,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; @@ -1357,18 +1306,18 @@ static PHP_FUNCTION(tidy_get_release) static PHP_FUNCTION(tidy_get_opt_doc) { PHPTidyObj *obj; - char *optval, *optname; + char *optname, *optval; 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; } } @@ -1393,7 +1342,7 @@ static PHP_FUNCTION(tidy_get_opt_doc) /* {{{ proto array tidy_get_config() - Get current Tidy configuration */ + Get current Tidy configuarion */ static PHP_FUNCTION(tidy_get_config) { TidyIterator itOpt; @@ -1414,7 +1363,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, 1); + add_assoc_string(return_value, opt_name, (char*)opt_value, 0); break; case TidyInteger: @@ -1451,7 +1400,7 @@ static PHP_FUNCTION(tidy_get_html_ver) } /* }}} */ -/* {{{ proto bool tidy_is_xhtml() +/* {{{ proto boolean tidy_is_xhtml() Indicates if the document is a XHTML document. */ static PHP_FUNCTION(tidy_is_xhtml) { @@ -1461,7 +1410,7 @@ static PHP_FUNCTION(tidy_is_xhtml) } /* }}} */ -/* {{{ proto bool tidy_is_xml() +/* {{{ proto boolean tidy_is_xml() Indicates if the document is a generic (non HTML/XHTML) XML document. */ static PHP_FUNCTION(tidy_is_xml) { @@ -1514,22 +1463,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; } } @@ -1546,7 +1495,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, 1); + RETURN_STRING((char *)optval, 0); break; case TidyInteger: @@ -1577,19 +1526,20 @@ 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; } @@ -1614,18 +1564,19 @@ 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; @@ -1651,10 +1602,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; } @@ -1691,7 +1642,7 @@ static PHP_FUNCTION(tidy_get_body) } /* }}} */ -/* {{{ proto bool tidyNode::hasChildren() +/* {{{ proto boolean tidyNode::hasChildren() Returns true if this node has children */ static TIDY_NODE_METHOD(hasChildren) { @@ -1705,7 +1656,7 @@ static TIDY_NODE_METHOD(hasChildren) } /* }}} */ -/* {{{ proto bool tidyNode::hasSiblings() +/* {{{ proto boolean tidyNode::hasSiblings() Returns true if this node has siblings */ static TIDY_NODE_METHOD(hasSiblings) { @@ -1719,7 +1670,7 @@ static TIDY_NODE_METHOD(hasSiblings) } /* }}} */ -/* {{{ proto bool tidyNode::isComment() +/* {{{ proto boolean tidyNode::isComment() Returns true if this node represents a comment */ static TIDY_NODE_METHOD(isComment) { @@ -1733,7 +1684,7 @@ static TIDY_NODE_METHOD(isComment) } /* }}} */ -/* {{{ proto bool tidyNode::isHtml() +/* {{{ proto boolean tidyNode::isHtml() Returns true if this node is part of a HTML document */ static TIDY_NODE_METHOD(isHtml) { @@ -1747,7 +1698,7 @@ static TIDY_NODE_METHOD(isHtml) } /* }}} */ -/* {{{ proto bool tidyNode::isText() +/* {{{ proto boolean tidyNode::isText() Returns true if this node represents text (no markup) */ static TIDY_NODE_METHOD(isText) { @@ -1761,7 +1712,7 @@ static TIDY_NODE_METHOD(isText) } /* }}} */ -/* {{{ proto bool tidyNode::isJste() +/* {{{ proto boolean tidyNode::isJste() Returns true if this node is JSTE */ static TIDY_NODE_METHOD(isJste) { @@ -1775,7 +1726,7 @@ static TIDY_NODE_METHOD(isJste) } /* }}} */ -/* {{{ proto bool tidyNode::isAsp() +/* {{{ proto boolean tidyNode::isAsp() Returns true if this node is ASP */ static TIDY_NODE_METHOD(isAsp) { @@ -1789,7 +1740,7 @@ static TIDY_NODE_METHOD(isAsp) } /* }}} */ -/* {{{ proto bool tidyNode::isPhp() +/* {{{ proto boolean tidyNode::isPhp() Returns true if this node is PHP */ static TIDY_NODE_METHOD(isPhp) { @@ -1812,7 +1763,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; @@ -1826,13 +1777,12 @@ 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 a1773c463d..c0a47dd293 100644 --- a/ext/zlib/CREDITS +++ b/ext/zlib/CREDITS @@ -1,2 +1,2 @@ Zlib -Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade Nicoletti, Michael Wallner +Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade Nicoletti diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4 index 25c7f4f420..62e05fbd02 100644 --- a/ext/zlib/config0.m4 +++ b/ext/zlib/config0.m4 @@ -41,17 +41,10 @@ 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 gzgets in zlib) + AC_MSG_ERROR(ZLIB extension requires zlib >= 1.0.9) ],[ $ac_extra ]) diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index 564c9e14f1..790c695977 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -14,7 +14,6 @@ +----------------------------------------------------------------------+ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | | Stefan Röhrich <sr@linux.de> | - | Michael Wallner <mike@php.net> | +----------------------------------------------------------------------+ */ @@ -25,50 +24,39 @@ #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); - -typedef struct _php_zlib_buffer { - char *data; - char *aptr; - size_t used; - size_t free; - size_t size; -} php_zlib_buffer; +ZEND_END_MODULE_GLOBALS(zlib) -typedef struct _php_zlib_context { - z_stream Z; - php_zlib_buffer buffer; -} php_zlib_context; +PHPAPI ZEND_EXTERN_MODULE_GLOBALS(zlib) -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 + +int php_ob_gzhandler_check(TSRMLS_D); + +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_wrapper php_stream_gzip_wrapper; #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 fb3795dccb..84fc3b5f10 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 8c03ea068d..6a4e0f4e67 100644 --- a/ext/zlib/tests/006.phpt +++ b/ext/zlib/tests/006.phpt @@ -48,8 +48,6 @@ 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 09207a583e..ec37b99de6 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, ZLIB_ENCODING_GZIP)); -var_dump(gzencode("", 9, ZLIB_ENCODING_DEFLATE)); +var_dump(gzencode("", -1, 1)); +var_dump(gzencode("", 9, 2)); $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, ZLIB_ENCODING_GZIP)); -var_dump(gzencode($string, 9, ZLIB_ENCODING_DEFLATE)); +var_dump(gzencode($string, -1, 1)); +var_dump(gzencode($string, 9, 2)); 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 either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d +Warning: gzencode(): encoding mode must be FORCE_GZIP or FORCE_DEFLATE in %s on line %d bool(false) string(%d) "%s" string(%d) "%s" -Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d +Warning: gzencode(): encoding mode must be FORCE_GZIP or FORCE_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 1506d0c1ee..dddeb1d55d 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, [int encoding]]) +/* Prototype : string gzcompress(string data [, int level]) * 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) "36922f486410d08209d0d0d21b26030e" +string(32) "400a53d19ca337727f8cd362f5cd3ee0" int(0) -- Compression level 3 -- string(32) "a441a2f5169bb303cd45b860a5a9dbf9" @@ -122,4 +122,4 @@ int(0) -- Testing with no specified compression level -- string(70) "789c735428ce4dccc951282e29cacc4b5728c95748cecf2d284a2d2ee6020087a509cb" -===Done=== +===Done===
\ No newline at end of file diff --git a/ext/zlib/tests/gzcompress_error1.phpt b/ext/zlib/tests/gzcompress_error1.phpt index 9db0a56fa1..7fa60b9003 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, [int encoding]]) +/* Prototype : string gzcompress(string data [, int level]) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: @@ -28,30 +28,26 @@ 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, $encoding, $extra_arg) ); +var_dump( gzcompress($data, $level, $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-- @@ -64,7 +60,7 @@ NULL -- Testing gzcompress() function with more than expected no. of arguments -- -Warning: gzcompress() expects at most 3 parameters, 4 given in %s on line %d +Warning: gzcompress() expects at most 2 parameters, 3 given in %s on line %d NULL -- Testing with incorrect compression level -- @@ -72,13 +68,11 @@ 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 -===Done=== + +Warning: gzcompress() expects parameter 2 to be long, object given in %s on line %d +NULL +===Done===
\ No newline at end of file diff --git a/ext/zlib/tests/gzcompress_variation1.phpt b/ext/zlib/tests/gzcompress_variation1.phpt index 7a8457c24f..04aac01085 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, [int encoding]]) +/* Prototype : string gzcompress(string data [, int level]) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: @@ -18,6 +18,8 @@ include(dirname(__FILE__) . '/data.inc'); echo "*** Testing gzcompress() : variation ***\n"; + + echo "\n-- Testing multiple compression --\n"; $output = gzcompress($data); var_dump( md5($output)); @@ -31,4 +33,4 @@ var_dump(md5(gzcompress($output))); -- Testing multiple compression -- string(32) "764809aef15bb34cb73ad49ecb600d99" string(32) "eba942bc2061f23ea8688cc5101872a4" -===Done=== +===Done===
\ No newline at end of file diff --git a/ext/zlib/tests/gzdeflate_basic1.phpt b/ext/zlib/tests/gzdeflate_basic1.phpt index a2ae0f01da..823f320352 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 : string gzdeflate(string data [, int level, [int encoding]]) +/* Prototype : proto string gzdeflate(string data [, int level]) * 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 8abd5bec25..78491af9f1 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, [int encoding]]) +/* Prototype : string gzdeflate(string data [, int level]) * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: @@ -28,18 +28,13 @@ 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, $encoding, $extra_arg) ); +var_dump( gzdeflate($data, $level, $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"; @@ -63,7 +58,7 @@ NULL -- Testing gzdeflate() function with more than expected no. of arguments -- -Warning: gzdeflate() expects at most 3 parameters, 4 given in %s on line %d +Warning: gzdeflate() expects at most 2 parameters, 3 given in %s on line %d NULL -- Testing with incorrect compression level -- @@ -71,11 +66,6 @@ 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 @@ -83,4 +73,4 @@ NULL Warning: gzdeflate() expects parameter 2 to be long, object given in %s on line %d NULL -===Done=== +===Done===
\ No newline at end of file diff --git a/ext/zlib/tests/gzdeflate_variation1.phpt b/ext/zlib/tests/gzdeflate_variation1.phpt index bc2453d78c..75eb16e03d 100644 --- a/ext/zlib/tests/gzdeflate_variation1.phpt +++ b/ext/zlib/tests/gzdeflate_variation1.phpt @@ -18,6 +18,8 @@ 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 3c0ec559e9..9b3dcc8a38 100644 --- a/ext/zlib/tests/gzencode_basic1.phpt +++ b/ext/zlib/tests/gzencode_basic1.phpt @@ -51,13 +51,6 @@ 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-- @@ -65,9 +58,9 @@ var_dump(bin2hex(gzencode($smallstring, -1, FORCE_GZIP))); -- Compression level -1 -- string(32) "d9ede02415ce91d21e5a94274e2b9c42" -- Compression level 0 -- -string(32) "bbf32d5508e5f1f4e6d42790489dae15" +string(32) "67aaf60426bb2cbd86d7fe530cb12306" -- Compression level 1 -- -string(32) "0bfaaa7a5a57f8fb533074fca6c85eeb" +string(32) "bce9c439cf767c1988ff4881b287d1ce" -- Compression level 2 -- string(32) "7ddbfed63a76c42808722b66f1c133fc" -- Compression level 3 -- @@ -83,13 +76,13 @@ string(32) "d9ede02415ce91d21e5a94274e2b9c42" -- Compression level 8 -- string(32) "d9ede02415ce91d21e5a94274e2b9c42" -- Compression level 9 -- -string(32) "0f220a09e9895bcb3a1308d2bc99cfdf" +string(32) "d9ede02415ce91d21e5a94274e2b9c42" -- Compression level -1 -- string(32) "f77bd31e1e4dd11d12828fb661a08010" -- Compression level 0 -- -string(32) "9c5005db88490d6fe102ea2c233b2872" +string(32) "36220d650930849b67e8e0622f9bf270" -- Compression level 1 -- -string(32) "d24ff7c4c20cef69b9c3abd603368db9" +string(32) "f77bd31e1e4dd11d12828fb661a08010" -- Compression level 2 -- string(32) "f77bd31e1e4dd11d12828fb661a08010" -- Compression level 3 -- @@ -105,11 +98,5 @@ string(32) "f77bd31e1e4dd11d12828fb661a08010" -- Compression level 8 -- string(32) "f77bd31e1e4dd11d12828fb661a08010" -- Compression level 9 -- -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=== +string(32) "f77bd31e1e4dd11d12828fb661a08010" +===Done===
\ No newline at end of file diff --git a/ext/zlib/tests/gzencode_error1.phpt b/ext/zlib/tests/gzencode_error1.phpt index 9ecf4b8f08..ed8c977477 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 either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d +Warning: gzencode(): encoding mode must be FORCE_GZIP or FORCE_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 either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d +Warning: gzencode(): encoding mode must be FORCE_GZIP or FORCE_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=== +===Done===
\ No newline at end of file diff --git a/ext/zlib/tests/gzencode_variation1.phpt b/ext/zlib/tests/gzencode_variation1.phpt index ef1d3a77f7..47e2097f5f 100644 --- a/ext/zlib/tests/gzencode_variation1.phpt +++ b/ext/zlib/tests/gzencode_variation1.phpt @@ -3,10 +3,6 @@ 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"; } @@ -34,4 +30,4 @@ var_dump(bin2hex(gzencode($output))); -- Testing multiple compression -- string(3658) "1f8b0800000000000003010e07f1f81f8b08000000000000036d574d6fe4c80dbdeb57d4ad2f3dfe01eb83e1ec22980e309b4562c067b64449159754dafab0b6e7d7e73d96da1e4c72184c4b2ab2c8f7c847fa25baabba98dc1a8b2b7c38bb324b713ee37f757f56cdc5c7f5b17b9d152f923b157c5ae335e0b75fedd0e2d781c6b98ea3a6ee05affe1dfc3a6527f8f09c52dcb38ba38bb5249934d6ecfe1e53a9ab76ff4c342cf2a64ed2028349fc9a8b139755685352acb82b9fbb67f8bade5cdcb698e1fcec94b7ceba3cb897e806cfc8114350dd1ebbdfa35b62d2478b0056d23ed809b9b95d696d91ce2aa97c911e3fa539c43f84c887554a4d125c9e63ff96711cc08c0866263cb37a0bbe2122ae8f6baecb2284abfb4ddf916db8354cddeef37c1afe5fa02fc7afb3db34f5b3acbdf2eb905490d8f38d7468d253a323d5ebb903760d7944d3b2024e834a99ddce77669bdd823cfbb8e899d4ad4c799677452e6029e80023a03b2374005590641f7d3877df2ad09f3c0e82a54d6a5644fd63049a37ed4bc362016fd9f51264f1e5c630727421ae930b7ed416e93e47b7c71a400390361ffbecb7561bb98f69b5da289e91becc27f08b3b724cb8704f9144d366431d0cb870c56b205deaa2e17636063761a911039fb7e4bf9f06c4f0aecd2ec80e8b41831ca7515e31286166458ea3ef71f2ce7cde2ae269c96d60525724a9c9170b713ed5750758f3cd2a361fc8b288fc92358ce884692e8ea0fe59bd969a0da2eed5831b715749eaae7178f3ebd30fb88c92105f367cce2c882955dc6bf8eca0d5d57540b3092894743ba0fd5b2dad021836191f1afc0bba14dde1642cb0b1aa6879c38907dcefa0720082b801bec61417469219175267dfa047df35b0bd1332001c28cdfafd3bcabe91e74368cdd8d8478e494c190e7ee90c67f2bde288e68ab6b15e883c995be4f8feb6c6dda4278e4f38578ddbdc7be36788daf0c3cb1d1819c73822f7000a0d1813fa94153b572315e51343b536bc64977dff163cebfd8418773261f524017e251fccc60ae29a5770ae097594d52e9c1229d87ce967a36401c46b69945afb249d101c9d420ffa9a123e232c20e76467d5d169202a2dd4c582949e013e745df7958d4b0cc4fd4377a737cd4feea7974070000f314d423e0634cb9a618fdf5dc64fd422181fd59c9230c9f6f9d18dc8fc23e9cccbc7188733b04aa57de83ebea0be3633cff5fa1ff83269be7f44f5a8d84550cc703255fd345dd402034d0b3e11a73ec6e3d4a77f4f685b614329f1b3132ae7af33d02e1e55e291fa6574b758d1f0200e7423dbc852211818043a7c9ce80aa9d59fce0401959f5ea2cf71fde90824f8c9192dbe9d329db143794675ddcf257dd7755273b67340414e3ccad12e3f661f8aad9cf9957dc1275d10a51d3934fa81e68dc6768fb8ee23e373936c8e13feab8b0f50d227f7af76f561fb0950f3d099bbc316c3892a42fb36806d8660e800fa4f43fd4b962d2097d71933a54b77ff948677848eb17bb3a88b621682cfb3bbb49cf42fed6b3944124ad8358ca688aa44dd5f2144c7c9ab16f25b9aca9654ef357ec9ad55c40d324d6cc3d9e3920b863c231d31a95d937fb5520f9c816c79b7dcecc593fb9593cc05a51ebb1eeddd5b49eb437769738d0f64adc579d372b8b7f7c0208487ee3915ebf5766e148ebd77cf4e01f3ec285047011e55838968b6494d517fe29224777b24dd3ddf933101695b102e87db805eef291b74dcfd91628fb2a53f93dbd2968ef2e598746c9204f89fba1f0246fc671610a0591806e46a1346f77c40d910a47c5e20ffb23f003c04b648327a4ed98032c1965bd35bb0044f5344248f56fdb99aa61d6451d68e33489a83bffbe6573541b2da5f64681ea12090f778b2075374778810f73965fa3626a9d41f4df2f83f7c34658cec921b5a9bde49dd5007ec882b02adc514f81aa85898b5cc98e1b137733c0a8789b7f5648d2d231b80bf74978f25d61ce08a8abd11801fd8f995e066676307192ff7641f1cc6e0dee68565b8b22ac3889cd067bf732754a6b270af1044c6a8776811a4f6d8bd0477a9f516064201b920b92d7cd4dc7eee13e6b3eb3528a82f9abb3f388ebe6a8f871393461b73816ec54c99d604174bc5a6801de13908f86aea6a7d0fea107d682bcf1ec348b83872e6b8a316ecd02eb8f8dc86a609bf59a2dd03f1dfa4079436d55e24617be1a2854d008b2b2b1705e2078a7f3946318df1c24f6bf70d4b456eca286ec2b585b28262cc048a098c3e2d5f325a92bb36f691afdc14c822da1b116c9c1c07bb362eb0a04b78834c812134230ebf2044ac2e3c0e3ad00f848dc5010f3bf917ec2fc700b7bf26dacea8440620e04f90f4d97d6dd77cfde8a05c7d3930f1e5811fb8ec5c70964dcc8187ec90e32fdd6b64eec7586413b7d55bed65c4cce39a9b6c15e70e9da94e53fc904e6286f01f5b5562c94211befbc23507e01b2a3865e2f45b5d7b591f290087a5605b82495b4e393f31aa5b37211ec40241a746d903c5eebf117a4d3ddb0d00007b64cbc70e070000" -===Done=== +===Done===
\ No newline at end of file diff --git a/ext/zlib/tests/gzencode_variation2-win32.phpt b/ext/zlib/tests/gzencode_variation2-win32.phpt deleted file mode 100644 index f664359e2a..0000000000 --- a/ext/zlib/tests/gzencode_variation2-win32.phpt +++ /dev/null @@ -1,42 +0,0 @@ ---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 e6fe7dd65c..901cd53c19 100644 --- a/ext/zlib/tests/gzencode_variation2.phpt +++ b/ext/zlib/tests/gzencode_variation2.phpt @@ -1,14 +1,8 @@ --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"; } @@ -39,4 +33,4 @@ var_dump(bin2hex(gzencode($data, -1, FORCE_DEFLATE))); string(90) "1f8b0800000000000003735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200d7739de519000000" string(90) "1f8b0800000000000003735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200d7739de519000000" string(86) "1f8b0800000000000003789c735428ce4dccc951282e29cacc4b5728c95748cd4bce4f49e50200735808cd" -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/zlib/tests/gzfile_variation10.phpt b/ext/zlib/tests/gzfile_variation10.phpt index 71d0ca82d2..2a6d8915d0 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=== +===DONE===
\ No newline at end of file diff --git a/ext/zlib/tests/gzfilegzreadfile.phpt b/ext/zlib/tests/gzfilegzreadfile.phpt index b6cc5f97e9..2d6843ddd4 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 = b<<<EOD +$original = <<<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 4f0ca9fa7f..dd53c78f4e 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 = ''; -for($i=0; $i<30000; ++$i) $string .= $i . ' '; +$string = b''; +for($i=0; $i<30000; ++$i) $string .= (binary)$i . b' '; var_dump(strlen($string)); // deflate string $deflated = gzdeflate($string,9); @@ -15,12 +15,9 @@ var_dump(strlen($deflated)); $truncated = substr($deflated, 0, 65535); var_dump(strlen($truncated)); // inflate $truncated string (check if it will not eat all memory) -var_dump(gzinflate($truncated)); +gzinflate($truncated); ?> ---EXPECTF-- +--EXPECT-- 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 6e86d865ee..436025d13a 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 = 'aaaaaaaaaaaaaaa'; +$original = b'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 e7562e044e..de505f7216 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, b"This is the test file"); + fwrite($h, "This is the test file"); fclose($h); diff --git a/ext/zlib/tests/gzopen_variation8.phpt b/ext/zlib/tests/gzopen_variation8.phpt index e7c83701a4..bb0126227f 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 = b<<<EOT +$data = <<<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 dd0097f286..1f50d77126 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 = b"Here is the string to be written. "; +$str = "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 71d728b6ed..6d6729a72f 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(b"hallo php",4096); +$original = str_repeat("hallo php",4096); $filename = tempnam("/tmp", "phpt"); $fp = gzopen($filename, "wb"); @@ -15,12 +15,7 @@ var_dump(gztell($fp)); fclose($fp); $fp = gzopen($filename, "rb"); - -$data = ''; -while ($buf = gzread($fp, 8092)) { - $data .= $buf; -} - +$data = gzread($fp, strlen($original)); if ($data == $original) { echo "Strings are equal\n"; } else { diff --git a/ext/zlib/tests/gzreadgzwriteplain.phpt b/ext/zlib/tests/gzreadgzwriteplain.phpt index 6a752b6212..7bb567d889 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(b"hallo php",4096); +$original = str_repeat("hallo php",4096); $filename = tempnam("/tmp", "phpt"); $fp = fopen($filename, "wb"); @@ -15,12 +15,7 @@ var_dump(ftell($fp)); fclose($fp); $fp = gzopen($filename, "rb"); - -$data = ''; -while ($buf = gzread($fp, 8192)) { - $data .= $buf; -} - +$data = gzread($fp, strlen($original)); if ($data == $original) { echo "Strings are equal\n"; } else { @@ -29,11 +24,7 @@ if ($data == $original) { } gzseek($fp, strlen($original) / 2); - -$data = ''; -while ($buf = gzread($fp, 8192)) { - $data .= $buf; -} +$data = gzread($fp, strlen($original)); 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 203a375a06..fa7f1759e6 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 all max length of $length --\n"; +echo "\n-- Calling gzuncompress() with 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 all max length of 3547 -- +-- Calling gzuncompress() with max length of 3547 -- Result length is 3547 -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/zlib/tests/gzuncompress_error1.phpt b/ext/zlib/tests/gzuncompress_error1.phpt index f26a4f5dcd..66e5b2ac43 100644 --- a/ext/zlib/tests/gzuncompress_error1.phpt +++ b/ext/zlib/tests/gzuncompress_error1.phpt @@ -14,6 +14,8 @@ if (!extension_loaded("zlib")) { * Alias to functions: */ + + echo "*** Testing gzuncompress() : error conditions ***\n"; // Zero arguments @@ -27,12 +29,14 @@ $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)); @@ -64,7 +68,7 @@ NULL -- Testing with a buffer that is too small -- -Warning: gzuncompress(): insufficient memory in %s on line %d +Warning: gzuncompress(): buffer error in %s on line %d bool(false) -- Testing with incorrect arguments -- @@ -77,4 +81,4 @@ NULL Warning: gzuncompress() expects parameter 2 to be long, string given in %s on line %d NULL -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/zlib/tests/gzwrite_basic.phpt b/ext/zlib/tests/gzwrite_basic.phpt index 4f76f32cd0..0d7521625d 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 = b"Here is the string to be written. "; +$str = "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 ab6c2606b4..bd3778e366 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 = b"Here is the string to be written. "; +$str = "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 deleted file mode 100644 index 0b3cd1069d..0000000000 --- a/ext/zlib/tests/ob_001.phpt +++ /dev/null @@ -1,19 +0,0 @@ ---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 deleted file mode 100644 index 5601440eb8..0000000000 --- a/ext/zlib/tests/ob_002.phpt +++ /dev/null @@ -1,17 +0,0 @@ ---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 deleted file mode 100644 index 43dbb08969..0000000000 --- a/ext/zlib/tests/ob_003.phpt +++ /dev/null @@ -1,25 +0,0 @@ ---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 deleted file mode 100644 index 3d3be9df7b..0000000000 --- a/ext/zlib/tests/ob_004.phpt +++ /dev/null @@ -1,25 +0,0 @@ ---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 deleted file mode 100644 index c266cb71f3..0000000000 --- a/ext/zlib/tests/ob_005.phpt +++ /dev/null @@ -1,21 +0,0 @@ ---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 7b4c2c77fc..29249a1f2b 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=== +===DONE===
\ No newline at end of file diff --git a/ext/zlib/tests/readgzfile_variation14.phpt b/ext/zlib/tests/readgzfile_variation14.phpt index ee0d6d6d4e..165bf59b89 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=== +===DONE===
\ No newline at end of file diff --git a/ext/zlib/tests/readgzfile_variation4.phpt b/ext/zlib/tests/readgzfile_variation4.phpt index ece84a990e..cbc561c71d 100644 --- a/ext/zlib/tests/readgzfile_variation4.phpt +++ b/ext/zlib/tests/readgzfile_variation4.phpt @@ -26,18 +26,9 @@ 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 460e188930..dde0dabdd0 100644 --- a/ext/zlib/tests/readgzfile_variation5.phpt +++ b/ext/zlib/tests/readgzfile_variation5.phpt @@ -25,15 +25,8 @@ 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=== +===DONE===
\ No newline at end of file diff --git a/ext/zlib/tests/readgzfile_variation6.phpt b/ext/zlib/tests/readgzfile_variation6.phpt index 69a4dc190a..1beeca764b 100644 --- a/ext/zlib/tests/readgzfile_variation6.phpt +++ b/ext/zlib/tests/readgzfile_variation6.phpt @@ -43,7 +43,6 @@ 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 20162b5cb5..df244d3954 100644 --- a/ext/zlib/tests/readgzfile_variation7.phpt +++ b/ext/zlib/tests/readgzfile_variation7.phpt @@ -29,15 +29,8 @@ 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 a2099b6f7a..4332d8e5e6 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, b"This is quite the thing ain't it\n"); +fwrite($a, "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 +This is quite the thing ain't it
\ No newline at end of file diff --git a/ext/zlib/tests/zlib_scheme_copy_variation2.phpt b/ext/zlib/tests/zlib_scheme_copy_variation2.phpt index 576de944ce..0b56ec430a 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 = b<<<EOT +$org_data = <<<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 13d5bea483..69c05bbb24 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -16,26 +16,201 @@ | 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 "ext/standard/info.h" -#include "ext/standard/file.h" -#include "ext/standard/php_string.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() -ZEND_DECLARE_MODULE_GLOBALS(zlib); +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 +}; +/* }}} */ + +#ifdef COMPILE_DL_ZLIB +ZEND_GET_MODULE(php_zlib) +#endif /* {{{ Memory management wrappers */ @@ -50,403 +225,156 @@ static void php_zlib_free(voidpf opaque, voidpf address) } /* }}} */ -/* {{{ php_zlib_output_conflict_check() */ -static int php_zlib_output_conflict_check(zval *handler_name TSRMLS_DC) -{ - 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; -} -/* }}} */ - -/* {{{ php_zlib_output_encoding() */ -static int php_zlib_output_encoding(TSRMLS_D) +/* {{{ OnUpdate_zlib_output_compression */ +static PHP_INI_MH(OnUpdate_zlib_output_compression) { - zval **enc; - - if (!ZLIBG(compression_coding)) { - zend_is_auto_global(ZEND_STRL("_SERVER") TSRMLS_CC); - - 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); -} -/* }}} */ + int status, int_value; + char *ini_value; -/* {{{ 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); - } + if (new_value == NULL) { return FAILURE; } - 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; - } + 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"); } - 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; - } + int_value = zend_atoi(new_value, new_value_length); + ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 0); - 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; - } + 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; + } - php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS, &flags TSRMLS_CC); + 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"); + return FAILURE; + } - 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); - } + status = OnUpdateLong(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); - if (output_context->op & PHP_OUTPUT_HANDLER_FINAL) { - deflateEnd(&ctx->Z); - } + if (stage == PHP_INI_STAGE_RUNTIME && int_value) { + status = php_zlib_output_compression_start(TSRMLS_C); } - return SUCCESS; + + return status; } /* }}} */ -/* {{{ php_zlib_output_handler_dtor() */ -static void php_zlib_output_handler_dtor(void *opaq TSRMLS_DC) +/* {{{ OnUpdate_zlib_output_compression_level */ +static PHP_INI_MH(OnUpdate_zlib_output_compression_level) { - php_zlib_context *ctx = (php_zlib_context *) opaq; + OnUpdateLong(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); - if (ctx) { - if (ctx->buffer.data) { - efree(ctx->buffer.data); - } - efree(ctx); - } + return SUCCESS; } /* }}} */ -/* {{{ 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) +/* {{{ OnUpdate_zlib_output_handler */ +static PHP_INI_MH(OnUpdate_zlib_output_handler) { - php_output_handler *h = NULL; - php_zlib_context *ctx; - - 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); + 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; } - return h; -} -/* }}} */ + OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); -/* {{{ php_zlib_output_compression_start() */ -static void php_zlib_output_compression_start(TSRMLS_D) -{ - zval *zoh, *tmp; - php_output_handler *h; - - 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; - } + return SUCCESS; } /* }}} */ -/* {{{ 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) -{ - int status; - z_stream Z; - - memset(&Z, 0, sizeof(z_stream)); - Z.zalloc = php_zlib_alloc; - Z.zfree = php_zlib_free; - - 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); - Z.next_in = (Bytef *) in_buf; - Z.next_out = (Bytef *) *out_buf; - Z.avail_in = in_len; - Z.avail_out = *out_len; +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() - status = deflate(&Z, Z_FINISH); - deflateEnd(&Z); +/* {{{ PHP_MINIT_FUNCTION + */ +static PHP_MINIT_FUNCTION(zlib) +{ + 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 (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); - } - } + REGISTER_LONG_CONSTANT("FORCE_GZIP", CODING_GZIP, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FORCE_DEFLATE", CODING_DEFLATE, CONST_CS | CONST_PERSISTENT); - *out_buf = NULL; - *out_len = 0; + REGISTER_INI_ENTRIES(); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); - return FAILURE; + return SUCCESS; } /* }}} */ -/* {{{ php_zlib_inflate_rounds() */ -static inline int php_zlib_inflate_rounds(z_stream *Z, size_t max, char **buf, size_t *len) +/* {{{ PHP_RINIT_FUNCTION + */ +static PHP_RINIT_FUNCTION(zlib) { - int status, round = 0; - php_zlib_buffer buffer = {NULL, NULL, 0, 0, 0}; - - *buf = NULL; - *len = 0; - - 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); + ZLIBG(ob_gzhandler_status) = 0; + ZLIBG(compression_coding) = 0; - 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); + php_zlib_output_compression_start(TSRMLS_C); - 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; + return SUCCESS; } /* }}} */ -/* {{{ 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_MSHUTDOWN_FUNCTION + */ +static PHP_MSHUTDOWN_FUNCTION(zlib) { - 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); - } - } + php_unregister_url_stream_wrapper("zlib" TSRMLS_CC); + php_stream_filter_unregister_factory("zlib.*" TSRMLS_CC); - *out_buf = NULL; - *out_len = 0; + UNREGISTER_INI_ENTRIES(); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); - return FAILURE; + return SUCCESS; } /* }}} */ -/* {{{ proto string zlib_get_coding_type(void) - Returns the coding type used for output compression */ -static PHP_FUNCTION(zlib_get_coding_type) +/* {{{ PHP_MINFO_FUNCTION + */ +static PHP_MINFO_FUNCTION(zlib) { - 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; - } + 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(); } /* }}} */ /* {{{ proto array gzfile(string filename [, int use_include_path]) - Read and uncompress entire .gz-file into an array */ + Read und uncompress entire .gz-file into an array */ static PHP_FUNCTION(gzfile) { char *filename; int filename_len; - int flags = REPORT_ERRORS; - char *slashed, buf[8192] = {0}; + long flags = 0; + char *slashed, buf[8192]; register int i = 0; - long use_include_path = 0; + int use_include_path = 0; php_stream *stream; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &filename, &filename_len, &use_include_path)) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &filename, &filename_len, &flags) == FAILURE) { return; } - if (use_include_path) { - flags |= USE_PATH; - } + use_include_path = flags ? USE_PATH : 0; /* using a stream here is a bit more efficient (resource wise) than php_gzopen_wrapper */ - stream = php_stream_gzopen(NULL, filename, "rb", flags, NULL, NULL STREAMS_CC TSRMLS_CC); - - if (!stream) { + stream = php_stream_gzopen(NULL, filename, "rb", use_include_path | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, NULL STREAMS_CC TSRMLS_CC); + if (stream == NULL) { /* Error reporting is already done by stream code */ RETURN_FALSE; } @@ -455,12 +383,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 { @@ -475,22 +403,19 @@ static PHP_FUNCTION(gzfile) Open a .gz-file and return a .gz-file pointer */ static PHP_FUNCTION(gzopen) { - char *filename; - char *mode; + char *filename, *mode; int filename_len, mode_len; - int flags = REPORT_ERRORS; + long flags = 0; php_stream *stream; - long use_include_path = 0; + int use_include_path = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", &filename, &filename_len, &mode, &mode_len, &use_include_path) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", &filename, &filename_len, &mode, &mode_len, &flags) == FAILURE) { return; } - if (use_include_path) { - flags |= USE_PATH; - } + use_include_path = flags ? USE_PATH : 0; - stream = php_stream_gzopen(NULL, filename, mode, flags, NULL, NULL STREAMS_CC TSRMLS_CC); + stream = php_stream_gzopen(NULL, filename, mode, use_include_path | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, NULL STREAMS_CC TSRMLS_CC); if (!stream) { RETURN_FALSE; @@ -499,27 +424,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; - int flags = REPORT_ERRORS; + long flags = 0; php_stream *stream; int size; - long use_include_path = 0; + int use_include_path = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &filename, &filename_len, &use_include_path) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &filename, &filename_len, &flags) == FAILURE) { return; } - if (use_include_path) { - flags |= USE_PATH; - } - - stream = php_stream_gzopen(NULL, filename, "rb", flags, NULL, NULL STREAMS_CC TSRMLS_CC); + use_include_path = flags ? USE_PATH : 0; + stream = php_stream_gzopen(NULL, filename, "rb", use_include_path | ENFORCE_SAFE_MODE, NULL, NULL STREAMS_CC TSRMLS_CC); if (!stream) { RETURN_FALSE; } @@ -529,350 +454,676 @@ static PHP_FUNCTION(readgzfile) } /* }}} */ -#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 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; -#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); \ -} + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &level) == FAILURE) { + return; + } -/* {{{ proto binary zlib_encode(binary data, int encoding[, int level = -1]) - Compress data with the specified encoding */ -PHP_ZLIB_ENCODE_FUNC(zlib_encode, 0); -/* }}} */ + 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_decode(binary data[, int max_decoded_len]) - Uncompress any raw/gzip/zlib encoded data */ -PHP_ZLIB_DECODE_FUNC(zlib_decode, PHP_ZLIB_ENCODING_ANY); -/* }}} */ + l2 = data_len + (data_len / PHP_ZLIB_MODIFIER) + 15 + 1; /* room for \0 */ + s2 = (char *) emalloc(l2); + if (!s2) { + RETURN_FALSE; + } -/* NOTE: The naming of these userland functions was quite unlucky */ + if (level >= 0) { + status = compress2(s2, &l2, data, data_len, level); + } else { + status = compress(s2, &l2, data, data_len); + } -/* {{{ 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); + 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; + } +} /* }}} */ -#ifdef COMPILE_DL_ZLIB -ZEND_GET_MODULE(php_zlib) -#endif +/* {{{ 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; -/* {{{ arginfo */ -ZEND_BEGIN_ARG_INFO(arginfo_zlib_get_coding_type, 0) -ZEND_END_ARG_INFO() + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &limit) == FAILURE) { + return; + } -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 (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; + } +} +/* }}} */ -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 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; -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 (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &level) == FAILURE) { + return; + } -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 ((level < -1) || (level > 9)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "compression level (%ld) must be within -1..9", level); + 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.data_type = Z_ASCII; + stream.zalloc = php_zlib_alloc; + stream.zfree = php_zlib_free; + stream.opaque = (voidpf) Z_NULL; -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() + stream.next_in = (Bytef *) data; + stream.avail_in = data_len; -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.avail_out = stream.avail_in + (stream.avail_in / PHP_ZLIB_MODIFIER) + 15 + 1; /* room for \0 */ -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() + s2 = (char *) emalloc(stream.avail_out); + if (!s2) { + RETURN_FALSE; + } -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() + stream.next_out = s2; -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() + /* 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_gzuncompress, 0, 0, 1) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, max_decoded_len) -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; + } +} /* }}} */ -/* {{{ 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 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; + } + + if (!data_len) { + RETURN_FALSE; + } + + 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; + } + + /* + 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); + + if (!s2) { + if (s1) { + efree(s1); + } + inflateEnd(&stream); + RETURN_FALSE; + } + s1 = s2; + + stream.next_out = (Bytef *) &s2[stream.total_out]; + stream.avail_out = length - stream.total_out; + status = inflate(&stream, Z_NO_FLUSH); + + } while ((Z_BUF_ERROR == status || (Z_OK == status && stream.avail_in)) && !plength && factor < maxfactor); + + inflateEnd(&stream); + + if ((plength && Z_OK == status) || factor >= maxfactor) { + status = Z_MEM_ERROR; + } + + 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; + } +} /* }}} */ -/* {{{ OnUpdate_zlib_output_compression */ -static PHP_INI_MH(OnUpdate_zlib_output_compression) +/* {{{ proto string zlib_get_coding_type(void) + Returns the coding type used for output compression */ +static PHP_FUNCTION(zlib_get_coding_type) { - int status, int_value; - char *ini_value; + switch (ZLIBG(compression_coding)) { + case CODING_GZIP: + RETURN_STRINGL("gzip", sizeof("gzip") - 1, 1); - if (new_value == NULL) { - return FAILURE; + case CODING_DEFLATE: + RETURN_STRINGL("deflate", sizeof("deflate") - 1, 1); } - 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"); + 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; } - int_value = zend_atoi(new_value, new_value_length); - ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 0); + ZLIBG(stream).next_out = buffer + start_offset; + ZLIBG(stream).avail_out = outlen; - 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; + 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); } - 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; + if (do_end) { + err = deflate(&ZLIBG(stream), Z_FINISH); + buffer[outlen + start_offset - ZLIBG(stream).avail_out] = '\0'; + } + + *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; } } - status = OnUpdateLong(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); + ZLIBG(stream).next_in = (Bytef *) str; + ZLIBG(stream).avail_in = (uInt) str_length; - if (stage == PHP_INI_STAGE_RUNTIME && int_value) { - zval tmp; + if (ZLIBG(compression_coding) == CODING_GZIP) { + ZLIBG(crc) = crc32(ZLIBG(crc), (const Bytef *) str, str_length); + } - 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); + 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; } - zval_dtor(&tmp); + deflateEnd(&ZLIBG(stream)); } - return status; + + return SUCCESS; } /* }}} */ -/* {{{ OnUpdate_zlib_output_handler */ -static PHP_INI_MH(OnUpdate_zlib_output_handler) +/* {{{ proto string gzencode(string data [, int level [, int encoding_mode]]) + GZ encode a string */ +static PHP_FUNCTION(gzencode) { - 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; + 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; } - return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); + 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 (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; + } } /* }}} */ -/* {{{ 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() +/* {{{ 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; +} + /* }}} */ -/* {{{ PHP_MINIT_FUNCTION */ -static PHP_MINIT_FUNCTION(zlib) +/* {{{ 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_register_url_stream_wrapper("compress.zlib", &php_stream_gzip_wrapper TSRMLS_CC); - php_stream_filter_register_factory("zlib.*", &php_zlib_filter_factory TSRMLS_CC); + 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; + } - 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 (ZLIBG(ob_gzhandler_status) == -1) { + RETURN_FALSE; + } - 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); + zend_is_auto_global("_SERVER", sizeof("_SERVER")-1 TSRMLS_CC); - 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 (!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; + } - return SUCCESS; + 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; + + 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; + } + } + + if (return_original) { + zval_dtor(return_value); + } + + } else { + return_original = 1; + } + + if (return_original) { + /* return the original string */ + RETURN_STRINGL(string, string_len, 1); + } } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION */ -static PHP_MSHUTDOWN_FUNCTION(zlib) +/* {{{ 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_unregister_url_stream_wrapper("zlib" TSRMLS_CC); - php_stream_filter_unregister_factory("zlib.*" TSRMLS_CC); + zend_bool do_start, do_end; - UNREGISTER_INI_ENTRIES(); + 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; + } + } - return SUCCESS; + 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"); + } + } } /* }}} */ -/* {{{ PHP_RINIT_FUNCTION */ -static PHP_RINIT_FUNCTION(zlib) +/* {{{ php_enable_output_compression + */ +static int php_enable_output_compression(int buffer_size TSRMLS_DC) { - ZLIBG(compression_coding) = 0; + zval **a_encoding; - php_zlib_output_compression_start(TSRMLS_C); + 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; + } + + php_ob_set_internal_handler(php_gzip_output_handler, (uint)buffer_size, "zlib output compression", 0 TSRMLS_CC); + + if (ZLIBG(output_handler) && strlen(ZLIBG(output_handler))) { + php_start_ob_buffer_named(ZLIBG(output_handler), 0, 1 TSRMLS_CC); + } return SUCCESS; } /* }}} */ -/* {{{ PHP_MINFO_FUNCTION */ -static PHP_MINFO_FUNCTION(zlib) +/* {{{ php_zlib_output_compression_start() */ +static int php_zlib_output_compression_start(TSRMLS_D) { - 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(); + 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_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 0f6c056390..4990cf0e1a 100644 --- a/ext/zlib/zlib_filter.c +++ b/ext/zlib/zlib_filter.c @@ -80,11 +80,8 @@ 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 < (unsigned int) bucket->buflen) { + while (bin < bucket->buflen) { if (data->finished) { consumed += bucket->buflen; @@ -110,6 +107,7 @@ 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) { @@ -125,9 +123,7 @@ 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); } @@ -206,11 +202,9 @@ static php_stream_filter_status_t php_zlib_deflate_filter( while (buckets_in->head) { size_t bin = 0, desired; - bucket = buckets_in->head; - - bucket = php_stream_bucket_make_writeable(bucket TSRMLS_CC); + bucket = php_stream_bucket_make_writeable(buckets_in->head TSRMLS_CC); - while (bin < (unsigned int) bucket->buflen) { + while (bin < bucket->buflen) { desired = bucket->buflen - bin; if (desired > data->inbuf_len) { desired = data->inbuf_len; @@ -227,6 +221,7 @@ 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) { @@ -240,7 +235,6 @@ 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); } @@ -264,7 +258,6 @@ static php_stream_filter_status_t php_zlib_deflate_filter( if (bytes_consumed) { *bytes_consumed = consumed; } - return exit_status; } @@ -298,7 +291,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; } @@ -310,14 +303,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; @@ -416,7 +409,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 c8b4263927..8970c55a00 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); } -php_stream_ops php_stream_gzio_ops = { +static php_stream_ops php_stream_gzio_ops = { php_gziop_write, php_gziop_read, php_gziop_close, php_gziop_flush, "ZLIB", |