dougm 01/01/20 13:19:09 Modified: lib/ModPerl Code.pm src/modules/perl mod_perl.c mod_perl.h modperl_apache_includes.h modperl_filter.c modperl_filter.h modperl_types.h Log: adjust to recent name changes Revision Changes Path 1.37 +1 -1 modperl-2.0/lib/ModPerl/Code.pm Index: Code.pm =================================================================== RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- Code.pm 2001/01/06 02:52:02 1.36 +++ Code.pm 2001/01/20 21:19:08 1.37 @@ -170,7 +170,7 @@ if (my $hook = $hooks{$handler}) { next if $not_ap_hook{$hook}; push @register_hooks, - " ap_hook_$hook($name, NULL, NULL, AP_HOOK_LAST);"; + " ap_hook_$hook($name, NULL, NULL, APR_HOOK_LAST);"; } my($protostr, $pass) = canon_proto($prototype, $name); 1.26 +5 -5 modperl-2.0/src/modules/perl/mod_perl.c Index: mod_perl.c =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mod_perl.c 2001/01/18 18:43:01 1.25 +++ mod_perl.c 2001/01/20 21:19:08 1.26 @@ -140,18 +140,18 @@ void modperl_register_hooks(apr_pool_t *p) { - ap_hook_open_logs(modperl_hook_init, NULL, NULL, AP_HOOK_MIDDLE); + ap_hook_open_logs(modperl_hook_init, NULL, NULL, APR_HOOK_MIDDLE); - ap_hook_handler(modperl_response_handler, NULL, NULL, AP_HOOK_MIDDLE); + ap_hook_handler(modperl_response_handler, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_insert_filter(modperl_output_filter_register, - NULL, NULL, AP_HOOK_LAST); + NULL, NULL, APR_HOOK_LAST); ap_register_output_filter(MODPERL_OUTPUT_FILTER_NAME, modperl_output_filter_handler, AP_FTYPE_CONTENT); - ap_hook_post_config(modperl_hook_post_config, NULL, NULL, AP_HOOK_MIDDLE); + ap_hook_post_config(modperl_hook_post_config, NULL, NULL, APR_HOOK_MIDDLE); modperl_register_handler_hooks(); } @@ -219,7 +219,7 @@ return retval; } -module MODULE_VAR_EXPORT perl_module = { +module AP_MODULE_DECLARE_DATA perl_module = { STANDARD20_MODULE_STUFF, modperl_create_dir_config, /* dir config creater */ modperl_merge_dir_config, /* dir merger --- default is to override */ 1.24 +1 -1 modperl-2.0/src/modules/perl/mod_perl.h Index: mod_perl.h =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mod_perl.h 2001/01/18 18:43:02 1.23 +++ mod_perl.h 2001/01/20 21:19:08 1.24 @@ -4,7 +4,7 @@ #include "modperl_apache_includes.h" #include "modperl_perl_includes.h" -extern module MODULE_VAR_EXPORT perl_module; +extern module AP_MODULE_DECLARE_DATA perl_module; #include "modperl_flags.h" #include "modperl_hooks.h" 1.2 +1 -1 modperl-2.0/src/modules/perl/modperl_apache_includes.h Index: modperl_apache_includes.h =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_apache_includes.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- modperl_apache_includes.h 2001/01/06 02:52:03 1.1 +++ modperl_apache_includes.h 2001/01/20 21:19:08 1.2 @@ -17,7 +17,7 @@ #include "apr_lock.h" #include "apr_strings.h" -#include "ap_buckets.h" +#include "apr_buckets.h" #include "util_filter.h" #endif /* MODPERL_APACHE_INCLUDES_H */ 1.3 +23 -23 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- modperl_filter.c 2001/01/02 18:58:21 1.2 +++ modperl_filter.c 2001/01/20 21:19:08 1.3 @@ -5,9 +5,9 @@ MP_INLINE apr_status_t modperl_wbucket_pass(modperl_wbucket_t *wb, const char *buf, apr_ssize_t len) { - ap_bucket_brigade *bb = ap_brigade_create(wb->pool); - ap_bucket *bucket = ap_bucket_create_transient(buf, len); - AP_BRIGADE_INSERT_TAIL(bb, bucket); + apr_bucket_brigade *bb = apr_brigade_create(wb->pool); + apr_bucket *bucket = apr_bucket_create_transient(buf, len); + APR_BRIGADE_INSERT_TAIL(bb, bucket); return ap_pass_brigade(wb->filters, bb); } @@ -57,7 +57,7 @@ }; modperl_filter_t *modperl_filter_new(ap_filter_t *f, - ap_bucket_brigade *bb, + apr_bucket_brigade *bb, modperl_filter_mode_e mode) { apr_pool_t *p = mode == MP_INPUT_FILTER_MODE ? @@ -132,25 +132,25 @@ MP_INLINE static apr_status_t send_eos(ap_filter_t *f) { - ap_bucket_brigade *bb = ap_brigade_create(f->r->pool); - ap_bucket *b = ap_bucket_create_eos(); - AP_BRIGADE_INSERT_TAIL(bb, b); + apr_bucket_brigade *bb = apr_brigade_create(f->r->pool); + apr_bucket *b = apr_bucket_create_eos(); + APR_BRIGADE_INSERT_TAIL(bb, b); return ap_pass_brigade(f->next, bb); } -/* unrolled AP_BRIGADE_FOREACH loop */ +/* unrolled APR_BRIGADE_FOREACH loop */ #define MP_FILTER_SENTINEL(filter) \ -AP_BRIGADE_SENTINEL(filter->bb) +APR_BRIGADE_SENTINEL(filter->bb) #define MP_FILTER_FIRST(filter) \ -AP_BRIGADE_FIRST(filter->bb) +APR_BRIGADE_FIRST(filter->bb) #define MP_FILTER_NEXT(filter) \ -AP_BUCKET_NEXT(filter->bucket) +APR_BUCKET_NEXT(filter->bucket) #define MP_FILTER_IS_EOS(filter) \ -AP_BUCKET_IS_EOS(filter->bucket) +APR_BUCKET_IS_EOS(filter->bucket) MP_INLINE static int get_bucket(modperl_filter_t *filter) { @@ -168,7 +168,7 @@ else if (filter->bucket != MP_FILTER_SENTINEL(filter)) { filter->bucket = MP_FILTER_NEXT(filter); if (filter->bucket == MP_FILTER_SENTINEL(filter)) { - ap_brigade_destroy(filter->bb); + apr_brigade_destroy(filter->bb); filter->bb = NULL; return 0; } @@ -236,7 +236,7 @@ num_buckets++; - filter->rc = ap_bucket_read(filter->bucket, &buf, &buf_len, 0); + filter->rc = apr_bucket_read(filter->bucket, &buf, &buf_len, 0); if (filter->rc == APR_SUCCESS) { MP_TRACE_f(MP_FUNC, @@ -247,7 +247,7 @@ } else { MP_TRACE_f(MP_FUNC, - "ap_bucket_read error: %s\n", + "apr_bucket_read error: %s\n", modperl_apr_strerror(filter->rc)); return len; } @@ -296,7 +296,7 @@ if (filter->eos) { MP_TRACE_f(MP_FUNC, "sending EOS bucket\n"); filter->rc = send_eos(filter->f); - ap_brigade_destroy(filter->bb); + apr_brigade_destroy(filter->bb); filter->bb = NULL; filter->eos = 0; } @@ -311,16 +311,16 @@ return modperl_wbucket_write(&filter->wbucket, buf, len); } -#define AP_BRIGADE_IS_EOS(bb) \ -AP_BUCKET_IS_EOS(AP_BRIGADE_FIRST(bb)) +#define APR_BRIGADE_IS_EOS(bb) \ +APR_BUCKET_IS_EOS(APR_BRIGADE_FIRST(bb)) apr_status_t modperl_output_filter_handler(ap_filter_t *f, - ap_bucket_brigade *bb) + apr_bucket_brigade *bb) { modperl_filter_t *filter; int status; - if (AP_BRIGADE_IS_EOS(bb)) { + if (APR_BRIGADE_IS_EOS(bb)) { /* XXX: see about preventing this in the first place */ MP_TRACE_f(MP_FUNC, "first bucket is EOS, skipping callback\n"); return ap_pass_brigade(f->next, bb); @@ -359,9 +359,9 @@ } } -void modperl_brigade_dump(ap_bucket_brigade *bb, FILE *fp) +void modperl_brigade_dump(apr_bucket_brigade *bb, FILE *fp) { - ap_bucket *bucket; + apr_bucket *bucket; int i = 0; if (fp == NULL) { @@ -371,7 +371,7 @@ fprintf(fp, "dump of brigade 0x%lx\n", (unsigned long)bb); - AP_BRIGADE_FOREACH(bucket, bb) { + APR_BRIGADE_FOREACH(bucket, bb) { fprintf(fp, " %d: bucket=%s(0x%lx), length=%ld, data=0x%lx\n", i, bucket->type->name, (unsigned long)bucket, 1.2 +3 -3 modperl-2.0/src/modules/perl/modperl_filter.h Index: modperl_filter.h =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- modperl_filter.h 2001/01/02 06:41:19 1.1 +++ modperl_filter.h 2001/01/20 21:19:08 1.2 @@ -16,7 +16,7 @@ /* generic filter routines */ modperl_filter_t *modperl_filter_new(ap_filter_t *f, - ap_bucket_brigade *bb, + apr_bucket_brigade *bb, modperl_filter_mode_e mode); int modperl_run_filter(modperl_filter_t *filter); @@ -25,7 +25,7 @@ /* output filters */ apr_status_t modperl_output_filter_handler(ap_filter_t *f, - ap_bucket_brigade *bb); + apr_bucket_brigade *bb); void modperl_output_filter_register(request_rec *r); @@ -40,6 +40,6 @@ const char *buf, apr_ssize_t *len); -void modperl_brigade_dump(ap_bucket_brigade *bb, FILE *fp); +void modperl_brigade_dump(apr_bucket_brigade *bb, FILE *fp); #endif /* MODPERL_FILTER_H */ 1.19 +2 -2 modperl-2.0/src/modules/perl/modperl_types.h Index: modperl_types.h =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_types.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- modperl_types.h 2001/01/09 05:41:20 1.18 +++ modperl_types.h 2001/01/20 21:19:09 1.19 @@ -178,8 +178,8 @@ char *leftover; apr_ssize_t remaining; modperl_wbucket_t wbucket; - ap_bucket *bucket; - ap_bucket_brigade *bb; + apr_bucket *bucket; + apr_bucket_brigade *bb; apr_status_t rc; modperl_filter_mode_e mode; apr_pool_t *pool;