cvs commit: modperl-2.0/xs/tables/current/Apache FunctionTable.pm StructureTable.pm
dougm 01/04/23 19:25:45
Modified:xs/tables/current/Apache FunctionTable.pm StructureTable.pm
Log:
sync
Revision ChangesPath
1.4 +115 -93 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FunctionTable.pm 2001/04/19 17:45:22 1.3
+++ FunctionTable.pm 2001/04/24 02:25:45 1.4
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Thu Apr 19 10:01:42 2001
+# ! Mon Apr 23 18:32:09 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -5708,6 +5708,24 @@
'name' => 'ap_set_string_slot'
},
{
+'return_type' => 'const char *',
+'args' => [
+ {
+'name' => 'cmd',
+'type' => 'cmd_parms *'
+ },
+ {
+'name' => 'struct_ptr',
+'type' => 'void *'
+ },
+ {
+'name' => 'arg',
+'type' => 'const char *'
+ }
+],
+'name' => 'ap_set_int_slot'
+ },
+ {
'return_type' => 'int',
'args' => [
{
@@ -7963,6 +7981,10 @@
{
'name' => 'mode',
'type' => 'ap_input_mode_t'
+ },
+ {
+'name' => 'readbytes',
+'type' => 'apr_size_t *'
}
],
'name' => 'ap_get_brigade'
@@ -9538,6 +9560,98 @@
'name' => 'ap_matches_request_vhost'
},
{
+'return_type' => 'int',
+'args' => [],
+'name' => 'ap_exists_scoreboard_image'
+ },
+ {
+'return_type' => 'void',
+'args' => [
+ {
+'name' => 'p',
+'type' => 'apr_pool_t *'
+ },
+ {
+'name' => 't',
+'type' => 'ap_scoreboard_e'
+ }
+],
+'name' => 'ap_create_scoreboard'
+ },
+ {
+'return_type' => 'void',
+'args' => [
+ {
+'name' => 'child_num',
+'type' => 'int'
+ },
+ {
+'name' => 'thread_num',
+'type' => 'int'
+ },
+ {
+'name' => 'r',
+'type' => 'request_rec *'
+ }
+],
+'name' => 'ap_increment_counts'
+ },
+ {
+'return_type' => 'apr_status_t',
+'args' => [
+ {
+'name' => 'd',
+'type' => 'void *'
+ }
+],
+'name' => 'ap_cleanup_scoreboard'
+ },
+ {
+'return_type' => 'void',
+'args' => [],
+'name' => 'ap_sync_scoreboard_image'
+ },
+ {
+'return_type' => 'int',
+'args' => [
+ {
+'name' => 'child_num',
+'type' => 'int'
+ },
+ {
+'name' => 'thread_num',
+'type' => 'int'
+ },
+ {
+'name' => 'status',
+'type' => 'int'
+ },
+ {
+'name' => 'r',
+'type' => 'request_rec *'
+ }
+],
+'name' => 'ap_update_child_status'
+ },
+ {
+'return_type' => 'void',
+'args' => [
+ {
+'name' => 'child_num',
+'type' => 'int'
+ },
+ {
+'name' => 'thread_num',
+'type' => 'int'
+ },
+ {
+'name' => 'status',
+'type' => 'int'
+ }
+],
+'name' => 'ap_time_process_request'
+ },
+ {
'return_type' => 'void',
'args' => [
{
@@ -9654,98 +9768,6 @@
}
],
'name' => 'ap_rfc1413'
- },
- {
-'return_type' => 'int',
-'args' => [],
-'name' => 'ap_exists_scoreboard_image'
- },
- {
-'return_type' => 'void',
-'args' => [
- {
-'name' => 'p',
-'type' => 'apr_pool_t *'
- },
- {
-'name' => 't',
-'type' => 'ap_scoreboard_e'
- }
-],
-'name' => 'ap_create_scoreboard'
- },
- {
-'return_type' => 'void',
-'args' => [
- {
-'name' => 'child_num',
-'type' => 'int'
- },
- {
-'name' => 'thread_num',
-'type' => 'int'
- },
- {
-'name' => 'r',
-'type' => 'request_rec *'
- }
-],
-'name' => 'ap_increment_counts'
- },
- {
-'return_type' => 'apr_status_t',
-'args' => [
- {
-'name' => 'd',
-'type' => 'void *'
- }
-],
-'name' => 'ap_cleanup_scoreboard'
- },
- {
-'return_type' => 'void',
-'args' => [],
-'name' => 'ap_sync_scoreboard_image'
- },
- {
-'return_type' => 'int',
-'args' => [
- {
-'name' => 'child
cvs commit: modperl-2.0/xs/maps apache_functions.map
dougm 01/04/23 19:26:19
Modified:src/modules/perl modperl_filter.c modperl_filter.h
t/filter/TestFilter input_body.pm input_msg.pm
xs/Apache/Filter Apache__Filter.h
xs/maps apache_functions.map
Log:
adjust to ap_get_brigade() / input filter api changes
Revision ChangesPath
1.17 +7 -4 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- modperl_filter.c 2001/04/20 00:43:47 1.16
+++ modperl_filter.c 2001/04/24 02:26:17 1.17
@@ -86,7 +86,8 @@
return mg ? (modperl_filter_t *)mg->mg_ptr : NULL;
}
-int modperl_run_filter(modperl_filter_t *filter, ap_input_mode_t mode)
+int modperl_run_filter(modperl_filter_t *filter, ap_input_mode_t mode,
+ apr_size_t *readbytes)
{
AV *args = Nullav;
int status;
@@ -109,6 +110,7 @@
if (filter->mode == MP_INPUT_FILTER_MODE) {
av_push(args, newSViv(mode));
+av_push(args, newSViv(*readbytes));
}
if ((status = modperl_callback(aTHX_ handler, p, s, args)) != OK) {
@@ -321,7 +323,7 @@
}
else {
filter = modperl_filter_new(f, bb, MP_OUTPUT_FILTER_MODE);
-status = modperl_run_filter(filter, 0);
+status = modperl_run_filter(filter, 0, 0);
}
switch (status) {
@@ -336,7 +338,8 @@
apr_status_t modperl_input_filter_handler(ap_filter_t *f,
apr_bucket_brigade *bb,
- ap_input_mode_t mode)
+ ap_input_mode_t mode,
+ apr_size_t *readbytes)
{
modperl_filter_t *filter;
int status;
@@ -348,7 +351,7 @@
}
else {
filter = modperl_filter_new(f, bb, MP_INPUT_FILTER_MODE);
-status = modperl_run_filter(filter, mode);
+status = modperl_run_filter(filter, mode, readbytes);
}
switch (status) {
1.6 +4 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- modperl_filter.h 2001/04/20 00:43:47 1.5
+++ modperl_filter.h 2001/04/24 02:26:17 1.6
@@ -25,7 +25,8 @@
modperl_filter_t *modperl_filter_mg_get(pTHX_ SV *obj);
-int modperl_run_filter(modperl_filter_t *filter, ap_input_mode_t mode);
+int modperl_run_filter(modperl_filter_t *filter, ap_input_mode_t mode,
+ apr_size_t *readbytes);
/* output filters */
apr_status_t modperl_output_filter_handler(ap_filter_t *f,
@@ -49,7 +50,8 @@
/* input filters */
apr_status_t modperl_input_filter_handler(ap_filter_t *f,
apr_bucket_brigade *bb,
- ap_input_mode_t mode);
+ ap_input_mode_t mode,
+ apr_size_t *readbytes);
int modperl_input_filter_register_connection(conn_rec *c);
1.4 +2 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- input_body.pm 2001/04/20 01:21:28 1.3
+++ input_body.pm 2001/04/24 02:26:17 1.4
@@ -13,10 +13,10 @@
use APR::Bucket ();
sub handler : InputFilterBody {
-my($filter, $bb, $mode) = @_;
+my($filter, $bb, $mode, $readbytes) = @_;
if ($bb->empty) {
-my $rv = $filter->next->get_brigade($bb, $mode);
+my $rv = $filter->next->get_brigade($bb, $mode, $readbytes);
if ($rv != APR::SUCCESS) {
return $rv;
1.4 +2 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- input_msg.pm 2001/04/20 01:21:28 1.3
+++ input_msg.pm 2001/04/24 02:26:17 1.4
@@ -14,10 +14,10 @@
my $to_url = '/TestFilter::input_msg::response';
sub handler : InputFilterMessage {
-my($filter, $bb, $mode) = @_;
+my($filter, $bb, $mode, $readbytes) = @_;
cvs commit: modperl-2.0/src/modules/perl modperl_types.h
dougm 01/04/23 22:10:41 Modified:src/modules/perl modperl_types.h Log: allow MP_IOBUFSIZE to be -D defined Revision ChangesPath 1.37 +6 -4 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.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- modperl_types.h 2001/04/19 21:26:35 1.36 +++ modperl_types.h 2001/04/24 05:10:40 1.37 @@ -1,10 +1,12 @@ #ifndef MODPERL_TYPES_H #define MODPERL_TYPES_H -#ifdef AP_IOBUFSIZE -# define MP_IOBUFSIZE AP_IOBUFSIZE -#else -# define MP_IOBUFSIZE 8192 +#ifndef MP_IOBUFSIZE +# ifdef AP_IOBUFSIZE +# define MP_IOBUFSIZE AP_IOBUFSIZE +# else +# define MP_IOBUFSIZE 8192 +# endif #endif /* aliases */
cvs commit: modperl-2.0/pod modperl_dev.pod
sbekman 01/04/23 22:50:28 Modified:pod modperl_dev.pod Log: document -DMP_IOBUFSIZE= option Revision ChangesPath 1.17 +14 -0 modperl-2.0/pod/modperl_dev.pod Index: modperl_dev.pod === RCS file: /home/cvs/modperl-2.0/pod/modperl_dev.pod,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- modperl_dev.pod 2001/04/20 16:50:53 1.16 +++ modperl_dev.pod 2001/04/24 05:50:28 1.17 @@ -96,6 +96,20 @@ =back +mod_perl specific compiler opts: + +=over 4 + +=item -DMP_IOBUFSIZE + +Change the default mod_perl's 8k IO buffer size, e.g. 16k: + + MP_CCOPTS=-DMP_IOBUFSIZE=16384 + +=back + + + Options can also be specified in the file C. Command line options override those from C and those from MP_OPTIONS_FILE.
Re: cvs commit: modperl-2.0/src/modules/perl modperl_types.h
On 24 Apr 2001 [EMAIL PROTECTED] wrote: > dougm 01/04/23 22:10:41 > > Modified:src/modules/perl modperl_types.h > Log: > allow MP_IOBUFSIZE to be -D defined That's the buffer size you have mentioned in your reply to my dual setup question? This solves the outgoing data server tieing. What about incoming traffic. Can we do the same for let's say files uploaded from slow clients? So the data gets buffered somewhere, while Perl interpreter is not used? Basically the idea is not to invoke the Perl interpreter before a certain amount (or all of it) of data has been read. > Revision ChangesPath > 1.37 +6 -4 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.36 > retrieving revision 1.37 > diff -u -r1.36 -r1.37 > --- modperl_types.h 2001/04/19 21:26:35 1.36 > +++ modperl_types.h 2001/04/24 05:10:40 1.37 > @@ -1,10 +1,12 @@ >#ifndef MODPERL_TYPES_H >#define MODPERL_TYPES_H > > -#ifdef AP_IOBUFSIZE > -# define MP_IOBUFSIZE AP_IOBUFSIZE > -#else > -# define MP_IOBUFSIZE 8192 > +#ifndef MP_IOBUFSIZE > +# ifdef AP_IOBUFSIZE > +# define MP_IOBUFSIZE AP_IOBUFSIZE > +# else > +# define MP_IOBUFSIZE 8192 > +# endif >#endif > >/* aliases */ > > > > _ Stas Bekman JAm_pH -- Just Another mod_perl Hacker http://stason.org/ mod_perl Guide http://perl.apache.org/guide mailto:[EMAIL PROTECTED] http://apachetoday.com http://eXtropia.com/ http://singlesheaven.com http://perl.apache.org http://perlmonth.com/
