[bknr-cvs] edi changed trunk/thirdparty/flexi-streams/

[BKNR Commits]

Revision: 3735
Author: edi
URL: http://bknr.net/trac/changeset/3735

Update to 1.0.7

U   trunk/thirdparty/flexi-streams/CHANGELOG
U   trunk/thirdparty/flexi-streams/decode.lisp
U   trunk/thirdparty/flexi-streams/doc/index.html
U   trunk/thirdparty/flexi-streams/flexi-streams.asd

Modified: trunk/thirdparty/flexi-streams/CHANGELOG
===================================================================
--- trunk/thirdparty/flexi-streams/CHANGELOG	2008-08-26 00:44:15 UTC (rev 3734)
+++ trunk/thirdparty/flexi-streams/CHANGELOG	2008-08-26 11:01:26 UTC (rev 3735)
@@ -1,3 +1,7 @@
+Version 1.0.7
+2008-08-26
+Don't read a second time if the first READ-SEQUENCE already reached EOF (Drakma bug report by Stas Boukarev)
+
 Version 1.0.6
 2008-08-25
 Don't use a reserve if we can't rewind the stream (Drakma bug report by Stas Boukarev)

Modified: trunk/thirdparty/flexi-streams/decode.lisp
===================================================================
--- trunk/thirdparty/flexi-streams/decode.lisp	2008-08-26 00:44:15 UTC (rev 3734)
+++ trunk/thirdparty/flexi-streams/decode.lisp	2008-08-26 11:01:26 UTC (rev 3735)
@@ -1,5 +1,5 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: FLEXI-STREAMS; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/flexi-streams/decode.lisp,v 1.34 2008/08/26 00:38:06 edi Exp $
+;;; $Header: /usr/local/cvsrep/flexi-streams/decode.lisp,v 1.35 2008/08/26 10:59:22 edi Exp $
 
 ;;; Copyright (c) 2005-2008, Dr. Edmund Weitz.  All rights reserved.
 
@@ -92,6 +92,7 @@
                   (buffer-pos 0)
                   (buffer-end 0)
                   (index start)
+                  donep
                   ;; whether we will later be able to rewind the stream if
                   ;; needed (to get rid of unused octets in the buffer)
                   (can-rewind-p (maybe-rewind stream 0))
@@ -120,6 +121,8 @@
                     (fill-buffer (end)
                       "Tries to fill the buffer from BUFFER-POS to END and
 returns NIL if the buffer doesn't contain any new data."
+                      (when donep
+                        (return-from fill-buffer nil))
                       ;; put data from octet stack into buffer if there is any
                       (loop
                        (when (>= buffer-pos end)
@@ -132,6 +135,9 @@
                       (setq buffer-end (read-sequence buffer stream
                                                       :start buffer-pos
                                                       :end end))
+                      ;; we reached EOF, so we remember this
+                      (when (< buffer-end end)
+                        (setq donep t))
                       ;; BUFFER-POS is only greater than zero if the buffer
                       ;; already contains unread data from the octet stack
                       ;; (see below), so we test for ZEROP here and do /not/

Modified: trunk/thirdparty/flexi-streams/doc/index.html
===================================================================
--- trunk/thirdparty/flexi-streams/doc/index.html	2008-08-26 00:44:15 UTC (rev 3734)
+++ trunk/thirdparty/flexi-streams/doc/index.html	2008-08-26 11:01:26 UTC (rev 3735)
@@ -229,7 +229,7 @@
 <p>
 FLEXI-STREAMS together with this documentation can be downloaded from <a
 href="http://weitz.de/files/flexi-streams.tar.gz">http://weitz.de/files/flexi-streams.tar.gz</a>. The
-current version is 1.0.6.
+current version is 1.0.7.
 <p>
 Before you install FLEXI-STREAMS you first need to
 install the <a
@@ -1114,7 +1114,7 @@
 his work on making FLEXI-STREAMS faster.
 
 <p>
-$Header: /usr/local/cvsrep/flexi-streams/doc/index.html,v 1.125 2008/08/26 00:38:08 edi Exp $
+$Header: /usr/local/cvsrep/flexi-streams/doc/index.html,v 1.126 2008/08/26 10:59:24 edi Exp $
 <p><a href="http://weitz.de/index.html">BACK TO MY HOMEPAGE</a>
 
 </body>

Modified: trunk/thirdparty/flexi-streams/flexi-streams.asd
===================================================================
--- trunk/thirdparty/flexi-streams/flexi-streams.asd	2008-08-26 00:44:15 UTC (rev 3734)
+++ trunk/thirdparty/flexi-streams/flexi-streams.asd	2008-08-26 11:01:26 UTC (rev 3735)
@@ -1,5 +1,5 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/flexi-streams/flexi-streams.asd,v 1.78 2008/08/26 00:38:06 edi Exp $
+;;; $Header: /usr/local/cvsrep/flexi-streams/flexi-streams.asd,v 1.79 2008/08/26 10:59:22 edi Exp $
 
 ;;; Copyright (c) 2005-2008, Dr. Edmund Weitz.  All rights reserved.
 
@@ -35,7 +35,7 @@
 (in-package :flexi-streams-system)
 
 (defsystem :flexi-streams
-  :version "1.0.6"
+  :version "1.0.7"
   :serial t
   :components ((:file "packages")
                (:file "mapping")