httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@covalent.net
Subject RE: cvs commit: apache-2.0/src/main iol_file.c
Date Sun, 28 May 2000 00:37:43 GMT


Fine, I'll back it out and fix it with a no-timed read later tonight.

Ryan

On Sun, 28 May 2000, dean gaudet wrote:

> hi,
> 
> i haven't read apache-cvs in a while, but am vetoing the patch which
> introduced check_read.
> 
> first of all a minor nit: iol.h contains documentation, i know this is odd
> for apache header files, but it would be nice if folks making addition to
> this header file took a few moments to document additions.  we have to
> start somewhere with documentation.
> 
> then the major nit:  check_read is redundant.  the same thing can be
> achieved by setting the timeout to 0 before doing a read.  i showed this
> when i gave suggested saferead code for 2.0.
> 
> -dean
> 
> On Sat, 27 May 2000, William A. Rowe, Jr. wrote:
> 
> > > > wrowe       00/05/27 00:06:28
> > > > 
> > > >   Modified:    src/main iol_file.c
> > > >   Log:
> > > >     A workaround since we haven't implemented the will_block 
> > > > stuff in Win32.
> > > >   
> > > >   Revision  Changes    Path
> > > >   1.18      +4 -0      apache-2.0/src/main/iol_file.c
> > > >   
> > > >   Index: iol_file.c
> > > >   
> > > ===================================================================
> > > >   RCS file: /home/cvs/apache-2.0/src/main/iol_file.c,v
> > > >   retrieving revision 1.17
> > > >   retrieving revision 1.18
> > > >   diff -u -r1.17 -r1.18
> > > >   --- iol_file.c	2000/05/24 22:27:16	1.17
> > > >   +++ iol_file.c	2000/05/27 07:06:27	1.18
> > > >   @@ -138,7 +138,11 @@
> > > >        file_getopt,
> > > >        NULL,
> > > >        NULL,
> > > >   +#ifdef WIN32
> > > >   +    NULL
> > > >   +#else
> > > >        file_check_read
> > > >   +#endif
> > > >    };
> > > >    
> > > >    /*
> > > 
> > > That's it for tonight... I'm not 100% on this patch, so I 
> > > thought I would
> > > point it out if someone else wants to take a look at a better 
> > > solution.
> > 
> > 
> > And if you are looking at that fix... is this patch appropriate
> > as well?
> > 
> > Index: os/win32/iol_socket.c
> > ===================================================================
> > RCS file: /home/cvs/apache-2.0/src/os/win32/iol_socket.c,v
> > retrieving revision 1.15
> > diff -u -r1.15 iol_socket.c
> > --- os/win32/iol_socket.c	2000/04/16 16:59:41	1.15
> > +++ os/win32/iol_socket.c	2000/05/27 17:11:05
> > @@ -144,7 +144,8 @@
> >      win32_setopt,
> >      win32_getopt,
> >      win32_sendfile,
> > -    win32_shutdown
> > +    win32_shutdown,
> > +    NULL             /* check_read */
> >  };
> >  
> >  ap_iol *win32_attach_socket(ap_pool_t *p, ap_socket_t *sock)
> > 
> 
> 


_______________________________________________________________________________
Ryan Bloom                        	rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------


Mime
View raw message