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/support ab.c htpasswd.c htdigest.c
Date Mon, 07 Aug 2000 19:26:04 GMT
trawick     00/08/07 12:26:03

  Modified:    src      CHANGES
               src/ap   ap_base64.c ap_sha1.c
               src/include buff.h
               src/main buff.c rfc1413.c util_charset.c util_ebcdic.c
                        util_script.c http_core.c util_md5.c
               src/modules/experimental mod_charset_lite.c
               src/support ab.c htpasswd.c htdigest.c
  Log:
  Fix some problems with the apr conversion so that APACHE_XLATE builds work
  again.
  
  Revision  Changes    Path
  1.195     +3 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.194
  retrieving revision 1.195
  diff -u -r1.194 -r1.195
  --- CHANGES	2000/08/04 23:22:55	1.194
  +++ CHANGES	2000/08/07 19:25:58	1.195
  @@ -1,4 +1,7 @@
   Changes with Apache 2.0a6
  +  *) Get xlate builds working again.  The apr renaming in 2.0a5 broke
  +     APACHE_XLATE builds.  [Jeff Trawick]
  +
     *) A configuration file parsing problem was fixed.  When the 
        configuration file started with an IfModule/IfDefine container, 
        only the last statement in the container would be retained.  
  
  
  
  1.13      +6 -6      apache-2.0/src/ap/ap_base64.c
  
  Index: ap_base64.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_base64.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ap_base64.c	2000/08/02 05:25:22	1.12
  +++ ap_base64.c	2000/08/07 19:25:59	1.13
  @@ -124,14 +124,14 @@
       
       /* Only single-byte conversion is supported.
        */
  -    rv = ap_xlate_get_sb(to_ascii, &onoff);
  +    rv = apr_xlate_get_sb(to_ascii, &onoff);
       if (rv) {
           return rv;
       }
       if (!onoff) { /* If conversion is not single-byte-only */
           return APR_EINVAL;
       }
  -    rv = ap_xlate_get_sb(to_ebcdic, &onoff);
  +    rv = apr_xlate_get_sb(to_ebcdic, &onoff);
       if (rv) {
           return rv;
       }
  @@ -143,8 +143,8 @@
           os_toascii[i] = i;
       }
       inbytes_left = outbytes_left = sizeof(os_toascii);
  -    ap_xlate_conv_buffer(to_ascii, os_toascii, &inbytes_left,
  -                         os_toascii, &outbytes_left);
  +    apr_xlate_conv_buffer(to_ascii, os_toascii, &inbytes_left,
  +                          os_toascii, &outbytes_left);
   
       return APR_SUCCESS;
   }
  @@ -175,8 +175,8 @@
       len = ap_base64decode_binary((unsigned char *) bufplain, bufcoded);
   #ifdef CHARSET_EBCDIC
       inbytes_left = outbytes_left = len;
  -    ap_xlate_conv_buffer(xlate_to_ebcdic, bufplain, &inbytes_left,
  -                         bufplain, &outbytes_left);
  +    apr_xlate_conv_buffer(xlate_to_ebcdic, bufplain, &inbytes_left,
  +                          bufplain, &outbytes_left);
   #endif				/* CHARSET_EBCDIC */
       bufplain[len] = '\0';
       return len;
  
  
  
  1.14      +8 -8      apache-2.0/src/ap/ap_sha1.c
  
  Index: ap_sha1.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_sha1.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ap_sha1.c	2000/08/02 05:25:23	1.13
  +++ ap_sha1.c	2000/08/07 19:25:59	1.14
  @@ -129,7 +129,7 @@
   
       /* Only single-byte conversion is supported.
        */
  -    rv = ap_xlate_get_sb(x, &onoff);
  +    rv = apr_xlate_get_sb(x, &onoff);
       if (rv) {
           return rv;
       }
  @@ -316,9 +316,9 @@
   	    i = count;
   	}
           inbytes_left = outbytes_left = i;
  -        ap_xlate_conv_buffer(ebcdic2ascii_xlate, buffer, &inbytes_left,
  -                             ((AP_BYTE *) sha_info->data) + sha_info->local,
  -                             &outbytes_left);
  +        apr_xlate_conv_buffer(ebcdic2ascii_xlate, buffer, &inbytes_left,
  +                              ((AP_BYTE *) sha_info->data) + sha_info->local,
  +                              &outbytes_left);
   	count -= i;
   	buffer += i;
   	sha_info->local += i;
  @@ -332,16 +332,16 @@
       }
       while (count >= SHA_BLOCKSIZE) {
           inbytes_left = outbytes_left = SHA_BLOCKSIZE;
  -        ap_xlate_conv_buffer(ebcdic2ascii_xlate, buffer, &inbytes_left,
  -                             (AP_BYTE *) sha_info->data, &outbytes_left);
  +        apr_xlate_conv_buffer(ebcdic2ascii_xlate, buffer, &inbytes_left,
  +                              (AP_BYTE *) sha_info->data, &outbytes_left);
   	buffer += SHA_BLOCKSIZE;
   	count -= SHA_BLOCKSIZE;
   	maybe_byte_reverse(sha_info->data, SHA_BLOCKSIZE);
   	sha_transform(sha_info);
       }
       inbytes_left = outbytes_left = count;
  -    ap_xlate_conv_buffer(ebcdic2ascii_xlate, buffer, &inbytes_left,
  -                         (AP_BYTE *) sha_info->data, &outbytes_left);
  +    apr_xlate_conv_buffer(ebcdic2ascii_xlate, buffer, &inbytes_left,
  +                          (AP_BYTE *) sha_info->data, &outbytes_left);
       sha_info->local = count;
   #else
       ap_SHA1Update_binary(sha_info, (const unsigned char *) buf, count);
  
  
  
  1.34      +2 -2      apache-2.0/src/include/buff.h
  
  Index: buff.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/buff.h,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- buff.h	2000/08/02 05:25:28	1.33
  +++ buff.h	2000/08/07 19:25:59	1.34
  @@ -308,13 +308,13 @@
   #define ap_bgetc(fb)   ( ((fb)->incnt == 0) ? (fb)->last_getc_raw = ap_bfilbuf(fb)
