phpapdebug((stderr, "Creating new config (%p) for %s\n", newx, dummy));
zend_hash_init(&newx->config, 0, NULL, NULL, 1);
- apr_register_cleanup(p, newx, destroy_php_config, NULL);
+ apr_pool_cleanup_register(p, newx, destroy_php_config, NULL);
return (void *) newx;
}
while (str_length > 0) {
now = MIN(str_length, 4096);
b = apr_bucket_transient_create(str, now);
- AP_BRIGADE_INSERT_TAIL(bb, b);
+ APR_BRIGADE_INSERT_TAIL(bb, b);
str += now;
str_length -= now;
}
bb = apr_brigade_create(ctx->f->r->pool);
b = apr_bucket_flush_create();
- AP_BRIGADE_INSERT_TAIL(bb, b);
+ APR_BRIGADE_INSERT_TAIL(bb, b);
if (ap_pass_brigade(ctx->f->next, bb) != APR_SUCCESS) {
php_handle_aborted_connection();
}
ctx = SG(server_context);
- apr_puts(msg, ctx->f->r->server->error_log);
+ apr_file_puts(msg, ctx->f->r->server->error_log);
}
static sapi_module_struct apache2_sapi_module = {
/* If we have received all data from the previous filters,
* we "flatten" the buckets by creating a single string buffer.
*/
- if (ctx->state == 1 && apr_bucket_IS_EOS(AP_BRIGADE_LAST(ctx->bb))) {
+ if (ctx->state == 1 && APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(ctx->bb))) {
int fd;
zend_file_handle zfd;
smart_str content = {0};
skip_execution:
#define NO_DATA "php_filter did not get ANY data"
eos = apr_bucket_transient_create(NO_DATA, sizeof(NO_DATA)-1);
- AP_BRIGADE_INSERT_HEAD(bb, eos);
+ APR_BRIGADE_INSERT_HEAD(bb, eos);
ok:
php_apache_request_dtor(f SLS_CC);
SG(server_context) = 0;
/* Pass EOS bucket to next filter to signal end of request */
eos = apr_bucket_eos_create();
- AP_BRIGADE_INSERT_TAIL(bb, eos);
+ APR_BRIGADE_INSERT_TAIL(bb, eos);
return ap_pass_brigade(f->next, bb);
} else
- ap_brigade_destroy(bb);
+ apr_brigade_destroy(bb);
return APR_SUCCESS;
}
tsrm_startup(1, 1, 0, NULL);
sapi_startup(&apache2_sapi_module);
apache2_sapi_module.startup(&apache2_sapi_module);
- apr_register_cleanup(pchild, NULL, php_apache_server_shutdown, NULL);
+ apr_pool_cleanup_register(pchild, NULL, php_apache_server_shutdown, NULL);
php_apache_register_module();
}