httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject cvs commit: httpd-test/specweb99/specweb99-2.0 mod_specweb99.c
Date Sat, 29 May 2004 03:15:50 GMT
gregames    2004/05/28 20:15:50

  Modified:    specweb99/specweb99-2.0 mod_specweb99.c
  Log:
  fix a compile failure with 2.1 HEAD on Linux.
  
  APR_HAS_LARGE_FILES is now true, so we try to compile this section of code.
  It fails because "b" isn't defined.  But the largest SPECweb99 file,
  class3_8 is 921600 bytes long and AP_MAX_SENDFILE is 16M, so the test
  if (s.size > AP_MAX_SENDFILE) will always fail.
  
  Revision  Changes    Path
  1.34      +0 -23     httpd-test/specweb99/specweb99-2.0/mod_specweb99.c
  
  Index: mod_specweb99.c
  ===================================================================
  RCS file: /home/cvs/httpd-test/specweb99/specweb99-2.0/mod_specweb99.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -d -b -u -r1.33 -r1.34
  --- mod_specweb99.c	28 May 2004 18:54:58 -0000	1.33
  +++ mod_specweb99.c	29 May 2004 03:15:50 -0000	1.34
  @@ -262,29 +262,6 @@
       }
   
       bb = apr_brigade_create(r->pool, c->bucket_alloc);
  -#if APR_HAS_LARGE_FILES
  -    /* XXX Is the following test ever true?
  -     * The largest SPECweb99 file is class3_8, which is 921600 bytes long.
  -     * I'm guessing AP_MAX_SENDFILE will be something like 2G or 4G.
  -     */
  -    if (s.size > AP_MAX_SENDFILE) {
  -    /*
  -     * APR_HAS_LARGE_FILES issue; must split into mutiple buckets, no
  -     * greater than MAX(apr_size_t), and more granular than that in case
  -     * the brigade code/filters attempt to read it directly.
  -     */
  -        apr_off_t fsize = s.size;
  -        b = apr_bucket_file_create(f, zero, AP_MAX_SENDFILE, r->pool);
  -        while (fsize > AP_MAX_SENDFILE) {
  -            APR_BRIGADE_INSERT_TAIL(bb, b);
  -            apr_bucket_copy(b, &b);
  -            b->start += AP_MAX_SENDFILE;
  -            fsize -= AP_MAX_SENDFILE;
  -        }
  -        b->length = (apr_size_t) fsize; /* Resize just the last bucket */
  -    }
  -    else
  -#endif
           b2 = apr_bucket_file_create(f, zero, (apr_size_t) (s.size),
                                       r->pool, c->bucket_alloc);
           b3 = apr_bucket_immortal_create(boilerplate_end, 
  
  
  

Mime
View raw message