Re: cvs commit: httpd-2.0/modules/experimental cache_storage.c cache_util.c mod_mem_cache.c mod_cache.c mod_cache.h

[Ian Holsman <ia...@cnet.com>]

On Thu, 2001-08-23 at 11:07, Jeff Trawick wrote:
> stoddard@apache.org writes:
apr_uri_components got renamed to apr_uri_t

> 
> >   Index: mod_cache.c
> >   ===================================================================
> >   RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_cache.c,v
> >   retrieving revision 1.6
> >   retrieving revision 1.7
> >   diff -u -r1.6 -r1.7
> >   --- mod_cache.c	2001/06/09 04:21:27	1.6
> >   +++ mod_cache.c	2001/08/23 14:15:00	1.7
> >   @@ -56,69 +56,750 @@
> >     * University of Illinois, Urbana-Champaign.
> >     */
> >    
> >   -#include "apr_strings.h"
> >   -#include "ap_config.h"
> >   -#include "util_filter.h"
> >   -#include "httpd.h"
> >   -#include "http_config.h"
> >   -#include "http_request.h"
> >   -#include "http_core.h"
> >   -#include "http_protocol.h"
> >   -#include "http_log.h"
> >   -#include "http_main.h"
> >   -#include "util_script.h"
> >   -#include "http_core.h" 
> >   +#define CORE_PRIVATE
> >   +
> >    #include "mod_cache.h"
> >   -#include "apr_hooks.h"
> >   +
> >   +module AP_MODULE_DECLARE_DATA tcache_module;
> >   +
> >   +
> >   +
> >   +/* -------------------------------------------------------------- */
> >    
> >   -AP_DECLARE_DATA module cache_module;
> >    
> >   -APR_HOOK_STRUCT(
> >   -            APR_HOOK_LINK(serve_cache)
> >   -            APR_HOOK_LINK(store_cache)
> >   -)
> >    
> >   -AP_IMPLEMENT_HOOK_RUN_FIRST(int,serve_cache,(request_rec *r),(r),DECLINED)
> >   -AP_IMPLEMENT_HOOK_RUN_FIRST(int,store_cache,(request_rec *r, apr_bucket_brigade *bb, void **cf),
> >   -                            (r, bb, cf),DECLINED)
> >   +/*
> >   + * CACHE handler
> >   + * -------------
> >   + *
> >   + * Can we deliver this request from the cache?
> >   + * If yes:
> >   + *   deliver the content by installing the CACHE_OUT filter.
> >   + * If no:
> >   + *   check whether we're allowed to try cache it
> >   + *   If yes:
> >   + *     add CACHE_IN filter
> >   + *   If No:
> >   + *     oh well.
> >   + */
> >    
> >   -static int cache_handler(request_rec *r)
> >   +int ap_url_cache_handler(request_rec *r);
> >   +
> >   +int ap_url_cache_handler(request_rec *r)
> >    {
> >   -    /* I am sure there is common error checking that belongs in this function,
> >   -     * but I'm not sure what it is.
> >   +    apr_status_t rv;
> >   +    const char *cc_in;
> >   +    apr_pool_t *p = r->pool;
> >   +    apr_uri_components uri = r->parsed_uri;
> 
> What in the world is apr_uri_components?  Should I be searching in
> files other than '*.c' and '*.h' to find it?  gcc can't find it
> either.
> 
> make[3]: Entering directory `/home/trawick/apache/httpd-2.0/modules/experimental'
> /bin/sh /home/trawick/apache/httpd-2.0/srclib/apr/libtool --silent --mode=compile gcc  -g -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DNO_DBM_REWRITEMAP  -DAPACHE_XLATE -Wall  -DLINUX=2 -D_REENTRANT -DAP_DEBUG -DAP_HAVE_DESIGNATED_INITIALIZER   -I. -I/home/trawick/apache/httpd-2.0/os/unix -I/home/trawick/apache/httpd-2.0/server/mpm/prefork -I/home/trawick/apache/httpd-2.0/modules/http -I/home/trawick/apache/httpd-2.0/include -I/home/trawick/apache/httpd-2.0/srclib/apr/include -I/home/trawick/apache/httpd-2.0/srclib/apr-util/include -I/home/trawick/apache/httpd-2.0/modules/dav/main  -c mod_cache.c && touch mod_cache.lo
> mod_cache.c: In function `ap_url_cache_handler':
> mod_cache.c:93: `apr_uri_components' undeclared (first use in this function)
> mod_cache.c:93: (Each undeclared identifier is reported only once
> mod_cache.c:93: for each function it appears in.)
> mod_cache.c:93: parse error before `uri'
> mod_cache.c:95: `uri' undeclared (first use in this function)
> mod_cache.c:92: warning: unused variable `p'
> mod_cache.c: In function `ap_cache_out_filter':
> mod_cache.c:276: warning: unused variable `info'
> mod_cache.c: In function `ap_cache_in_filter':
> mod_cache.c:344: `apr_uri_components' undeclared (first use in this function)
> mod_cache.c:344: parse error before `uri'
> mod_cache.c:348: warning: unused variable `out'
> mod_cache.c:347: warning: unused variable `e'
> make[3]: *** [mod_cache.lo] Error 1
> make[3]: Leaving directory `/home/trawick/apache/httpd-2.0/modules/experimental'
> make[2]: *** [all-recursive] Error 1
> make[2]: Leaving directory `/home/trawick/apache/httpd-2.0/modules/experimental'
> make[1]: *** [all-recursive] Error 1
> make[1]: Leaving directory `/home/trawick/apache/httpd-2.0/modules'
> 
-- 
Ian Holsman          IanH@cnet.com
Performance Measurement & Analysis
CNET Networks   -   (415) 364-8608

Re: cvs commit: httpd-2.0/modules/experimental cache_storage.ccache_util.c mod_mem_cache.c mod_cache.c mod_cache.h

[Bill Stoddard <st...@raleigh.ibm.com>]

----- 
> On Thu, 2001-08-23 at 11:07, Jeff Trawick wrote:
> > stoddard@apache.org writes:
> apr_uri_components got renamed to apr_uri_t
> 

Ahh... I was developing off a slightly stale development tree. Updating now...

Bill