dougm 00/08/14 21:35:14
Modified: . Changes
Apache Apache.pm
src/modules/perl Apache.xs
Log:
fix $r->args(undef)
Revision Changes Path
1.506 +2 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -r1.505 -r1.506
--- Changes 2000/08/10 02:33:19 1.505
+++ Changes 2000/08/15 04:35:13 1.506
@@ -10,6 +10,8 @@
=item 1.24_01-dev
+fix $r->args(undef), thanks to Greg Cope for the spot
+
quotemeta path_info in Registry regexp
[Tobias Hoellrich <[EMAIL PROTECTED]>]
1.52 +1 -1 modperl/Apache/Apache.pm
Index: Apache.pm
===================================================================
RCS file: /home/cvs/modperl/Apache/Apache.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Apache.pm 2000/06/15 08:13:36 1.51
+++ Apache.pm 2000/08/15 04:35:13 1.52
@@ -55,7 +55,7 @@
sub args {
my($r, $val) = @_;
parse_args(wantarray,
- $val ? $r->query_string($val) : $r->query_string);
+ @_ > 1 ? $r->query_string($val) : $r->query_string);
}
*READ = \&read unless defined &READ;
1.102 +7 -10 modperl/src/modules/perl/Apache.xs
Index: Apache.xs
===================================================================
RCS file: /home/cvs/modperl/src/modules/perl/Apache.xs,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- Apache.xs 2000/08/10 02:33:21 1.101
+++ Apache.xs 2000/08/15 04:35:14 1.102
@@ -1888,21 +1888,18 @@
OUTPUT:
RETVAL
-void
+char *
query_string(r, ...)
Apache r
- PREINIT:
- SV *sv = sv_newmortal();
+ CODE:
+ get_set_PVp(r->args,r->pool);
- PPCODE:
- if(r->args)
- sv_setpv(sv, r->args);
- SvTAINTED_on(sv);
- XPUSHs(sv);
+ OUTPUT:
+ RETVAL
- if(items > 1)
- r->args = pstrdup(r->pool, (char *)SvPV(ST(1),na));
+ CLEANUP:
+ if (ST(0) != &sv_undef) SvTAINTED_on(ST(0));
# /* Various other config info which may change with .htaccess files
# * These are config vectors, with one void* pointer for each module
