[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] cvs: pecl /phar phar.c
From:       "Marcus Boerger" <helly () php ! net>
Date:       2006-02-28 14:44:22
Message-ID: cvshelly1141137862 () cvsserver
[Download RAW message or body]

helly		Tue Feb 28 14:44:22 2006 UTC

  Modified files:              
    /pecl/phar	phar.c 
  Log:
  - Need to set eof flag when inner stream has eof condition
  
http://cvs.php.net/viewcvs.cgi/pecl/phar/phar.c?r1=1.66&r2=1.67&diff_format=u
Index: pecl/phar/phar.c
diff -u pecl/phar/phar.c:1.66 pecl/phar/phar.c:1.67
--- pecl/phar/phar.c:1.66	Tue Feb 28 01:56:59 2006
+++ pecl/phar/phar.c	Tue Feb 28 14:44:22 2006
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: phar.c,v 1.66 2006/02/28 01:56:59 helly Exp $ */
+/* $Id: phar.c,v 1.67 2006/02/28 14:44:22 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1028,7 +1028,13 @@
 {
 	phar_entry_data *data = (phar_entry_data *)stream->abstract;
 
-	return php_stream_read(data->fp, buf, count);
+	size_t got = php_stream_read(data->fp, buf, count);
+	
+	if (data->fp->eof) {
+		stream->eof = 1;
+	}
+	
+	return got;
 }
 /* }}} */
 
@@ -1730,7 +1736,7 @@
 	php_info_print_table_start();
 	php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
 	php_info_print_table_row(2, "Phar API version", PHAR_VERSION_STR);
-	php_info_print_table_row(2, "CVS revision", "$Revision: 1.66 $");
+	php_info_print_table_row(2, "CVS revision", "$Revision: 1.67 $");
 	php_info_print_table_row(2, "gzip compression", 
 #if HAVE_ZLIB
 		"enabled");

-- 
PECL CVS Mailing List 
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]