Here's a context diff of changes needed to compile against Apache 2.0.35-dev
(or newer I assume).
Billy Rose
*** php-4.2.0RC2/sapi/apache2filter/sapi_apache2.c Thu Mar 14 04:57:00
2002
--- ../php-4.2.0RC2/sapi/apache2filter/sapi_apache2.c Mon Apr 8 09:21:46
2002
***************
*** 55,64 ****
if (str_length == 0) return 0;
! bb = apr_brigade_create(ctx->f->r->pool);
while (str_length > 0) {
now = MIN(str_length, 4096);
! b = apr_bucket_transient_create(str, now);
APR_BRIGADE_INSERT_TAIL(bb, b);
str += now;
str_length -= now;
--- 55,64 ----
if (str_length == 0) return 0;
! bb = apr_brigade_create(ctx->f->r->pool,ctx->f->c->bucket_alloc);
while (str_length > 0) {
now = MIN(str_length, 4096);
! b = apr_bucket_transient_create(str,
now,ctx->f->c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(bb, b);
str += now;
str_length -= now;
***************
*** 171,178 ****
* all further flush buckets.
*/
! bb = apr_brigade_create(ctx->f->r->pool);
! b = apr_bucket_flush_create();
APR_BRIGADE_INSERT_TAIL(bb, b);
if (ap_pass_brigade(ctx->f->next, bb) != APR_SUCCESS) {
php_handle_aborted_connection();
--- 171,178 ----
* all further flush buckets.
*/
! bb = apr_brigade_create(ctx->f->r->pool,ctx->f->c->bucket_alloc);
! b = apr_bucket_flush_create(ctx->f->c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(bb, b);
if (ap_pass_brigade(ctx->f->next, bb) != APR_SUCCESS) {
php_handle_aborted_connection();
***************
*** 234,240 ****
if (ctx == NULL) { \
/* Initialize filter context */ \
SG(server_context) = ctx = apr_pcalloc(f->r->pool,
sizeof(*ctx)); \
! ctx->bb = apr_brigade_create(f->c->pool); \
}
static int php_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,
--- 234,240 ----
if (ctx == NULL) { \
/* Initialize filter context */ \
SG(server_context) = ctx = apr_pcalloc(f->r->pool,
sizeof(*ctx)); \
! ctx->bb = apr_brigade_create(f->c->pool,f->c->bucket_alloc);
\
}
static int php_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,
***************
*** 383,389 ****
#define PHP_NO_DATA "The PHP Filter did not receive suitable input data"
! eos =
apr_bucket_transient_create(PHP_NO_DATA, sizeof(PHP_NO_DATA)-1);
APR_BRIGADE_INSERT_HEAD(bb, eos);
}
}
--- 383,389 ----
#define PHP_NO_DATA "The PHP Filter did not receive suitable input data"
! eos =
apr_bucket_transient_create(PHP_NO_DATA,
sizeof(PHP_NO_DATA)-1,ctx->f->c->bucket_alloc);
APR_BRIGADE_INSERT_HEAD(bb, eos);
}
}
***************
*** 392,398 ****
SG(server_context) = 0;
/* Pass EOS bucket to next filter to signal end of request
*/
! eos = apr_bucket_eos_create();
APR_BRIGADE_INSERT_TAIL(bb, eos);
return ap_pass_brigade(f->next, bb);
--- 392,398 ----
SG(server_context) = 0;
/* Pass EOS bucket to next filter to signal end of request
*/
! eos = apr_bucket_eos_create(ctx->f->c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(bb, eos);
return ap_pass_brigade(f->next, bb);
--
PHP Development Mailing List <http://www.php.net/>
To unsubscribe, visit: http://www.php.net/unsub.php
