[interchange-cvs] interchange - heins modified code/SystemTag/deliver.coretag

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2003-07-26 21:59:12 GMT
Modified:  code/SystemTag deliver.coretag
Log:
* Allow set of status header even when not doing redirect.

* Fix double-setting of Content-Type header, use proper header
  setting routine.

Revision  Changes    Path
1.5       +5 -5      interchange/code/SystemTag/deliver.coretag


rev 1.5, prev_rev 1.4
Index: deliver.coretag
===================================================================
RCS file: /var/cvs/interchange/code/SystemTag/deliver.coretag,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- deliver.coretag	14 Jan 2003 02:25:50 -0000	1.4
+++ deliver.coretag	26 Jul 2003 21:59:12 -0000	1.5
@@ -1,7 +1,7 @@
 UserTag deliver Order type
 UserTag deliver HasEndTag
 UserTag deliver addAttr
-UserTag deliver Version $Revision: 1.4 $
+UserTag deliver Version $Revision: 1.5 $
 UserTag deliver Routine <<EOR
 sub {
 	my ($type, $opt, $body) = @_;
@@ -17,7 +17,7 @@
 	elsif(ref $body) {
 		$out = $body;
 	}
-	elsif($body) {
+	elsif(length $body) {
 		$out = \$body;
 	}
 
@@ -46,6 +46,9 @@
 	}
 
 	$type ||= 'application/octet-stream';
+
+	$Tag->tag( { op => 'header', name => 'Status', content => $opt->{status} } )
+		if $opt->{status};
 	$Tag->tag( { op => 'header', name => 'Content-Type', content => $type } );
 
 	if($opt->{get_encrypted}) {
@@ -57,9 +60,6 @@
 		$$out =~ s/(---+END PGP MESSAGE---+).*/$1\n/s;
 	}
 
-	$Vend::StatusLine = $Vend::StatusLine ? "$Vend::StatusLine\n" : '';
-	$Vend::StatusLine .=  "Content-Type: $type";
-	
 	if($opt->{extra_headers}) {
 		my @lines = grep /\S/, split /[\r\n]+/, $opt->{extra_headers};
 		for(@lines) {