Author: joes
Date: Wed Nov 24 16:30:05 2004
New Revision: 106523
URL: http://svn.apache.org/viewcvs?view=rev&rev=106523
Log:
Allow ctors for Apache::Cookie, Apache::Cookie::Jar
and Apache:::Request to accept Apache::Request objects
(instead of requiring an Apache::RequestRec object).
This thread details the bug
http://thread.gmane.org/gmane.comp.apache.mod-perl/15727
Modified:
httpd/apreq/trunk/CHANGES
httpd/apreq/trunk/glue/perl/t/response/TestApReq/inherit.pm
httpd/apreq/trunk/glue/perl/xsbuilder/Apache/Cookie/Cookie_pm
httpd/apreq/trunk/glue/perl/xsbuilder/Apache/Request/Request_pm
Modified: httpd/apreq/trunk/CHANGES
Url:
http://svn.apache.org/viewcvs/httpd/apreq/trunk/CHANGES?view=diff&rev=106523&p1=httpd/apreq/trunk/CHANGES&r1=106522&p2=httpd/apreq/trunk/CHANGES&r2=106523
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Wed Nov 24 16:30:05 2004
@@ -5,6 +5,13 @@
@section v2_05 Changes with libapreq2-2.05
+- Perl API [joes]
+ Allow ctors for Apache::Cookie, Apache::Cookie::Jar
+ and Apache:::Request to accept Apache::Request objects
+ (instead of requiring an Apache::RequestRec object).
+ This thread details the bug
+ http://thread.gmane.org/gmane.comp.apache.mod-perl/15727
+
- C API [Bojan Smojver]
Bake cookies with err_headers_out so they are
sent on non-2xx server responses (ie. a 304 redirect).
Modified: httpd/apreq/trunk/glue/perl/t/response/TestApReq/inherit.pm
Url:
http://svn.apache.org/viewcvs/httpd/apreq/trunk/glue/perl/t/response/TestApReq/inherit.pm?view=diff&rev=106523&p1=httpd/apreq/trunk/glue/perl/t/response/TestApReq/inherit.pm&r1=106522&p2=httpd/apreq/trunk/glue/perl/t/response/TestApReq/inherit.pm&r2=106523
==============================================================================
--- httpd/apreq/trunk/glue/perl/t/response/TestApReq/inherit.pm (original)
+++ httpd/apreq/trunk/glue/perl/t/response/TestApReq/inherit.pm Wed Nov 24
16:30:05 2004
@@ -12,7 +12,9 @@
$r = __PACKAGE__->new($r); # tickles refcnt bug in apreq-1
die "Wrong package: ", ref $r unless $r->isa('TestApReq::inherit');
$r->content_type('text/plain');
- my $j = Apache::Cookie->jar($r->env);
+ # look for segfault when $r->isa("Apache::Request")
+ my $j = Apache::Cookie::Jar->new($r);
+
my $req = bless { r => $r, j => $j };
$req->printf("method => %s\n", $req->method);
$req->printf("cookie => %s\n", $req->cookies("apache")->as_string);
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/Apache/Cookie/Cookie_pm
Url:
http://svn.apache.org/viewcvs/httpd/apreq/trunk/glue/perl/xsbuilder/Apache/Cookie/Cookie_pm?view=diff&rev=106523&p1=httpd/apreq/trunk/glue/perl/xsbuilder/Apache/Cookie/Cookie_pm&r1=106522&p2=httpd/apreq/trunk/glue/perl/xsbuilder/Apache/Cookie/Cookie_pm&r2=106523
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/Apache/Cookie/Cookie_pm
(original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/Apache/Cookie/Cookie_pm Wed Nov
24 16:30:05 2004
@@ -23,6 +23,7 @@
sub new {
my $class = shift;
my $env = shift;
+ $env = $env->env if $env->isa("Apache::Request");
my $jar = $class->jar($env);
$jar->config(@_) if @_;
return $jar;
@@ -40,6 +41,7 @@
sub new {
my ($class, $env, %attrs) = @_;
+ $env = $env->env if $env->isa("Apache::Request");
my $name = delete $attrs{name};
my $value = delete $attrs{value};
$name = delete $attrs{-name} unless defined $name;
@@ -67,6 +69,7 @@
die $usage;
}
}
+ $env = $env->env if $env->isa("Apache::Request");
my $jar = $class->jar($env, @_);
return wantarray ? %{(scalar $jar->cookies) || {}} : $jar->cookies;
}
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/Apache/Request/Request_pm
Url:
http://svn.apache.org/viewcvs/httpd/apreq/trunk/glue/perl/xsbuilder/Apache/Request/Request_pm?view=diff&rev=106523&p1=httpd/apreq/trunk/glue/perl/xsbuilder/Apache/Request/Request_pm&r1=106522&p2=httpd/apreq/trunk/glue/perl/xsbuilder/Apache/Request/Request_pm&r2=106523
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/Apache/Request/Request_pm
(original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/Apache/Request/Request_pm Wed Nov
24 16:30:05 2004
@@ -22,6 +22,7 @@
sub new {
my $class = shift;
my $env = shift;
+ $env = $env->env if $env->isa("Apache::Request");
my $req = $class->request($env);
$req->config(@_);
return $req;
