cvs commit: httpd-apreq-2/env mod_apreq.c

[joes]

joes        2003/10/31 12:50:19

  Modified:    env      mod_apreq.c
  Log:
  Put apreq_request call back in filter to allow filter to be invoked from 
AddInputFilter server config
  
  Revision  Changes    Path
  1.36      +5 -3      httpd-apreq-2/env/mod_apreq.c
  
  Index: mod_apreq.c
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/env/mod_apreq.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- mod_apreq.c       29 Oct 2003 03:10:13 -0000      1.35
  +++ mod_apreq.c       31 Oct 2003 20:50:18 -0000      1.36
  @@ -114,7 +114,7 @@
   
   
   #define APREQ_MODULE_NAME "APACHE2"
  -#define APREQ_MODULE_MAGIC_NUMBER 20031025
  +#define APREQ_MODULE_MAGIC_NUMBER 20031031
   
   
   static void apache2_log(const char *file, int line, int level, 
  @@ -404,7 +404,8 @@
               return ctx->status;
           }
   
  -        /* assert(req); */
  +        if (req == NULL)
  +            req = apreq_request(r, NULL);
   
       }
       else if (!ctx->saw_eos) {
  @@ -416,7 +417,8 @@
           apr_bucket *last = APR_BRIGADE_LAST(ctx->spool);
           apr_size_t total_read = 0;
   
  -        /* assert(req); */
  +        if (req == NULL)
  +            req = apreq_request(r, NULL);
   
           while (total_read < readbytes) {
               apr_off_t len;