stas2003/02/17 01:03:17
Modified:.Changes
lib/Apache compat.pm
src/modules/perl modperl_callback.c modperl_callback.h
modperl_handler.c
t/htdocs .cvsignore
t/modperl .cvsignore
t/response/TestCompat apache.pm
todo api.txt
xs/ModPerl/Util ModPerl__Util.h
xs/maps modperl_functions.map
Added: t/response/TestModperl current_callback.pm
Log:
- implement Apache::current_callback
- $r-current_callback goes into Apache::compat, since now we have a way
too many callbacks unrelated to $r
- add some tests
Revision ChangesPath
1.125 +4 -0 modperl-2.0/Changes
Index: Changes
===
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- Changes 12 Feb 2003 23:42:23 - 1.124
+++ Changes 17 Feb 2003 09:03:16 - 1.125
@@ -10,6 +10,10 @@
=item 1.99_09-dev
+implement Apache::current_callback + $r-current_callback goes into
+Apache::compat, since now we have a way too many callbacks unrelated
+to $r [Stas]
+
Add Apache::compat methods: $r-connection-auth_type and
$r-connection-user (requires 'PerlOptions +GlobalRequest') + tests
[Stas]
1.78 +4 -0 modperl-2.0/lib/Apache/compat.pm
Index: compat.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/compat.pm,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- compat.pm 12 Feb 2003 23:42:23 - 1.77
+++ compat.pm 17 Feb 2003 09:03:16 - 1.78
@@ -125,6 +125,10 @@
die $err if $err;
}
+sub current_callback {
+return Apache::current_callback();
+}
+
package Apache::Constants;
use Apache::Const ();
1.54 +2 -0 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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- modperl_callback.c29 Jan 2003 01:04:33 - 1.53
+++ modperl_callback.c17 Feb 2003 09:03:16 - 1.54
@@ -172,6 +172,8 @@
break;
};
+modperl_callback_current_callback_set(desc);
+
/* XXX: deal with {push,set}_handler of the phase we're currently in */
/* for now avoid the segfault by not letting av-nelts grow if
* somebody push_handlers to the phase we are currently in, but
1.22 +9 -0 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- modperl_callback.h21 Feb 2002 01:45:34 - 1.21
+++ modperl_callback.h17 Feb 2003 09:03:16 - 1.22
@@ -10,6 +10,15 @@
#define ap_hook_fixup ap_hook_fixups
#define ap_hook_logap_hook_log_transaction
+#define modperl_callback_current_callback_sv \
+get_sv(Apache::__CurrentCallback, TRUE)
+
+#define modperl_callback_current_callback_set(desc) \
+sv_setpv(modperl_callback_current_callback_sv, desc)
+
+#define modperl_callback_current_callback_get() \
+SvPVX(modperl_callback_current_callback_sv)
+
int modperl_callback(pTHX_ modperl_handler_t *handler, apr_pool_t *p,
request_rec *r, server_rec *s, AV *args);
1.16 +1 -1 modperl-2.0/src/modules/perl/modperl_handler.c
Index: modperl_handler.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_handler.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- modperl_handler.c 1 Jan 2003 03:45:54 - 1.15
+++ modperl_handler.c 17 Feb 2003 09:03:16 - 1.16
@@ -175,7 +175,7 @@
}
#define set_desc(dtype) \
-MP_TRACE_a_do(if (desc) *desc = modperl_handler_desc_##dtype(idx))
+if (desc) *desc = modperl_handler_desc_##dtype(idx)
#define check_modify(dtype) \
if ((action MP_HANDLER_ACTION_GET) rcfg) { \
1.2 +1 -0 modperl-2.0/t/htdocs/.cvsignore
Index: .cvsignore
===
RCS file: /home/cvs/modperl-2.0/t/htdocs/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore26 Feb 2002 19:09:10 - 1.1
+++ .cvsignore17