: \
                       ((fb)->incnt--, (fb)->last_getc_raw = *((fb)->inptr++), \
                       ((fb)->read_xlate)\
  -                    ?ap_xlate_conv_byte((fb)->read_xlate,(fb)->last_getc_raw): \
  +                    ?apr_xlate_conv_byte((fb)->read_xlate,(fb)->last_getc_raw): \
                       (fb)->last_getc_raw) )
    
   #define ap_bputc(c, fb) ((((fb)->flags & (B_EOUT|B_WRERR|B_WR)) != B_WR || \
                        (fb)->outcnt == (fb)->bufsiz) ? ap_bflsbuf(c, (fb)) : \
                        ((fb)->outbase[(fb)->outcnt++] = ((fb)->write_xlate)\
  -                     ?ap_xlate_conv_byte((fb)->write_xlate,(unsigned char)c):(c), 0))
  +                     ?apr_xlate_conv_byte((fb)->write_xlate,(unsigned char)c):(c), 0))
    
   #endif /*APACHE_XLATE*/
   
  
  
  
  1.57      +17 -17    apache-2.0/src/main/buff.c
  
  Index: buff.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- buff.c	2000/08/02 05:26:47	1.56
  +++ buff.c	2000/08/07 19:26:00	1.57
  @@ -246,7 +246,7 @@
       case BO_WXLATE:
           fb->write_xlate = (apr_xlate_t *)*(const apr_xlate_t **)optval;
           if (fb->write_xlate) {
  -            ap_xlate_get_sb(fb->write_xlate, &fb->write_xlate_sb);
  +            apr_xlate_get_sb(fb->write_xlate, &fb->write_xlate_sb);
               fb->b_write_ops = xlate_write_ops;
           }
           else {
  @@ -367,9 +367,9 @@
        * but leave CRLF in ascii
        */
       inbytes_left = outbytes_left = CHUNK_HEADER_SIZE - 2;
  -    ap_xlate_conv_buffer(ap_hdrs_to_ascii,
  -                         &fb->outbase[fb->outchunk], &inbytes_left,
  -                         &fb->outbase[fb->outchunk], &outbytes_left);
  +    apr_xlate_conv_buffer(ap_hdrs_to_ascii,
  +                          &fb->outbase[fb->outchunk], &inbytes_left,
  +                          &fb->outbase[fb->outchunk], &outbytes_left);
   #endif /*CHARSET_EBCDIC*/
   
       if (extra == 0) {
  @@ -494,8 +494,8 @@
       rv = ap_bread_core(fb, buf, nbyte, bytes_read);
       if (rv == APR_SUCCESS && *bytes_read) {
           inbytes_left = outbytes_left = *bytes_read;
  -        rv = ap_xlate_conv_buffer(fb->read_xlate, buf, &inbytes_left,
  -                                  buf, &outbytes_left);
  +        rv = apr_xlate_conv_buffer(fb->read_xlate, buf, &inbytes_left,
  +                                   buf, &outbytes_left);
           if (!rv && (inbytes_left || outbytes_left)) {
               *bytes_read = 0;
               rv = APR_EINVAL;
  @@ -651,7 +651,7 @@
   	ch = fb->inptr[i++];
   #ifdef APACHE_XLATE
           if (fb->read_xlate)
  -            ch = ap_xlate_conv_byte(fb->read_xlate, (unsigned char)ch);
  +            ch = apr_xlate_conv_byte(fb->read_xlate, (unsigned char)ch);
   
           /* AS/400 problem not handled by this code...
            * It's possible that a cgi program may return 0x15 as LF and
  @@ -998,8 +998,8 @@
           --nbyte;
           inbytes_left = fb->partial_write_len;
           outbytes_left = fb->xbufsize;
  -        rv = ap_xlate_conv_buffer(fb->write_xlate, fb->partial_write, 
  -                                  &inbytes_left, fb->xbuf, &outbytes_left);
  +        rv = apr_xlate_conv_buffer(fb->write_xlate, fb->partial_write, 
  +                                   &inbytes_left, fb->xbuf, &outbytes_left);
       } while (rv == APR_INCOMPLETE && nbyte);
       if (rv == APR_INCOMPLETE) { /* ran out of nbyte before completing char */
           return APR_SUCCESS; /* hope for the rest on the next call */
  @@ -1040,8 +1040,8 @@
   
       inbytes_left = nbyte;
       outbytes_left = fb->xbufsize;
  -    rv = ap_xlate_conv_buffer(fb->write_xlate, buf, &inbytes_left,
  -                              fb->xbuf, &outbytes_left);
  +    rv = apr_xlate_conv_buffer(fb->write_xlate, buf, &inbytes_left,
  +                               fb->xbuf, &outbytes_left);
       if (rv == APR_INCOMPLETE) { /* partial character at end of input */
           /* We need to save the final byte(s) for next time; we can't
            * convert it until the caller passes us the rest of the input
  @@ -1311,9 +1311,9 @@
       if (fb->write_xlate) {
           inbytes_left = outbytes_left =
               b->vbuff.curpos - (char *)&fb->outbase[fb->outcnt];
  -        rv = ap_xlate_conv_buffer(fb->write_xlate, &fb->outbase[fb->outcnt],
  -                                  &inbytes_left, &fb->outbase[fb->outcnt],
  -                                  &outbytes_left);
  +        rv = apr_xlate_conv_buffer(fb->write_xlate, &fb->outbase[fb->outcnt],
  +                                   &inbytes_left, &fb->outbase[fb->outcnt],
  +                                   &outbytes_left);
           ap_assert(!rv && !inbytes_left && !outbytes_left);
       }
   #endif /*APACHE_XLATE*/
  @@ -1362,9 +1362,9 @@
   
               inbytes_left = outbytes_left =
                   b.vbuff.curpos - (char *)&fb->outbase[fb->outcnt];
  -            rv = ap_xlate_conv_buffer(fb->write_xlate, &fb->outbase[fb->outcnt],
  -                                      &inbytes_left, &fb->outbase[fb->outcnt],
  -                                      &outbytes_left);
  +            rv = apr_xlate_conv_buffer(fb->write_xlate, &fb->outbase[fb->outcnt],
  +                                       &inbytes_left, &fb->outbase[fb->outcnt],
  +                                       &outbytes_left);
               ap_assert(!rv && !inbytes_left && !outbytes_left);
           }
   #endif /*APACHE_XLATE*/
  
  
  
  1.21      +4 -4      apache-2.0/src/main/rfc1413.c
  
  Index: rfc1413.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/rfc1413.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- rfc1413.c	2000/08/02 05:26:49	1.20
  +++ rfc1413.c	2000/08/07 19:26:00	1.21
  @@ -158,8 +158,8 @@
   		sav_our_port);
   #ifdef CHARSET_EBCDIC
       inbytes_left = outbytes_left = buflen;
  -    ap_xlate_conv_buffer(ap_hdrs_to_ascii, buffer, &inbytes_left,
  -                         buffer, &outbytes_left);
  +    apr_xlate_conv_buffer(ap_hdrs_to_ascii, buffer, &inbytes_left,
  +                          buffer, &outbytes_left);
   #endif
   
       /* send query to server. Handle short write. */
  @@ -211,8 +211,8 @@
   /* RFC1413_USERLEN = 512 */
   #ifdef CHARSET_EBCDIC
       inbytes_left = outbytes_left = i;
  -    ap_xlate_conv_buffer(ap_hdrs_from_ascii, buffer, &inbytes_left,
  -                         buffer, &outbytes_left);
  +    apr_xlate_conv_buffer(ap_hdrs_from_ascii, buffer, &inbytes_left,
  +                          buffer, &outbytes_left);
   #endif
       if (sscanf(buffer, "%u , %u : USERID :%*[^:]:%512s", &rmt_port, &our_port,
   	       user) != 3 || sav_rmt_port != rmt_port
  
  
  
  1.4       +1 -1      apache-2.0/src/main/util_charset.c
  
  Index: util_charset.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_charset.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- util_charset.c	2000/08/02 05:26:49	1.3
  +++ util_charset.c	2000/08/07 19:26:00	1.4
  @@ -104,7 +104,7 @@
       if (output) {
           r->rrx->to_net = xlate;
           if (xlate) {
  -            ap_xlate_get_sb(r->rrx->to_net, &r->rrx->to_net_sb);
  +            apr_xlate_get_sb(r->rrx->to_net, &r->rrx->to_net_sb);
           }
           rv = ap_bsetopt(r->connection->client, BO_WXLATE, &xlate);
       }
  
  
  
  1.11      +10 -10    apache-2.0/src/main/util_ebcdic.c
  
  Index: util_ebcdic.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_ebcdic.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- util_ebcdic.c	2000/08/02 05:26:49	1.10
  +++ util_ebcdic.c	2000/08/07 19:26:00	1.11
  @@ -70,38 +70,38 @@
       apr_status_t rv;
       char buf[80];
   
  -    rv = ap_xlate_open(&ap_hdrs_to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, pool);
  +    rv = apr_xlate_open(&ap_hdrs_to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, pool);
       if (rv) {
           ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
  -                     "ap_xlate_open() failed");
  +                     "apr_xlate_open() failed");
           return rv;
       }
   
  -    rv = ap_xlate_open(&ap_hdrs_from_ascii, APR_DEFAULT_CHARSET, "ISO8859-1", pool);
  +    rv = apr_xlate_open(&ap_hdrs_from_ascii, APR_DEFAULT_CHARSET, "ISO8859-1", pool);
       if (rv) {
           ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
  -                     "ap_xlate_open() failed");
  +                     "apr_xlate_open() failed");
           return rv;
       }
   
  -    rv = ap_xlate_open(&ap_locale_to_ascii, "ISO8859-1", APR_LOCALE_CHARSET, pool);
  +    rv = apr_xlate_open(&ap_locale_to_ascii, "ISO8859-1", APR_LOCALE_CHARSET, pool);
       if (rv) {
           ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
  -                     "ap_xlate_open() failed");
  +                     "apr_xlate_open() failed");
           return rv;
       }
   
  -    rv = ap_xlate_open(&ap_locale_from_ascii, APR_LOCALE_CHARSET, "ISO8859-1", pool);
  +    rv = apr_xlate_open(&ap_locale_from_ascii, APR_LOCALE_CHARSET, "ISO8859-1", pool);
       if (rv) {
           ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
  -                     "ap_xlate_open() failed");
  +                     "apr_xlate_open() failed");
           return rv;
       }
   
  -    rv = ap_MD5InitEBCDIC(ap_hdrs_to_ascii);
  +    rv = apr_MD5InitEBCDIC(ap_hdrs_to_ascii);
       if (rv) {
           ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
  -                     "ap_MD5InitEBCDIC() failed");
  +                     "apr_MD5InitEBCDIC() failed");
           return rv;
       }
       
  
  
  
  1.40      +3 -3      apache-2.0/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- util_script.c	2000/08/06 06:07:35	1.39
  +++ util_script.c	2000/08/07 19:26:00	1.40
  @@ -496,7 +496,7 @@
               apr_size_t inbytes_left, outbytes_left;
   
   	    for (cp = w; *cp != '\0'; ++cp) {
  -                native = ap_xlate_conv_byte(ap_hdrs_from_ascii, *cp);
  +                native = apr_xlate_conv_byte(ap_hdrs_from_ascii, *cp);
   		if (isprint(*cp) && !isprint(native))
   		    ++maybeEBCDIC;
   		if (!isprint(*cp) && isprint(native))
  @@ -507,8 +507,8 @@
                                "CGI Interface Error: Script headers apparently ASCII: (CGI
= %s)",
                                r->filename);
                   inbytes_left = outbytes_left = cp - w;
  -                ap_xlate_conv_buffer(ap_hdrs_from_ascii,
  -                                     w, &inbytes_left, w, &outbytes_left);
  +                apr_xlate_conv_buffer(ap_hdrs_from_ascii,
  +                                      w, &inbytes_left, w, &outbytes_left);
   	    }
   	}
   #endif /*CHARSET_EBCDIC*/
  
  
  
  1.96      +1 -1      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.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- http_core.c	2000/08/06 06:07:34	1.95
  +++ http_core.c	2000/08/07 19:26:00	1.96
  @@ -2850,7 +2850,7 @@
   	    apr_MD5Init(&context);
   #ifdef APACHE_XLATE
               if (r->rrx->to_net) {
  -                ap_MD5SetXlate(&context, r->rrx->to_net);
  +                apr_MD5SetXlate(&context, r->rrx->to_net);
               }
   #endif
   	    apr_MD5Update(&context, addr, (unsigned int)r->finfo.size);
  
  
  
  1.19      +2 -2      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- util_md5.c	2000/08/06 06:07:35	1.18
  +++ util_md5.c	2000/08/07 19:26:00	1.19
  @@ -106,7 +106,7 @@
   
       apr_MD5Init(&my_md5);
   #ifdef CHARSET_EBCDIC
  -    ap_MD5SetXlate(&my_md5, ap_hdrs_to_ascii);
  +    apr_MD5SetXlate(&my_md5, ap_hdrs_to_ascii);
   #endif
       apr_MD5Update(&my_md5, buf, (unsigned int)length);
       apr_MD5Final(hash, &my_md5);
  @@ -208,7 +208,7 @@
   
       apr_MD5Init(&context);
       if (xlate) {
  -        ap_MD5SetXlate(&context, xlate);
  +        apr_MD5SetXlate(&context, xlate);
       }
       nbytes = sizeof(buf);
       while (apr_read(infile, buf, &nbytes) == APR_SUCCESS) {
  
  
  
  1.7       +3 -3      apache-2.0/src/modules/experimental/mod_charset_lite.c
  
  Index: mod_charset_lite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/experimental/mod_charset_lite.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_charset_lite.c	2000/08/02 05:27:01	1.6
  +++ mod_charset_lite.c	2000/08/07 19:26:01	1.7
  @@ -226,7 +226,7 @@
                        dc && dc->charset_default ? dc->charset_default : "(none)");
       }
   
  -    rv = ap_xlate_open(&output_xlate, dc->charset_default, dc->charset_source,
r->pool);
  +    rv = apr_xlate_open(&output_xlate, dc->charset_default, dc->charset_source,
r->pool);
       if (rv != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
                        "can't open translation %s->%s",
  @@ -247,8 +247,8 @@
            * with the OPTIONS method, but for now we don't set up translation 
            * of it.
            */
  -        rv = ap_xlate_open(&input_xlate, dc->charset_source, 
  -                           dc->charset_default, r->pool);
  +        rv = apr_xlate_open(&input_xlate, dc->charset_source, 
  +                            dc->charset_default, r->pool);
           if (rv != APR_SUCCESS) {
               ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
                            "can't open translation %s->%s",
  
  
  
  1.23      +6 -6      apache-2.0/src/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/ab.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ab.c	2000/08/06 06:07:53	1.22
  +++ ab.c	2000/08/07 19:26:02	1.23
  @@ -862,14 +862,14 @@
   static void copyright(void)
   {
       if (!use_html) {
  -        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.22 $>
apache-2.0");
  +        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.23 $>
apache-2.0");
           printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
           printf("Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/\n");
           printf("\n");
       }
       else {
           printf("<p>\n");
  -        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i>
apache-2.0<br>\n", AB_VERSION, "$Revision: 1.22 $");
  +        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i>
apache-2.0<br>\n", AB_VERSION, "$Revision: 1.23 $");
           printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
           printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/<br>\n");
           printf("</p>\n<p>\n");
  @@ -989,14 +989,14 @@
       apr_create_pool(&cntxt, NULL);
   
   #ifdef NOT_ASCII
  -    status = ap_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, cntxt);
  +    status = apr_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, cntxt);
       if (status) {
  -        fprintf(stderr, "ap_xlate_open(to ASCII)->%d\n", status);
  +        fprintf(stderr, "apr_xlate_open(to ASCII)->%d\n", status);
           exit(1);
       }
  -    status = ap_xlate_open(&from_ascii, APR_DEFAULT_CHARSET, "ISO8859-1", cntxt);
  +    status = apr_xlate_open(&from_ascii, APR_DEFAULT_CHARSET, "ISO8859-1", cntxt);
       if (status) {
  -        fprintf(stderr, "ap_xlate_open(from ASCII)->%d\n", status);
  +        fprintf(stderr, "apr_xlate_open(from ASCII)->%d\n", status);
           exit(1);
       }
       status = ap_base64init_ebcdic(to_ascii, from_ascii);
  
  
  
  1.21      +4 -4      apache-2.0/src/support/htpasswd.c
  
  Index: htpasswd.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htpasswd.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- htpasswd.c	2000/08/02 05:27:37	1.20
  +++ htpasswd.c	2000/08/07 19:26:02	1.21
  @@ -384,9 +384,9 @@
       atexit(apr_terminate);
       apr_create_pool(&pool, NULL);
   
  -    rv = ap_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, pool);
  +    rv = apr_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, pool);
       if (rv) {
  -        fprintf(stderr, "ap_xlate_open(to ASCII)->%d\n", rv);
  +        fprintf(stderr, "apr_xlate_open(to ASCII)->%d\n", rv);
           exit(1);
       }
       rv = ap_SHA1InitEBCDIC(to_ascii);
  @@ -394,9 +394,9 @@
           fprintf(stderr, "ap_SHA1InitEBCDIC()->%d\n", rv);
           exit(1);
       }
  -    rv = ap_MD5InitEBCDIC(to_ascii);
  +    rv = apr_MD5InitEBCDIC(to_ascii);
       if (rv) {
  -        fprintf(stderr, "ap_MD5InitEBCDIC()->%d\n", rv);
  +        fprintf(stderr, "apr_MD5InitEBCDIC()->%d\n", rv);
           exit(1);
       }
   #endif /*CHARSET_EBCDIC*/
  
  
  
  1.12      +1 -1      apache-2.0/src/support/htdigest.c
  
  Index: htdigest.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htdigest.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- htdigest.c	2000/08/06 06:07:53	1.11
  +++ htdigest.c	2000/08/07 19:26:02	1.12
  @@ -186,7 +186,7 @@
   
       apr_MD5Init(&context);
   #ifdef CHARSET_EBCDIC
  -    ap_MD5SetXlate(&context, to_ascii);
  +    apr_MD5SetXlate(&context, to_ascii);
   #endif
       apr_MD5Update(&context, (unsigned char *) string, strlen(string));
       apr_MD5Final(digest, &context);
  
  
  

Mime
View raw message