httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_include.c
Date Fri, 02 Mar 2001 21:36:24 GMT
trawick     01/03/02 13:36:23

  Modified:    modules/experimental config.m4 mod_case_filter.c
                        mod_charset_lite.c mod_disk_cache.c
                        mod_ext_filter.c
               modules/filters mod_include.c
  Log:
  Use the proper enum for the block/non-block parameter to apr_bucket_read().
  A couple of these changed in meaning (e.g., 1->APR_BLOCK_READ).
  
  PR:		6980
  
  Revision  Changes    Path
  1.7       +1 -0      httpd-2.0/modules/experimental/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/config.m4,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- config.m4	2001/01/27 17:50:45	1.6
  +++ config.m4	2001/03/02 21:36:12	1.7
  @@ -10,5 +10,6 @@
   APACHE_MODULE(generic_hook_import, example hook importer, , , no)
   APACHE_MODULE(optional_fn_import, example optional function importer, , , no)
   APACHE_MODULE(optional_fn_export, example optional function exporter, , , no)
  +APACHE_MODULE(bucket_trace, bucket trace module, , , no)
   
   APACHE_MODPATH_FINISH
  
  
  
  1.4       +1 -1      httpd-2.0/modules/experimental/mod_case_filter.c
  
  Index: mod_case_filter.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_case_filter.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_case_filter.c	2001/02/08 07:44:00	1.3
  +++ mod_case_filter.c	2001/03/02 21:36:13	1.4
  @@ -60,7 +60,7 @@
   	    }
   
   	// read
  -	apr_bucket_read(pbktIn,&data,&len,1);
  +	apr_bucket_read(pbktIn,&data,&len,APR_BLOCK_READ);
   
   	// write
   	buf=apr_palloc(f->r->pool,len);
  
  
  
  1.44      +2 -2      httpd-2.0/modules/experimental/mod_charset_lite.c
  
  Index: mod_charset_lite.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_charset_lite.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- mod_charset_lite.c	2001/02/25 23:08:50	1.43
  +++ mod_charset_lite.c	2001/03/02 21:36:13	1.44
  @@ -751,7 +751,7 @@
                   APR_BUCKET_IS_EOS(b)) {
                   break;
               }
  -            rv = apr_bucket_read(b, &bucket, &bytes_in_bucket, 0);
  +            rv = apr_bucket_read(b, &bucket, &bytes_in_bucket, APR_BLOCK_READ);
               if (rv != APR_SUCCESS) {
                   ctx->ees = EES_BUCKET_READ;
                   break;
  @@ -913,7 +913,7 @@
                   }
                   break;
               }
  -            rv = apr_bucket_read(dptr, &cur_str, &cur_len, 0);
  +            rv = apr_bucket_read(dptr, &cur_str, &cur_len, APR_BLOCK_READ);
               if (rv != APR_SUCCESS) {
                   done = 1;
                   ctx->ees = EES_BUCKET_READ;
  
  
  
  1.7       +1 -1      httpd-2.0/modules/experimental/mod_disk_cache.c
  
  Index: mod_disk_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_disk_cache.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_disk_cache.c	2001/02/16 04:26:37	1.6
  +++ mod_disk_cache.c	2001/03/02 21:36:14	1.7
  @@ -144,7 +144,7 @@
           const char *str;
           apr_ssize_t length;
   
  -        apr_bucket_read(e, &str, &length, 0);
  +        apr_bucket_read(e, &str, &length, APR_BLOCK_READ);
           apr_file_write(ctx->fd, str, &length);
       }
       if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) {
  
  
  
  1.12      +2 -2      httpd-2.0/modules/experimental/mod_ext_filter.c
  
  Index: mod_ext_filter.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_ext_filter.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_ext_filter.c	2001/02/16 04:26:37	1.11
  +++ mod_ext_filter.c	2001/03/02 21:36:15	1.12
  @@ -659,7 +659,7 @@
               break;
           }
   
  -        rv = apr_bucket_read(b, &data, &len, 1);
  +        rv = apr_bucket_read(b, &data, &len, APR_BLOCK_READ);
           if (rv != APR_SUCCESS) {
               ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, "apr_bucket_read()");
               return rv;
  @@ -764,7 +764,7 @@
   
       APR_BRIGADE_FOREACH(b, bb) {
           if (!APR_BUCKET_IS_EOS(b)) {
  -            if ((rv = apr_bucket_read(b, (const char **)&buf, &len, 0)) != APR_SUCCESS)
{
  +            if ((rv = apr_bucket_read(b, (const char **)&buf, &len, APR_BLOCK_READ))
!= APR_SUCCESS) {
                   ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, "apr_bucket_read() failed");
                   return rv;
               }
  
  
  
  1.103     +2 -2      httpd-2.0/modules/filters/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
  retrieving revision 1.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- mod_include.c	2001/03/02 06:58:00	1.102
  +++ mod_include.c	2001/03/02 21:36:21	1.103
  @@ -159,7 +159,7 @@
           if (APR_BUCKET_IS_EOS(dptr)) {
               break;
           }
  -        apr_bucket_read(dptr, &buf, &len, 0);
  +        apr_bucket_read(dptr, &buf, &len, APR_BLOCK_READ);
           /* XXX handle retcodes */
           if (len == 0) { /* end of pipe? */
               break;
  @@ -257,7 +257,7 @@
           if (APR_BUCKET_IS_EOS(dptr)) {
               break;
           }
  -        apr_bucket_read(dptr, &buf, &len, 0);
  +        apr_bucket_read(dptr, &buf, &len, APR_BLOCK_READ);
           /* XXX handle retcodes */
           if (len == 0) { /* end of pipe? */
               break;
  
  
  

Mime
View raw message