httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-test/perl-framework/c-modules/nntp_like mod_nntp_like.c
Date Sat, 19 Jan 2002 07:45:56 GMT
jerenkrantz    02/01/18 23:45:56

  Modified:    perl-framework/c-modules/input_body_filter
                        mod_input_body_filter.c
               perl-framework/c-modules/nntp_like mod_nntp_like.c
  Log:
  Sync up with new input filtering prototype changes.
  
  Revision  Changes    Path
  1.6       +5 -3      httpd-test/perl-framework/c-modules/input_body_filter/mod_input_body_filter.c
  
  Index: mod_input_body_filter.c
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/c-modules/input_body_filter/mod_input_body_filter.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_input_body_filter.c	29 Sep 2001 07:02:33 -0000	1.5
  +++ mod_input_body_filter.c	19 Jan 2002 07:45:56 -0000	1.6
  @@ -81,7 +81,9 @@
   } input_body_ctx_t;
   
   static int input_body_filter_handler(ap_filter_t *f, apr_bucket_brigade *bb, 
  -                                     ap_input_mode_t mode, apr_off_t *readbytes)
  +                                     ap_input_mode_t mode, 
  +                                     apr_read_type_e block,
  +                                     apr_off_t *readbytes)
   {
       apr_status_t rv;
       apr_pool_t *p = f->r->pool;
  @@ -94,7 +96,7 @@
   
       if (APR_BRIGADE_EMPTY(ctx->b))
       {
  -        if ((rv = ap_get_brigade(f->next, ctx->b, mode,
  +        if ((rv = ap_get_brigade(f->next, ctx->b, mode, block,
                                    readbytes)) != APR_SUCCESS) {
               return rv;
           }
  @@ -113,7 +115,7 @@
               break;
           }
   
  -        rv = apr_bucket_read(bucket, &data, &len, mode);
  +        rv = apr_bucket_read(bucket, &data, &len, block);
   
           if (rv != APR_SUCCESS) {
               return rv;
  
  
  
  1.3       +4 -3      httpd-test/perl-framework/c-modules/nntp_like/mod_nntp_like.c
  
  Index: mod_nntp_like.c
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/c-modules/nntp_like/mod_nntp_like.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_nntp_like.c	21 Nov 2001 18:42:09 -0000	1.2
  +++ mod_nntp_like.c	19 Jan 2002 07:45:56 -0000	1.3
  @@ -75,8 +75,8 @@
   
       bb = apr_brigade_create(c->pool);
   
  -    rv = ap_get_brigade(c->input_filters, bb,
  -                        AP_MODE_INIT, &zero);
  +    rv = ap_get_brigade(c->input_filters, bb, AP_MODE_INIT, 
  +                        APR_BLOCK_READ, &zero);
   
       apr_brigade_destroy(bb);
   
  @@ -127,7 +127,8 @@
   
       for (;;) {
           if ((rv = ap_get_brigade(c->input_filters, bb,
  -                                 AP_MODE_BLOCKING, &zero) != APR_SUCCESS || 
  +                                 AP_MODE_GETLINE,
  +                                 APR_BLOCK_READ, &zero) != APR_SUCCESS || 
                APR_BRIGADE_EMPTY(bb)))
           {
               apr_brigade_destroy(bb);
  
  
  

Mime
View raw message