svn commit: r171247 - in /httpd/apreq/trunk: CHANGES glue/perl/t/response/TestApReq/request.pm glue/perl/xsbuilder/APR/Request/APR__Request.h

[jo...@apache.org]

Author: joes
Date: Sat May 21 13:15:19 2005
New Revision: 171247

URL: http://svn.apache.org/viewcvs?rev=171247&view=rev
Log:
Drop HOOK_DATA and redundant upload_hook args.

Modified:
    httpd/apreq/trunk/CHANGES
    httpd/apreq/trunk/glue/perl/t/response/TestApReq/request.pm
    httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/APR__Request.h

Modified: httpd/apreq/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/CHANGES?rev=171247&r1=171246&r2=171247&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Sat May 21 13:15:19 2005
@@ -6,6 +6,10 @@
 
 
 - Perl API [joes]
+  Drop support for Apache2::Request::new's HOOK_DATA.
+  UPLOAD_HOOK now takes only two arguments: ($upload, $data).
+
+- Perl API [joes]
   Drop support for Apache2::Cookie::Jar::new's VALUE_CLASS.
   2.05-dev broke that API, and it's not worth trying to fix.
   People who need that should use APR::Request::Cookie::Table's

Modified: httpd/apreq/trunk/glue/perl/t/response/TestApReq/request.pm
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/glue/perl/t/response/TestApReq/request.pm?rev=171247&r1=171246&r2=171247&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/t/response/TestApReq/request.pm (original)
+++ httpd/apreq/trunk/glue/perl/t/response/TestApReq/request.pm Sat May 21 13:15:19 2005
@@ -17,11 +17,8 @@
 my $data;
 
 sub hook {
-    my ($upload, $buffer, $len) = @_;
+    my ($upload, $buffer) = @_;
     warn "$upload saw EOS" and return unless defined $buffer;
-
-    die "BAD UPLOAD ARGS" unless length $buffer == $len;
-    warn "$upload saw $buffer";
     $data .= $buffer;
 }
 
@@ -29,10 +26,10 @@
     my $r = shift;
     my $temp_dir =
         File::Spec->catfile(Apache2::ServerUtil::server_root, 'logs'); 
-    my $req = Apache2::Request->new($r);#, POST_MAX => 1_000_000,
-                                        #TEMP_DIR => $temp_dir);
-    $req->temp_dir($temp_dir);
-    $req->read_limit(1_000_000);
+    my $req = Apache2::Request->new($r, POST_MAX => 1_000_000,
+                                        TEMP_DIR => $temp_dir);
+#    $req->temp_dir($temp_dir);
+#    $req->read_limit(1_000_000);
     $req->content_type('text/plain');
 
     my $test  = $req->APR::Request::args('test');

Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/APR__Request.h
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/APR__Request.h?rev=171247&r1=171246&r2=171247&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/APR__Request.h (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/APR__Request.h Sat May 21 13:15:19 2005
@@ -370,18 +370,15 @@
 {
     dSP;
     SV *sv = ctx->bucket_data;
-    STRLEN len = SvPOK(sv) ? SvCUR(sv) : 0;
 
     PUSHMARK(SP);
-    EXTEND(SP, 3);
+    EXTEND(SP, 2);
     ENTER;
     SAVETMPS;
 
     sv = apreq_xs_param2sv(aTHX_ upload, PARAM_CLASS, ctx->parent);
     PUSHs(sv_2mortal(sv));
     PUSHs(ctx->bucket_data);
-    PUSHs(sv_2mortal(newSViv(len)));
-
     PUTBACK;
     perl_call_sv(ctx->hook, G_EVAL|G_DISCARD);
     FREETMPS;