cvs commit: modperl-2.0/xs/maps apache_structures.map apr_functions.map apr_types.map
dougm 02/03/29 08:16:43
Modified:src/modules/perl modperl_filter.c
t/filter/TestFilter buckets.pm input_body.pm input_msg.pm
xs/APR/Brigade APR__Brigade.h
xs/maps apache_structures.map apr_functions.map
apr_types.map
Log:
adjust to recent bucket api changes
Revision ChangesPath
1.33 +11 -6 modperl-2.0/src/modules/perl/modperl_filter.c
Index: modperl_filter.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- modperl_filter.c 10 Mar 2002 00:09:52 - 1.32
+++ modperl_filter.c 29 Mar 2002 16:16:43 - 1.33
@@ -5,6 +5,7 @@
MP_INLINE apr_status_t modperl_wbucket_pass(modperl_wbucket_t *wb,
const char *buf, apr_ssize_t len)
{
+apr_bucket_alloc_t *ba = (*wb->filters)->c->bucket_alloc;
apr_bucket_brigade *bb;
apr_bucket *bucket;
@@ -28,8 +29,8 @@
}
}
-bb = apr_brigade_create(wb->pool);
-bucket = apr_bucket_transient_create(buf, len);
+bb = apr_brigade_create(wb->pool, ba);
+bucket = apr_bucket_transient_create(buf, len, ba);
APR_BRIGADE_INSERT_TAIL(bb, bucket);
MP_TRACE_f(MP_FUNC, "buffer length=%d\n", len);
@@ -162,16 +163,20 @@
MP_INLINE static apr_status_t send_eos(ap_filter_t *f)
{
-apr_bucket_brigade *bb = apr_brigade_create(MP_FILTER_POOL(f));
-apr_bucket *b = apr_bucket_eos_create();
+apr_bucket_alloc_t *ba = f->c->bucket_alloc;
+apr_bucket_brigade *bb = apr_brigade_create(MP_FILTER_POOL(f),
+ba);
+apr_bucket *b = apr_bucket_eos_create(ba);
APR_BRIGADE_INSERT_TAIL(bb, b);
return ap_pass_brigade(f->next, bb);
}
MP_INLINE static apr_status_t send_flush(ap_filter_t *f)
{
-apr_bucket_brigade *bb = apr_brigade_create(MP_FILTER_POOL(f));
-apr_bucket *b = apr_bucket_flush_create();
+apr_bucket_alloc_t *ba = f->c->bucket_alloc;
+apr_bucket_brigade *bb = apr_brigade_create(MP_FILTER_POOL(f),
+ba);
+apr_bucket *b = apr_bucket_flush_create(ba);
APR_BRIGADE_INSERT_TAIL(bb, b);
return ap_pass_brigade(f->next, bb);
}
1.5 +3 -1 modperl-2.0/t/filter/TestFilter/buckets.pm
Index: buckets.pm
===
RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/buckets.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buckets.pm21 Dec 2001 11:30:38 - 1.4
+++ buckets.pm29 Mar 2002 16:16:43 - 1.5
@@ -15,6 +15,8 @@
plan tests => 4;
+my $ba = $filter->r->connection->bucket_alloc;
+
#should only have 1 bucket from the response() below
for (my $bucket = $bb->first; $bucket; $bucket = $bb->next($bucket)) {
ok $bucket->type->name;
@@ -25,7 +27,7 @@
my $tests = Apache::TestToString->finish;
-my $brigade = APR::Brigade->new($filter->r->pool);
+my $brigade = APR::Brigade->new($filter->r->pool, $ba);
my $bucket = APR::Bucket->new($tests);
$brigade->insert_tail($bucket);
1.10 +3 -1 modperl-2.0/t/filter/TestFilter/input_body.pm
Index: input_body.pm
===
RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/input_body.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- input_body.pm 20 Jan 2002 18:37:05 - 1.9
+++ input_body.pm 29 Mar 2002 16:16:43 - 1.10
@@ -13,7 +13,9 @@
sub handler : FilterRequestHandler {
my($filter, $bb, $mode, $block, $readbytes) = @_;
-my $ctx_bb = APR::Brigade->new($filter->r->pool);
+my $ba = $filter->r->connection->bucket_alloc;
+
+my $ctx_bb = APR::Brigade->new($filter->r->pool, $ba);
my $rv = $filter->next->get_brigade($ctx_bb, $mode, $block, $readbytes);
1.10 +2 -1 modperl-2.0/t/filter/TestFilter/input_msg.pm
Index: input_msg.pm
===
RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/input_msg.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- input_msg.pm 20 Jan 2002 18:37:05 - 1.9
+++ input_msg.pm 29 Mar 2002 16:16:43 - 1.10
@@ -14,7 +14,8 @@
sub handler : FilterConnectionHandler {
my($filter, $bb, $mode, $block, $readbytes) = @_;
-my $ctx_bb = APR::Brigade->new($filter->c->pool);
+my $c = $filter->c;
+my $ctx_bb = APR::B
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 02/03/29 08:16:21
Modified:xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.23 +12 -1 modperl-2.0/xs/tables/current/Apache/ConstantsTable.pm
Index: ConstantsTable.pm
===
RCS file: /home/cvs/modperl-2.0/xs/tables/current/Apache/ConstantsTable.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ConstantsTable.pm 10 Mar 2002 00:17:05 - 1.22
+++ ConstantsTable.pm 29 Mar 2002 16:16:20 - 1.23
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sat Mar 9 16:13:55 2002
+# ! Fri Mar 29 06:55:58 2002
# ! do NOT edit, any changes will be lost !
# !!
@@ -59,6 +59,17 @@
'M_MOVE',
'M_LOCK',
'M_UNLOCK',
+ 'M_VERSION_CONTROL',
+ 'M_CHECKOUT',
+ 'M_UNCHECKOUT',
+ 'M_CHECKIN',
+ 'M_UPDATE',
+ 'M_LABEL',
+ 'M_REPORT',
+ 'M_MKWORKSPACE',
+ 'M_MKACTIVITY',
+ 'M_BASELINE_CONTROL',
+ 'M_MERGE',
'M_INVALID',
'METHODS'
],
1.35 +301 -43 modperl-2.0/xs/tables/current/Apache/FunctionTable.pm
Index: FunctionTable.pm
===
RCS file: /home/cvs/modperl-2.0/xs/tables/current/Apache/FunctionTable.pm,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- FunctionTable.pm 10 Mar 2002 00:17:05 - 1.34
+++ FunctionTable.pm 29 Mar 2002 16:16:20 - 1.35
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sat Mar 9 16:14:02 2002
+# ! Fri Mar 29 06:55:29 2002
# ! do NOT edit, any changes will be lost !
# !!
@@ -195,6 +195,16 @@
},
{
'return_type' => 'void',
+'name' => 'ap_add_output_filters_by_type',
+'args' => [
+ {
+'type' => 'request_rec *',
+'name' => 'r'
+ }
+]
+ },
+ {
+'return_type' => 'void',
'name' => 'ap_add_per_dir_conf',
'args' => [
{
@@ -340,6 +350,10 @@
{
'type' => 'apr_pool_t *',
'name' => 'p'
+ },
+ {
+'type' => 'apr_bucket_alloc_t *',
+'name' => 'list'
}
]
},
@@ -2964,6 +2978,10 @@
'name' => 'ap_method_name_of',
'args' => [
{
+'type' => 'apr_pool_t *',
+'name' => 'p'
+ },
+ {
'type' => 'int',
'name' => 'methnum'
}
@@ -3620,6 +3638,20 @@
]
},
{
+'return_type' => 'apr_status_t',
+'name' => 'ap_recent_ctime',
+'args' => [
+ {
+'type' => 'char *',
+'name' => 'date_str'
+ },
+ {
+'type' => 'apr_time_t',
+'name' => 't'
+ }
+]
+ },
+ {
'return_type' => 'void',
'name' => 'ap_reclaim_child_processes',
'args' => [
@@ -3854,7 +3886,7 @@
},
{
'return_type' => 'apr_status_t',
-'name' => 'ap_rgetline',
+'name' => 'ap_rgetline_core',
'args' => [
{
'type' => 'char **',
@@ -4005,6 +4037,10 @@
{
'type' => 'void *',
'name' => 'sbh'
+ },
+ {
+'type' => 'apr_bucket_alloc_t *',
+'name' => 'alloc'
}
]
},
@@ -4286,6 +4322,10 @@
{
'type' => 'request_rec *',
'name' => 'r'
+ },
+ {
+'type' => 'int',
+'name' => 'lookup_uri'
}
]
},
@@ -4413,6 +4453,24 @@
},
{
'return_type' => 'int',
+'name' => 'ap_scan_script_header_err_brigade',
+'args' => [
+ {
+'type' => 'request_rec *',
+'name' => 'r'
+ },
+ {
+'type' => 'apr_bucket_brigade *',
+'name' => 'bb'
+ },
+ {
+'type' => 'char *',
+'name' => 'buffer'
+ }
+]
+ },
+ {
+'return_type' => 'int',
'name' => 'ap_scan_script_header_err_core',
'args' => [
{
@@ -4570,6 +4628,20 @@
]
},
{
+'return_type' => 'void',
+'name' => 'ap_set_content_type',
+'args' => [
+ {
+'type' => 'request_rec *',
+'name' => 'r'
+ },
+ {
+'type' => 'const char *',
+'name' => 'ct'
+ }
+]
+ },
+ {
