dougm 01/05/06 19:05:03
Modified: src/modules/perl modperl_filter.c modperl_filter.h
xs/Apache/Filter Apache__Filter.h
xs/maps apache_functions.map
Log:
ap_get_brigade() api has changed back to the original, back out the related change
Revision Changes Path
1.19 +3 -3 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- modperl_filter.c 2001/05/05 17:40:24 1.18
+++ modperl_filter.c 2001/05/07 02:05:00 1.19
@@ -87,7 +87,7 @@
}
int modperl_run_filter(modperl_filter_t *filter, ap_input_mode_t mode,
- apr_size_t readbytes)
+ apr_size_t *readbytes)
{
AV *args = Nullav;
int status;
@@ -110,7 +110,7 @@
if (filter->mode == MP_INPUT_FILTER_MODE) {
av_push(args, newSViv(mode));
- av_push(args, newSViv(readbytes));
+ av_push(args, newSViv(*readbytes));
}
if ((status = modperl_callback(aTHX_ handler, p, s, args)) != OK) {
@@ -339,7 +339,7 @@
apr_status_t modperl_input_filter_handler(ap_filter_t *f,
apr_bucket_brigade *bb,
ap_input_mode_t mode,
- apr_size_t readbytes)
+ apr_size_t *readbytes)
{
modperl_filter_t *filter;
int status;
1.8 +2 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- modperl_filter.h 2001/05/05 17:40:24 1.7
+++ modperl_filter.h 2001/05/07 02:05:01 1.8
@@ -26,7 +26,7 @@
modperl_filter_t *modperl_filter_mg_get(pTHX_ SV *obj);
int modperl_run_filter(modperl_filter_t *filter, ap_input_mode_t mode,
- apr_size_t readbytes);
+ apr_size_t *readbytes);
/* output filters */
apr_status_t modperl_output_filter_handler(ap_filter_t *f,
@@ -51,7 +51,7 @@
apr_status_t modperl_input_filter_handler(ap_filter_t *f,
apr_bucket_brigade *bb,
ap_input_mode_t mode,
- apr_size_t readbytes);
+ apr_size_t *readbytes);
int modperl_input_filter_register_connection(conn_rec *c);
1.11 +15 -0 modperl-2.0/xs/Apache/Filter/Apache__Filter.h
Index: Apache__Filter.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/Filter/Apache__Filter.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Apache__Filter.h 2001/05/05 17:40:25 1.10
+++ Apache__Filter.h 2001/05/07 02:05:02 1.11
@@ -58,6 +58,21 @@
return len;
}
+static apr_status_t mpxs_ap_get_brigade(pTHX_ ap_filter_t *filter,
+ apr_bucket_brigade *brigade,
+ ap_input_mode_t mode,
+ SV *svreadbytes)
+{
+ apr_size_t readbytes = svreadbytes ? SvIV(svreadbytes) : 0;
+ apr_status_t status = ap_get_brigade(filter, brigade, mode, &readbytes);
+
+ if (svreadbytes) {
+ sv_setiv(svreadbytes, readbytes);
+ }
+
+ return status;
+}
+
static MP_INLINE U32 *modperl_filter_attributes(SV *package, SV *cvrv)
{
return (U32 *)&MP_CODE_ATTRS(SvRV(cvrv));
1.25 +2 -2 modperl-2.0/xs/maps/apache_functions.map
Index: apache_functions.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_functions.map,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- apache_functions.map 2001/05/05 19:24:43 1.24
+++ apache_functions.map 2001/05/07 02:05:03 1.25
@@ -186,8 +186,8 @@
PACKAGE=guess
~ap_add_output_filter
ap_add_input_filter
- ap_get_brigade | | \
- filter, bucket, mode=AP_MODE_NONBLOCKING, readbytes=0
+ ap_get_brigade | mpxs_ | \
+ filter, bucket, mode=AP_MODE_NONBLOCKING, SV *:readbytes=Nullsv
ap_pass_brigade
ap_register_input_filter
ap_register_output_filter
