Use standardized names for ISO-8859-1, see http://www.iana.org/assignments/character...

(Using the name iso8859-1 may still work, because it is aliased in apr-iconv/ccs/charset.aliases)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104078 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/util_ebcdic.c b/server/util_ebcdic.c
index 56715b8f00d8cb808d544ba3cb3cd9a5d27b9b65..b47f9b28dd2dd6f55e8b5799cb01c13acc8a2b17 100644 (file)
--- a/server/util_ebcdic.c
+++ b/server/util_ebcdic.c
@@ -28,14 +28,14 @@ apr_status_t ap_init_ebcdic(apr_pool_t *pool)
     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");

diff --git a/support/ab.c b/support/ab.c
index 54785a55184572456e502fb59fa60f99cc55bb96..173791905956a28b449ceab659a87adfc16122a6 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -1789,14 +1789,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-        printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.144 $> apache-2.0");
+        printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.145 $> apache-2.0");
         printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
         printf("Copyright (c) 1998-2002 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", AP_AB_BASEREVISION, "$Revision: 1.144 $");
+        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.145 $");
         printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
         printf(" Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/<br>\n");
         printf("</p>\n<p>\n");
@@ -1986,12 +1986,12 @@ int main(int argc, const char * const argv[])
     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);

diff --git a/support/htdbm.c b/support/htdbm.c
index 1d59110d1541efb833f5bc76acc30cfe623078ec..652d5d793febd26363d899e15cd427be62e24794 100644 (file)
--- a/support/htdbm.c
+++ b/support/htdbm.c
@@ -143,7 +143,7 @@ static apr_status_t htdbm_init(apr_pool_t **pool, htdbm_t **hdbm)
     (*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;

diff --git a/support/htdigest.c b/support/htdigest.c
index ca510bf314c20be87e70f19848024958bc2eb59d..b3cc07875feb1017dcd41fea20eb6fc14d427a36 100644 (file)
--- a/support/htdigest.c
+++ b/support/htdigest.c
@@ -199,7 +199,7 @@ int main(int argc, const char * const argv[])
     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);

diff --git a/support/htpasswd.c b/support/htpasswd.c
index 3675c52b46b1bad5ff8e2686324351f7e97b9aaa..af03b11c1f1dc4c3097d79a6e675c0f04e9c7f4d 100644 (file)
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -412,7 +412,7 @@ int main(int argc, const char * const argv[])
     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);