httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Cliff Woolley <cliffwool...@yahoo.com>
Subject Re: cvs commit: httpd-2.0/server protocol.c
Date Fri, 06 Jul 2001 20:25:14 GMT
On 6 Jul 2001 stoddard@apache.org wrote:

> stoddard    01/07/06 12:49:50
>
>   Modified:    server   protocol.c
>   Log:
>   Grrr.. Cliff warned me about this.  APR should return APR_SUCCESS with
>   zero bytes read rather than APR_EOF. Will work on APR later...

All that needs to be done to apr-util is the following.  I haven't
committed it just because it will probably break Apache and I haven't had
a chance to try it and see what happens.

--Cliff


Index: apr_buckets_pipe.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_pipe.c,v
retrieving revision 1.36
diff -u -d -r1.36 apr_buckets_pipe.c
--- apr_buckets_pipe.c	2001/06/19 18:48:29	1.36
+++ apr_buckets_pipe.c	2001/07/06 20:18:51
@@ -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;
Index: apr_buckets_socket.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_socket.c,v
retrieving revision 1.25
diff -u -d -r1.25 apr_buckets_socket.c
--- apr_buckets_socket.c	2001/06/19 18:48:33	1.25
+++ apr_buckets_socket.c	2001/07/06 20:18:51
@@ -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;
 }



--------------------------------------------------------------
   Cliff Woolley
   cliffwoolley@yahoo.com
   Charlottesville, VA



Mime
View raw message