archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move server_filter to an extension-specific global

Browse source
This commit is contained in:
Rasmus Lerdorf 2000-10-23 00:52:11 +00:00
parent 1bf216ca57
commit bccdaff6d1
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
main/SAPI.h
View file

@ -102,7 +102,6 @@ typedef struct {
char *default_charset; char *default_charset;
HashTable *rfc1867_uploaded_files; HashTable *rfc1867_uploaded_files;
long post_max_size; long post_max_size;
void *server_filter;
} sapi_globals_struct; } sapi_globals_struct;

14
sapi/apache2/mod_php4.c
View file

@ -91,6 +91,15 @@ module MODULE_VAR_EXPORT php4_module;
int saved_umask; int saved_umask;
static unsigned char apache_php_initialized; static unsigned char apache_php_initialized;
/* per-thread globals (when the ZTS stuff gets added) */
typedef struct {
ap_filter_t *server_filter;
} php_ap_globals_struct;
/* Needs to be per-thread when in threaded mode (per-server for now in pre-fork
* mode) */
static php_ap_globals_struct *php_ap_globals;
typedef struct _php_per_dir_entry { typedef struct _php_per_dir_entry {
char *key; char *key;
char *value; char *value;
@ -122,7 +131,7 @@ static int sapi_apache_ub_write(const char *str, uint str_length)
bb = ap_brigade_create(r->pool); bb = ap_brigade_create(r->pool);
b = ap_bucket_create_immortal(str, str_length); b = ap_bucket_create_immortal(str, str_length);
AP_BRIGADE_INSERT_TAIL(bb, b); AP_BRIGADE_INSERT_TAIL(bb, b);
ap_pass_brigade(SG(server_filter)->next, bb); ap_pass_brigade((php_ap_globals->server_filter)->next, bb);
} else { } else {
ret = fwrite(str, 1, str_length, stderr); ret = fwrite(str, 1, str_length, stderr);
} }
@ -714,7 +723,8 @@ static int php_filter(ap_filter_t *f, ap_bucket_brigade *bb) {
if (ctx == NULL) { if (ctx == NULL) {
f->ctx = ctx = apr_pcalloc(c->pool, sizeof(php_output_filter_ctx_t)); f->ctx = ctx = apr_pcalloc(c->pool, sizeof(php_output_filter_ctx_t));
ctx->b = ap_brigade_create(c->pool); /* create an initial empty brigade */ ctx->b = ap_brigade_create(c->pool); /* create an initial empty brigade */
SG(server_filter) = f; php_ap_globals = palloc(sizeof *php_ap_globals);
php_ap_globals->server_filter = f;
} }
ap_save_brigade(f, ctx->bb, bb); ap_save_brigade(f, ctx->bb, bb);