httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/main util_md5.c http_core.c
Date Wed, 25 Oct 2000 18:54:21 GMT
trawick     00/10/25 11:54:21

  Modified:    src      CHANGES
               src/include util_md5.h
               src/main util_md5.c http_core.c
  Log:
  Get rid of the xlate version of ap_md5_digest()
  since we don't compute digests of filtered (e.g., translated)
  response bodies this way anymore.  (Note that we don't do it at
  all at the present; somebody needs to write a filter to do so.)
  
  Revision  Changes    Path
  1.297     +5 -1      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.296
  retrieving revision 1.297
  diff -u -r1.296 -r1.297
  --- CHANGES	2000/10/24 18:39:59	1.296
  +++ CHANGES	2000/10/25 18:54:16	1.297
  @@ -18,7 +18,11 @@
        [Ryan Bloom]
   
     *) Charset translation: mod_charset_lite handles translation of
  -     request bodies.  [Jeff Trawick]
  +     request bodies.  Get rid of the xlate version of ap_md5_digest()
  +     since we don't compute digests of filtered (e.g., translated) 
  +     response bodies this way anymore.  (Note that we don't do it at
  +     all at the present; somebody needs to write a filter to do so.)
  +     [Jeff Trawick]
   
     *) Input filters and ap_get_brigade() now have a input mode parameter 
        (blocking, non-blocking, peek) instead of a length parameter.
  
  
  
  1.17      +1 -8      apache-2.0/src/include/util_md5.h
  
  Index: util_md5.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_md5.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- util_md5.h	2000/10/16 06:04:35	1.16
  +++ util_md5.h	2000/10/25 18:54:19	1.17
  @@ -97,20 +97,13 @@
    */
   AP_DECLARE(char *) ap_md5contextTo64(apr_pool_t *p, apr_md5_ctx_t *context);
   
  -#ifdef APACHE_XLATE
   /**
    * Create an MD5 Digest for a given file
    * @param p The pool to allocate out of
    * @param infile The file to create the digest for
  - * @param xlate The translation header to use.
  - * @warning The xlate parameter is only available if APACHE_XLATE is defined
  - * @deffunc char *ap_md5digest(apr_pool_t *p, apr_file_t *infile, apr_xlate_t *xlate)
  + * @deffunc char *ap_md5digest(apr_pool_t *p, apr_file_t *infile)
    */
  -AP_DECLARE(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile,
  -                                apr_xlate_t *xlate);
  -#else
   AP_DECLARE(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile);
  -#endif
   
   #ifdef __cplusplus
   }
  
  
  
  1.21      +0 -27     apache-2.0/src/main/util_md5.c
  
  Index: util_md5.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_md5.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- util_md5.c	2000/10/16 06:04:53	1.20
  +++ util_md5.c	2000/10/25 18:54:20	1.21
  @@ -195,32 +195,6 @@
       return encodedDigest;
   }
   
  -#ifdef APACHE_XLATE
  -
  -AP_DECLARE(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile,
  -                                apr_xlate_t *xlate)
  -{
  -    apr_md5_ctx_t context;
  -    unsigned char buf[1000];
  -    long length = 0;
  -    int nbytes;
  -    apr_off_t offset = 0L;
  -
  -    apr_MD5Init(&context);
  -    if (xlate) {
  -        apr_MD5SetXlate(&context, xlate);
  -    }
  -    nbytes = sizeof(buf);
  -    while (apr_read(infile, buf, &nbytes) == APR_SUCCESS) {
  -	length += nbytes;
  -	apr_MD5Update(&context, buf, nbytes);
  -    }
  -    apr_seek(infile, APR_SET, &offset);
  -    return ap_md5contextTo64(p, &context);
  -}
  -
  -#else
  -
   AP_DECLARE(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile)
   {
       apr_md5_ctx_t context;
  @@ -239,4 +213,3 @@
       return ap_md5contextTo64(p, &context);
   }
   
  -#endif
  
  
  
  1.188     +0 -5      apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.187
  retrieving revision 1.188
  diff -u -r1.187 -r1.188
  --- http_core.c	2000/10/25 15:42:38	1.187
  +++ http_core.c	2000/10/25 18:54:20	1.188
  @@ -3006,13 +3006,8 @@
   #endif
   
           if (bld_content_md5) {
  -#ifdef APACHE_XLATE
   	    apr_table_setn(r->headers_out, "Content-MD5",
  -                           ap_md5digest(r->pool, fd, NULL));
  -#else
  -	    apr_table_setn(r->headers_out, "Content-MD5",
                              ap_md5digest(r->pool, fd));
  -#endif /* APACHE_XLATE */
   	}
   
   	rangestatus = ap_set_byterange(r);
  
  
  

Mime
View raw message