apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr-util/buckets apr_buckets_pipe.c apr_buckets_socket.c
Date Sat, 29 Sep 2001 07:06:19 GMT
jerenkrantz    01/09/29 00:06:19

  Modified:    buckets  apr_buckets_pipe.c apr_buckets_socket.c
  Log:
  APR_EOF does not need to be returned when we are exhausted.
  
  The higher levels should be able to handle the case when the bucket
  automagically disappears and is replaced with an immortal bucket
  of length 0.  This is a success condition and should be treated as
  such.
  
  Revision  Changes    Path
  1.42      +0 -4      apr-util/buckets/apr_buckets_pipe.c
  
  Index: apr_buckets_pipe.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/apr_buckets_pipe.c,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- apr_buckets_pipe.c	2001/09/22 22:36:07	1.41
  +++ apr_buckets_pipe.c	2001/09/29 07:06:19	1.42
  @@ -110,10 +110,6 @@
           *str = a->data;
           if (rv == APR_EOF) {
               apr_file_close(p);
  -            if (block == APR_NONBLOCK_READ) {
  -                /* XXX: this is bogus, should return APR_SUCCESS */
  -                return APR_EOF;
  -            }
           }
       }
       return APR_SUCCESS;
  
  
  
  1.31      +0 -4      apr-util/buckets/apr_buckets_socket.c
  
  Index: apr_buckets_socket.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/apr_buckets_socket.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- apr_buckets_socket.c	2001/09/22 22:36:07	1.30
  +++ apr_buckets_socket.c	2001/09/29 07:06:19	1.31
  @@ -111,10 +111,6 @@
           free(buf);
           a = apr_bucket_immortal_make(a, "", 0);
           *str = a->data;
  -        if (rv == APR_EOF && block == APR_NONBLOCK_READ) {
  -            /* XXX: this is bogus... should return APR_SUCCESS */
  -            return APR_EOF;
  -        }
       }
       return APR_SUCCESS;
   }
  
  
  

Mime
View raw message