You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Jeff Trawick <tr...@attglobal.net> on 2001/08/02 18:58:47 UTC

Re: cvs commit: httpd-2.0/modules/filters mod_include.c

rbb@apache.org writes:

>   Index: mod_include.c
>   ===================================================================
>   RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
>   retrieving revision 1.118
>   retrieving revision 1.119
>   diff -u -r1.118 -r1.119
>   --- mod_include.c	2001/08/02 05:27:06	1.118
>   +++ mod_include.c	2001/08/02 16:35:22	1.119
>   @@ -2466,7 +2466,7 @@
>                                 (tmp_dptr != APR_BRIGADE_SENTINEL(*bb)));
>                    }
>    
>   -                return;
>   +                return APR_SUCCESS;

I was looking into these warnings a bit earlier today.  Isn't this an
error path?  Shouldn't we be returning the apr_status_t returned from
get_combined_directive()?

-- 
Jeff Trawick | trawick@attglobal.net | PGP public key at web site:
       http://www.geocities.com/SiliconValley/Park/9289/
             Born in Roswell... married an alien...

Re: cvs commit: httpd-2.0/modules/filters mod_include.c

Posted by Ryan Bloom <rb...@covalent.net>.
On Thursday 02 August 2001 09:58, Jeff Trawick wrote:
> rbb@apache.org writes:
> >   Index: mod_include.c
> >   ===================================================================
> >   RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
> >   retrieving revision 1.118
> >   retrieving revision 1.119
> >   diff -u -r1.118 -r1.119
> >   --- mod_include.c	2001/08/02 05:27:06	1.118
> >   +++ mod_include.c	2001/08/02 16:35:22	1.119
> >   @@ -2466,7 +2466,7 @@
> >                                 (tmp_dptr != APR_BRIGADE_SENTINEL(*bb)));
> >                    }
> >
> >   -                return;
> >   +                return APR_SUCCESS;
>
> I was looking into these warnings a bit earlier today.  Isn't this an
> error path?  Shouldn't we be returning the apr_status_t returned from
> get_combined_directive()?

Nope.  Two different types of errors.  Basically, if get_combined_directive fails, that just means
that the current SSI tag didn't succeed properly, it doesn't mean that the entire page failed.  We
are returning an error code at this point that says we aren't stopping sending the request.  If
one SSI tag failed, we have to keep going, because we aren't aborting the page transfer.

Ryan

_____________________________________________________________________________
Ryan Bloom                        	rbb@apache.org
Covalent Technologies			rbb@covalent.net
-----------------------------------------------------------------------------