httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject cvs commit: httpd-2.0/support ab.c htdbm.c htdigest.c htpasswd.c
Date Tue, 29 Jun 2004 13:33:24 GMT
martin      2004/06/29 06:33:24

  Modified:    server   util_ebcdic.c
               misc/unix charset.c
               support  ab.c htdbm.c htdigest.c htpasswd.c
  Log:
  Use standardized names for ISO-8859-1, see http://www.iana.org/assignments/character-sets
  (Using the name iso8859-1 may still work, because it is aliased in apr-iconv/ccs/charset.aliases)
  
  Revision  Changes    Path
  1.26      +2 -2      httpd-2.0/server/util_ebcdic.c
  
  Index: util_ebcdic.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util_ebcdic.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -u -r1.25 -r1.26
  --- util_ebcdic.c	9 Feb 2004 20:40:49 -0000	1.25
  +++ util_ebcdic.c	29 Jun 2004 13:33:23 -0000	1.26
  @@ -28,14 +28,14 @@
       apr_status_t rv;
       char buf[80];
   
  -    rv = apr_xlate_open(&ap_hdrs_to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, pool);
  +    rv = apr_xlate_open(&ap_hdrs_to_ascii, "ISO-8859-1", APR_DEFAULT_CHARSET, pool);
       if (rv) {
           ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
                        "apr_xlate_open() failed");
           return rv;
       }
   
  -    rv = apr_xlate_open(&ap_hdrs_from_ascii, APR_DEFAULT_CHARSET, "ISO8859-1", pool);
  +    rv = apr_xlate_open(&ap_hdrs_from_ascii, APR_DEFAULT_CHARSET, "ISO-8859-1", pool);
       if (rv) {
           ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
                        "apr_xlate_open() failed");
  
  
  
  1.7       +1 -1      apr/misc/unix/charset.c
  
  Index: charset.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/unix/charset.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- charset.c	13 Feb 2004 09:38:32 -0000	1.6
  +++ charset.c	29 Jun 2004 13:33:23 -0000	1.7
  @@ -55,7 +55,7 @@
       }
   
       if ('A' == 0x41) {
  -        return "ISO8859-1"; /* not necessarily true */
  +        return "ISO-8859-1"; /* not necessarily true */
       }
   
       return "unknown";
  
  
  
  1.145     +4 -4      httpd-2.0/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.c,v
  retrieving revision 1.144
  retrieving revision 1.145
  diff -u -u -r1.144 -r1.145
  --- ab.c	18 May 2004 19:21:35 -0000	1.144
  +++ ab.c	29 Jun 2004 13:33:24 -0000	1.145
  @@ -1986,12 +1986,12 @@
       apr_pool_create(&cntxt, NULL);
   
   #ifdef NOT_ASCII
  -    status = apr_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, cntxt);
  +    status = apr_xlate_open(&to_ascii, "ISO-8859-1", APR_DEFAULT_CHARSET, cntxt);
       if (status) {
           fprintf(stderr, "apr_xlate_open(to ASCII)->%d\n", status);
           exit(1);
       }
  -    status = apr_xlate_open(&from_ascii, APR_DEFAULT_CHARSET, "ISO8859-1", cntxt);
  +    status = apr_xlate_open(&from_ascii, APR_DEFAULT_CHARSET, "ISO-8859-1", cntxt);
       if (status) {
           fprintf(stderr, "apr_xlate_open(from ASCII)->%d\n", status);
           exit(1);
  
  
  
  1.16      +1 -1      httpd-2.0/support/htdbm.c
  
  Index: htdbm.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htdbm.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -u -r1.15 -r1.16
  --- htdbm.c	17 Mar 2004 01:03:27 -0000	1.15
  +++ htdbm.c	29 Jun 2004 13:33:24 -0000	1.16
  @@ -143,7 +143,7 @@
       (*hdbm)->pool = *pool;
   
   #if APR_CHARSET_EBCDIC
  -    rv = apr_xlate_open(&((*hdbm)->to_ascii), "ISO8859-1", APR_DEFAULT_CHARSET,
(*hdbm)->pool);
  +    rv = apr_xlate_open(&((*hdbm)->to_ascii), "ISO-8859-1", APR_DEFAULT_CHARSET,
(*hdbm)->pool);
       if (rv) {
           fprintf(stderr, "apr_xlate_open(to ASCII)->%d\n", rv);
           return APR_EGENERAL;
  
  
  
  1.46      +1 -1      httpd-2.0/support/htdigest.c
  
  Index: htdigest.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htdigest.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -u -r1.45 -r1.46
  --- htdigest.c	17 Mar 2004 01:17:26 -0000	1.45
  +++ htdigest.c	29 Jun 2004 13:33:24 -0000	1.46
  @@ -199,7 +199,7 @@
       apr_file_open_stderr(&errfile, cntxt);
   
   #if APR_CHARSET_EBCDIC
  -    rv = apr_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, cntxt);
  +    rv = apr_xlate_open(&to_ascii, "ISO-8859-1", APR_DEFAULT_CHARSET, cntxt);
       if (rv) {
           apr_file_printf(errfile, "apr_xlate_open(): %s (%d)\n",
                   apr_strerror(rv, line, sizeof(line)), rv);
  
  
  
  1.77      +1 -1      httpd-2.0/support/htpasswd.c
  
  Index: htpasswd.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htpasswd.c,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -u -r1.76 -r1.77
  --- htpasswd.c	24 Apr 2004 18:56:00 -0000	1.76
  +++ htpasswd.c	29 Jun 2004 13:33:24 -0000	1.77
  @@ -412,7 +412,7 @@
       apr_file_open_stderr(&errfile, pool);
   
   #if APR_CHARSET_EBCDIC
  -    rv = apr_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, pool);
  +    rv = apr_xlate_open(&to_ascii, "ISO-8859-1", APR_DEFAULT_CHARSET, pool);
       if (rv) {
           apr_file_printf(errfile, "apr_xlate_open(to ASCII)->%d\n", rv);
           exit(1);
  
  
  

Mime
View raw message