apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r292299 - in /apr/apr-iconv/trunk: CHANGES lib/iconv_module.c
Date Wed, 28 Sep 2005 21:11:57 GMT
Author: wrowe
Date: Wed Sep 28 14:11:55 2005
New Revision: 292299

URL: http://svn.apache.org/viewcvs?rev=292299&view=rev
Log:

  Per previous discussions on dev@apr, be agreeable to falling back upon
  APR_ICONV_PATH for applications which are using APR 1 but have not yet
  migrated to using APR_ICONV1_PATH.

  Once they do, ignore APR_ICONV_PATH so that APR 0 will co-exist.

  Two more enhancements could be added, one to validate that the module
  loaded is an APR 1 flavor, and the other to search for apriconv-1.so
  (.dll) and use that parent directory, apriconv-1/ subdir.  But skip
  those for today since this specific patch provides compatibility and
  a solution for now.

Modified:
    apr/apr-iconv/trunk/CHANGES
    apr/apr-iconv/trunk/lib/iconv_module.c

Modified: apr/apr-iconv/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr-iconv/trunk/CHANGES?rev=292299&r1=292298&r2=292299&view=diff
==============================================================================
--- apr/apr-iconv/trunk/CHANGES (original)
+++ apr/apr-iconv/trunk/CHANGES Wed Sep 28 14:11:55 2005
@@ -1,9 +1,13 @@
 Changes with APR-ICONV 1.1
 
   *) APR_ICONV1_PATH distinguishes between our apr-iconv 0.9 and 1.x
-     flavors (changed pool arguments to several internal functions, so the
-     loadable charset modules are not binary compatible.)  The older 0.9
-     flavor APR_ICONV_PATH won't be searched.  [William Rowe]
+     flavors (the pool arguments to several internal functions changed
+     in 1.0, so the loadable charset modules are not binary compatible.)
+     To maintain APR-iconv 1.0 compatibility, first APR_ICONV1 is used,
+     if it is set then the older 0.9 flavor APR_ICONV_PATH won't be 
+     searched.  apr-iconv 0.9 and 1.0 will only coexist if both the
+     APR_ICONV1_PATH and APR_ICONV_PATH variables are both set to their
+     respective charset directories.  [William Rowe]
 
 Changes with APR-ICONV 1.0.2
 

Modified: apr/apr-iconv/trunk/lib/iconv_module.c
URL: http://svn.apache.org/viewcvs/apr/apr-iconv/trunk/lib/iconv_module.c?rev=292299&r1=292298&r2=292299&view=diff
==============================================================================
--- apr/apr-iconv/trunk/lib/iconv_module.c (original)
+++ apr/apr-iconv/trunk/lib/iconv_module.c Wed Sep 28 14:11:55 2005
@@ -96,7 +96,11 @@
         while (0 != (*ptr++ = apr_tolower(*name++)))
             ;
 
-        if (!apr_env_get(&ptr, APR_ICONV_PATH, subpool)
+        /* Fall back on APR_ICONV_PATH if APR_ICONVn_PATH isn't set...
+         * TODO: Drop support for "APR_ICONV_PATH" in apr-iconv 2.0
+         */
+        if ((!apr_env_get(&ptr, APR_ICONV_PATH, subpool)
+             || (!apr_env_get(&ptr, "APR_ICONV_PATH", subpool))
             && !apr_filepath_list_split(&pathelts, ptr, subpool))
         {
             int i;



Mime
View raw message