mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed zlib.output_compression so it can work even if zlib extension is built as shared

Browse Source
This commit is contained in:
Moriyoshi Koizumi 2003-02-10 19:04:44 +00:00
parent 63aa8acf02
commit 21f766b7a4
3 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/zlib/php_zlib.h
View File

@ -52,6 +52,7 @@ PHP_FUNCTION(gzdeflate);
PHP_FUNCTION(gzinflate);
PHP_FUNCTION(gzencode);
PHP_FUNCTION(ob_gzhandler);
PHP_FUNCTION(zlib_get_coding_type);
int php_enable_output_compression(int buffer_size TSRMLS_DC);
int php_ob_gzhandler_check(TSRMLS_D);

18
ext/zlib/zlib.c
View File

@ -104,6 +104,7 @@ function_entry php_zlib_functions[] = {
PHP_FE(gzinflate, NULL)
PHP_FE(gzencode, NULL)
PHP_FE(ob_gzhandler, NULL)
PHP_FE(zlib_get_coding_type, NULL)
{NULL, NULL, NULL}
};
/* }}} */
@ -661,6 +662,23 @@ PHP_FUNCTION(gzinflate)
}
/* }}} */
/*`{{{ proto zlib_get_coding_type()
Returns the coding type used for output compression */
PHP_FUNCTION(zlib_get_coding_type)
{
switch (ZLIBG(ob_gzip_coding)) {
case CODING_GZIP:
RETURN_STRINGL("gzip", sizeof("gzip") - 1, 1);
case CODING_DEFLATE:
RETURN_STRINGL("deflate", sizeof("deflate") - 1, 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)

51
main/SAPI.c
View File

@ -25,14 +25,14 @@
#include "php.h"
#include "SAPI.h"
#include "php_ini.h"
#include "ext/standard/php_string.h"
#include "ext/standard/pageinfo.h"
#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
#include "ext/pcre/php_pcre.h"
#endif
#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
#if HAVE_ZLIB
#include "ext/zlib/php_zlib.h"
ZEND_EXTERN_MODULE_GLOBALS(zlib)
#endif
#ifdef ZTS
#include "TSRM.h"
@ -556,9 +556,9 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC)
while (*ptr == ' ' && *ptr != '\0') {
ptr++;
}
#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
#if HAVE_ZLIB
if(!strncmp(ptr, "image/", sizeof("image/")-1)) {
ZLIBG(output_compression) = 0;
zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
}
#endif
mimetype = estrdup(ptr);
@ -704,27 +704,32 @@ SAPI_API int sapi_send_headers(TSRMLS_D)
return SUCCESS;
}
#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
#if HAVE_ZLIB
/* Add output compression headers at this late stage in order to make
it possible to switch it off inside the script. */
if (ZLIBG(output_compression)) {
switch (ZLIBG(ob_gzip_coding)) {
case CODING_GZIP:
if (sapi_add_header("Content-Encoding: gzip", sizeof("Content-Encoding: gzip") - 1, 1)==FAILURE) {
return FAILURE;
}
if (sapi_add_header("Vary: Accept-Encoding", sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
return FAILURE;
}
break;
case CODING_DEFLATE:
if (sapi_add_header("Content-Encoding: deflate", sizeof("Content-Encoding: deflate") - 1, 1)==FAILURE) {
return FAILURE;
}
if (sapi_add_header("Vary: Accept-Encoding", sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
return FAILURE;
}
break;
if (zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0)) {
zval nm_zlib_get_coding_type;
zval *uf_result = NULL;
ZVAL_STRINGL(&nm_zlib_get_coding_type, "zlib_get_coding_type", sizeof("zlib_get_coding_type") - 1, 0);
if (call_user_function_ex(CG(function_table), NULL, &nm_zlib_get_coding_type, &uf_result, 0, NULL, 1, NULL TSRMLS_CC) != FAILURE && uf_result != NULL && Z_TYPE_P(uf_result) == IS_STRING) {
char buf[128];
uint len;
assert(Z_STRVAL_P(uf_result) != NULL);
len = snprintf(buf, sizeof(buf), "Content-Encoding: %s", Z_STRVAL_P(uf_result));
if (sapi_add_header(buf, len, 1)==FAILURE) {
return FAILURE;
}
if (sapi_add_header("Vary: Accept-Encoding", sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
return FAILURE;
}
}
if (uf_result != NULL) {
zval_ptr_dtor(&uf_result);
}
}
#endif