cvs commit: modperl-2.0/t/apache scanhdrs2.t
stas2003/01/10 23:41:04
Modified:t/apache scanhdrs2.t
Log:
t_cmp's args are (expected, received, comment)
not (received, expected, comment)
(the debug info was confusing otherwise)
Revision ChangesPath
1.2 +3 -3 modperl-2.0/t/apache/scanhdrs2.t
Index: scanhdrs2.t
===
RCS file: /home/cvs/modperl-2.0/t/apache/scanhdrs2.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scanhdrs2.t 29 Jun 2002 20:39:22 - 1.1
+++ scanhdrs2.t 11 Jan 2003 07:41:04 - 1.2
@@ -14,10 +14,10 @@
my $res = GET "$location?$redirect", redirect_ok => 0;
-ok t_cmp($res->header('Location'), $redirect,
+ok t_cmp($redirect, $res->header('Location'),
"Location header");
-ok t_cmp($res->code, 302,
+ok t_cmp(302, $res->code,
"status == 302");
$redirect = '/index.html';
@@ -27,7 +27,7 @@
ok t_cmp(1, !$res->header('Location'),
"no Location header");
-ok t_cmp($res->code, 200,
+ok t_cmp(200, $res->code,
"status == 200");
ok t_cmp(qr{welcome to}, $res->content,
cvs commit: modperl-2.0/lib mod_perl.pm
dougm 2003/01/10 20:17:58
Modified:.Changes
lib mod_perl.pm
Log:
bump version
Revision ChangesPath
1.97 +2 -0 modperl-2.0/Changes
Index: Changes
===
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- Changes 11 Jan 2003 04:14:55 - 1.96
+++ Changes 11 Jan 2003 04:17:58 - 1.97
@@ -8,6 +8,8 @@
=over 3
+=item 1.99_09-dev
+
=item 1.99_08 - January 10, 2003
Correct ModPerl::RegistryCooker to reset %INC, after compile for .pl
1.9 +1 -1 modperl-2.0/lib/mod_perl.pm
Index: mod_perl.pm
===
RCS file: /home/cvs/modperl-2.0/lib/mod_perl.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_perl.pm 27 Sep 2002 19:41:51 - 1.8
+++ mod_perl.pm 11 Jan 2003 04:17:58 - 1.9
@@ -4,7 +4,7 @@
use strict;
BEGIN {
-our $VERSION = "1.9908";
+our $VERSION = "1.9909";
}
1;
cvs commit: modperl-2.0 Changes STATUS
dougm 2003/01/10 20:14:55 Modified:.Changes STATUS Log: 1.99_08 Revision ChangesPath 1.96 +1 -1 modperl-2.0/Changes Index: Changes === RCS file: /home/cvs/modperl-2.0/Changes,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- Changes 11 Jan 2003 02:10:18 - 1.95 +++ Changes 11 Jan 2003 04:14:55 - 1.96 @@ -8,7 +8,7 @@ =over 3 -=item 1.99_08-dev +=item 1.99_08 - January 10, 2003 Correct ModPerl::RegistryCooker to reset %INC, after compile for .pl files which don't declare the package + add tests to check that [Stas] 1.32 +2 -2 modperl-2.0/STATUS Index: STATUS === RCS file: /home/cvs/modperl-2.0/STATUS,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- STATUS11 Jan 2003 02:09:30 - 1.31 +++ STATUS11 Jan 2003 04:14:55 - 1.32 @@ -4,7 +4,7 @@ Release: - 1.99_08-dev: In development + 1.99_08: Released Jan 10, 2003 1.99_07: Released Sep 27, 2002 1.99_06: Not released 1.99_05: Released Aug 20, 2002
cvs commit: modperl-2.0/lib/ModPerl Code.pm
dougm 2003/01/10 19:20:54
Modified:.Makefile.PL
lib/ModPerl Code.pm
Log:
reuse Makefile.PL $mod_perl::VERSION fixup
Revision ChangesPath
1.89 +2 -0 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Makefile.PL 15 Dec 2002 04:03:43 - 1.88
+++ Makefile.PL 11 Jan 2003 03:20:54 - 1.89
@@ -293,6 +293,8 @@
last if /^=item/;
}
close $fh;
+
+$build->{VERSION} = $VERSION;
}
sub perl_version_check {
1.89 +4 -3 modperl-2.0/lib/ModPerl/Code.pm
Index: Code.pm
===
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Code.pm 4 Sep 2002 17:10:14 - 1.88
+++ Code.pm 11 Jan 2003 03:20:54 - 1.89
@@ -433,9 +433,8 @@
sub generate_trace {
my($self, $h_fh) = @_;
-my $dev = '-dev'; #XXX parse Changes
-my $v = $mod_perl::VERSION;
-$v =~ s/(\d\d)(\d\d)$/$1 . '_' . $2 . $dev/e;
+my $v = $self->{build}->{VERSION};
+
print $h_fh qq(#define MP_VERSION_STRING "mod_perl/$v"\n);
my $i = 1;
@@ -667,6 +666,8 @@
sub generate {
my($self, $build) = @_;
+
+$self->{build} = $build;
for my $s (values %sources) {
for (qw(h c)) {
cvs commit: modperl-2.0 README
stas2003/01/10 18:13:57 Modified:.README Log: correct the URL to /docs Revision ChangesPath 1.10 +2 -2 modperl-2.0/README Index: README === RCS file: /home/cvs/modperl-2.0/README,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- README11 Jan 2003 02:07:02 - 1.9 +++ README11 Jan 2003 02:13:57 - 1.10 @@ -27,7 +27,7 @@ Documentation are available in docs/. Currently they don't get installed on 'make install'. Certain API documentation can be found in -docs/api/. The online version is at http://perl.apache.org/release/docs. +docs/api/. The online version is at http://perl.apache.org/docs/. *** Todo *** @@ -40,7 +40,7 @@ list by sending mail to [EMAIL PROTECTED] When reporting bugs please follow the instructions at: -http://perl.apache.org/release/docs/2.0/user/help/help.html#Reporting_Problems +http://perl.apache.org/docs/2.0/user/help/help.html#Reporting_Problems For announcements join the mod_perl announce list by sending mail to [EMAIL PROTECTED]
cvs commit: modperl-2.0 Changes
dougm 2003/01/10 18:10:18 Modified:.Changes Log: tmp disable of -lapr linking is not part of the release Revision ChangesPath 1.95 +0 -2 modperl-2.0/Changes Index: Changes === RCS file: /home/cvs/modperl-2.0/Changes,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- Changes 6 Jan 2003 10:42:38 - 1.94 +++ Changes 11 Jan 2003 02:10:18 - 1.95 @@ -118,8 +118,6 @@ naming scheme, such as libapr-0.so.0.9.2, only if apr-config and apu-config scripts exist. [Stas Bekman] -temporarily disable APR.pm's attempt to link against -lapr and -lapr-util - define IoTYPE_RDONLY/IoTYPE_WRONLY for perl-5.6.0 so the project compiles again under 5.6.0 [Stas Bekman]
cvs commit: modperl-2.0 STATUS
dougm 2003/01/10 18:09:30
Modified:.STATUS
Log:
stas fixed -lapr linking issues
Revision ChangesPath
1.31 +1 -5 modperl-2.0/STATUS
Index: STATUS
===
RCS file: /home/cvs/modperl-2.0/STATUS,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- STATUS1 Jan 2003 23:22:19 - 1.30
+++ STATUS11 Jan 2003 02:09:30 - 1.31
@@ -99,10 +99,6 @@
- Apache::CmdParms::{GETC,getline} needs compat mapping, similar to
what Apache::Directive->as_string does, but one char or line at a time
-* xs/APR/APR/Makefile.PL
- - linking against -lapr and -lapr-util to support new goofy apr version
-scheme and the old one and windows
-
* Quite a few people reported problems with TestHooks during 'make test'
- http://marc.theaimsgroup.com/?t=10298540558&r=1&w=2
cvs commit: modperl-2.0 README
dougm 2003/01/10 18:07:02 Modified:.README Log: we support 2.0.36+ company credits should be on the website. a few other tweaks. Revision ChangesPath 1.9 +13 -17modperl-2.0/README Index: README === RCS file: /home/cvs/modperl-2.0/README,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- README1 Jan 2003 04:10:49 - 1.8 +++ README11 Jan 2003 02:07:02 - 1.9 @@ -3,15 +3,14 @@ *** Prerequisites *** Apache: - this version of mod_perl works with Apache versions 2.0.39 - - 2.0.43. Older Apache versions aren't supported. Newer Apache version - may not work with this version of mod_perl, but only with the cvs - version which can be obtained from: + This version of mod_perl works with Apache versions 2.0.36 - + 2.0.43. Newer Apache versions may work with this version of mod_perl. + If not, the the cvs version likely will, which can be obtained from: http://perl.apache.org/download/source.html#2_0_Development_Source_Distribution Perl: - version 5.6.1 or higher is required. mod_perl builds with 5.6.0, - but it's likely that you will have problems using it. + Version 5.6.1 or higher is required. mod_perl builds with 5.6.0, + but is not supported if you have problems using it. Perl version 5.8.0 is required for threaded MPMs. @@ -26,22 +25,21 @@ *** Documentation *** -Documentation are available in /docs. Currently they don't get +Documentation are available in docs/. Currently they don't get installed on 'make install'. Certain API documentation can be found in -/docs/api/. the online version is at -http://perl.apache.org/release/docs). +docs/api/. The online version is at http://perl.apache.org/release/docs. *** Todo *** mod_perl-2.0-tobe is not 100% feature complete with the 1.xx version. -See the todo/ directory for what remains to be done. +See the STATUS file and todo/ directory for what remains to be done. *** Support *** For comments, questions, bug-reports, etc., join the mod_perl users list by sending mail to [EMAIL PROTECTED] -when reporting bugs please follow the instructions at: +When reporting bugs please follow the instructions at: http://perl.apache.org/release/docs/2.0/user/help/help.html#Reporting_Problems For announcements join the mod_perl announce list by sending mail to @@ -49,11 +47,9 @@ *** Developers *** -mod_perl-2.0 was designed and written by Doug MacEachern, with -contributions from many others (see the CREDITS and Changes files). +Development discussion takes place on [EMAIL PROTECTED] -Doug's mod_perl-2.0 development time is sponsored by -Covalent Technologies: http://www.covalent.net/ +*** Authors *** -Stas Bekman's mod_perl-2.0 development time is sponsored by -TicketMaster: http://www.ticketmaster.com/ \ No newline at end of file +mod_perl-2.0 was designed and written by Doug MacEachern, with +contributions from many others (see the CREDITS and Changes files).
cvs commit: modperl-2.0/lib/ModPerl TestRun.pm
dougm 2003/01/10 17:54:44
Modified:lib/ModPerl TestRun.pm
Log:
ask super class if we should_load_module for anything other than mod_perl.c
Revision ChangesPath
1.8 +1 -1 modperl-2.0/lib/ModPerl/TestRun.pm
Index: TestRun.pm
===
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/TestRun.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestRun.pm2 Dec 2002 16:22:09 - 1.7
+++ TestRun.pm11 Jan 2003 01:54:44 - 1.8
@@ -19,7 +19,7 @@
sub should_load_module {
my($self, $name) = @_;
-$name eq 'mod_perl.c' ? 0 : 1;
+$name eq 'mod_perl.c' ? 0 : $self->SUPER::should_load_module($name);
}
1;
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 2003/01/10 16:02:17
Modified:src/modules/perl modperl_util.c modperl_util.h
xs/Apache/RequestUtil Apache__RequestUtil.h
xs/tables/current/ModPerl FunctionTable.pm
Log:
sv_str_header needs to be passed the current aTHX to avoid a pile of
calls to the expensive dTHX; in $r->as_string. also needed to
s/sv_catpvf/Perl_sv_catpvf for the -DPERL_CORE optimization.
have made sv_str_header private to Apache__RequestUtil.h in the
process, as the usage is ugly with THX; can re-{think,expose} later if
it turns out to be needed elsewhere.
Revision ChangesPath
1.50 +0 -7 modperl-2.0/src/modules/perl/modperl_util.c
Index: modperl_util.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- modperl_util.c6 Dec 2002 16:19:36 - 1.49
+++ modperl_util.c11 Jan 2003 00:02:16 - 1.50
@@ -615,10 +615,3 @@
return rv;
}
-int modperl_sv_str_header(void *arg, const char *k, const char *v)
-{
-SV *sv = (SV*)arg;
-sv_catpvf(sv, "%s: %s\n", k, v);
-return 1;
-}
-
1.37 +0 -2 modperl-2.0/src/modules/perl/modperl_util.h
Index: modperl_util.h
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- modperl_util.h6 Dec 2002 16:19:36 - 1.36
+++ modperl_util.h11 Jan 2003 00:02:16 - 1.37
@@ -118,7 +118,5 @@
MP_INLINE int modperl_perl_module_loaded(pTHX_ const char *name);
SV *modperl_perl_gensym(pTHX_ char *pack);
-
-int modperl_sv_str_header(void *arg, const char *k, const char *v);
#endif /* MODPERL_UTIL_H */
1.15 +26 -8 modperl-2.0/xs/Apache/RequestUtil/Apache__RequestUtil.h
Index: Apache__RequestUtil.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestUtil/Apache__RequestUtil.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Apache__RequestUtil.h 10 Jan 2003 23:32:33 - 1.14
+++ Apache__RequestUtil.h 11 Jan 2003 00:02:16 - 1.15
@@ -215,25 +215,43 @@
return dcfg->location;
}
+typedef struct {
+PerlInterpreter *perl;
+SV *sv;
+} sv_str_header_t;
+
+static int sv_str_header(void *arg, const char *k, const char *v)
+{
+sv_str_header_t *svh = (sv_str_header_t *)arg;
+dTHXa(svh->perl);
+Perl_sv_catpvf(aTHX_ svh->sv, "%s: %s\n", k, v);
+return 1;
+}
+
static MP_INLINE
SV *mpxs_Apache__RequestRec_as_string(pTHX_ request_rec *r)
{
-SV *retval = newSVpv(r->the_request, 0);
+sv_str_header_t svh;
+#ifdef USE_ITHREADS
+svh.perl = aTHX;
+#endif
+
+svh.sv = newSVpv(r->the_request, 0);
-sv_catpvn(retval, "\n", 1);
+sv_catpvn(svh.sv, "\n", 1);
apr_table_do((int (*) (void *, const char *, const char *))
- modperl_sv_str_header, (void *) retval, r->headers_in, NULL);
+ sv_str_header, (void *) &svh, r->headers_in, NULL);
-Perl_sv_catpvf(aTHX_ retval, "\n%s %s\n", r->protocol, r->status_line);
+Perl_sv_catpvf(aTHX_ svh.sv, "\n%s %s\n", r->protocol, r->status_line);
apr_table_do((int (*) (void *, const char *, const char *))
- modperl_sv_str_header, (void *) retval, r->headers_out, NULL);
+ sv_str_header, (void *) &svh, r->headers_out, NULL);
apr_table_do((int (*) (void *, const char *, const char *))
- modperl_sv_str_header, (void *) retval, r->err_headers_out, NULL);
+ sv_str_header, (void *) &svh, r->err_headers_out, NULL);
-sv_catpvn(retval, "\n", 1);
+sv_catpvn(svh.sv, "\n", 1);
-return retval;
+return svh.sv;
}
1.90 +0 -18 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===
RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- FunctionTable.pm 12 Dec 2002 10:05:08 - 1.89
+++ FunctionTable.pm 11 Jan 2003 00:02:16 - 1.90
@@ -3831,24 +3831,6 @@
]
},
{
-'return_type' => 'int',
-'name' => 'modperl_sv_str_header',
-'args' => [
- {
-'type' => 'void *',
-'name' => 'arg'
- },
- {
-'type' => 'const char *',
-'name' => 'k'
- },
- {
-'type' => 'const char *',
-
cvs commit: modperl-2.0/xs/Apache/RequestUtil Apache__RequestUtil.h
dougm 2003/01/10 15:32:33 Modified:xs/Apache/RequestUtil Apache__RequestUtil.h Log: s/sv_catpvf/Perl_sv_catpvf/ required for -DPERL_CORE optimization Revision ChangesPath 1.14 +1 -1 modperl-2.0/xs/Apache/RequestUtil/Apache__RequestUtil.h Index: Apache__RequestUtil.h === RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestUtil/Apache__RequestUtil.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Apache__RequestUtil.h 6 Dec 2002 16:19:36 - 1.13 +++ Apache__RequestUtil.h 10 Jan 2003 23:32:33 - 1.14 @@ -225,7 +225,7 @@ apr_table_do((int (*) (void *, const char *, const char *)) modperl_sv_str_header, (void *) retval, r->headers_in, NULL); -sv_catpvf(retval, "\n%s %s\n", r->protocol, r->status_line); +Perl_sv_catpvf(aTHX_ retval, "\n%s %s\n", r->protocol, r->status_line); apr_table_do((int (*) (void *, const char *, const char *)) modperl_sv_str_header, (void *) retval, r->headers_out, NULL);
cvs commit: modperl-2.0/src/modules/perl modperl_apache_includes.h
dougm 2003/01/10 15:26:03 Modified:src/modules/perl modperl_apache_includes.h Log: apr_poll.h and APR_POLL* constant move is recentish; provide support for older versions Revision ChangesPath 1.19 +6 -0 modperl-2.0/src/modules/perl/modperl_apache_includes.h Index: modperl_apache_includes.h === RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_apache_includes.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- modperl_apache_includes.h 14 Nov 2002 04:23:55 - 1.18 +++ modperl_apache_includes.h 10 Jan 2003 23:26:03 - 1.19 @@ -19,7 +19,13 @@ #include "http_vhost.h" #include "ap_mpm.h" +#ifndef APR_POLLIN +/* + * apr_poll.h introduced around 2.0.40 + * APR_POLL* constants moved here around 2.0.44 + */ #include "apr_poll.h" +#endif #include "apr_lib.h" #include "apr_strings.h" #include "apr_uri.h"
