Status: 
X-Status: 
X-Keywords: 
Return-Path: 
 <apreq-cvs-return-35-apmail-httpd-apreq-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-apreq-cvs-archive@httpd.apache.org
Received: (qmail 41710 invoked by uid 500); 18 May 2001 17:31:34 -0000
Mailing-List: contact apreq-cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Post: <mailto:apreq-cvs@httpd.apache.org>
List-Help: <mailto:apreq-cvs-help@httpd.apache.org>
List-Unsubscribe: <mailto:apreq-cvs-unsubscribe@httpd.apache.org>
List-Subscribe: <mailto:apreq-cvs-subscribe@httpd.apache.org>
Delivered-To: mailing list apreq-cvs@httpd.apache.org
Received: (qmail 41618 invoked by uid 1066); 18 May 2001 17:31:17 -0000
Date: 18 May 2001 17:31:17 -0000
Message-ID: <20010518173117.41617.qmail@apache.org>
From: dougm@apache.org
To: httpd-apreq-cvs@apache.org
Subject: cvs commit: httpd-apreq Changes

dougm       01/05/18 10:31:16

  Modified:    Request  Request.xs
               .        Changes
  Log:
  $r->upload can be set to another Apache::Upload instance
  
  Revision  Changes    Path
  1.14      +9 -2      httpd-apreq/Request/Request.xs
  
  Index: Request.xs
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/Request/Request.xs,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Request.xs	2001/04/03 19:21:37	1.13
  +++ Request.xs	2001/05/18 17:31:05	1.14
  @@ -335,16 +335,23 @@
       }
   
   void
  -ApacheRequest_upload(req, name=NULL)
  +ApacheRequest_upload(req, sv=Nullsv)
       Apache::Request req
  -    char *name
  +    SV *sv
   
       PREINIT:
       ApacheUpload *uptr;
   
       PPCODE:
  +    if (sv && SvOBJECT(sv) && sv_isa(sv, "Apache::Upload")) {
  +        req->upload = (ApacheUpload *)SvIV((SV*)SvRV(sv));
  +        XSRETURN_EMPTY;
  +    }
       ApacheRequest_parse(req);
       if (GIMME == G_SCALAR) {
  +        STRLEN n_a;
  +        char *name = sv ? SvPV(sv, n_a) : NULL;
  +
   	if (name) {
   	    uptr = ApacheUpload_find(req->upload, name);
   	    if (!uptr) {
  
  
  
  1.35      +3 -0      httpd-apreq/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/Changes,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Changes	2001/04/02 22:44:55	1.34
  +++ Changes	2001/05/18 17:31:12	1.35
  @@ -4,6 +4,9 @@
   
   =item 0.32_01 - ?
   
  +$r->upload can be set to another Apache::Upload instance [dougm]
  +based on patch from Dave LaMacchia <dml@topped-with-meat.com>
  +
   =item 0.32 - April 4, 2001
   
   fix $r->param( key => [ 0..9 ] ), convert to XS. [Joe Schaefer <joe@sunstarsys.com>]