URL: Removed CONFIG_URL_ESCAPE_COMPAT

diff --git a/ucw/default.cfg b/ucw/default.cfg
index 1504f8dfb8c67560deae27fc02def2abf3682b5f..91e0289e4457a4ada01035fa7b251aa719c34697 100644 (file)
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -49,9 +49,6 @@ UnSet("DEFAULT_CONFIG");
 # Environment variable with configuration file
 UnSet("ENV_VAR_CONFIG");
 
-# Use obsolete URL escaping rules (if you need behavior identical to the older versions of libucw)
-UnSet("CONFIG_URL_ESCAPE_COMPAT");
-
 # Allow use of direct IO on files
 Set("CONFIG_DIRECT_IO");
 Set("CONFIG_UCW_FB_DIRECT");

diff --git a/ucw/url.c b/ucw/url.c
index 39e52946e2bd086cd3cbdaefa4985fe217b56fde..a14d5e4972049f37e8a2a6e306557dc8b5369c91 100644 (file)
--- a/ucw/url.c
+++ b/ucw/url.c
@@ -92,14 +92,12 @@ url_deescape(const char *s, char *d)
              val = NCC_AND; break;
            case '#':
              val = NCC_HASH; break;
-#ifndef CONFIG_URL_ESCAPE_COMPAT
            case '$':
              val = NCC_DOLLAR; break;
            case '+':
              val = NCC_PLUS; break;
            case ',':
              val = NCC_COMMA; break;
-#endif
            }
          *d++ = val;
          s += 3;
@@ -142,10 +140,7 @@ url_enescape(const char *s, char *d)
          c == '!' || c == '*' || c == '\'' || c == '(' || c == ')' ||  /* ... and some exceptions and reserved chars */
          c == '$' || c == '-' || c == '_' || c == '.' || c == '+' ||
          c == ',' || c == '=' || c == '&' || c == '#' || c == ';' ||
-         c == '/' || c == '?' || c == ':' || c == '@'
-#ifndef CONFIG_URL_ESCAPE_COMPAT
-         || c == '~'
-#endif
+         c == '/' || c == '?' || c == ':' || c == '@' || c == '~'
        )
        *d++ = *s++;
       else

diff --git a/ucw/url.h b/ucw/url.h
index c389fb16a9a9b72b8acc0e16a34307b6c7a4a04e..d2689be536d8bd4b272bded3b756d1e2b93a0333 100644 (file)
--- a/ucw/url.h
+++ b/ucw/url.h
@@ -24,23 +24,15 @@ enum {
   NCC_EQUAL = 6,
   NCC_AND = 7,
   NCC_HASH = 8,
-#ifdef CONFIG_URL_ESCAPE_COMPAT
-  NCC_MAX = 9
-#else
   // Avoid 9 (\t) and 10 (\n)
   NCC_DOLLAR = 11,
   NCC_PLUS = 12,
   // Avoid 13 (\r)
   NCC_COMMA = 14,
   NCC_MAX = 15
-#endif
 };
 
-#ifdef CONFIG_URL_ESCAPE_COMPAT
-#define NCC_CHARS " ;/?:@=&#"
-#else
 #define NCC_CHARS " ;/?:@=&#\t\n$+\r,"
-#endif
 
 /* Remove/Introduce '%' escapes */