dougm 01/10/06 14:05:40
Modified: src/modules/perl modperl_callback.c modperl_callback.h
modperl_filter.c
Log:
pass a request_rec to modperl_callback() for future use
Revision Changes Path
1.45 +2 -2 modperl-2.0/src/modules/perl/modperl_callback.c
Index: modperl_callback.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- modperl_callback.c 2001/09/28 15:16:06 1.44
+++ modperl_callback.c 2001/10/06 21:05:40 1.45
@@ -1,7 +1,7 @@
#include "mod_perl.h"
int modperl_callback(pTHX_ modperl_handler_t *handler, apr_pool_t *p,
- server_rec *s, AV *args)
+ request_rec *r, server_rec *s, AV *args)
{
CV *cv=Nullcv;
I32 flags = G_EVAL|G_SCALAR;
@@ -168,7 +168,7 @@
handlers = (modperl_handler_t **)av->elts;
for (i=0; i<av->nelts; i++) {
- if ((status = modperl_callback(aTHX_ handlers[i], p, s, av_args)) != OK) {
+ if ((status = modperl_callback(aTHX_ handlers[i], p, r, s, av_args)) != OK)
{
status = modperl_errsv(aTHX_ status, r, s);
}
1.19 +1 -1 modperl-2.0/src/modules/perl/modperl_callback.h
Index: modperl_callback.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- modperl_callback.h 2001/03/16 17:23:24 1.18
+++ modperl_callback.h 2001/10/06 21:05:40 1.19
@@ -11,7 +11,7 @@
#define ap_hook_log ap_hook_log_transaction
int modperl_callback(pTHX_ modperl_handler_t *handler, apr_pool_t *p,
- server_rec *s, AV *args);
+ request_rec *r, server_rec *s, AV *args);
int modperl_callback_run_handlers(int idx, int type,
request_rec *r, conn_rec *c, server_rec *s,
1.26 +1 -1 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- modperl_filter.c 2001/08/30 05:15:51 1.25
+++ modperl_filter.c 2001/10/06 21:05:40 1.26
@@ -140,7 +140,7 @@
av_push(args, newSViv(*readbytes));
}
- if ((status = modperl_callback(aTHX_ handler, p, s, args)) != OK) {
+ if ((status = modperl_callback(aTHX_ handler, p, r, s, args)) != OK) {
status = modperl_errsv(aTHX_ status, r, s);
}
