httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/standard mod_include.c
Date Sun, 17 Sep 2000 18:52:50 GMT
rbb         00/09/17 11:52:49

  Modified:    src/ap   ap_buckets_refcount.c ap_buckets_simple.c
               src/modules/standard mod_include.c
  Log:
  If a bucket is split at the first or last character, then we should get
  a zero length bucket and a bucket containing the original text.  Later
  filters will either throw away the zero length bucket, or they will just
  ignore it.  The problem is that if we return an error in those conditions,
  then all filters need special logic whenever they are going to split a
  bucket.  By always splitting, only a few selected buckets need the special
  logic to deal with zero-length buckets.  This also fixes mod_include to not
  have the special logic around it's split call.
  
  Revision  Changes    Path
  1.6       +1 -1      apache-2.0/src/ap/ap_buckets_refcount.c
  
  Index: ap_buckets_refcount.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_refcount.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ap_buckets_refcount.c	2000/09/09 06:48:07	1.5
  +++ ap_buckets_refcount.c	2000/09/17 18:52:46	1.6
  @@ -64,7 +64,7 @@
       ap_bucket_shared *ad, *bd;
       ap_bucket_refcount *r;
   
  -    if (point <= 0 || point >= a->length) {
  +    if (point < 0 || point > a->length) {
   	return APR_EINVAL;
       }
   
  
  
  
  1.5       +1 -1      apache-2.0/src/ap/ap_buckets_simple.c
  
  Index: ap_buckets_simple.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_simple.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ap_buckets_simple.c	2000/09/09 06:48:07	1.4
  +++ ap_buckets_simple.c	2000/09/17 18:52:46	1.5
  @@ -66,7 +66,7 @@
       ap_bucket *b;
       ap_bucket_simple *ad, *bd;
   
  -    if (point <= 0 || point >= a->length) {
  +    if (point < 0 || point > a->length) {
   	return APR_EINVAL;
       }
   
  
  
  
  1.58      +0 -4      apache-2.0/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- mod_include.c	2000/09/15 21:23:46	1.57
  +++ mod_include.c	2000/09/17 18:52:48	1.58
  @@ -210,10 +210,6 @@
                        * on what we are searching for.
                        */
                       if (str[0] == '<') {
  -                        if (c - buf - strlen(str) == 0) {
  -                            /* first thing in bucket is tag; nothing to split */
  -                            return dptr;
  -                        }
                           dptr->split(dptr, c - buf - strlen(str));
                       }
                       else {
  
  
  

Mime
View raw message