stas 2004/05/24 12:56:52
Modified: . Changes
t/response/TestAPI request_rec.pm
xs/Apache/RequestRec Apache__RequestRec.h
xs/maps modperl_functions.map
Log:
$r->finfo now accepts APR::Finfo object as an optional argument.
Revision Changes Path
1.379 +7 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -u -r1.378 -r1.379
--- Changes 22 May 2004 21:47:32 -0000 1.378
+++ Changes 24 May 2004 19:56:51 -0000 1.379
@@ -12,6 +12,13 @@
=item 1.99_15-dev
+$r->finfo now accepts APR::Finfo object as an optional
+argument. [Stas]
+
+APR::Finfo [Stas]
+ - change stat() to return finfo
+ - make all field accessors readonly
+
ARP::password_validate is now ARP::Util::password_validate [Stas]
APR::IpSubnet::new() now throws APR::Error exception (not returning
1.18 +15 -2 modperl-2.0/t/response/TestAPI/request_rec.pm
Index: request_rec.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/request_rec.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -u -r1.17 -r1.18
--- request_rec.pm 18 Apr 2003 06:18:58 -0000 1.17
+++ request_rec.pm 24 May 2004 19:56:51 -0000 1.18
@@ -10,7 +10,10 @@
use Apache::RequestRec ();
use Apache::RequestUtil ();
+use APR::Finfo ();
+
use Apache::Const -compile => 'OK';
+use APR::Const -compile => qw(FINFO_NORM);
#this test module is only for testing fields in the request_rec
#listed in apache_structures.map
@@ -20,7 +23,7 @@
sub handler {
my $r = shift;
- plan $r, tests => 42;
+ plan $r, tests => 43;
#Apache->request($r); #PerlOptions +GlobalRequest takes care
my $gr = Apache->request;
@@ -130,7 +133,17 @@
ok $r->args || 1;
- #finfo
+ # finfo
+ {
+ my $finfo = APR::Finfo::stat(__FILE__, APR::FINFO_NORM, $r->pool);
+ $r->finfo($finfo);
+ # just one field test, all accessors are fully tested in
+ # TestAPR::finfo
+ ok t_cmp(__FILE__,
+ $r->finfo->fname,
+ '$r->finfo');
+ }
+
#parsed_uri
#per_dir_config
1.14 +6 -1 modperl-2.0/xs/Apache/RequestRec/Apache__RequestRec.h
Index: Apache__RequestRec.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestRec/Apache__RequestRec.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- Apache__RequestRec.h 4 Mar 2004 06:01:13 -0000 1.13
+++ Apache__RequestRec.h 24 May 2004 19:56:52 -0000 1.14
@@ -74,8 +74,13 @@
}
static MP_INLINE
-apr_finfo_t *mpxs_Apache__RequestRec_finfo(request_rec *r)
+apr_finfo_t *mpxs_Apache__RequestRec_finfo(pTHX_ request_rec *r,
+ apr_finfo_t *finfo)
{
+ if (finfo) {
+ r->finfo = *finfo;
+ }
+
return &r->finfo;
}
1.73 +1 -1 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -u -r1.72 -r1.73
--- modperl_functions.map 14 Apr 2004 03:41:39 -0000 1.72
+++ modperl_functions.map 24 May 2004 19:56:52 -0000 1.73
@@ -16,7 +16,7 @@
mpxs_Apache__RequestRec_content_type | | r, type=Nullsv
mpxs_Apache__RequestRec_proxyreq | | r, val=Nullsv
mpxs_Apache__RequestRec_subprocess_env | | r, key=NULL, val=Nullsv
- mpxs_Apache__RequestRec_finfo
+ mpxs_Apache__RequestRec_finfo | | r, finfo=NULL
SV *:DEFINE_server_root_relative | | SV *:p, const char *:fname=""
mpxs_Apache__RequestRec_handler | | ...
